Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/css/style-rtl.css
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/css/style-rtl.css	(revision 3824)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/css/style-rtl.css	(revision 3825)
@@ -2459,18 +2459,4 @@
 }
 
-.single .type-plugin .entry-content .reviews-link {
-  display: inline-block;
-  font-size: 12.8px;
-  font-size: 0.8rem;
-  margin-top: 8px;
-  margin-top: 0.5rem;
-}
-
-.single .type-plugin .entry-content .reviews-link:after {
-  content: "\f341";
-  font-family: dashicons;
-  vertical-align: text-top;
-}
-
 .single .type-plugin .entry-content .plugin-screenshots {
   list-style-type: none;
@@ -2481,4 +2467,62 @@
 .single .type-plugin .entry-content .plugin-screenshots figcaption {
   font-style: italic;
+}
+
+.single .type-plugin .entry-content .plugin-faqs h2:first-of-type {
+  font-size: 20px;
+  font-size: 1.25rem;
+  font-weight: 600;
+  letter-spacing: 0.16px;
+  letter-spacing: 0.01rem;
+  text-transform: uppercase;
+  border: none;
+  color: #32373c;
+  font-weight: 600;
+  padding: 0;
+  text-transform: inherit;
+}
+
+.single .type-plugin .entry-content .plugin-faqs dl {
+  border-bottom: 1px solid #eee;
+}
+
+.single .type-plugin .entry-content .plugin-faqs dt {
+  border-top: 1px solid #eee;
+  cursor: pointer;
+  font-size: 16px;
+  font-size: 1rem;
+  font-weight: 600;
+  letter-spacing: 0.8px;
+  letter-spacing: 0.05rem;
+  padding: 16px 0;
+  padding: 1rem 0;
+  text-transform: uppercase;
+}
+
+.single .type-plugin .entry-content .plugin-faqs dt:after {
+  content: "\f347";
+  float: left;
+  font-family: dashicons;
+  margin: 0 16px;
+  margin: 0 1rem;
+}
+
+.single .type-plugin .entry-content .plugin-faqs dt.open:after {
+  content: "\f343";
+}
+
+.single .type-plugin .entry-content .plugin-faqs dd {
+  display: none;
+  margin: 0 0 16px;
+  margin: 0 0 1rem;
+}
+
+.single .type-plugin .entry-content .plugin-faqs dd p {
+  margin: 0;
+}
+
+.single .type-plugin .entry-content .plugin-faqs dd p + p {
+  margin-top: 16px;
+  margin-top: 1rem;
 }
 
@@ -2545,4 +2589,18 @@
     line-height: 1;
   }
+}
+
+.single .type-plugin .entry-content .reviews-link {
+  display: inline-block;
+  font-size: 12.8px;
+  font-size: 0.8rem;
+  margin-top: 8px;
+  margin-top: 0.5rem;
+}
+
+.single .type-plugin .entry-content .reviews-link:after {
+  content: "\f341";
+  font-family: dashicons;
+  vertical-align: text-top;
 }
 
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/css/style.css
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/css/style.css	(revision 3824)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/css/style.css	(revision 3825)
@@ -2459,18 +2459,4 @@
 }
 
-.single .type-plugin .entry-content .reviews-link {
-  display: inline-block;
-  font-size: 12.8px;
-  font-size: 0.8rem;
-  margin-top: 8px;
-  margin-top: 0.5rem;
-}
-
-.single .type-plugin .entry-content .reviews-link:after {
-  content: "\f345";
-  font-family: dashicons;
-  vertical-align: text-top;
-}
-
 .single .type-plugin .entry-content .plugin-screenshots {
   list-style-type: none;
@@ -2481,4 +2467,62 @@
 .single .type-plugin .entry-content .plugin-screenshots figcaption {
   font-style: italic;
+}
+
+.single .type-plugin .entry-content .plugin-faqs h2:first-of-type {
+  font-size: 20px;
+  font-size: 1.25rem;
+  font-weight: 600;
+  letter-spacing: 0.16px;
+  letter-spacing: 0.01rem;
+  text-transform: uppercase;
+  border: none;
+  color: #32373c;
+  font-weight: 600;
+  padding: 0;
+  text-transform: inherit;
+}
+
+.single .type-plugin .entry-content .plugin-faqs dl {
+  border-bottom: 1px solid #eee;
+}
+
+.single .type-plugin .entry-content .plugin-faqs dt {
+  border-top: 1px solid #eee;
+  cursor: pointer;
+  font-size: 16px;
+  font-size: 1rem;
+  font-weight: 600;
+  letter-spacing: 0.8px;
+  letter-spacing: 0.05rem;
+  padding: 16px 0;
+  padding: 1rem 0;
+  text-transform: uppercase;
+}
+
+.single .type-plugin .entry-content .plugin-faqs dt:after {
+  content: "\f347";
+  float: right;
+  font-family: dashicons;
+  margin: 0 16px;
+  margin: 0 1rem;
+}
+
+.single .type-plugin .entry-content .plugin-faqs dt.open:after {
+  content: "\f343";
+}
+
+.single .type-plugin .entry-content .plugin-faqs dd {
+  display: none;
+  margin: 0 0 16px;
+  margin: 0 0 1rem;
+}
+
+.single .type-plugin .entry-content .plugin-faqs dd p {
+  margin: 0;
+}
+
+.single .type-plugin .entry-content .plugin-faqs dd p + p {
+  margin-top: 16px;
+  margin-top: 1rem;
 }
 
@@ -2545,4 +2589,18 @@
     line-height: 1;
   }
+}
+
+.single .type-plugin .entry-content .reviews-link {
+  display: inline-block;
+  font-size: 12.8px;
+  font-size: 0.8rem;
+  margin-top: 8px;
+  margin-top: 0.5rem;
+}
+
+.single .type-plugin .entry-content .reviews-link:after {
+  content: "\f345";
+  font-family: dashicons;
+  vertical-align: text-top;
 }
 
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php	(revision 3824)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php	(revision 3825)
@@ -198,4 +198,80 @@
 
 /**
+ * Temporary FAQ parser until we have all readmes re-imported.
+ *
+ * @param $content
+ * @param $section_slug
+ *
+ * @return string
+ */
+function temporary_faq_parser( $content, $section_slug ) {
+	if ( 'faq' !== $section_slug ) {
+		return $content;
+	}
+
+	if ( strpos( $content, '</dl>' ) ) {
+		return $content;
+	}
+
+	$lines      = explode( "\n", $content );
+	$definition = false;
+
+	$content = "<dl>\n";
+	while ( ( $line = array_shift( $lines ) ) !== null ) {
+		$trimmed = trim( $line );
+		if ( empty( $trimmed ) ) {
+			continue;
+		}
+
+		if ( 0 === strpos( $trimmed, '<h4>' ) ) {
+			if ( $definition ) {
+				$content   .= "</dd>\n";
+				$definition = false;
+			}
+
+			$content .= '<dt aria-expanded="false">' . strip_tags( $line ) . "</dt>\n";
+			continue;
+		}
+
+		if ( ! $definition ) {
+			$content   .= '<dd>' . $line;
+			$definition = true;
+			continue;
+		}
+
+		$content .= "\n" . $line;
+	}
+
+	$content .= "</dd>\n</dl>";
+
+	if ( ! strpos( $content, '</dt>' ) ) {
+		$content = wp_kses( $content, array(
+			'a'          => array(
+				'href'  => true,
+				'title' => true,
+				'rel'   => true,
+			),
+			'blockquote' => array(
+				'cite' => true
+			),
+			'br'         => true,
+			'p'          => true,
+			'code'       => true,
+			'pre'        => true,
+			'em'         => true,
+			'strong'     => true,
+			'ul'         => true,
+			'ol'         => true,
+			'li'         => true,
+			'h3'         => true,
+			'h4'         => true,
+		) );
+	}
+
+	return $content;
+}
+add_filter( 'the_content', __NAMESPACE__ . '\temporary_faq_parser', 10, 2 );
+
+/**
  * Bold archive terms are made here.
  *
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/_site.scss
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/_site.scss	(revision 3824)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/_site.scss	(revision 3825)
@@ -13,6 +13,6 @@
 --------------------------------------------------------------*/
 @import "primary/main";
-@import "primary/plugin-index";
-@import "primary/plugin-single";
+@import "primary/plugin/index";
+@import "primary/plugin/single";
 
 /*--------------------------------------------------------------
Index: tes/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/_plugin-index.scss
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/_plugin-index.scss	(revision 3824)
+++ 	(revision )
@@ -1,79 +1,0 @@
-.plugin-card {
-	margin-bottom: 4%;
-
-	@media screen and ( min-width: $ms-breakpoint ) {
-		display: inline-block;
-		margin-right: 4%;
-		width: 48%;
-
-		&:nth-of-type( even ) {
-			margin-right: 0;
-		}
-	}
-
-	.entry-thumbnail {
-		display: none;
-		max-width: 128px;
-	}
-
-	.entry {
-		display: inline-block;
-		margin: auto;
-		vertical-align: top;
-	}
-
-	@media screen and ( min-width: 21em ) {
-		.entry-thumbnail {
-			display: inline-block;
-			margin: 0 4% 0 0;
-			vertical-align: top;
-		}
-
-		.entry {
-			 width: calc(96% - 128px);
-		 }
-	}
-
-	.entry-title {
-		@include font-size( ms-unitless( ms(0) ) );
-		line-height: 1.3;
-		margin: 0 0 8px;
-
-		a {
-			font-weight: 400;
-		}
-	}
-
-	.plugin-rating {
-		line-height: 1;
-		margin: 0 10px 8px 0;
-
-		.wporg-ratings {
-			display: inline-block;
-			margin-right: 5px;
-		}
-
-		[class*='dashicons-star-'] {
-			color: #ffb900;
-		}
-
-		.rating-count {
-			color: #999;
-			@include font-size( ms-unitless( ms(-2) ) );
-			top: -1px;
-		}
-	}
-
-	.entry-excerpt {
-		@include font-size( ms-unitless( ms(-2) ) );
-
-		p {
-			margin: 0 0 8px;
-		}
-	}
-}
-
-// Flip the half star for rating.
-.rtl .dashicons-star-half {
-	transform: rotateY(180deg);
-}
Index: tes/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/_plugin-single.scss
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/_plugin-single.scss	(revision 3824)
+++ 	(revision )
@@ -1,365 +1,0 @@
-@import "../../variables-site/variables-site";
-
-.single .type-plugin {
-	@extend .clear;
-
-	.plugin-notice {
-		margin-top: 0;
-	}
-
-	.plugin-banner {
-		background-position: 50% 50%;
-		background-size: 100%;
-		display: inline-block;
-		font-size: 0;
-		line-height: 0;
-		margin: 0 auto ms(1);
-		padding-top: 32.38342%; /* 250px / 722px */
-		vertical-align: middle;
-		width: 100%;
-
-		@media screen and ( min-width: 60em ) {
-			margin-top: ms(4);
-		}
-	}
-
-	.plugin-header {
-		@extend .clear;
-		border-bottom: 2px solid #eee;
-		padding: ms(1) ms(4);
-
-		.plugin-thumbnail {
-			display: none;
-			float: left;
-			height: 96px;
-			margin-right: 16px;
-			margin-right: 1rem;
-			width: 96px;
-
-			@media screen and ( min-width: 26em ) {
-				display: block;
-			}
-
-			.plugin-icon {
-				background-size: contain !important;
-				height: 96px !important;
-				width: 96px !important;
-			}
-
-		}
-
-		.plugin-actions {
-			float: right;
-		}
-
-		@keyframes favme-anime {
-			0% {
-				opacity: 1;
-				font-size: ms(0);
-				-webkit-text-stroke-color: transparent;
-			}
-			25% {
-				opacity: 0.6;
-				color: #fff;
-				font-size: ms(-2);
-				-webkit-text-stroke-width: 1px;
-				-webkit-text-stroke-color: #dc3232;
-			}
-			75% {
-				opacity: 0.6;
-				color: #fff;
-				font-size: ms(3);
-				-webkit-text-stroke-width: 1px;
-				-webkit-text-stroke-color: #dc3232;
-			}
-			100% {
-				opacity: 1;
-				font-size: ms(2);
-				-webkit-text-stroke-color: transparent;
-			}
-		}
-
-		@keyframes favme-hover {
-			from {
-				@include font-size( ms-unitless( ms(3) ) );
-			}
-			80% {
-				@include font-size( ms-unitless( ms(2) ) );
-			}
-		}
-
-		.plugin-favorite{
-			display: inline-block;
-			height: 36px;
-			text-align: center;
-			width: 36px;
-
-			.plugin-favorite-heart {
-				align-items: center;
-				color: #cbcdce;
-				display: flex;
-				@include font-size( ms-unitless( ms(2) ) );
-				height: 100%;
-				justify-content: center;
-				line-height: 1;
-				transition: all .2s ease;
-
-				&.favorited {
-					color: #dc3232;
-				}
-
-				&:hover {
-					animation: favme-hover .3s infinite alternate;
-				}
-
-				&:hover,
-				&:focus {
-					text-decoration: none;
-				}
-
-				&:after {
-					content: "\f487";
-					font-family: dashicons;
-					vertical-align: top;
-				}
-
-				&.is-animating {
-					animation: favme-anime .3s;
-				}
-			}
-
-		}
-
-		.plugin-title {
-			clear: none;
-			@include font-size( ms-unitless( ms(4) ) );
-			font-weight: 400;
-			margin: 0;
-		}
-
-		.byline {
-			color: #78848f;
-		}
-	}
-
-	.plugin-banner + .plugin-header {
-		padding-top: 0;
-	}
-
-	.entry-content,
-	.entry-meta {
-		padding: 0 ms(4);
-	}
-
-	.entry-content {
-		max-width: 768px;
-		max-width: 48rem;
-
-		@media screen and ( min-width: $ms-breakpoint ) {
-			float: left;
-			padding: 0;
-			width: 65%;
-		}
-
-		.read-more {
-			border-bottom: 2px solid #eee;
-			max-height: 200px;
-			overflow: hidden;
-			padding-bottom: 1px;
-
-			&#reviews {
-				max-height: none;
-				overflow: auto;
-			}
-
-			h1, h2, h3 {
-				@include font-size( ms-unitless( ms(0) ) );
-				font-weight: 600;
-				letter-spacing: 0.16px;
-				letter-spacing: 0.01rem;
-				text-transform: uppercase;
-
-				&:nth-child(2) {
-					margin-top: 0;
-				}
-			}
-
-			h4, h5, h6 {
-				@include font-size( ms-unitless( ms(-2) ) );
-				font-weight: 600;
-				letter-spacing: 0.8px;
-				letter-spacing: 0.05rem;
-				text-transform: uppercase;
-
-				&:nth-child(2) {
-					margin-top: 0;
-				}
-			}
-
-			h2:first-of-type {
-				@include font-size( ms-unitless( ms(2) ) );
-
-				// Override wp4.css.
-				border: none;
-				color: $color__text-main;
-				font-weight: 600;
-				padding: 0;
-				text-transform: inherit;
-			}
-
-			p:first-child {
-				margin-top: 0;
-			}
-
-			&.toggled {
-				max-height: none;
-			}
-		}
-
-		.section-toggle {
-			color: $color__link;
-			cursor: pointer;
-			@include font-size( ms-unitless( ms(-2) ) );
-			margin-top: 8px;
-			margin-top: 0.5rem;
-			position: relative;
-
-			&:after {
-				content: "\f347";
-				font-family: dashicons;
-				padding-left: 5px;
-				vertical-align: text-top;
-			}
-		}
-
-		.toggled + .section-toggle:after {
-			content: "\f343";
-		}
-
-		.reviews-link {
-			display: inline-block;
-			@include font-size( ms-unitless( ms(-2) ) );
-			margin-top: 8px;
-			margin-top: 0.5rem;
-
-			&:after {
-				content: "\f345";
-				font-family: dashicons;
-				vertical-align: text-top;
-			}
-		}
-
-		.plugin-screenshots {
-			list-style-type: none;
-			margin: 0;
-			padding: 0;
-
-			figcaption {
-				font-style: italic;
-			}
-		}
-
-		.plugin-reviews {
-			list-style-type: none;
-			margin: 0;
-			padding: 0;
-
-			.plugin-review + .plugin-review {
-				margin: 32px 0 16px;
-				margin: 2rem 0 1rem;
-			}
-
-			.review-avatar {
-				display: none;
-			}
-
-			.review,
-			.wporg-ratings,
-			.review-author {
-				display: inline-block;
-				vertical-align: top;
-			}
-
-			.review-header {
-				margin: 0 0 8px;
-				margin: 0 0 0.5rem;
-			}
-
-			.review-title {
-				@include font-size( ms-unitless( ms(0) ) );
-				font-weight: 600;
-				letter-spacing: 0.16px;
-				letter-spacing: 0.01rem;
-				margin: 0 0 8px;
-				margin: 0 0 0.5rem;
-				text-transform: inherit;
-			}
-
-			.review-author {
-				line-height: 1.25;
-				margin-left: 10px;
-			}
-
-			@media screen and ( min-width: $ms-breakpoint ) {
-				.review-avatar {
-					display: inline-block;
-					vertical-align: top;
-
-					.avatar {
-						margin-right: 16px;
-						margin-right: 1rem;
-					}
-				}
-
-				.review {
-					width: calc(100% - 60px - 1rem);
-				}
-
-				.review-header {
-					margin: 0;
-				}
-
-				.review-author {
-					line-height: 1;
-				}
-			}
-		}
-
-		.plugin-developers {
-			list-style-type: none;
-			margin: 0;
-
-			li {
-				display: inline-block;
-				margin: 0 4% 16px 0;
-				margin: 0 4% 1rem 0;
-				vertical-align: top;
-				width: 48%;
-
-				&:nth-of-type( even ) {
-					margin-right: 0;
-				}
-			}
-		}
-
-		.avatar {
-			border-radius: 50%;
-			margin-right: 10px;
-			vertical-align: middle;
-		}
-	}
-
-	@media screen and ( min-width: $ms-breakpoint ) {
-		.plugin-header,
-		.entry-content,
-		.entry-meta {
-			padding-left: 0;
-			padding-right: 0;
-		}
-
-		.entry-meta {
-			float: right;
-			width: 30%;
-		}
-	}
-}
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/_index.scss
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/_index.scss	(revision 3825)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/_index.scss	(revision 3825)
@@ -0,0 +1,79 @@
+.plugin-card {
+	margin-bottom: 4%;
+
+	@media screen and ( min-width: $ms-breakpoint ) {
+		display: inline-block;
+		margin-right: 4%;
+		width: 48%;
+
+		&:nth-of-type( even ) {
+			margin-right: 0;
+		}
+	}
+
+	.entry-thumbnail {
+		display: none;
+		max-width: 128px;
+	}
+
+	.entry {
+		display: inline-block;
+		margin: auto;
+		vertical-align: top;
+	}
+
+	@media screen and ( min-width: 21em ) {
+		.entry-thumbnail {
+			display: inline-block;
+			margin: 0 4% 0 0;
+			vertical-align: top;
+		}
+
+		.entry {
+			 width: calc(96% - 128px);
+		 }
+	}
+
+	.entry-title {
+		@include font-size( ms-unitless( ms(0) ) );
+		line-height: 1.3;
+		margin: 0 0 8px;
+
+		a {
+			font-weight: 400;
+		}
+	}
+
+	.plugin-rating {
+		line-height: 1;
+		margin: 0 10px 8px 0;
+
+		.wporg-ratings {
+			display: inline-block;
+			margin-right: 5px;
+		}
+
+		[class*='dashicons-star-'] {
+			color: #ffb900;
+		}
+
+		.rating-count {
+			color: #999;
+			@include font-size( ms-unitless( ms(-2) ) );
+			top: -1px;
+		}
+	}
+
+	.entry-excerpt {
+		@include font-size( ms-unitless( ms(-2) ) );
+
+		p {
+			margin: 0 0 8px;
+		}
+	}
+}
+
+// Flip the half star for rating.
+.rtl .dashicons-star-half {
+	transform: rotateY(180deg);
+}
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/_single.scss
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/_single.scss	(revision 3825)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/_single.scss	(revision 3825)
@@ -0,0 +1,184 @@
+@import "../../../variables-site/variables-site";
+
+.single .type-plugin {
+	@extend .clear;
+
+	.plugin-notice {
+		margin-top: 0;
+	}
+
+	.plugin-banner {
+		background-position: 50% 50%;
+		background-size: 100%;
+		display: inline-block;
+		font-size: 0;
+		line-height: 0;
+		margin: 0 auto ms(1);
+		padding-top: 32.38342%; /* 250px / 722px */
+		vertical-align: middle;
+		width: 100%;
+
+		@media screen and ( min-width: 60em ) {
+			margin-top: ms(4);
+		}
+	}
+
+	.plugin-header {
+		@extend .clear;
+		border-bottom: 2px solid #eee;
+		padding: ms(1) ms(4);
+
+		.plugin-thumbnail {
+			display: none;
+			float: left;
+			height: 96px;
+			margin-right: 16px;
+			margin-right: 1rem;
+			width: 96px;
+
+			@media screen and ( min-width: 26em ) {
+				display: block;
+			}
+
+			.plugin-icon {
+				background-size: contain !important;
+				height: 96px !important;
+				width: 96px !important;
+			}
+
+		}
+
+		.plugin-actions {
+			float: right;
+		}
+
+		@keyframes favme-anime {
+			0% {
+				opacity: 1;
+				font-size: ms(0);
+				-webkit-text-stroke-color: transparent;
+			}
+			25% {
+				opacity: 0.6;
+				color: #fff;
+				font-size: ms(-2);
+				-webkit-text-stroke-width: 1px;
+				-webkit-text-stroke-color: #dc3232;
+			}
+			75% {
+				opacity: 0.6;
+				color: #fff;
+				font-size: ms(3);
+				-webkit-text-stroke-width: 1px;
+				-webkit-text-stroke-color: #dc3232;
+			}
+			100% {
+				opacity: 1;
+				font-size: ms(2);
+				-webkit-text-stroke-color: transparent;
+			}
+		}
+
+		@keyframes favme-hover {
+			from {
+				@include font-size( ms-unitless( ms(3) ) );
+			}
+			80% {
+				@include font-size( ms-unitless( ms(2) ) );
+			}
+		}
+
+		.plugin-favorite {
+			display: inline-block;
+			height: 36px;
+			text-align: center;
+			width: 36px;
+
+			.plugin-favorite-heart {
+				align-items: center;
+				color: #cbcdce;
+				display: flex;
+				@include font-size( ms-unitless( ms(2) ) );
+				height: 100%;
+				justify-content: center;
+				line-height: 1;
+				transition: all .2s ease;
+
+				&.favorited {
+					color: #dc3232;
+				}
+
+				&:hover {
+					animation: favme-hover .3s infinite alternate;
+				}
+
+				&:hover,
+				&:focus {
+					text-decoration: none;
+				}
+
+				&:after {
+					content: "\f487";
+					font-family: dashicons;
+					vertical-align: top;
+				}
+
+				&.is-animating {
+					animation: favme-anime .3s;
+				}
+			}
+
+		}
+
+		.plugin-title {
+			clear: none;
+			@include font-size( ms-unitless( ms(4) ) );
+			font-weight: 400;
+			margin: 0;
+		}
+
+		.byline {
+			color: #78848f;
+		}
+	}
+
+	.plugin-banner + .plugin-header {
+		padding-top: 0;
+	}
+
+	.entry-content,
+	.entry-meta {
+		padding: 0 ms(4);
+	}
+
+	.entry-content {
+		max-width: 768px;
+		max-width: 48rem;
+
+		@media screen and ( min-width: $ms-breakpoint ) {
+			float: left;
+			padding: 0;
+			width: 65%;
+		}
+
+		@import 'section/index';
+		@import 'section/screenshots';
+		@import 'section/faq';
+		@import 'section/reviews';
+		@import 'section/developers';
+	}
+
+	@media screen and ( min-width: $ms-breakpoint ) {
+		.plugin-header,
+		.entry-content,
+		.entry-meta {
+			padding-left: 0;
+			padding-right: 0;
+		}
+
+		.entry-meta {
+			float: right;
+			width: 30%;
+		}
+	}
+}
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_developers.scss
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_developers.scss	(revision 3825)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_developers.scss	(revision 3825)
@@ -0,0 +1,22 @@
+.plugin-developers {
+	list-style-type: none;
+	margin: 0;
+
+	li {
+		display: inline-block;
+		margin: 0 4% 16px 0;
+		margin: 0 4% 1rem 0;
+		vertical-align: top;
+		width: 48%;
+
+		&:nth-of-type( even ) {
+			margin-right: 0;
+		}
+	}
+}
+
+.avatar {
+	border-radius: 50%;
+	margin-right: 10px;
+	vertical-align: middle;
+}
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_faq.scss
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_faq.scss	(revision 3825)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_faq.scss	(revision 3825)
@@ -0,0 +1,61 @@
+@import "../../../../variables-site/variables-site";
+
+.plugin-faqs {
+	h2:first-of-type {
+		@include font-size( ms-unitless( ms(2) ) );
+		font-weight: 600;
+		letter-spacing: 0.16px;
+		letter-spacing: 0.01rem;
+		text-transform: uppercase;
+
+		// Override wp4.css.
+		border: none;
+		color: $color__text-main;
+		font-weight: 600;
+		padding: 0;
+		text-transform: inherit;
+	}
+
+	dl {
+		border-bottom: 1px solid #eee;
+	}
+
+	dt {
+		border-top: 1px solid #eee;
+		cursor: pointer;
+		@include font-size( ms-unitless( ms(0) ) );
+		font-weight: 600;
+		letter-spacing: 0.8px;
+		letter-spacing: 0.05rem;
+		padding: 16px 0;
+		padding: 1rem 0;
+		text-transform: uppercase;
+
+		&:after {
+			content: "\f347";
+			float: right;
+			font-family: dashicons;
+			margin: 0 16px;
+			margin: 0 1rem;
+		}
+
+		&.open:after {
+			content: "\f343";
+		}
+	}
+
+	dd {
+		display: none;
+		margin: 0 0 16px;
+		margin: 0 0 1rem;
+
+		& p {
+			margin: 0;
+		}
+
+		& p + p {
+			margin-top: 16px;
+			margin-top: 1rem;
+		}
+	}
+}
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_index.scss
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_index.scss	(revision 3825)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_index.scss	(revision 3825)
@@ -0,0 +1,76 @@
+@import "../../../../variables-site/variables-site";
+
+.read-more {
+	border-bottom: 2px solid #eee;
+	max-height: 200px;
+	overflow: hidden;
+	padding-bottom: 1px;
+
+	&#reviews {
+		max-height: none;
+		overflow: auto;
+	}
+
+	h1, h2, h3 {
+		@include font-size( ms-unitless( ms(0) ) );
+		font-weight: 600;
+		letter-spacing: 0.16px;
+		letter-spacing: 0.01rem;
+		text-transform: uppercase;
+
+		&:nth-child(2) {
+			margin-top: 0;
+		}
+	}
+
+	h4, h5, h6 {
+		@include font-size( ms-unitless( ms(-2) ) );
+		font-weight: 600;
+		letter-spacing: 0.8px;
+		letter-spacing: 0.05rem;
+		text-transform: uppercase;
+
+		&:nth-child(2) {
+			margin-top: 0;
+		}
+	}
+
+	h2:first-of-type {
+		@include font-size( ms-unitless( ms(2) ) );
+
+		// Override wp4.css.
+		border: none;
+		color: $color__text-main;
+		font-weight: 600;
+		padding: 0;
+		text-transform: inherit;
+	}
+
+	p:first-child {
+		margin-top: 0;
+	}
+
+	&.toggled {
+		max-height: none;
+	}
+}
+
+.section-toggle {
+	color: $color__link;
+	cursor: pointer;
+	@include font-size( ms-unitless( ms(-2) ) );
+	margin-top: 8px;
+	margin-top: 0.5rem;
+	position: relative;
+
+	&:after {
+		content: "\f347";
+		font-family: dashicons;
+		padding-left: 5px;
+		vertical-align: text-top;
+	}
+}
+
+.toggled + .section-toggle:after {
+	content: "\f343";
+}
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_reviews.scss
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_reviews.scss	(revision 3825)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_reviews.scss	(revision 3825)
@@ -0,0 +1,80 @@
+@import "../../../../variables-site/variables-site";
+
+.plugin-reviews {
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+
+	.plugin-review + .plugin-review {
+		margin: 32px 0 16px;
+		margin: 2rem 0 1rem;
+	}
+
+	.review-avatar {
+		display: none;
+	}
+
+	.review,
+	.wporg-ratings,
+	.review-author {
+		display: inline-block;
+		vertical-align: top;
+	}
+
+	.review-header {
+		margin: 0 0 8px;
+		margin: 0 0 0.5rem;
+	}
+
+	.review-title {
+		@include font-size( ms-unitless( ms(0) ) );
+		font-weight: 600;
+		letter-spacing: 0.16px;
+		letter-spacing: 0.01rem;
+		margin: 0 0 8px;
+		margin: 0 0 0.5rem;
+		text-transform: inherit;
+	}
+
+	.review-author {
+		line-height: 1.25;
+		margin-left: 10px;
+	}
+
+	@media screen and ( min-width: $ms-breakpoint ) {
+		.review-avatar {
+			display: inline-block;
+			vertical-align: top;
+
+			.avatar {
+				margin-right: 16px;
+				margin-right: 1rem;
+			}
+		}
+
+		.review {
+			width: calc(100% - 60px - 1rem);
+		}
+
+		.review-header {
+			margin: 0;
+		}
+
+		.review-author {
+			line-height: 1;
+		}
+	}
+}
+
+.reviews-link {
+	display: inline-block;
+	@include font-size( ms-unitless( ms(-2) ) );
+	margin-top: 8px;
+	margin-top: 0.5rem;
+
+	&:after {
+		content: "\f345";
+		font-family: dashicons;
+		vertical-align: text-top;
+	}
+}
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_screenshots.scss
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_screenshots.scss	(revision 3825)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/site/primary/plugin/section/_screenshots.scss	(revision 3825)
@@ -0,0 +1,9 @@
+.plugin-screenshots {
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+
+	figcaption {
+		font-style: italic;
+	}
+}
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-single.php
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-single.php	(revision 3824)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-single.php	(revision 3825)
@@ -12,4 +12,5 @@
 use WordPressdotorg\Plugin_Directory\Template;
 use WordPressdotorg\Plugin_Directory\Tools;
+global $section, $section_slug, $section_content;
 
 $content = Plugin_Directory::instance()->split_post_content_into_pages( get_the_content() );
@@ -79,18 +80,8 @@
 				$section = wp_list_filter( $plugin_sections, array( 'slug' => $section_slug ) );
 				$section = array_pop( $section );
+
+				get_template_part( 'template-parts/section', $section_slug );
+			endforeach;
 		?>
-
-			<div id="<?php echo esc_attr( $section_slug ); ?>" class="read-more" aria-expanded="false">
-				<h2><?php echo $section['title']; ?></h2>
-				<?php echo $section_content; ?>
-			</div>
-				<?php if ( 'reviews' === $section_slug ) : ?>
-				<a class="reviews-link" href="<?php echo esc_url( 'https://wordpress.org/support/view/plugin-reviews/' . get_post()->post_name . '/' ); ?>">
-					<?php printf( __( 'Read all %s reviews', 'wporg-plugins' ), array_sum( get_post_meta( get_the_ID(), 'ratings', true ) ) ); ?>
-				</a>
-				<?php else : ?>
-			<button type="button" class="button-link section-toggle" aria-controls="<?php echo esc_attr( $section_slug ); ?>"><?php _e( 'Read more', 'wporg-plugins' ); ?></button>
-				<?php endif; ?>
-		<?php endforeach; ?>
 	</div><!-- .entry-content -->
 
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section-faq.php
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section-faq.php	(revision 3825)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section-faq.php	(revision 3825)
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Template part for displaying the FAQ section of a plugin.
+ *
+ * @link https://codex.wordpress.org/Template_Hierarchy
+ *
+ * @package WordPressdotorg\Plugin_Directory\Theme
+ */
+
+global $section, $section_slug, $section_content;
+?>
+
+<div id="faq" class="plugin-faqs">
+	<h2><?php echo $section['title']; ?></h2>
+	<?php echo $section_content; ?>
+</div>
+<script>
+	( function( $ ) {
+		$( '#faq' ).on( 'click', 'dt', function( event ) {
+			var $question = $( event.target );
+
+			if ( ! $question.is( '.open' ) ) {
+				$question.siblings( '.open' ).toggleClass( 'open' ).attr( 'aria-expanded', false ).next( 'dd' ).slideToggle( 200 );
+			}
+
+			$question.toggleClass( 'open' ).attr( 'aria-expanded', function( index, attribute ) {
+				return 'true' !== attribute;
+			} ).next( 'dd' ).slideToggle( 200 );
+		});
+	} )( jQuery );
+</script>
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section-reviews.php
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section-reviews.php	(revision 3825)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section-reviews.php	(revision 3825)
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Template part for displaying plugin reviews.
+ *
+ * @link https://codex.wordpress.org/Template_Hierarchy
+ *
+ * @package WordPressdotorg\Plugin_Directory\Theme
+ */
+
+global $section, $section_slug, $section_content;
+?>
+
+<div id="<?php echo esc_attr( $section_slug ); ?>" class="read-more" aria-expanded="false">
+	<h2><?php echo $section['title']; ?></h2>
+	<?php echo $section_content; ?>
+</div>
+<a class="reviews-link" href="<?php echo esc_url( 'https://wordpress.org/support/view/plugin-reviews/' . get_post()->post_name . '/' ); ?>">
+	<?php printf( __( 'Read all %s reviews', 'wporg-plugins' ), array_sum( get_post_meta( get_the_ID(), 'ratings', true ) ) ); ?>
+</a>
Index: /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section.php
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section.php	(revision 3825)
+++ /sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section.php	(revision 3825)
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Template part for displaying a plugin readme section.
+ *
+ * @link https://codex.wordpress.org/Template_Hierarchy
+ *
+ * @package WordPressdotorg\Plugin_Directory\Theme
+ */
+
+global $section, $section_slug, $section_content;
+?>
+
+<div id="<?php echo esc_attr( $section_slug ); ?>" class="read-more" aria-expanded="false">
+	<h2><?php echo $section['title']; ?></h2>
+	<?php echo $section_content; ?>
+</div>
+<button type="button" class="button-link section-toggle" aria-controls="<?php echo esc_attr( $section_slug ); ?>"><?php _e( 'Read more', 'wporg-plugins' ); ?></button>
