Update twentysixteen 1.7

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

23 files changed, 1869 insertions, 845 deletions

diff --git a/themes/twentysixteen/archive.php b/themes/twentysixteen/archive.php
index 7f302359..bdd2967e 100644
--- a/themes/twentysixteen/archive.php
+++ b/themes/twentysixteen/archive.php
@@ -32,8 +32,7 @@ get_header(); ?>
 
 			<?php
 			// Start the Loop.
-			while ( have_posts() ) :
-				the_post();
+			while ( have_posts() ) : the_post();
 
 				/*
 				 * Include the Post-Format-specific template for the content.
@@ -42,19 +41,17 @@ get_header(); ?>
 				 */
 				get_template_part( 'template-parts/content', get_post_format() );
 
-				// End the loop.
+			// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
-			the_posts_pagination(
-				array(
-					'prev_text'          => __( 'Previous page', 'twentysixteen' ),
-					'next_text'          => __( 'Next page', 'twentysixteen' ),
-					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
-				)
-			);
+			the_posts_pagination( array(
+				'prev_text'          => __( 'Previous page', 'twentysixteen' ),
+				'next_text'          => __( 'Next page', 'twentysixteen' ),
+				'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' );
 
diff --git a/themes/twentysixteen/comments.php b/themes/twentysixteen/comments.php
index 95dd5651..7ff5b32d 100644
--- a/themes/twentysixteen/comments.php
+++ b/themes/twentysixteen/comments.php
@@ -26,23 +26,23 @@ if ( post_password_required() ) {
 		<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>
 
@@ -50,13 +50,11 @@ if ( post_password_required() ) {
 
 		<ol class="comment-list">
 			<?php
-				wp_list_comments(
-					array(
-						'style'       => 'ol',
-						'short_ping'  => true,
-						'avatar_size' => 42,
-					)
-				);
+				wp_list_comments( array(
+					'style'       => 'ol',
+					'short_ping'  => true,
+					'avatar_size' => 42,
+				) );
 			?>
 		</ol><!-- .comment-list -->
 
@@ -66,18 +64,16 @@ if ( post_password_required() ) {
 
 	<?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
-		comment_form(
-			array(
-				'title_reply_before' => '<h2 id="reply-title" class="comment-reply-title">',
-				'title_reply_after'  => '</h2>',
-			)
-		);
+		comment_form( array(
+			'title_reply_before' => '<h2 id="reply-title" class="comment-reply-title">',
+			'title_reply_after'  => '</h2>',
+		) );
 	?>
 
 </div><!-- .comments-area -->
diff --git a/themes/twentysixteen/css/blocks.css b/themes/twentysixteen/css/blocks.css
new file mode 100644
index 00000000..ae742241
--- /dev/null
+++ b/themes/twentysixteen/css/blocks.css
@@ -0,0 +1,423 @@
+/*
+Theme Name: Twenty Sixteen
+Description: Used to style blocks.
+*/
+
+/*--------------------------------------------------------------
+>>> TABLE OF CONTENTS:
+----------------------------------------------------------------
+1.0 General Block Styles
+2.0 Blocks - Common Blocks
+3.0 Blocks - Formatting
+4.0 Blocks - Layout Elements
+5.0 Blocks - Widgets
+6.0 Blocks - Colors
+--------------------------------------------------------------*/
+
+/*--------------------------------------------------------------
+1.0 General Block Styles
+--------------------------------------------------------------*/
+
+/* Captions */
+
+[class^="wp-block-"] figcaption {
+	color: #686868;
+	font-style: italic;
+	line-height: 1.6153846154;
+	padding-top: 0.5384615385em;
+	text-align: left;
+}
+
+.rtl [class^="wp-block-"] figcaption {
+	text-align: right;
+}
+
+/*--------------------------------------------------------------
+2.0 Blocks - Common Blocks
+--------------------------------------------------------------*/
+
+/* Paragraph */
+
+p.has-drop-cap:not(:focus)::first-letter {
+	font-size: 5em;
+}
+
+/* Image */
+
+@media screen and (min-width: 61.5625em) {
+	body:not(.search-results) article:not(.type-page) .wp-block-image figcaption.below-entry-meta {
+		clear: both;
+		display: block;
+		float: none;
+		margin-right: 0;
+		margin-left: -40%;
+		max-width: 140%;
+	}
+
+	body.rtl:not(.search-results) article:not(.type-page) .wp-block-image figcaption.below-entry-meta {
+		margin-left: 0;
+		margin-right: -40%;
+	}
+}
+
+/* Gallery */
+
+.wp-block-gallery {
+	margin-bottom: 1.75em;
+}
+
+/* Quote */
+
+.wp-block-quote:not(.is-large):not(.is-style-large).alignleft,
+.wp-block-quote:not(.is-large):not(.is-style-large).alignright {
+	border-left: none;
+	padding-left: 0;
+}
+
+.rtl .wp-block-quote:not(.is-large):not(.is-style-large).alignleft,
+.rtl .wp-block-quote:not(.is-large):not(.is-style-large).alignright {
+	border-right: none;
+	padding-right: 0;
+}
+
+.wp-block-quote cite {
+	color: #1a1a1a;
+	display: block;
+	font-size: 16px;
+	font-size: 1rem;
+	line-height: 1.75;
+}
+
+.wp-block-quote cite:before {
+	content: "\2014\00a0";
+}
+
+/* Audio */
+
+.wp-block-audio audio {
+	display: block;
+	width: 100%;
+}
+
+/* Cover */
+
+.wp-block-cover-image.aligncenter,
+.wp-block-cover.aligncenter {
+	display: flex;
+}
+
+/* File */
+
+.wp-block-file .wp-block-file__button {
+	background: #1a1a1a;
+	border: 0;
+	border-radius: 2px;
+	color: #fff;
+	font-family: Montserrat, "Helvetica Neue", sans-serif;
+	font-weight: 700;
+	letter-spacing: 0.046875em;
+	line-height: 1;
+	padding: 0.84375em 0.875em 0.78125em;
+	text-transform: uppercase;
+}
+
+.wp-block-file .wp-block-file__button:hover,
+.wp-block-file .wp-block-file__button:focus {
+	background: #007acc;
+}
+
+.wp-block-file .wp-block-file__button:focus {
+	outline: thin dotted;
+	outline-offset: -4px;
+}
+
+.rtl .wp-block-file * + .wp-block-file__button {
+	margin-left: 0.75em;
+	margin-right: 0;
+}
+
+/*--------------------------------------------------------------
+3.0 Blocks - Formatting Blocks
+--------------------------------------------------------------*/
+
+/* Code */
+
+.wp-block-code {
+	border: 0;
+	font-family: Inconsolata, monospace;
+	font-size: 16px;
+	font-size: 1rem;
+	line-height: 1.75;
+	padding: 0;
+}
+
+/* Pullquote */
+
+.wp-block-pullquote {
+	border-width: 4px;
+}
+
+.wp-block-pullquote blockquote {
+	border-left: 0;
+	margin: 0;
+	padding: 0;
+}
+
+.rtl .wp-block-pullquote blockquote {
+	border-right: 0;
+}
+
+.wp-block-pullquote p {
+	color: #686868;
+	font-size: 19px;
+	font-size: 1.1875rem;
+}
+
+.wp-block-pullquote cite {
+	color: #1a1a1a;
+	display: block;
+	font-size: 16px;
+	font-size: 1rem;
+	font-style: none;
+	line-height: 1.75;
+	text-transform: none;
+}
+
+.wp-block-pullquote cite:before {
+	content: "\2014\00a0";
+}
+
+/* Table */
+
+.wp-block-table,
+.wp-block-table th,
+.wp-block-table td {
+	border: 1px solid #d1d1d1;
+}
+
+.wp-block-table {
+	border-collapse: separate;
+	border-spacing: 0;
+	border-width: 1px 0 0 1px;
+	margin: 0 0 1.75em;
+	table-layout: fixed;
+	width: 100%;
+}
+
+.wp-block-table th,
+.wp-block-table td {
+	font-weight: normal;
+	padding: 0.4375em;
+	text-align: left;
+}
+
+.wp-block-table th {
+	border-width: 0 1px 1px 0;
+	font-weight: 700;
+}
+
+.wp-block-table td {
+	border-width: 0 1px 1px 0;
+}
+
+.rtl .wp-block-table th,
+.rtl .wp-block-table td {
+	text-align: right;
+}
+
+/*--------------------------------------------------------------
+4.0 Blocks - Layout Elements
+--------------------------------------------------------------*/
+
+/* Buttons */
+
+.wp-block-button .wp-block-button__link {
+	border: 0;
+	border-radius: 2px;
+	font-family: Montserrat, "Helvetica Neue", sans-serif;
+	font-weight: 700;
+	letter-spacing: 0.046875em;
+	line-height: 1;
+	padding: 0.84375em 0.875em 0.78125em;
+	text-transform: uppercase;
+}
+
+.entry-content .wp-block-button__link {
+	background: #1a1a1a;
+	color: #fff;
+}
+
+.entry-content .wp-block-button__link:hover,
+.entry-content .wp-block-button__link:focus {
+	background: #007acc;
+	color: #fff;
+}
+
+.wp-block-button .wp-block-button__link:focus {
+	outline: thin dotted;
+	outline-offset: -4px;
+}
+
+/* Seperator */
+
+hr.wp-block-separator {
+	border: 0;
+}
+
+.wp-block-separator {
+	margin-left: auto;
+	margin-right: auto;
+	max-width: 100px;
+}
+
+.wp-block-separator.is-style-wide {
+	max-width: 100%;
+}
+
+/* Media & Text */
+
+.wp-block-media-text {
+	margin-bottom: 1.75em;
+}
+
+.wp-block-media-text *:last-child {
+	margin-bottom: 0;
+}
+
+/*--------------------------------------------------------------
+5.0 Blocks - Widget Blocks
+--------------------------------------------------------------*/
+
+/* Archives, Categories & Latest Posts */
+
+.wp-block-archives.aligncenter,
+.wp-block-categories.aligncenter,
+.wp-block-latest-posts.aligncenter {
+	list-style-position: inside;
+	text-align: center;
+}
+
+/* Latest Comments */
+
+.wp-block-latest-comments__comment-meta a {
+	box-shadow: none;
+	font-weight: 700;
+}
+
+.wp-block-latest-comments__comment-date {
+	color: #686868;
+	font-family: Montserrat, "Helvetica Neue", sans-serif;
+	font-size: 13px;
+	font-size: 0.8125rem;
+	line-height: 1.6153846154;
+}
+
+.wp-block-latest-comments .wp-block-latest-comments__comment {
+	border-top: 1px solid #d1d1d1;
+	margin-bottom: 0;
+	padding: 1.75em 0;
+}
+
+.wp-block-latest-comments__comment-excerpt p:last-child {
+	margin-bottom: 0;
+}
+
+/*--------------------------------------------------------------
+6.0 Blocks - Colors
+--------------------------------------------------------------*/
+
+.entry-content .has-dark-gray-color {
+	color: #1a1a1a;
+}
+
+.entry-content .has-dark-gray-background-color {
+	background-color: #1a1a1a;
+}
+
+.entry-content .has-medium-gray-color {
+	color: #686868;
+}
+
+.entry-content .has-medium-gray-background-color {
+	background-color: #686868;
+}
+
+.entry-content .has-light-gray-color {
+	color: #e5e5e5;
+}
+
+.entry-content .has-light-gray-background-color {
+	background-color: #e5e5e5;
+}
+
+.entry-content .has-white-color {
+	color: #fff;
+}
+
+.entry-content .has-white-background-color {
+	background-color: #fff;
+}
+
+.entry-content .has-blue-gray-color {
+	color: #4d545c;
+}
+
+.entry-content .has-blue-gray-background-color {
+	background-color: #4d545c;
+}
+
+.entry-content .has-bright-blue-color {
+	color: #007acc;
+}
+
+.entry-content .has-bright-blue-background-color {
+	background-color: #007acc;
+}
+
+.entry-content .has-light-blue-color {
+	color: #9adffd;
+}
+
+.entry-content .has-light-blue-background-color {
+	background-color: #9adffd;
+}
+
+.entry-content .has-dark-brown-color {
+	color: #402b30;
+}
+
+.entry-content .has-dark-brown-background-color {
+	background-color: #402b30;
+}
+
+.entry-content .has-medium-brown-color {
+	color: #774e24;
+}
+
+.entry-content .has-medium-brown-background-color {
+	background-color: #774e24;
+}
+
+.entry-content .has-dark-red-color {
+	color: #640c1f;
+}
+
+.entry-content .has-dark-red-background-color {
+	background-color: #640c1f;
+}
+
+.entry-content .has-bright-red-color {
+	color: #ff675f;
+}
+
+.entry-content .has-bright-red-background-color {
+	background-color: #ff675f;
+}
+
+.entry-content .has-yellow-color {
+	color: #ffef8e;
+}
+
+.entry-content .has-yellow-background-color {
+	background-color: #ffef8e;
+}
diff --git a/themes/twentysixteen/css/editor-blocks.css b/themes/twentysixteen/css/editor-blocks.css
new file mode 100644
index 00000000..802353bf
--- /dev/null
+++ b/themes/twentysixteen/css/editor-blocks.css
@@ -0,0 +1,612 @@
+/*
+Theme Name: Twenty Sixteen
+Description: Used to style blocks in the editor.
+*/
+
+/*--------------------------------------------------------------
+>>> TABLE OF CONTENTS:
+----------------------------------------------------------------
+1.0 General Typography
+2.0 General Block Styles
+3.0 Blocks - Common Blocks
+4.0 Blocks - Formatting
+5.0 Blocks - Layout Elements
+6.0 Blocks - Widgets
+--------------------------------------------------------------*/
+
+/*--------------------------------------------------------------
+1.0 General Typography
+--------------------------------------------------------------*/
+
+.edit-post-visual-editor .editor-block-list__block,
+.editor-default-block-appender textarea.editor-default-block-appender__content {
+	font-family: Merriweather, Georgia, serif;
+	font-size: 16px;
+	font-size: 1rem;
+	line-height: 1.75;
+}
+
+.edit-post-visual-editor .editor-block-list__block {
+	color: #1a1a1a;
+}
+
+.editor-post-title__block .editor-post-title__input {
+	font-family: Montserrat, "Helvetica Neue", sans-serif;
+	font-size: 28px;
+	font-size: 1.75rem;
+	font-weight: 700;
+	line-height: 1.25;
+	margin-bottom: 1em;
+}
+
+.edit-post-visual-editor h1 {
+	font-size: 28px;
+	font-size: 1.75rem;
+	line-height: 1.25;
+	margin-top: 2em;
+	margin-bottom: 1em;
+}
+
+.edit-post-visual-editor h2 {
+	font-size: 23px;
+	font-size: 1.4375rem;
+	line-height: 1.2173913043;
+	margin-top: 2.4347826087em;
+	margin-bottom: 1.2173913043em;
+}
+
+.edit-post-visual-editor h3 {
+	font-size: 19px;
+	font-size: 1.1875rem;
+	line-height: 1.1052631579;
+	margin-top: 2.9473684211em;
+	margin-bottom: 1.4736842105em;
+}
+
+.edit-post-visual-editor h4,
+.edit-post-visual-editor h5,
+.edit-post-visual-editor h6 {
+	font-size: 16px;
+	font-size: 1rem;
+	line-height: 1.3125;
+	margin-top: 3.5em;
+	margin-bottom: 1.75em;
+}
+
+.edit-post-visual-editor h4 {
+	letter-spacing: 0.140625em;
+	text-transform: uppercase;
+}
+
+.edit-post-visual-editor h6 {
+	font-style: italic;
+}
+
+.edit-post-visual-editor h1,
+.edit-post-visual-editor h2,
+.edit-post-visual-editor h3,
+.edit-post-visual-editor h4,
+.edit-post-visual-editor h5,
+.edit-post-visual-editor h6 {
+	font-weight: 900;
+}
+
+@media screen and (min-width: 61.5625em) {
+	.edit-post-visual-editor h1 {
+		font-size: 33px;
+		font-size: 2.0625rem;
+		line-height: 1.2727272727;
+		margin-top: 1.696969697em;
+		margin-bottom: 0.8484848485em;
+	}
+
+	.edit-post-visual-editor h2 {
+		font-size: 28px;
+		font-size: 1.75rem;
+		line-height: 1.25;
+		margin-top: 2em;
+		margin-bottom: 1em;
+	}
+
+	.edit-post-visual-editor h3 {
+		font-size: 23px;
+		font-size: 1.4375rem;
+		line-height: 1.2173913043;
+		margin-top: 2.4347826087em;
+		margin-bottom: 1.2173913043em;
+	}
+
+	.edit-post-visual-editor h4 {
+		letter-spacing: 0.131578947em;
+	}
+
+	.edit-post-visual-editor h4,
+	.edit-post-visual-editor h5,
+	.edit-post-visual-editor h6 {
+		font-size: 19px;
+		font-size: 1.1875rem;
+		line-height: 1.1052631579;
+		margin-top: 2.9473684211em;
+		margin-bottom: 1.473684211em;
+	}
+}
+
+.edit-post-visual-editor h1:first-child,
+.edit-post-visual-editor h2:first-child,
+.edit-post-visual-editor h3:first-child,
+.edit-post-visual-editor h4:first-child,
+.edit-post-visual-editor h5:first-child,
+.edit-post-visual-editor h6:first-child {
+	margin-top: 0;
+}
+
+.edit-post-visual-editor p {
+	margin: 0 0 1.75em;
+}
+
+.edit-post-visual-editor blockquote p {
+	margin-bottom: 1.4736842105em;
+}
+
+@media screen and (min-width: 44.375em) {
+	.editor-post-title__block .editor-post-title__input {
+		font-size: 33px;
+		font-size: 2.0625rem;
+		line-height: 1.2727272727;
+		margin-bottom: 0.8484848485em;
+	}
+}
+
+@media screen and (min-width: 61.5625em) {
+	.editor-post-title__block .editor-post-title__input {
+		font-size: 40px;
+		font-size: 2.5rem;
+		line-height: 1.225;
+		margin-bottom: 1.05em;
+	}
+}
+
+/*--------------------------------------------------------------
+2.0 General Block Styles
+--------------------------------------------------------------*/
+
+/* Main column width */
+
+.editor-styles-wrapper {
+	max-width: 100% !important; /* Override where editor-style.css is affecting this */
+}
+
+.wp-block {
+	max-width: 630px; /* 600px + 30px to account for padding. */
+}
+
+/* Link styles */
+
+.edit-post-visual-editor a,
+.editor-block-list__block a,
+.wp-block-freeform.block-library-rich-text__tinymce a {
+	color: #007acc;
+}
+
+/* List styles */
+
+.edit-post-visual-editor ul:not(.wp-block-gallery),
+.editor-block-list__block ul:not(.wp-block-gallery),
+.block-library-list ul,
+.edit-post-visual-editor ol,
+.editor-block-list__block ol,
+.block-library-list ol {
+	margin: 0 0 1.75em 1.25em;
+	padding: 0;
+}
+
+.edit-post-visual-editor ul:not(.wp-block-gallery),
+.editor-block-list__block ul:not(.wp-block-gallery),
+.block-library-list ul {
+	list-style: disc;
+}
+
+.edit-post-visual-editor ol,
+.editor-block-list__block ol,
+.block-library-list ol {
+	list-style: decimal;
+	margin-left: 1.5em;
+}
+
+.edit-post-visual-editor ul:not(.wp-block-gallery) li,
+.editor-block-list__block ul:not(.wp-block-gallery) li,
+.edit-post-visual-editor ol li,
+.editor-block-list__block ol li,
+.block-library-list li {
+	margin-bottom: 0;
+}
+
+.edit-post-visual-editor ul:not(.wp-block-gallery) li > ul,
+.editor-block-list__block ul:not(.wp-block-gallery) li > ul,
+.block-library-list li > ul,
+.edit-post-visual-editor li > ol,
+.editor-block-list__block li > ol,
+.block-library-list li > ol {
+	margin-bottom: 0;
+}
+
+.rtl .edit-post-visual-editor ul:not(.wp-block-gallery),
+.rtl .editor-block-list__block ul:not(.wp-block-gallery),
+.rtl .block-library-list ul,
+.rtl .edit-post-visual-editor ol,
+.rtl .editor-block-list__block ol,
+.rtl .block-library-list ol {
+	margin-left: 0;
+	margin-right: 1.25em;
+	padding: 0;
+}
+
+.rtl .edit-post-visual-editor ol,
+.rtl .editor-block-list__block ol,
+.rtl .block-library-list ol {
+	margin-left: 1.5em;
+	margin-right: 1.5em;
+}
+
+/* Quotes */
+
+.rtl .editor-block-list__block blockquote {
+	border-left: 0;
+	padding-left: 0;
+}
+
+/* Captions */
+
+[class^="wp-block-"] figcaption {
+	color: #686868;
+	font-style: italic;
+	line-height: 1.6153846154;
+	padding-top: 0.5384615385em;
+	text-align: left;
+}
+
+.rtl [class^="wp-block-"] figcaption {
+	text-align: right;
+}
+
+/*--------------------------------------------------------------
+3.0 Blocks - Common Blocks
+--------------------------------------------------------------*/
+
+/* Paragraph */
+
+.wp-block-paragraph.has-drop-cap:not(:focus)::first-letter {
+	font-size: 5em;
+	line-height: 0.68;
+	margin: 0.05em 0.1em 0 0;
+	text-transform: uppercase;
+	font-style: normal;
+}
+
+.rtl .wp-block-paragraph.has-drop-cap:not(:focus)::first-letter {
+	margin: 0.05em 0 0 0.1em;
+}
+
+/* Quote */
+
+.wp-block-quote {
+	border: 0 solid #1a1a1a;
+	border-left-width: 4px;
+	color: #686868;
+	font-style: italic;
+	line-height: 1.4736842105;
+	margin: 0 0 1.4736842105em;
+	overflow: hidden;
+	padding: 0 0 0 1.263157895em;
+}
+
+.wp-block-quote:not(.is-large):not(.is-style-large).alignleft,
+.wp-block-quote:not(.is-large):not(.is-style-large).alignright {
+	border-left: 0;
+	padding-left: 0;
+}
+
+.editor-block-list__block .wp-block-quote p {
+	font-size: 19px;
+	font-size: 1.1875rem;
+	margin-bottom: 1.4736842105em;
+}
+
+.wp-block-quote__citation {
+	color: #1a1a1a;
+	display: block;
+	font-size: 16px;
+	font-size: 1rem;
+	line-height: 1.75;
+}
+
+.wp-block-quote__citation:before {
+	content: "\2014\00a0";
+}
+
+.wp-block-quote em,
+.wp-block-quote i,
+.wp-block-quote__citation:before {
+	font-style: normal;
+}
+
+.wp-block-quote strong,
+.wp-block-quote b {
+	font-weight: 400;
+}
+
+.wp-block-quote > :last-child {
+	margin-bottom: 0;
+}
+
+.wp-block-quote.alignleft {
+	margin: 0.3157894737em 1.4736842105em 1.473684211em 0;
+}
+
+.wp-block-quote.alignright {
+	margin: 0.3157894737em 0 1.473684211em 1.4736842105em;
+}
+
+.wp-block-quote.aligncenter {
+	margin-bottom: 1.473684211em;
+}
+
+.rtl .wp-block-quote:not(.is-large):not(.is-style-large).alignleft,
+.rtl .wp-block-quote:not(.is-large):not(.is-style-large).alignright  {
+	border-right: 0;
+	padding-right: 0;
+}
+
+@media screen and (min-width: 44.375em) {
+	.wp-block-quote.alignleft,
+	.wp-block-quote.alignright {
+		border-width: 4px 0 0 0;
+		padding: 0.9473684211em 0 0;
+		width: -webkit-calc(50% - 0.736842105em);
+		width: calc(50% - 0.736842105em);
+	}
+
+	.wp-block-quote:not(.alignleft):not(.alignright) {
+		margin-left: -1.473684211em;
+	}
+
+	.rtl .wp-block-quote:not(.alignleft):not(.alignright) {
+		margin-left: 0;
+		margin-right: -1.473684211em;
+	}
+}
+
+@media screen and (min-width: 80em) {
+	.editor-block-list__block .wp-block-quote.alignleft {
+		margin-left: -40%;
+		width: -webkit-calc(60% - 1.4736842105em);
+		width: calc(60% - 1.4736842105em);
+	}
+}
+
+/* File */
+
+.wp-block-file__textlink {
+	box-shadow: 0 1px 0 0 currentColor;
+	color: #007acc;
+}
+
+.wp-block-file .wp-block-file__button {
+	background: #1a1a1a;
+	border: 0;
+	border-radius: 2px;
+	color: #fff;
+	font-family: Montserrat, "Helvetica Neue", sans-serif;
+	font-weight: 700;
+	letter-spacing: 0.046875em;
+	line-height: 1;
+	padding: 0.84375em 0.875em 0.78125em;
+	text-transform: uppercase;
+}
+
+/*--------------------------------------------------------------
+4.0 Blocks - Formatting
+--------------------------------------------------------------*/
+
+/* Code */
+
+.wp-block-code {
+	border: 0;
+	padding: 0.125em 0.25em;
+}
+
+/* Classic */
+
+.wp-block-freeform.block-library-rich-text__tinymce blockquote {
+	border: 0 solid #1a1a1a;
+	border-left-width: 4px;
+	color: #686868;
+	font-style: italic;
+	line-height: 1.4736842105;
+	margin: 0 0 1.4736842105em;
+	overflow: hidden;
+	padding: 0 0 0 1.263157895em;
+}
+
+.editor-block-list__block .wp-block-freeform.block-library-rich-text__tinymce blockquote:not(.alignleft):not(.alignright) {
+	margin-left: 0;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce blockquote p {
+	font-size: 19px;
+	font-size: 1.1875rem;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce blockquote cite {
+	color: #1a1a1a;
+	display: block;
+	font-size: 16px;
+	font-size: 1rem;
+	font-style: normal;
+	line-height: 1.75;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce blockquote cite:before {
+	content: "\2014\00a0";
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce blockquote.alignleft {
+	margin: 0.3157894737em 1.4736842105em 1.473684211em 0;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce blockquote.alignright {
+	margin: 0.3157894737em 0 1.473684211em 1.4736842105em;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce blockquote.aligncenter {
+	margin-bottom: 1.473684211em;
+}
+
+@media screen and (min-width: 44.375em) {
+	.wp-block-freeform.block-library-rich-text__tinymce blockquote.alignleft,
+	.wp-block-freeform.block-library-rich-text__tinymce blockquote.alignright {
+		border-width: 4px 0 0 0;
+		padding: 0.9473684211em 0 0;
+		width: -webkit-calc(50% - 0.736842105em);
+		width: calc(50% - 0.736842105em);
+	}
+}
+
+.rtl .wp-block-freeform.block-library-rich-text__tinymce blockquote {
+	border-left-width: 0;
+	border-right-width: 4px;
+	overflow: hidden;
+	padding-left: 0;
+	padding-right: 1.263157895em;
+}
+
+.rtl .wp-block-freeform.block-library-rich-text__tinymce .alignleft {
+	float: left;
+}
+
+.rtl .wp-block-freeform.block-library-rich-text__tinymce .alignright {
+	float: right;
+}
+
+.rtl .wp-block-freeform.block-library-rich-text__tinymce blockquote.alignleft {
+	margin: 0.3157894737em 0 1.473684211em 1.4736842105em;
+}
+
+.rtl .wp-block-freeform.block-library-rich-text__tinymce blockquote.alignright {
+	margin: 0.3157894737em 1.4736842105em 1.473684211em 0;
+}
+
+/* Pullquote */
+
+.editor-block-list__block .wp-block-pullquote blockquote {
+	border: 0;
+	margin: 0;
+	padding: 0;
+}
+
+.wp-block-pullquote blockquote > .editor-rich-text p {
+	color: #686868;
+	font-size: 19px;
+	font-size: 1.1875rem;
+}
+
+.wp-block-pullquote .wp-block-pullquote__citation {
+	color: #1a1a1a;
+	display: block;
+	font-size: 16px;
+	font-size: 1rem;
+	font-style: italic;
+	line-height: 1.75;
+	text-transform: none;
+}
+
+.wp-block-pullquote .wp-block-pullquote__citation:before {
+	content: "\2014\00a0";
+}
+
+/* Table */
+
+.editor-block-list__block table.wp-block-table th,
+.editor-block-list__block table.wp-block-table td {
+	padding: 0;
+}
+
+.rtl .wp-block-table th,
+.rtl .wp-block-table td {
+	text-align: right;
+}
+
+/*--------------------------------------------------------------
+5.0 Blocks - Layout Elements
+--------------------------------------------------------------*/
+
+/* Buttons */
+
+.wp-block-button .wp-block-button__link {
+	background: #1a1a1a;
+	border: 0;
+	border-radius: 2px;
+	color: #fff;
+	font-family: Montserrat, "Helvetica Neue", sans-serif;
+	font-weight: 700;
+	letter-spacing: 0.046875em;
+	line-height: 1;
+	padding: 0.84375em 0.875em 0.78125em;
+	text-transform: uppercase;
+}
+
+/* Media & Text */
+
+.wp-block-media-text *:last-child {
+	margin-bottom: 0;
+}
+
+/*--------------------------------------------------------------
+6.0 Blocks - Widgets
+--------------------------------------------------------------*/
+
+/* Archives, Categories & Latest Posts */
+
+[data-align="center"] .wp-block-archives ul,
+[data-align="center"] .wp-block-categories ul,
+[data-align="center"] .wp-block-latest-posts ul {
+	list-style-position: inside;
+}
+
+/* Latest Comments */
+
+.editor-block-list__block .wp-block-latest-comments__comment-meta a {
+	box-shadow: none;
+	font-weight: 700;
+	text-decoration: none;
+}
+
+.wp-block-latest-comments__comment-date {
+	color: #686868;
+	font-family: Montserrat, "Helvetica Neue", sans-serif;
+	font-size: 13px;
+	font-size: 0.8125rem;
+	line-height: 1.6153846154;
+}
+
+.wp-block-latest-comments .wp-block-latest-comments__comment {
+	border-top: 1px solid #d1d1d1;
+	margin-bottom: 0;
+	padding: 1.75em 0;
+}
+
+.wp-block-latest-comments__comment-excerpt p:last-child {
+	margin-bottom: 0;
+}
+
+/* Latest Posts */
+
+.edit-post-visual-editor .wp-block-latest-posts.is-grid {
+	list-style: none;
+	margin-left: 0;
+	margin-right: 0;
+}
+
+.edit-post-visual-editor .wp-block-latest-posts.is-grid li {
+	margin-bottom: 16px;
+}
diff --git a/themes/twentysixteen/css/editor-style.css b/themes/twentysixteen/css/editor-style.css
index 30551958..ed48ce7f 100644
--- a/themes/twentysixteen/css/editor-style.css
+++ b/themes/twentysixteen/css/editor-style.css
@@ -223,11 +223,11 @@ sub {
 	vertical-align: baseline;
 }
 
-sub {
+sup {
 	top: -6px;
 }
 
-sup {
+sub {
 	bottom: -3px;
 }
 
diff --git a/themes/twentysixteen/footer.php b/themes/twentysixteen/footer.php
index 5fff3bd9..baa82092 100644
--- a/themes/twentysixteen/footer.php
+++ b/themes/twentysixteen/footer.php
@@ -16,12 +16,10 @@
 			<?php if ( has_nav_menu( 'primary' ) ) : ?>
 				<nav class="main-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Footer Primary Menu', 'twentysixteen' ); ?>">
 					<?php
-						wp_nav_menu(
-							array(
-								'theme_location' => 'primary',
-								'menu_class'     => 'primary-menu',
-							)
-						);
+						wp_nav_menu( array(
+							'theme_location' => 'primary',
+							'menu_class'     => 'primary-menu',
+						 ) );
 					?>
 				</nav><!-- .main-navigation -->
 			<?php endif; ?>
@@ -29,15 +27,13 @@
 			<?php if ( has_nav_menu( 'social' ) ) : ?>
 				<nav class="social-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Footer Social Links Menu', 'twentysixteen' ); ?>">
 					<?php
-						wp_nav_menu(
-							array(
-								'theme_location' => 'social',
-								'menu_class'     => 'social-links-menu',
-								'depth'          => 1,
-								'link_before'    => '<span class="screen-reader-text">',
-								'link_after'     => '</span>',
-							)
-						);
+						wp_nav_menu( array(
+							'theme_location' => 'social',
+							'menu_class'     => 'social-links-menu',
+							'depth'          => 1,
+							'link_before'    => '<span class="screen-reader-text">',
+							'link_after'     => '</span>',
+						) );
 					?>
 				</nav><!-- .social-navigation -->
 			<?php endif; ?>
diff --git a/themes/twentysixteen/functions.php b/themes/twentysixteen/functions.php
index 3e675eaf..1bade4ca 100644
--- a/themes/twentysixteen/functions.php
+++ b/themes/twentysixteen/functions.php
@@ -33,108 +33,173 @@ if ( version_compare( $GLOBALS['wp_version'], '4.4-alpha', '<' ) ) {
 }
 
 if ( ! function_exists( 'twentysixteen_setup' ) ) :
-	/**
-	 * Sets up theme defaults and registers support for various WordPress features.
+/**
+ * Sets up theme defaults and registers support for various WordPress features.
+ *
+ * Note that this function is hooked into the after_setup_theme hook, which
+ * runs before the init hook. The init hook is too late for some features, such
+ * as indicating support for post thumbnails.
+ *
+ * Create your own twentysixteen_setup() function to override in a child theme.
+ *
+ * @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.
 	 *
-	 * Note that this function is hooked into the after_setup_theme hook, which
-	 * runs before the init hook. The init hook is too late for some features, such
-	 * as indicating support for post thumbnails.
+	 *  @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.
 	 *
-	 * Create your own twentysixteen_setup() function to override in a child theme.
+	 * @link https://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.
 	 *
-	 * @since Twenty Sixteen 1.0
+	 * See: https://codex.wordpress.org/Post_Formats
 	 */
-	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 https://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() ) );
-
-		// Indicate widget sidebars can use selective refresh in the Customizer.
-		add_theme_support( 'customize-selective-refresh-widgets' );
-	}
+	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() ) );
+
+	// Load regular editor styles into the new block-based editor.
+	add_theme_support( 'editor-styles' );
+
+	// Load default block styles.
+	add_theme_support( 'wp-block-styles' );
+
+	// Add support for responsive embeds.
+	add_theme_support( 'responsive-embeds' );
+
+	// Add support for custom color scheme.
+	add_theme_support( 'editor-color-palette', array(
+		array(
+			'name'  => __( 'Dark Gray', 'twentysixteen' ),
+			'slug'  => 'dark-gray',
+			'color' => '#1a1a1a',
+		),
+		array(
+			'name'  => __( 'Medium Gray', 'twentysixteen' ),
+			'slug'  => 'medium-gray',
+			'color' => '#686868',
+		),
+		array(
+			'name'  => __( 'Light Gray', 'twentysixteen' ),
+			'slug'  => 'light-gray',
+			'color' => '#e5e5e5',
+		),
+		array(
+			'name'  => __( 'White', 'twentysixteen' ),
+			'slug'  => 'white',
+			'color' => '#fff',
+		),
+		array(
+			'name'  => __( 'Blue Gray', 'twentysixteen' ),
+			'slug'  => 'blue-gray',
+			'color' => '#4d545c',
+		),
+		array(
+			'name'  => __( 'Bright Blue', 'twentysixteen' ),
+			'slug'  => 'bright-blue',
+			'color' => '#007acc',
+		),
+		array(
+			'name'  => __( 'Light Blue', 'twentysixteen' ),
+			'slug'  => 'light-blue',
+			'color' => '#9adffd',
+		),
+		array(
+			'name'  => __( 'Dark Brown', 'twentysixteen' ),
+			'slug'  => 'dark-brown',
+			'color' => '#402b30',
+		),
+		array(
+			'name'  => __( 'Medium Brown', 'twentysixteen' ),
+			'slug'  => 'medium-brown',
+			'color' => '#774e24',
+		),
+		array(
+			'name'  => __( 'Dark Red', 'twentysixteen' ),
+			'slug'  => 'dark-red',
+			'color' => '#640c1f',
+		),
+		array(
+			'name'  => __( 'Bright Red', 'twentysixteen' ),
+			'slug'  => 'bright-red',
+			'color' => '#ff675f',
+		),
+		array(
+			'name'  => __( 'Yellow', 'twentysixteen' ),
+			'slug'  => 'yellow',
+			'color' => '#ffef8e',
+		),
+	) );
+
+	// 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' );
 
@@ -160,85 +225,77 @@ add_action( 'after_setup_theme', 'twentysixteen_content_width', 0 );
  * @since Twenty Sixteen 1.0
  */
 function twentysixteen_widgets_init() {
-	register_sidebar(
-		array(
-			'name'          => __( 'Sidebar', 'twentysixteen' ),
-			'id'            => 'sidebar-1',
-			'description'   => __( 'Add widgets here to appear in your sidebar.', 'twentysixteen' ),
-			'before_widget' => '<section id="%1$s" class="widget %2$s">',
-			'after_widget'  => '</section>',
-			'before_title'  => '<h2 class="widget-title">',
-			'after_title'   => '</h2>',
-		)
-	);
-
-	register_sidebar(
-		array(
-			'name'          => __( 'Content Bottom 1', 'twentysixteen' ),
-			'id'            => 'sidebar-2',
-			'description'   => __( 'Appears at the bottom of the content on posts and pages.', 'twentysixteen' ),
-			'before_widget' => '<section id="%1$s" class="widget %2$s">',
-			'after_widget'  => '</section>',
-			'before_title'  => '<h2 class="widget-title">',
-			'after_title'   => '</h2>',
-		)
-	);
-
-	register_sidebar(
-		array(
-			'name'          => __( 'Content Bottom 2', 'twentysixteen' ),
-			'id'            => 'sidebar-3',
-			'description'   => __( 'Appears at the bottom of the content on posts and pages.', 'twentysixteen' ),
-			'before_widget' => '<section id="%1$s" class="widget %2$s">',
-			'after_widget'  => '</section>',
-			'before_title'  => '<h2 class="widget-title">',
-			'after_title'   => '</h2>',
-		)
-	);
+	register_sidebar( array(
+		'name'          => __( 'Sidebar', 'twentysixteen' ),
+		'id'            => 'sidebar-1',
+		'description'   => __( 'Add widgets here to appear in your sidebar.', 'twentysixteen' ),
+		'before_widget' => '<section id="%1$s" class="widget %2$s">',
+		'after_widget'  => '</section>',
+		'before_title'  => '<h2 class="widget-title">',
+		'after_title'   => '</h2>',
+	) );
+
+	register_sidebar( array(
+		'name'          => __( 'Content Bottom 1', 'twentysixteen' ),
+		'id'            => 'sidebar-2',
+		'description'   => __( 'Appears at the bottom of the content on posts and pages.', 'twentysixteen' ),
+		'before_widget' => '<section id="%1$s" class="widget %2$s">',
+		'after_widget'  => '</section>',
+		'before_title'  => '<h2 class="widget-title">',
+		'after_title'   => '</h2>',
+	) );
+
+	register_sidebar( array(
+		'name'          => __( 'Content Bottom 2', 'twentysixteen' ),
+		'id'            => 'sidebar-3',
+		'description'   => __( 'Appears at the bottom of the content on posts and pages.', 'twentysixteen' ),
+		'before_widget' => '<section id="%1$s" class="widget %2$s">',
+		'after_widget'  => '</section>',
+		'before_title'  => '<h2 class="widget-title">',
+		'after_title'   => '</h2>',
+	) );
 }
 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.
-	 *
-	 * @since Twenty Sixteen 1.0
-	 *
-	 * @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';
-		}
+/**
+ * Register Google fonts for Twenty Sixteen.
+ *
+ * Create your own twentysixteen_fonts_url() function to override in a child theme.
+ *
+ * @since Twenty Sixteen 1.0
+ *
+ * @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 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';
-		}
+	/* 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';
+	}
 
-		if ( $fonts ) {
-			$fonts_url = add_query_arg(
-				array(
-					'family' => urlencode( implode( '|', $fonts ) ),
-					'subset' => urlencode( $subsets ),
-				), 'https://fonts.googleapis.com/css'
-			);
-		}
+	/* 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';
+	}
 
-		return $fonts_url;
+	if ( $fonts ) {
+		$fonts_url = add_query_arg( array(
+			'family' => urlencode( implode( '|', $fonts ) ),
+			'subset' => urlencode( $subsets ),
+		), 'https://fonts.googleapis.com/css' );
 	}
+
+	return $fonts_url;
+}
 endif;
 
 /**
@@ -268,6 +325,9 @@ function twentysixteen_scripts() {
 	// Theme stylesheet.
 	wp_enqueue_style( 'twentysixteen-style', get_stylesheet_uri() );
 
+	// Theme block stylesheet.
+	wp_enqueue_style( 'twentysixteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentysixteen-style' ), '20181018' );
+
 	// Load the Internet Explorer specific stylesheet.
 	wp_enqueue_style( 'twentysixteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentysixteen-style' ), '20160816' );
 	wp_style_add_data( 'twentysixteen-ie', 'conditional', 'lt IE 10' );
@@ -296,16 +356,27 @@ function twentysixteen_scripts() {
 
 	wp_enqueue_script( 'twentysixteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20160816', true );
 
-	wp_localize_script(
-		'twentysixteen-script', 'screenReaderText', array(
-			'expand'   => __( 'expand child menu', 'twentysixteen' ),
-			'collapse' => __( 'collapse child menu', 'twentysixteen' ),
-		)
-	);
+	wp_localize_script( 'twentysixteen-script', 'screenReaderText', array(
+		'expand'   => __( 'expand child menu', 'twentysixteen' ),
+		'collapse' => __( 'collapse child menu', 'twentysixteen' ),
+	) );
 }
 add_action( 'wp_enqueue_scripts', 'twentysixteen_scripts' );
 
 /**
+ * Enqueue styles for the block-based editor.
+ *
+ * @since Twenty Sixteen 1.6
+ */
+function twentysixteen_block_editor_styles() {
+	// Block styles.
+	wp_enqueue_style( 'twentysixteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css' );
+	// Add custom fonts.
+	wp_enqueue_style( 'twentysixteen-fonts', twentysixteen_fonts_url(), array(), null );
+}
+add_action( 'enqueue_block_editor_assets', 'twentysixteen_block_editor_styles' );
+
+/**
  * Adds custom classes to the array of body classes.
  *
  * @since Twenty Sixteen 1.0
@@ -351,10 +422,10 @@ function twentysixteen_hex2rgb( $color ) {
 	$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 ) );
-	} elseif ( 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 ) );
+	} else if ( strlen( $color ) === 6 ) {
 		$r = hexdec( substr( $color, 0, 2 ) );
 		$g = hexdec( substr( $color, 2, 2 ) );
 		$b = hexdec( substr( $color, 4, 2 ) );
@@ -362,11 +433,7 @@ function twentysixteen_hex2rgb( $color ) {
 		return array();
 	}
 
-	return array(
-		'red'   => $r,
-		'green' => $g,
-		'blue'  => $b,
-	);
+	return array( 'red' => $r, 'green' => $g, 'blue' => $b );
 }
 
 /**
@@ -411,7 +478,7 @@ function twentysixteen_content_image_sizes_attr( $sizes, $size ) {
 
 	return $sizes;
 }
-add_filter( 'wp_calculate_image_sizes', 'twentysixteen_content_image_sizes_attr', 10, 2 );
+add_filter( 'wp_calculate_image_sizes', 'twentysixteen_content_image_sizes_attr', 10 , 2 );
 
 /**
  * Add custom image sizes attribute to enhance responsive image functionality
@@ -434,7 +501,7 @@ function twentysixteen_post_thumbnail_sizes_attr( $attr, $attachment, $size ) {
 	}
 	return $attr;
 }
-add_filter( 'wp_get_attachment_image_attributes', 'twentysixteen_post_thumbnail_sizes_attr', 10, 3 );
+add_filter( 'wp_get_attachment_image_attributes', 'twentysixteen_post_thumbnail_sizes_attr', 10 , 3 );
 
 /**
  * Modifies tag cloud widget arguments to display all tags in the same font size
diff --git a/themes/twentysixteen/header.php b/themes/twentysixteen/header.php
index 9bc0d3e6..d230c4f8 100644
--- a/themes/twentysixteen/header.php
+++ b/themes/twentysixteen/header.php
@@ -35,12 +35,10 @@
 						<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;
+					<?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 -->
@@ -52,12 +50,10 @@ if ( $description || is_customize_preview() ) :
 						<?php if ( has_nav_menu( 'primary' ) ) : ?>
 							<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Primary Menu', 'twentysixteen' ); ?>">
 								<?php
-									wp_nav_menu(
-										array(
-											'theme_location' => 'primary',
-											'menu_class' => 'primary-menu',
-										)
-									);
+									wp_nav_menu( array(
+										'theme_location' => 'primary',
+										'menu_class'     => 'primary-menu',
+									 ) );
 								?>
 							</nav><!-- .main-navigation -->
 						<?php endif; ?>
@@ -65,15 +61,13 @@ if ( $description || is_customize_preview() ) :
 						<?php if ( has_nav_menu( 'social' ) ) : ?>
 							<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Social Links Menu', 'twentysixteen' ); ?>">
 								<?php
-									wp_nav_menu(
-										array(
-											'theme_location' => 'social',
-											'menu_class'  => 'social-links-menu',
-											'depth'       => 1,
-											'link_before' => '<span class="screen-reader-text">',
-											'link_after'  => '</span>',
-										)
-									);
+									wp_nav_menu( array(
+										'theme_location' => 'social',
+										'menu_class'     => 'social-links-menu',
+										'depth'          => 1,
+										'link_before'    => '<span class="screen-reader-text">',
+										'link_after'     => '</span>',
+									) );
 								?>
 							</nav><!-- .social-navigation -->
 						<?php endif; ?>
diff --git a/themes/twentysixteen/image.php b/themes/twentysixteen/image.php
index f67048b3..434b0b02 100644
--- a/themes/twentysixteen/image.php
+++ b/themes/twentysixteen/image.php
@@ -14,99 +14,93 @@ get_header(); ?>
 
 			<?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 -->
+					<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 -->
+					<header class="entry-header">
+						<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
+					</header><!-- .entry-header -->
 
-				<div class="entry-content">
+					<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' );
-
-							echo wp_get_attachment_image( get_the_ID(), $image_size );
-						?>
+						<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' );
 
-						<?php twentysixteen_excerpt( 'entry-caption' ); ?>
+								echo wp_get_attachment_image( get_the_ID(), $image_size );
+							?>
+
+							<?php twentysixteen_excerpt( 'entry-caption' ); ?>
 
 						</div><!-- .entry-attachment -->
 
 						<?php
-						the_content();
-						wp_link_pages(
-							array(
+							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 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'] )
-							);
-						}
+							// 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>'
-						);
-					?>
+							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(
+					// 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;
 			?>
diff --git a/themes/twentysixteen/inc/back-compat.php b/themes/twentysixteen/inc/back-compat.php
index ed0f86df..7ed4240c 100644
--- a/themes/twentysixteen/inc/back-compat.php
+++ b/themes/twentysixteen/inc/back-compat.php
@@ -50,11 +50,9 @@ function twentysixteen_upgrade_notice() {
  * @global string $wp_version WordPress version.
  */
 function twentysixteen_customize() {
-	wp_die(
-		sprintf( __( 'Twenty Sixteen requires at least WordPress version 4.4. You are running version %s. Please upgrade and try again.', 'twentysixteen' ), $GLOBALS['wp_version'] ), '', array(
-			'back_link' => true,
-		)
-	);
+	wp_die( sprintf( __( 'Twenty Sixteen requires at least WordPress version 4.4. You are running version %s. Please upgrade and try again.', 'twentysixteen' ), $GLOBALS['wp_version'] ), '', array(
+		'back_link' => true,
+	) );
 }
 add_action( 'load-customize.php', 'twentysixteen_customize' );
 
diff --git a/themes/twentysixteen/inc/customizer.php b/themes/twentysixteen/inc/customizer.php
index 0cc2fb52..62eb1b0b 100644
--- a/themes/twentysixteen/inc/customizer.php
+++ b/themes/twentysixteen/inc/customizer.php
@@ -30,13 +30,9 @@ function twentysixteen_custom_header_and_background() {
 	 *     @type string $default-color Default color of the background.
 	 * }
 	 */
-	add_theme_support(
-		'custom-background', apply_filters(
-			'twentysixteen_custom_background_args', array(
-				'default-color' => $default_background_color,
-			)
-		)
-	);
+	add_theme_support( 'custom-background', apply_filters( 'twentysixteen_custom_background_args', array(
+		'default-color' => $default_background_color,
+	) ) );
 
 	/**
 	 * Filter the arguments used when adding 'custom-header' support in Twenty Sixteen.
@@ -54,39 +50,35 @@ function twentysixteen_custom_header_and_background() {
 	 *                                      displayed on the blog.
 	 * }
 	 */
-	add_theme_support(
-		'custom-header', apply_filters(
-			'twentysixteen_custom_header_args', array(
-				'default-text-color' => $default_text_color,
-				'width'              => 1200,
-				'height'             => 280,
-				'flex-height'        => true,
-				'wp-head-callback'   => 'twentysixteen_header_style',
-			)
-		)
-	);
+	add_theme_support( 'custom-header', apply_filters( 'twentysixteen_custom_header_args', array(
+		'default-text-color'     => $default_text_color,
+		'width'                  => 1200,
+		'height'                 => 280,
+		'flex-height'            => true,
+		'wp-head-callback'       => 'twentysixteen_header_style',
+	) ) );
 }
 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.
-	 *
-	 * @since Twenty Sixteen 1.0
-	 *
-	 * @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;
-		}
+/**
+ * Styles the header text displayed on the site.
+ *
+ * Create your own twentysixteen_header_style() function to override in a child theme.
+ *
+ * @since Twenty Sixteen 1.0
+ *
+ * @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;
+	}
 
-		// 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;
 		}
@@ -96,9 +88,9 @@ if ( ! function_exists( 'twentysixteen_header_style' ) ) :
 			clip: rect(1px, 1px, 1px, 1px);
 			position: absolute;
 		}
-		</style>
-		<?php
-	}
+	</style>
+	<?php
+}
 endif; // twentysixteen_header_style
 
 /**
@@ -111,119 +103,87 @@ endif; // twentysixteen_header_style
 function twentysixteen_customize_register( $wp_customize ) {
 	$color_scheme = twentysixteen_get_color_scheme();
 
-	$wp_customize->get_setting( 'blogname' )->transport        = 'postMessage';
-	$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
+	$wp_customize->get_setting( 'blogname' )->transport         = 'postMessage';
+	$wp_customize->get_setting( 'blogdescription' )->transport  = 'postMessage';
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
-		$wp_customize->selective_refresh->add_partial(
-			'blogname', array(
-				'selector'            => '.site-title a',
-				'container_inclusive' => false,
-				'render_callback'     => 'twentysixteen_customize_partial_blogname',
-			)
-		);
-		$wp_customize->selective_refresh->add_partial(
-			'blogdescription', array(
-				'selector'            => '.site-description',
-				'container_inclusive' => false,
-				'render_callback'     => 'twentysixteen_customize_partial_blogdescription',
-			)
-		);
+		$wp_customize->selective_refresh->add_partial( 'blogname', array(
+			'selector' => '.site-title a',
+			'container_inclusive' => false,
+			'render_callback' => 'twentysixteen_customize_partial_blogname',
+		) );
+		$wp_customize->selective_refresh->add_partial( 'blogdescription', array(
+			'selector' => '.site-description',
+			'container_inclusive' => false,
+			'render_callback' => 'twentysixteen_customize_partial_blogdescription',
+		) );
 	}
 
 	// Add color scheme setting and control.
-	$wp_customize->add_setting(
-		'color_scheme', array(
-			'default'           => 'default',
-			'sanitize_callback' => 'twentysixteen_sanitize_color_scheme',
-			'transport'         => 'postMessage',
-		)
-	);
-
-	$wp_customize->add_control(
-		'color_scheme', array(
-			'label'    => __( 'Base Color Scheme', 'twentysixteen' ),
-			'section'  => 'colors',
-			'type'     => 'select',
-			'choices'  => twentysixteen_get_color_scheme_choices(),
-			'priority' => 1,
-		)
-	);
+	$wp_customize->add_setting( 'color_scheme', array(
+		'default'           => 'default',
+		'sanitize_callback' => 'twentysixteen_sanitize_color_scheme',
+		'transport'         => 'postMessage',
+	) );
+
+	$wp_customize->add_control( 'color_scheme', array(
+		'label'    => __( 'Base Color Scheme', 'twentysixteen' ),
+		'section'  => 'colors',
+		'type'     => 'select',
+		'choices'  => twentysixteen_get_color_scheme_choices(),
+		'priority' => 1,
+	) );
 
 	// Add page background color setting and control.
-	$wp_customize->add_setting(
-		'page_background_color', array(
-			'default'           => $color_scheme[1],
-			'sanitize_callback' => 'sanitize_hex_color',
-			'transport'         => 'postMessage',
-		)
-	);
+	$wp_customize->add_setting( 'page_background_color', array(
+		'default'           => $color_scheme[1],
+		'sanitize_callback' => 'sanitize_hex_color',
+		'transport'         => 'postMessage',
+	) );
 
-	$wp_customize->add_control(
-		new WP_Customize_Color_Control(
-			$wp_customize, 'page_background_color', array(
-				'label'   => __( 'Page Background Color', 'twentysixteen' ),
-				'section' => 'colors',
-			)
-		)
-	);
+	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'page_background_color', array(
+		'label'       => __( 'Page Background Color', 'twentysixteen' ),
+		'section'     => 'colors',
+	) ) );
 
 	// Remove the core header textcolor control, as it shares the main text color.
 	$wp_customize->remove_control( 'header_textcolor' );
 
 	// Add link color setting and control.
-	$wp_customize->add_setting(
-		'link_color', array(
-			'default'           => $color_scheme[2],
-			'sanitize_callback' => 'sanitize_hex_color',
-			'transport'         => 'postMessage',
-		)
-	);
+	$wp_customize->add_setting( 'link_color', array(
+		'default'           => $color_scheme[2],
+		'sanitize_callback' => 'sanitize_hex_color',
+		'transport'         => 'postMessage',
+	) );
 
-	$wp_customize->add_control(
-		new WP_Customize_Color_Control(
-			$wp_customize, 'link_color', array(
-				'label'   => __( 'Link Color', 'twentysixteen' ),
-				'section' => 'colors',
-			)
-		)
-	);
+	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'link_color', array(
+		'label'       => __( 'Link Color', 'twentysixteen' ),
+		'section'     => 'colors',
+	) ) );
 
 	// Add main text color setting and control.
-	$wp_customize->add_setting(
-		'main_text_color', array(
-			'default'           => $color_scheme[3],
-			'sanitize_callback' => 'sanitize_hex_color',
-			'transport'         => 'postMessage',
-		)
-	);
+	$wp_customize->add_setting( 'main_text_color', array(
+		'default'           => $color_scheme[3],
+		'sanitize_callback' => 'sanitize_hex_color',
+		'transport'         => 'postMessage',
+	) );
 
-	$wp_customize->add_control(
-		new WP_Customize_Color_Control(
-			$wp_customize, 'main_text_color', array(
-				'label'   => __( 'Main Text Color', 'twentysixteen' ),
-				'section' => 'colors',
-			)
-		)
-	);
+	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'main_text_color', array(
+		'label'       => __( 'Main Text Color', 'twentysixteen' ),
+		'section'     => 'colors',
+	) ) );
 
 	// Add secondary text color setting and control.
-	$wp_customize->add_setting(
-		'secondary_text_color', array(
-			'default'           => $color_scheme[4],
-			'sanitize_callback' => 'sanitize_hex_color',
-			'transport'         => 'postMessage',
-		)
-	);
-
-	$wp_customize->add_control(
-		new WP_Customize_Color_Control(
-			$wp_customize, 'secondary_text_color', array(
-				'label'   => __( 'Secondary Text Color', 'twentysixteen' ),
-				'section' => 'colors',
-			)
-		)
-	);
+	$wp_customize->add_setting( 'secondary_text_color', array(
+		'default'           => $color_scheme[4],
+		'sanitize_callback' => 'sanitize_hex_color',
+		'transport'         => 'postMessage',
+	) );
+
+	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'secondary_text_color', array(
+		'label'       => __( 'Secondary Text Color', 'twentysixteen' ),
+		'section'     => 'colors',
+	) ) );
 }
 add_action( 'customize_register', 'twentysixteen_customize_register', 11 );
 
@@ -288,129 +248,127 @@ function twentysixteen_get_color_schemes() {
 	 *     }
 	 * }
 	 */
-	return apply_filters(
-		'twentysixteen_color_schemes', array(
-			'default' => array(
-				'label'  => __( 'Default', 'twentysixteen' ),
-				'colors' => array(
-					'#1a1a1a',
-					'#ffffff',
-					'#007acc',
-					'#1a1a1a',
-					'#686868',
-				),
+	return apply_filters( 'twentysixteen_color_schemes', array(
+		'default' => array(
+			'label'  => __( 'Default', 'twentysixteen' ),
+			'colors' => array(
+				'#1a1a1a',
+				'#ffffff',
+				'#007acc',
+				'#1a1a1a',
+				'#686868',
 			),
-			'dark'    => array(
-				'label'  => __( 'Dark', 'twentysixteen' ),
-				'colors' => array(
-					'#262626',
-					'#1a1a1a',
-					'#9adffd',
-					'#e5e5e5',
-					'#c1c1c1',
-				),
+		),
+		'dark' => array(
+			'label'  => __( 'Dark', 'twentysixteen' ),
+			'colors' => array(
+				'#262626',
+				'#1a1a1a',
+				'#9adffd',
+				'#e5e5e5',
+				'#c1c1c1',
 			),
-			'gray'    => array(
-				'label'  => __( 'Gray', 'twentysixteen' ),
-				'colors' => array(
-					'#616a73',
-					'#4d545c',
-					'#c7c7c7',
-					'#f2f2f2',
-					'#f2f2f2',
-				),
+		),
+		'gray' => array(
+			'label'  => __( 'Gray', 'twentysixteen' ),
+			'colors' => array(
+				'#616a73',
+				'#4d545c',
+				'#c7c7c7',
+				'#f2f2f2',
+				'#f2f2f2',
 			),
-			'red'     => array(
-				'label'  => __( 'Red', 'twentysixteen' ),
-				'colors' => array(
-					'#ffffff',
-					'#ff675f',
-					'#640c1f',
-					'#402b30',
-					'#402b30',
-				),
+		),
+		'red' => array(
+			'label'  => __( 'Red', 'twentysixteen' ),
+			'colors' => array(
+				'#ffffff',
+				'#ff675f',
+				'#640c1f',
+				'#402b30',
+				'#402b30',
 			),
-			'yellow'  => array(
-				'label'  => __( 'Yellow', 'twentysixteen' ),
-				'colors' => array(
-					'#3b3721',
-					'#ffef8e',
-					'#774e24',
-					'#3b3721',
-					'#5b4d3e',
-				),
+		),
+		'yellow' => array(
+			'label'  => __( 'Yellow', 'twentysixteen' ),
+			'colors' => array(
+				'#3b3721',
+				'#ffef8e',
+				'#774e24',
+				'#3b3721',
+				'#5b4d3e',
 			),
-		)
-	);
+		),
+	) );
 }
 
 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.
-	 *
-	 * @since Twenty Sixteen 1.0
-	 *
-	 * @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();
-
-		if ( array_key_exists( $color_scheme_option, $color_schemes ) ) {
-			return $color_schemes[ $color_scheme_option ]['colors'];
-		}
+/**
+ * Retrieves the current Twenty Sixteen color scheme.
+ *
+ * Create your own twentysixteen_get_color_scheme() function to override in a child theme.
+ *
+ * @since Twenty Sixteen 1.0
+ *
+ * @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();
 
-		return $color_schemes['default']['colors'];
+	if ( array_key_exists( $color_scheme_option, $color_schemes ) ) {
+		return $color_schemes[ $color_scheme_option ]['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
-	 * in a child theme.
-	 *
-	 * @since Twenty Sixteen 1.0
-	 *
-	 * @return array Array of color schemes.
-	 */
-	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'];
-		}
+/**
+ * Retrieves an array of color scheme choices registered for Twenty Sixteen.
+ *
+ * Create your own twentysixteen_get_color_scheme_choices() function to override
+ * in a child theme.
+ *
+ * @since Twenty Sixteen 1.0
+ *
+ * @return array Array of color schemes.
+ */
+function twentysixteen_get_color_scheme_choices() {
+	$color_schemes                = twentysixteen_get_color_schemes();
+	$color_scheme_control_options = array();
 
-		return $color_scheme_control_options;
+	foreach ( $color_schemes as $color_scheme => $value ) {
+		$color_scheme_control_options[ $color_scheme ] = $value['label'];
 	}
+
+	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
-	 * in a child theme.
-	 *
-	 * @since Twenty Sixteen 1.0
-	 *
-	 * @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();
-
-		if ( ! array_key_exists( $value, $color_schemes ) ) {
-			return 'default';
-		}
+/**
+ * Handles sanitization for Twenty Sixteen color schemes.
+ *
+ * Create your own twentysixteen_sanitize_color_scheme() function to override
+ * in a child theme.
+ *
+ * @since Twenty Sixteen 1.0
+ *
+ * @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();
 
-		return $value;
+	if ( ! array_key_exists( $value, $color_schemes ) ) {
+		return 'default';
 	}
+
+	return $value;
+}
 endif; // twentysixteen_sanitize_color_scheme
 
 /**
@@ -487,16 +445,14 @@ add_action( 'customize_preview_init', 'twentysixteen_customize_preview_js' );
  * @return string Color scheme CSS.
  */
 function twentysixteen_get_color_scheme_css( $colors ) {
-	$colors = wp_parse_args(
-		$colors, array(
-			'background_color'      => '',
-			'page_background_color' => '',
-			'link_color'            => '',
-			'main_text_color'       => '',
-			'secondary_text_color'  => '',
-			'border_color'          => '',
-		)
-	);
+	$colors = wp_parse_args( $colors, array(
+		'background_color'      => '',
+		'page_background_color' => '',
+		'link_color'            => '',
+		'main_text_color'       => '',
+		'secondary_text_color'  => '',
+		'border_color'          => '',
+	) );
 
 	return <<<CSS
 	/* Color Scheme */
@@ -913,9 +869,9 @@ add_action( 'wp_enqueue_scripts', 'twentysixteen_page_background_color_css', 11
  * @see wp_add_inline_style()
  */
 function twentysixteen_link_color_css() {
-	$color_scheme  = twentysixteen_get_color_scheme();
-	$default_color = $color_scheme[2];
-	$link_color    = get_theme_mod( 'link_color', $default_color );
+	$color_scheme    = twentysixteen_get_color_scheme();
+	$default_color   = $color_scheme[2];
+	$link_color = get_theme_mod( 'link_color', $default_color );
 
 	// Don't do anything if the current color is the default.
 	if ( $link_color === $default_color ) {
@@ -1170,8 +1126,8 @@ add_action( 'wp_enqueue_scripts', 'twentysixteen_main_text_color_css', 11 );
  * @see wp_add_inline_style()
  */
 function twentysixteen_secondary_text_color_css() {
-	$color_scheme         = twentysixteen_get_color_scheme();
-	$default_color        = $color_scheme[4];
+	$color_scheme    = twentysixteen_get_color_scheme();
+	$default_color   = $color_scheme[4];
 	$secondary_text_color = get_theme_mod( 'secondary_text_color', $default_color );
 
 	// Don't do anything if the current color is the default.
diff --git a/themes/twentysixteen/inc/template-tags.php b/themes/twentysixteen/inc/template-tags.php
index ce5190a0..9b8f1f39 100644
--- a/themes/twentysixteen/inc/template-tags.php
+++ b/themes/twentysixteen/inc/template-tags.php
@@ -10,132 +10,126 @@
  */
 
 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()
-			);
-		}
+/**
+ * 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();
-		}
+	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 )
-			);
-		}
+	$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 ( '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>';
-		}
+	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>';
-
-		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()
-		);
+/**
+ * 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>';
 
-		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
-		);
+	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()
+	);
+
+	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
-			);
-		}
+/**
+ * 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
+		);
+	}
 
-		$tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentysixteen' ) );
-		if ( $tags_list && ! is_wp_error( $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 && ! is_wp_error( $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
-	 * element when on single views.
-	 *
-	 * Create your own twentysixteen_post_thumbnail() function to override in a child theme.
-	 *
-	 * @since Twenty Sixteen 1.0
-	 */
-	function twentysixteen_post_thumbnail() {
-		if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
-			return;
-		}
+/**
+ * Displays an optional post thumbnail.
+ *
+ * Wraps the post thumbnail in an anchor element on index views, or a div
+ * element when on single views.
+ *
+ * Create your own twentysixteen_post_thumbnail() function to override in a child theme.
+ *
+ * @since Twenty Sixteen 1.0
+ */
+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 -->
 
@@ -145,9 +139,8 @@ if ( ! function_exists( 'twentysixteen_post_thumbnail' ) ) :
 		<?php the_post_thumbnail( 'post-thumbnail', array( 'alt' => the_title_attribute( 'echo=0' ) ) ); ?>
 	</a>
 
-	<?php
-	endif; // End is_singular()
-	}
+	<?php endif; // End is_singular()
+}
 endif;
 
 if ( ! function_exists( 'twentysixteen_excerpt' ) ) :
@@ -165,74 +158,69 @@ if ( ! function_exists( 'twentysixteen_excerpt' ) ) :
 	function twentysixteen_excerpt( $class = 'entry-summary' ) {
 		$class = esc_attr( $class );
 
-		if ( has_excerpt() || is_search() ) :
-		?>
+		if ( has_excerpt() || is_search() ) : ?>
 			<div class="<?php echo $class; ?>">
 				<?php the_excerpt(); ?>
 			</div><!-- .<?php echo $class; ?> -->
-		<?php
-		endif;
+		<?php endif;
 	}
 endif;
 
 if ( ! function_exists( 'twentysixteen_excerpt_more' ) && ! is_admin() ) :
-	/**
-	 * Replaces "[...]" (appended to automatically generated excerpts) with ... and
-	 * a 'Continue reading' link.
-	 *
-	 * Create your own twentysixteen_excerpt_more() function to override in a child theme.
-	 *
-	 * @since Twenty Sixteen 1.0
-	 *
-	 * @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' );
+/**
+ * Replaces "[...]" (appended to automatically generated excerpts) with ... and
+ * a 'Continue reading' link.
+ *
+ * Create your own twentysixteen_excerpt_more() function to override in a child theme.
+ *
+ * @since Twenty Sixteen 1.0
+ *
+ * @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' );
 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.
-	 *
-	 * @since Twenty Sixteen 1.0
-	 *
-	 * @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 );
-		}
+/**
+ * Determines whether blog/site has more than one category.
+ *
+ * Create your own twentysixteen_categorized_blog() function to override in a child theme.
+ *
+ * @since Twenty Sixteen 1.0
+ *
+ * @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 || is_preview() ) {
-			// 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;
-		}
+	if ( $all_the_cool_cats > 1 || is_preview() ) {
+		// 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;
 
 /**
@@ -248,19 +236,19 @@ function twentysixteen_category_transient_flusher() {
 	delete_transient( 'twentysixteen_categories' );
 }
 add_action( 'edit_category', 'twentysixteen_category_transient_flusher' );
-add_action( 'save_post', 'twentysixteen_category_transient_flusher' );
+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();
-		}
+/**
+ * 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();
 	}
+}
 endif;
diff --git a/themes/twentysixteen/index.php b/themes/twentysixteen/index.php
index d31ef2f8..3f621abe 100644
--- a/themes/twentysixteen/index.php
+++ b/themes/twentysixteen/index.php
@@ -29,8 +29,7 @@ get_header(); ?>
 
 			<?php
 			// Start the loop.
-			while ( have_posts() ) :
-				the_post();
+			while ( have_posts() ) : the_post();
 
 				/*
 				 * Include the Post-Format-specific template for the content.
@@ -39,19 +38,17 @@ get_header(); ?>
 				 */
 				get_template_part( 'template-parts/content', get_post_format() );
 
-				// End the loop.
+			// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
-			the_posts_pagination(
-				array(
-					'prev_text'          => __( 'Previous page', 'twentysixteen' ),
-					'next_text'          => __( 'Next page', 'twentysixteen' ),
-					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
-				)
-			);
+			the_posts_pagination( array(
+				'prev_text'          => __( 'Previous page', 'twentysixteen' ),
+				'next_text'          => __( 'Next page', 'twentysixteen' ),
+				'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' );
 
diff --git a/themes/twentysixteen/js/functions.js b/themes/twentysixteen/js/functions.js
index 86105613..a15af117 100644
--- a/themes/twentysixteen/js/functions.js
+++ b/themes/twentysixteen/js/functions.js
@@ -148,26 +148,37 @@
 				entryFooterPos       = entryFooter.offset(),
 				entryFooterPosBottom = entryFooterPos.top + ( entryFooter.height() + 28 ),
 				caption              = element.closest( 'figure' ),
+				figcaption           = element.next( 'figcaption' ),
 				newImg;
 
 			// Add 'below-entry-meta' to elements below the entry meta.
 			if ( elementPosTop > entryFooterPosBottom ) {
 
 				// Check if full-size images and captions are larger than or equal to 840px.
-				if ( 'img.size-full' === param ) {
+				if ( 'img.size-full' === param || '.wp-block-image img' === param ) {
 
 					// Create an image to find native image width of resized images (i.e. max-width: 100%).
 					newImg = new Image();
 					newImg.src = element.attr( 'src' );
 
 					$( newImg ).on( 'load.twentysixteen', function() {
-						if ( newImg.width >= 840  ) {
+						if ( newImg.width >= 840 ) {
+
+							// Check if an image in an image block has a width attribute; if its value is less than 840, return.
+							if ( '.wp-block-image img' === param && element.is( '[width]' ) && element.attr( 'width' ) < 840 ) {
+								return;
+							}
+
 							element.addClass( 'below-entry-meta' );
 
 							if ( caption.hasClass( 'wp-caption' ) ) {
 								caption.addClass( 'below-entry-meta' );
 								caption.removeAttr( 'style' );
 							}
+
+							if ( figcaption ) {
+								figcaption.addClass( 'below-entry-meta' );
+							}
 						}
 					} );
 				} else {
@@ -190,11 +201,13 @@
 				resizeTimer = setTimeout( function() {
 					belowEntryMetaClass( 'img.size-full' );
 					belowEntryMetaClass( 'blockquote.alignleft, blockquote.alignright' );
+					belowEntryMetaClass( '.wp-block-image img' );
 				}, 300 );
 				onResizeARIA();
 			} );
 
 		belowEntryMetaClass( 'img.size-full' );
 		belowEntryMetaClass( 'blockquote.alignleft, blockquote.alignright' );
+		belowEntryMetaClass( '.wp-block-image img' );
 	} );
 } )( jQuery );
diff --git a/themes/twentysixteen/page.php b/themes/twentysixteen/page.php
index a232c9fc..315a3da7 100644
--- a/themes/twentysixteen/page.php
+++ b/themes/twentysixteen/page.php
@@ -17,8 +17,7 @@ get_header(); ?>
 	<main id="main" class="site-main" role="main">
 		<?php
 		// Start the loop.
-		while ( have_posts() ) :
-			the_post();
+		while ( have_posts() ) : the_post();
 
 			// Include the page content template.
 			get_template_part( 'template-parts/content', 'page' );
diff --git a/themes/twentysixteen/readme.txt b/themes/twentysixteen/readme.txt
index 9c0cf092..e1741beb 100644
--- a/themes/twentysixteen/readme.txt
+++ b/themes/twentysixteen/readme.txt
@@ -1,8 +1,8 @@
 === Twenty Sixteen ===
 Contributors: the WordPress team
 Requires at least: WordPress 4.4
-Tested up to: WordPress 5.0-trunk
-Version: 1.5
+Tested up to: WordPress 5.0
+Version: 1.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: one-column, two-columns, right-sidebar, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-images, flexible-header, microformats, post-formats, rtl-language-support, sticky-post, threaded-comments, translation-ready, blog
@@ -56,6 +56,16 @@ Image used in screenshot.png: A photo by Austin Schmid (https://unsplash.com/sch
 
 == Changelog ==
 
+= 1.7 =
+* Released: December 19, 2018
+
+https://codex.wordpress.org/Twenty_Sixteen_Theme_Changelog#Version_1.7
+
+= 1.6 =
+* Released: December 6, 2018
+
+https://codex.wordpress.org/Twenty_Sixteen_Theme_Changelog#Version_1.6
+
 = 1.5 =
 * Released: May 17, 2018
 
diff --git a/themes/twentysixteen/search.php b/themes/twentysixteen/search.php
index 0f893636..4180b5f9 100644
--- a/themes/twentysixteen/search.php
+++ b/themes/twentysixteen/search.php
@@ -20,8 +20,7 @@ get_header(); ?>
 
 			<?php
 			// Start the loop.
-			while ( have_posts() ) :
-				the_post();
+			while ( have_posts() ) : the_post();
 
 				/**
 				 * Run the loop for the search to output the results.
@@ -30,19 +29,17 @@ get_header(); ?>
 				 */
 				get_template_part( 'template-parts/content', 'search' );
 
-				// End the loop.
+			// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
-			the_posts_pagination(
-				array(
-					'prev_text'          => __( 'Previous page', 'twentysixteen' ),
-					'next_text'          => __( 'Next page', 'twentysixteen' ),
-					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
-				)
-			);
-
-			// If no content, include the "No posts found" template.
+			the_posts_pagination( array(
+				'prev_text'          => __( 'Previous page', 'twentysixteen' ),
+				'next_text'          => __( 'Next page', 'twentysixteen' ),
+				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
+			) );
+
+		// If no content, include the "No posts found" template.
 		else :
 			get_template_part( 'template-parts/content', 'none' );
 
diff --git a/themes/twentysixteen/sidebar.php b/themes/twentysixteen/sidebar.php
index 45aff971..d4d893eb 100644
--- a/themes/twentysixteen/sidebar.php
+++ b/themes/twentysixteen/sidebar.php
@@ -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 -->
diff --git a/themes/twentysixteen/single.php b/themes/twentysixteen/single.php
index 34541703..07e0df29 100644
--- a/themes/twentysixteen/single.php
+++ b/themes/twentysixteen/single.php
@@ -13,8 +13,7 @@ get_header(); ?>
 	<main id="main" class="site-main" role="main">
 		<?php
 		// Start the loop.
-		while ( have_posts() ) :
-			the_post();
+		while ( have_posts() ) : the_post();
 
 			// Include the single post content template.
 			get_template_part( 'template-parts/content', 'single' );
@@ -26,23 +25,19 @@ get_header(); ?>
 
 			if ( is_singular( 'attachment' ) ) {
 				// 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' ),
-					)
-				);
+				the_post_navigation( array(
+					'prev_text' => _x( '<span class="meta-nav">Published in</span><span class="post-title">%title</span>', 'Parent post link', 'twentysixteen' ),
+				) );
 			} elseif ( is_singular( 'post' ) ) {
 				// Previous/next post navigation.
-				the_post_navigation(
-					array(
-						'next_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Next', 'twentysixteen' ) . '</span> ' .
-							'<span class="screen-reader-text">' . __( 'Next post:', 'twentysixteen' ) . '</span> ' .
-							'<span class="post-title">%title</span>',
-						'prev_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Previous', 'twentysixteen' ) . '</span> ' .
-							'<span class="screen-reader-text">' . __( 'Previous post:', 'twentysixteen' ) . '</span> ' .
-							'<span class="post-title">%title</span>',
-					)
-				);
+				the_post_navigation( array(
+					'next_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Next', 'twentysixteen' ) . '</span> ' .
+						'<span class="screen-reader-text">' . __( 'Next post:', 'twentysixteen' ) . '</span> ' .
+						'<span class="post-title">%title</span>',
+					'prev_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Previous', 'twentysixteen' ) . '</span> ' .
+						'<span class="screen-reader-text">' . __( 'Previous post:', 'twentysixteen' ) . '</span> ' .
+						'<span class="post-title">%title</span>',
+				) );
 			}
 
 			// End of the loop.
diff --git a/themes/twentysixteen/style.css b/themes/twentysixteen/style.css
index aacb880a..f5a854ea 100644
--- a/themes/twentysixteen/style.css
+++ b/themes/twentysixteen/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentysixteen/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Twenty Sixteen is a modernized take on an ever-popular WordPress layout — the horizontal masthead with an optional right sidebar that works perfectly for blogs and websites. It has custom color options with beautiful default color schemes, a harmonious fluid grid using a mobile-first approach, and impeccable polish in every detail. Twenty Sixteen will make your WordPress look beautiful everywhere.
-Version: 1.5
+Version: 1.7
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: one-column, two-columns, right-sidebar, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-images, flexible-header, microformats, post-formats, rtl-language-support, sticky-post, threaded-comments, translation-ready, blog
diff --git a/themes/twentysixteen/template-parts/content-page.php b/themes/twentysixteen/template-parts/content-page.php
index 470776b4..2b57d2b5 100644
--- a/themes/twentysixteen/template-parts/content-page.php
+++ b/themes/twentysixteen/template-parts/content-page.php
@@ -19,16 +19,14 @@
 		<?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>',
-			)
-		);
+		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 -->
 
diff --git a/themes/twentysixteen/template-parts/content-single.php b/themes/twentysixteen/template-parts/content-single.php
index 58f829b4..241f5285 100644
--- a/themes/twentysixteen/template-parts/content-single.php
+++ b/themes/twentysixteen/template-parts/content-single.php
@@ -21,16 +21,14 @@
 		<?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>',
-				)
-			);
+			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>',
+			) );
 
 			if ( '' !== get_the_author_meta( 'description' ) ) {
 				get_template_part( 'template-parts/biography' );
diff --git a/themes/twentysixteen/template-parts/content.php b/themes/twentysixteen/template-parts/content.php
index 703487dc..22b0ea41 100644
--- a/themes/twentysixteen/template-parts/content.php
+++ b/themes/twentysixteen/template-parts/content.php
@@ -24,23 +24,19 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content(
-				sprintf(
-					__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentysixteen' ),
-					get_the_title()
-				)
-			);
+			the_content( sprintf(
+				__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentysixteen' ),
+				get_the_title()
+			) );
 
-			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>',
-				)
-			);
+			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 -->