diff --git a/admin/create-theme/theme-form.php b/admin/create-theme/theme-form.php
index ff137950..55f18b5c 100644
--- a/admin/create-theme/theme-form.php
+++ b/admin/create-theme/theme-form.php
@@ -6,219 +6,272 @@ class Theme_Form {
 	public static function create_admin_form_page() {
 		if ( ! wp_is_block_theme() ) {
 			?>
-			<div class="wrap">
-				<h2><?php _ex( 'Create Block Theme', 'UI String', 'create-block-theme' ); ?></h2>
-				<p><?php _e( 'Activate a block theme to use this tool.', 'create-block-theme' ); ?></p>
-			</div>
+<div class="wrap">
+	<h2><?php _ex( 'Create Block Theme', 'UI String', 'create-block-theme' ); ?></h2>
+	<p><?php _e( 'Activate a block theme to use this tool.', 'create-block-theme' ); ?></p>
+</div>
 			<?php
 			return;
 		}
 		?>
-		<div class="wrap">
-			<h2><?php _ex( 'Create Block Theme', 'UI String', 'create-block-theme' ); ?></h2>
-			<form enctype="multipart/form-data" method="POST">
-				<div id="col-container">
-					<div id="col-left">
-						<div class="col-wrap">
-							<p>
+<div class="wrap">
+	<h1><?php _ex( 'Create Block Theme', 'UI String', 'create-block-theme' ); ?></h1>
+	<p>
+		<?php
+		/* translators: %1$s: Theme Name. */
+		printf( esc_html__( 'Export your current block theme (%1$s) with changes you made to Templates, Template Parts and Global Styles.', 'create-block-theme' ), esc_html( wp_get_theme()->get( 'Name' ) ) );
+		?>
+	</p>
+	<h2><?php _e( 'Choose what to export', 'create-block-theme' ); ?></h2>
+	<form enctype="multipart/form-data" method="POST">
+		<div id="col-container">
+			<div id="col-left">
+				<div class="col-wrap">
+					<p>
+						<label>
+							<input checked value="export" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );" aria-describedby="export-description">
 							<?php
-							/* translators: %1$s: Theme Name. */
-							printf( esc_html__( 'Export your current block theme (%1$s) with changes you made to Templates, Template Parts and Global Styles.', 'create-block-theme' ), esc_html( wp_get_theme()->get( 'Name' ) ) );
+								printf(
+									/* translators: %s: Theme Name. */
+									__( 'Export %s', 'create-block-theme' ),
+									wp_get_theme()->get( 'Name' )
+								);
 							?>
-							</p>
+						</label>
+					</p>
+					<p id="export-description" class="description">
+						<?php _e( 'Export the activated theme with user changes', 'create-block-theme' ); ?>
+					</p>
 
+					<?php if ( is_child_theme() ) : ?>
+
+						<p>
 							<label>
-								<input checked value="export" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );" />
+								<input value="sibling" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );" aria-describedby="sibling-description">
 								<?php
-									printf(
-										/* translators: %s: Theme Name. */
-										__( 'Export %s', 'create-block-theme' ),
-										wp_get_theme()->get( 'Name' )
-									);
+								printf(
+									/* translators: %s: Theme Name. */
+									__( 'Create sibling of %s', 'create-block-theme' ),
+									wp_get_theme()->get( 'Name' )
+								);
 								?>
-								<br />
-								<?php _e( '[Export the activated theme with user changes]', 'create-block-theme' ); ?>
 							</label>
-							<br /><br />
-							<?php if ( is_child_theme() ) : ?>
-								<label>
-									<input value="sibling" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );"/>
-									<?php
-									printf(
-										/* translators: %s: Theme Name. */
-										__( 'Create sibling of %s', 'create-block-theme' ),
-										wp_get_theme()->get( 'Name' )
-									);
-									?>
-								</label>
-								<br />
-								<?php _e( '[Create a new theme cloning the activated child theme.  The parent theme will be the same as the parent of the currently activated theme. The resulting theme will have all of the assets of the activated theme, none of the assets provided by the parent theme, as well as user changes.]', 'create-block-theme' ); ?>
-								<br /><br />
-							<?php else : ?>
-								<label>
-									<input value="child" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );"/>
-									<?php
-									printf(
-										/* translators: %s: Theme Name. */
-										__( 'Create child of %s', 'create-block-theme' ),
-										wp_get_theme()->get( 'Name' )
-									);
-									?>
-								</label>
-								<br />
-								<?php _e( '[Create a new child theme. The currently activated theme will be the parent theme.]', 'create-block-theme' ); ?>
-								<br /><br />
-								<label>
-									<input value="clone" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );"/>
-									<?php
-										printf(
-											/* translators: %s: Theme Name. */
-											__( 'Clone %s', 'create-block-theme' ),
-											wp_get_theme()->get( 'Name' )
-										);
-									?>
-									<br />
-									<?php _e( '[Create a new theme cloning the activated theme. The resulting theme will have all of the assets of the activated theme as well as user changes.]', 'create-block-theme' ); ?>
-								</label>
-								<br /><br />
-							<?php endif; ?>
+						</p>
+						<p id="sibling-description" class="description">
+							<?php _e( 'Create a new theme cloning the activated child theme. The parent theme will be the same as the parent of the currently activated theme. The resulting theme will have all of the assets of the activated theme, none of the assets provided by the parent theme, as well as user changes.', 'create-block-theme' ); ?>
+						</p>
+
+					<?php else : ?>
+
+						<p>
+							<label>
+								<input value="child" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );" aria-describedby="child-description">
+								<?php
+								printf(
+									/* translators: %s: Theme Name. */
+									__( 'Create child of %s', 'create-block-theme' ),
+									wp_get_theme()->get( 'Name' )
+								);
+								?>
+							</label>
+						</p>
+						<p id="child-description" class="description">
+							<?php _e( 'Create a new child theme. The currently activated theme will be the parent theme.', 'create-block-theme' ); ?>
+						</p>
+
+						<p>
 							<label>
-								<input value="save" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );" />
+								<input value="clone" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );" aria-describedby="clone-description">
 								<?php
 									printf(
 										/* translators: %s: Theme Name. */
-										__( 'Overwrite %s', 'create-block-theme' ),
+										__( 'Clone %s', 'create-block-theme' ),
 										wp_get_theme()->get( 'Name' )
 									);
 								?>
-								<br />
-								<?php _e( '[Save USER changes as THEME changes and delete the USER changes.  Your changes will be saved in the theme on the folder.]', 'create-block-theme' ); ?>
 							</label>
-							<br /><br />
-							<label>
-								<input value="blank" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );" />
-								<?php _e( 'Create blank theme', 'create-block-theme' ); ?><br />
-								<?php _e( '[Generate a boilerplate "empty" theme inside of this site\'s themes directory.]', 'create-block-theme' ); ?>
-							</label>
-							<br /><br />
-							<label>
-								<input value="variation" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );" />
-								<?php _e( 'Create a style variation', 'create-block-theme' ); ?><br />
-								<?php
+						</p>
+						<p id="clone-description" class="description">
+							<?php _e( 'Create a new theme cloning the activated theme. The resulting theme will have all of the assets of the activated theme as well as user changes.', 'create-block-theme' ); ?>
+						</p>
+
+					<?php endif; ?>
+
+					<p>
+						<label>
+							<input value="save" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );" aria-describedby="save-description">
+							<?php
 								printf(
-									// translators: %1$s: Theme name
-									esc_html__( '[Save user changes as a style variation of %1$s.]', 'create-block-theme' ),
-									esc_html( wp_get_theme()->get( 'Name' ) )
+									/* translators: %s: Theme Name. */
+									__( 'Overwrite %s', 'create-block-theme' ),
+									wp_get_theme()->get( 'Name' )
 								);
-								?>
-							</label>
-							<br /><br />
+							?>
+						</label>
+					</p>
+					<p id="save-description" class="description">
+						<?php _e( 'Save USER changes as THEME changes and delete the USER changes.  Your changes will be saved in the theme on the folder.', 'create-block-theme' ); ?>
+					</p>
 
-							<input type="submit" value="<?php _e( 'Generate', 'create-block-theme' ); ?>" class="button button-primary" />
+					<p>
+						<label>
+							<input value="blank" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );" aria-describedby="blank-description">
+							<?php _e( 'Create blank theme', 'create-block-theme' ); ?>
+						</label>
+					</p>
+					<p id="blank-description" class="description">
+						<?php _e( 'Generate a boilerplate "empty" theme inside of this site\'s themes directory.', 'create-block-theme' ); ?>
+					</p>
 
-						</div>
+					<p>
+						<label>
+							<input value="variation" type="radio" name="theme[type]" class="regular-text code" onchange="toggleForm( this );" aria-describedby="variation-description">
+							<?php _e( 'Create a style variation', 'create-block-theme' ); ?>
+						</label>
+					</p>
+					<p id="variation-description" class="description">
+						<?php
+						printf(
+							// translators: %1$s: Theme name
+							esc_html__( 'Save user changes as a style variation of %1$s.', 'create-block-theme' ),
+							esc_html( wp_get_theme()->get( 'Name' ) )
+						);
+						?>
+					</p>
+				</div>
+			</div>
+
+			<div id="col-right">
+				<div class="col-wrap">
+					<div hidden id="new_variation_metadata_form" class="theme-form">
+						<p><em><?php _e( 'Items indicated with (*) are required.', 'create-block-theme' ); ?></em></p>
+						<p>
+							<label for="variation-name">
+								<?php _e( 'Variation Name (*)', 'create-block-theme' ); ?>
+							</label>
+							<input id="variation-name" placeholder="<?php _e( 'Variation Name', 'create-block-theme' ); ?>" type="text" name="theme[variation]" class="large-text">
+						</p>
 					</div>
-					<div id="col-right">
-						<div class="col-wrap">
-							<div hidden id="new_variation_metadata_form" class="theme-form">
-								<p><em><?php _e( 'Items indicated with (*) are required.', 'create-block-theme' ); ?></em></p>
-								<label>
-									<?php _e( 'Variation Name (*):', 'create-block-theme' ); ?><br />
-									<input placeholder="<?php _e( 'Variation Name', 'create-block-theme' ); ?>" type="text" name="theme[variation]" class="large-text" />
-								</label>
-							</div>
-							<div hidden id="new_theme_metadata_form" class="theme-form">
-								<p><em><?php _e( 'Items indicated with (*) are required.', 'create-block-theme' ); ?></em></p>
-								<label>
-									<?php _e( 'Theme Name (*):', 'create-block-theme' ); ?><br />
-									<input placeholder="<?php _e( 'Theme Name', 'create-block-theme' ); ?>" type="text" name="theme[name]" class="large-text" id="theme-name" autocomplete="off" />
-								</label>
-								<br /><br />
-								<label>
-									<?php _e( 'Theme Description:', 'create-block-theme' ); ?><br />
-									<textarea placeholder="<?php _e( 'A short description of the theme.', 'create-block-theme' ); ?>" rows="4" cols="50" name="theme[description]" class="large-text"></textarea>
-								</label>
-								<br /><br />
-								<label>
-									<?php _e( 'Theme URI:', 'create-block-theme' ); ?><br />
-									<small><?php _e( 'The URL of a public web page where users can find more information about the theme.', 'create-block-theme' ); ?></small><br />
-									<input placeholder="<?php _e( 'https://github.com/wordpress/twentytwentythree/', 'create-block-theme' ); ?>" type="text" name="theme[uri]" class="large-text code" />
-								</label>
-								<br /><br />
-								<label>
-									<?php _e( 'Author:', 'create-block-theme' ); ?><br />
-									<small><?php _e( 'The name of the individual or organization who developed the theme.', 'create-block-theme' ); ?></small><br />
-									<input placeholder="<?php _e( 'the WordPress team', 'create-block-theme' ); ?>" type="text" name="theme[author]" class="large-text" />
-								</label>
-								<br /><br />
-								<label>
-									<?php _e( 'Author URI:', 'create-block-theme' ); ?><br />
-									<small><?php _e( 'The URL of the authoring individual or organization.', 'create-block-theme' ); ?></small><br />
-									<input placeholder="<?php _e( 'https://wordpress.org/', 'create-block-theme' ); ?>" type="text" name="theme[author_uri]" class="large-text code" />
-								</label>
-								<br /><br />
-								<label for="screenshot">
-									<?php _e( 'Screenshot:', 'create-block-theme' ); ?><br />
-									<small><?php _e( 'Upload a new theme screenshot (2mb max | .png only | 1200x900 recommended)', 'create-block-theme' ); ?></small><br />
-									<input type="file" accept=".png"  name="screenshot" id="screenshot" class="upload"/>
-								</label>
-								<br /><br />
-								<label class="hide-on-blank-theme">
-									<?php _e( 'Image Credits:', 'create-block-theme' ); ?><br />
-									<small><?php _e( 'List the credits for each image you have included in the theme. Include the image name, license type, and source URL.', 'create-block-theme' ); ?></small><br />
-									<small>
-										<?php
-										printf(
-											/* Translators: Bundled resources licenses link. */
-											esc_html__( 'All bundled resources must have GPL-compatible licenses (%s).', 'create-block-theme' ),
-											'<a href="' . esc_url( __( 'https://make.wordpress.org/themes/handbook/review/resources/#licenses-bundled-resources', 'create-block-theme' ) ) . '" target="_blank">read more</a>'
-										);
-										?>
-									</small><br />
-									<?php
-									$image_credits_placeholder = __(
-										'Image Title
-License Type
-Source: https://example.com/source-url',
-										'create-block-theme'
-									);
-									?>
-									<textarea placeholder="<?php echo $image_credits_placeholder; ?>" rows="4" cols="50" name="theme[image_credits]" class="large-text"></textarea>
-									<br /><br />
-								</label>
-								<label class="hide-on-blank-theme">
-									<?php _e( 'Recommended Plugins:', 'create-block-theme' ); ?><br />
-									<small>
-										<?php
-										printf(
-											/* Translators: Recommended plugins link. */
-											esc_html__( 'List the recommended plugins for this theme. e.g. contact forms, social media. Plugins must be from the WordPress.org plugin repository (%s).', 'create-block-theme' ),
-											'<a href="' . esc_url( __( 'https://make.wordpress.org/themes/handbook/review/required/#6-plugins', 'create-block-theme' ) ) . '" target="_blank">read more</a>'
-										);
-										?>
-									</small><br />
-									<?php
-									$recommended_plugins_placeholder = __(
-										'Plugin Name
-https://wordpress.org/plugins/plugin-name/
-Plugin Description',
-										'create-block-theme'
-									);
-									?>
-									<textarea placeholder="<?php echo $recommended_plugins_placeholder; ?>" rows="4" cols="50" name="theme[recommended_plugins]" class="large-text"></textarea>
-									<br /><br />
-								</label>
-								<div>
-									<?php Theme_Tags::theme_tags_section(); ?>
-								</div>
-							</div>
-							<input type="hidden" name="page" value="create-block-theme" />
-							<input type="hidden" name="nonce" value="<?php echo wp_create_nonce( 'create_block_theme' ); ?>" />
+
+					<div hidden id="new_theme_metadata_form" class="theme-form">
+						<p><em><?php _e( 'Items indicated with (*) are required.', 'create-block-theme' ); ?></em></p>
+
+						<p>
+							<label for="theme-name">
+								<?php _e( 'Theme Name (*)', 'create-block-theme' ); ?>
+							</label>
+							<input id="theme-name" placeholder="<?php _e( 'Theme Name', 'create-block-theme' ); ?>" type="text" name="theme[name]" class="large-text" autocomplete="off">
+						</p>
+
+						<p>
+							<label for="theme-description">
+								<?php _e( 'Theme Description', 'create-block-theme' ); ?>
+							</label>
+							<textarea id="theme-description" placeholder="<?php _e( 'Theme Description', 'create-block-theme' ); ?>" rows="4" cols="50" name="theme[description]" class="large-text" aria-describedby="theme-description-description"></textarea>
+						</p>
+						<p id="theme-description-description" class="description">
+							<?php _e( 'A short description of the theme.', 'create-block-theme' ); ?>
+						</p>
+
+						<p>
+							<label for="theme-uri">
+								<?php _e( 'Theme URI', 'create-block-theme' ); ?>
+							</label>
+							<input id="theme-uri" placeholder="<?php echo esc_attr( 'https://github.com/wordpress/twentytwentythree/' ); ?>" type="text" name="theme[uri]" class="large-text code" aria-describedby="theme-uri-description">
+						</p>
+						<p id="theme-uri-description" class="description">
+							<?php _e( 'The URL of a public web page where users can find more information about the theme.', 'create-block-theme' ); ?>
+						</p>
+
+						<p>
+							<label for="theme-author">
+								<?php _e( 'Author', 'create-block-theme' ); ?>
+							</label>
+							<input id="theme-author" placeholder="<?php _e( 'the WordPress team', 'create-block-theme' ); ?>" type="text" name="theme[author]" class="large-text" aria-describedby="theme-author-description">
+						</p>
+						<p id="theme-author-description" class="description" >
+							<?php _e( 'The name of the individual or organization who developed the theme.', 'create-block-theme' ); ?>
+						</p>
+
+						<p>
+							<label for="theme-author-uri">
+								<?php _e( 'Author URI', 'create-block-theme' ); ?>
+							</label>
+							<input id="theme-author-uri" placeholder="<?php echo esc_attr( 'https://wordpress.org/' ); ?>" type="text" name="theme[author_uri]" class="large-text code" aria-describedby="theme-author-uri-description">
+						</p>
+						<p id="theme-author-uri-description" class="description">
+							<?php _e( 'The URL of the authoring individual or organization.', 'create-block-theme' ); ?>
+						</p>
+
+						<p>
+							<label for="screenshot">
+								<?php _e( 'Screenshot', 'create-block-theme' ); ?>
+							</label>
+							<input type="file" accept=".png"  name="screenshot" id="screenshot" class="upload" aria-describedby="screenshot-description">
+						</p>
+						<p id="screenshot-description" class="description">
+							<?php _e( 'Upload a new theme screenshot (2mb max | .png only | 1200x900 recommended)', 'create-block-theme' ); ?>
+						</p>
+
+						<p class="hide-on-blank-theme">
+							<label for="image-credits">
+								<?php _e( 'Image Credits', 'create-block-theme' ); ?>
+							</label>
+							<?php
+							/* translators: Image credits placeholder. */
+							$image_credits_placeholder  = __( 'Image Title', 'create-block-theme' );
+							$image_credits_placeholder .= "\n" . __( 'License Type', 'create-block-theme' );
+							$image_credits_placeholder .= "\n" . __( 'Source: https://example.com/source-url', 'create-block-theme' );
+							?>
+							<textarea id="image-credits" placeholder="<?php echo $image_credits_placeholder; ?>" rows="4" cols="50" name="theme[image_credits]" class="large-text" aria-describedby="image-credits-description"></textarea>
+						</p>
+						<p id="image-credits-description" class="description">
+							<?php _e( 'List the credits for each image you have included in the theme. Include the image name, license type, and source URL.', 'create-block-theme' ); ?><br />
+							<?php
+								printf(
+									/* Translators: Bundled resources licenses link. */
+									esc_html__( 'All bundled resources must have GPL-compatible licenses (%s).', 'create-block-theme' ),
+									'<a href="' . esc_url( 'https://make.wordpress.org/themes/handbook/review/resources/#licenses-bundled-resources' ) . '" target="_blank">' . __( 'read more', 'create-block-theme' ) . '</a>'
+								);
+							?>
+						</p>
+
+						<p class="hide-on-blank-theme">
+							<label for="recommended-plugins">
+								<?php _e( 'Recommended Plugins', 'create-block-theme' ); ?>
+							</label>
+							<?php
+							/* translators: Recommended plugins placeholder. */
+							$recommended_plugins_placeholder  = __( 'Plugin Name', 'create-block-theme' );
+							$recommended_plugins_placeholder .= "\nhttps://wordpress.org/plugins/plugin-name/";
+							$recommended_plugins_placeholder .= "\n" . __( 'Plugin Description', 'create-block-theme' );
+							?>
+							<textarea id="recommended-plugins" placeholder="<?php echo $recommended_plugins_placeholder; ?>" rows="4" cols="50" name="theme[recommended_plugins]" class="large-text" aria-describedby="recommended-plugins-description"></textarea>
+						</p>
+						<p id="recommended-plugins-description" class="description">
+							<?php
+							printf(
+								/* Translators: Recommended plugins link. */
+								esc_html__( 'List the recommended plugins for this theme. e.g. contact forms, social media. Plugins must be from the WordPress.org plugin repository (%s).', 'create-block-theme' ),
+								'<a href="' . esc_url( 'https://make.wordpress.org/themes/handbook/review/required/#6-plugins' ) . '" target="_blank">' . __( 'read more', 'create-block-theme' ) . '</a>'
+							);
+							?>
+						</p>
+
+						<div>
+							<?php Theme_Tags::theme_tags_section(); ?>
 						</div>
 					</div>
+					<input type="hidden" name="page" value="create-block-theme"
+					<input type="hidden" name="nonce" value="<?php echo wp_create_nonce( 'create_block_theme' ); ?>">
 				</div>
-			</form>
+			</div>
 		</div>
+		<p class="submit">
+			<input type="submit" value="<?php _e( 'Generate', 'create-block-theme' ); ?>" class="button button-primary">
+		</p>
+	</form>
+</div>
 		<?php
 	}
 
diff --git a/admin/create-theme/theme-tags.php b/admin/create-theme/theme-tags.php
index fc9ae030..a25d4dab 100644
--- a/admin/create-theme/theme-tags.php
+++ b/admin/create-theme/theme-tags.php
@@ -31,134 +31,142 @@ public static function theme_tags_list( $theme ) {
 	 * @since 1.5.2
 	 */
 	public static function theme_tags_section() {
-		echo '<div role="group" aria-labelledby="theme_tags_label">';
-		echo '<div id="theme_tags_label">';
-		_e( 'Theme Tags:', 'create-block-theme' );
-		echo '<br /><small>';
-		printf(
-			/* Translators: Theme Tags link. */
-			esc_html__( 'Add theme tags to help categorize the theme (%s).', 'create-block-theme' ),
-			'<a href="' . esc_url( __( 'https://make.wordpress.org/themes/handbook/review/required/theme-tags/', 'create-block-theme' ) ) . '" target="_blank">read more</a>'
-		);
-		echo '</small><br />';
-		echo '</div>';
-		echo '<div class="theme-tags">';
-
-		// Generate list of theme tags
-		$theme_tags = get_theme_feature_list();
-
-		if ( ! is_array( $theme_tags ) ) {
-			return null;
-		}
-
-		// Lists default tags
-		function list_default_tags() {
-			$default_tags = array( 'full-site-editing' );
-			return $default_tags;
-		}
-
-		// Checks if a tag is a default tag
-		function is_default_tag( $tag ) {
-			if ( ! is_string( $tag ) ) {
-				return null;
+		?>
+<div role="group" aria-labelledby="theme_tags_label">
+	<fieldset id="theme_tags_label">
+		<legend><?php _e( 'Theme Tags', 'create-block-theme' ); ?></legend>
+
+		<p class="description">
+			<?php
+			printf(
+				/* Translators: Theme Tags link. */
+				esc_html__(
+					'Add theme tags to help categorize the theme (%s).',
+					'create-block-theme'
+				),
+				'<a href="' . esc_url( __( 'https://make.wordpress.org/themes/handbook/review/required/theme-tags/', 'create-block-theme' ) ) . '" target="_blank">' . __( 'read more', 'create-block-theme' ) . '</a>'
+			);
+			?>
+		</p>
+
+		<div class="theme-tags">
+			<?php
+			// Generate a list of theme tags
+			$theme_tags = get_theme_feature_list();
+			if ( is_array( $theme_tags ) ) {
+				// Sort tags by relevance
+				krsort( $theme_tags );
+				foreach ( $theme_tags as $category => $tags ) {
+					self::theme_tags_category( $category, $tags );
+				}
 			}
+			?>
+		</div>
+
+		<p>
+			<label for="theme-custom-tags"><?php _e( 'Custom Tags', 'create-block-theme' ); ?></label>
+			<?php // Regex for pattern attribute ensures only single words or words with hyphens are used, separated by commas ?>
+			<input id="theme-custom-tags" placeholder="<?php _e( 'custom, tags, custom-tags', 'create-block-theme' ); ?>" type="text" name="theme[tags_custom]" class="large-text code" pattern="^[a-zA-Z\-]+(\s*,\s*[a-zA-Z\-]+)*$" aria-describedby="custom-tags-description">
+		</p>
+		<p id="custom-tags-description" class="description" >
+			<?php _e( 'Add custom tags (single or hyphenated words, separated by commas)', 'create-block-theme' ); ?>
+		</p>
+
+	</fieldset>
+</div>
+		<?php
+	}
 
-			$tag          = strtolower( $tag );
-			$default_tags = list_default_tags();
-
-			return in_array( $tag, $default_tags, true );
-		}
-
-		// Checks if a tag is included in the active theme or the default tags
-		function is_active_theme_tag( $tag ) {
-			if ( ! is_string( $tag ) ) {
-				return null;
-			}
+	/**
+	 * Output theme tags fieldset.
+	 */
+	protected static function theme_tags_category( $category, $tags ) {
+		?>
+		<fieldset id="<?php echo esc_attr( strtolower( $category ) ); ?>-tags">
+			<?php if ( 'Subject' === $category ) : ?>
+				<legend class="large-text"><?php echo esc_html( $category ); ?>&nbsp;<?php _e( '(max 3 tags)', 'create-block-theme' ); ?></legend>
+			<?php else : ?>
+				<legend class="large-text"><?php echo esc_html( $category ); ?></legend>
+			<?php endif; ?>
+
+			<?php foreach ( $tags as $tag => $pretty_tag ) : ?>
+				<?php self::tag_checkbox_input( $category, $tag, $pretty_tag ); ?>
+			<?php endforeach; ?>
+		</fieldset>
+		<?php
+	}
 
-			$tag               = strtolower( $tag );
-			$active_theme_tags = wp_get_theme()->get( 'Tags' );
-			$default_tags      = list_default_tags();
-			$merged_tags       = array_unique( array_merge( $default_tags, $active_theme_tags ) );
+	/**
+	 * Lists default tags.
+	 *
+	 * @return array
+	 */
+	protected static function list_default_tags() {
+		$default_tags = array( 'full-site-editing' );
+		return $default_tags;
+	}
 
-			return in_array( $tag, $merged_tags, true );
+	/**
+	 * Checks if a tag is a default tag.
+	 *
+	 * @param string $tag
+	 * @return boolean
+	 */
+	protected static function is_default_tag( $tag ) {
+		if ( ! is_string( $tag ) ) {
+			return null;
 		}
 
-		// Build checkbox input for given theme tag
-		function tag_checkbox_input( $category, $tag, $pretty_tag ) {
-			$class   = '';
-			$checked = '';
+		$tag          = strtolower( $tag );
+		$default_tags = self::list_default_tags();
 
-			if ( is_default_tag( $tag ) ) {
-				$class = 'default-tag';
-			}
-
-			if ( is_active_theme_tag( $tag ) ) {
-				$checked = ' checked';
-			}
+		return in_array( $tag, $default_tags, true );
+	}
 
-			echo '<input type="checkbox" id="theme-tag-' . $tag . '" name="theme[tags-' . strtolower( $category ) . '][]" value="' . $tag . '" class="' . $class . '" ' . $checked . '>';
-			echo '<label for="theme-tag-' . $tag . '">' . $pretty_tag . '</label><br />';
+	/**
+	 * Checks if a tag is included in the active theme or the default tags.
+	 *
+	 * @param string $tag
+	 * @return boolean
+	 */
+	protected static function is_active_theme_tag( $tag ) {
+		if ( ! is_string( $tag ) ) {
+			return null;
 		}
 
-		if ( is_array( $theme_tags ) ) {
-			// Sort tags by relevance
-			krsort( $theme_tags );
-
-			foreach ( $theme_tags as $category => $tags ) {
-				if ( 'Features' !== $category ) {
-					echo '<fieldset id="' . strtolower( $category ) . '_tags">';
-
-					if ( 'Subject' === $category ) {
-						echo '<legend class="large-text">' . $category . ' ' . __( '(max 3 tags)', 'create-block-theme' ) . ':</legend>';
-					} else {
-						echo '<legend class="large-text">' . $category . ':</legend>';
-					}
-
-					foreach ( $tags as $tag => $pretty_tag ) {
-						tag_checkbox_input( $category, $tag, $pretty_tag );
-					}
-
-					echo '</fieldset>';
-				}
-				if ( 'Features' === $category ) {
-					// Split features array in half to display in two columns
-					$half         = ceil( count( $tags ) / 2 );
-					$features_one = array_slice( $tags, 0, $half );
-					$features_two = array_slice( $tags, $half );
-
-					echo '<fieldset id="features-tags-1">';
-					echo '<legend class="large-text">' . $category . ':</legend>';
+		$tag               = strtolower( $tag );
+		$active_theme_tags = wp_get_theme()->get( 'Tags' );
+		$default_tags      = self::list_default_tags();
+		$merged_tags       = array_unique( array_merge( $default_tags, $active_theme_tags ) );
 
-					foreach ( $features_one as $tag => $pretty_tag ) {
-						tag_checkbox_input( $category, $tag, $pretty_tag );
-					}
-
-					echo '</fieldset>';
-					echo '<fieldset id="features-tags-2">';
+		return in_array( $tag, $merged_tags, true );
+	}
 
-					foreach ( $features_two as $tag => $pretty_tag ) {
-						tag_checkbox_input( $category, $tag, $pretty_tag );
-					}
+	/**
+	 * Build checkbox input for given theme tag.
+	 *
+	 * @param string $category
+	 * @param string $tag
+	 * @param string $pretty_tag
+	 * @return void
+	 */
+	protected static function tag_checkbox_input( $category, $tag, $pretty_tag ) {
+		$class   = '';
+		$checked = '';
 
-					echo '</fieldset>';
-				}
-			}
+		if ( self::is_default_tag( $tag ) ) {
+			$class = 'default-tag';
 		}
 
-		echo '</div>';
-
-		// Custom tags input
-		echo '<label>';
-		echo '<br /><small>';
-		_e( 'Add custom tags (single or hyphenated words, separated by commas):', 'create-block-theme' );
-		echo '</small><br />';
-
-		// Regex for pattern attribute ensures only single words or words with hyphens are used, separated by commas
-		echo '<input placeholder="' . __( 'custom, tags, custom-tags', 'create-block-theme' ) . '" type="text" name="theme[tags_custom]" class="large-text code" pattern="^[a-zA-Z\-]+(\s*,\s*[a-zA-Z\-]+)*$" />';
-
-		echo '</label>';
-
-		echo '</div>';
+		if ( self::is_active_theme_tag( $tag ) ) {
+			$checked = ' checked';
+		}
+		?>
+<div class="theme-tag-form-control">
+	<input type="checkbox" id="theme-tag-<?php echo esc_attr( $tag ); ?>" name="theme[tags-<?php echo esc_attr( strtolower( $category ) ); ?>][]" value="<?php echo esc_attr( $tag ); ?>" class="<?php echo esc_attr( $class ); ?>" <?php echo esc_html( $checked ); ?>>
+	<label for="theme-tag-<?php echo esc_attr( $tag ); ?>"><?php echo esc_html( $pretty_tag ); ?></label>
+</div>
+		<?php
 	}
 
 }
diff --git a/admin/css/form.css b/admin/css/form.css
index 096c3712..a4ab244f 100644
--- a/admin/css/form.css
+++ b/admin/css/form.css
@@ -1,12 +1,42 @@
+h2 {
+	margin-bottom: 0;
+}
+
+p.description {
+	margin-bottom: 1rem;
+}
+
+.submit {
+	clear: both;
+}
+
+#col-left label,
+.theme-form label,
+.theme-form legend {
+	font-weight: 600;
+}
+
+.theme-tag-form-control label {
+	font-weight: 400;
+}
+
+.theme-form label {
+	display: block;
+	margin-bottom: 0.25rem;
+}
+
 /* Theme Tag Checkboxes */
 .theme-tags {
-	display: flex;
-	gap: 4rem;
+	display: grid;
 	margin-top: 0.5rem;
 }
 
+.theme-tags fieldset {
+	margin-bottom: 1rem;
+}
+
 .theme-tags legend {
-	margin-bottom: 0.5rem;
+	margin-bottom: 1rem;
 }
 
 .theme-tags label {
@@ -15,6 +45,49 @@
 	margin-bottom: 0.25rem;
 }
 
-.theme-tags #features-tags-2 {
-	margin-top: 1.5rem;
+#features-tags {
+	display: grid;
+}
+
+.theme-tag-form-control {
+	margin-bottom: 0.5rem;
+}
+
+@media screen and (min-width: 600px) {
+	.theme-tags {
+		grid-template-columns: 1fr 1fr;
+	}
+
+	/* Feature tags have items than other categores, so display the list in 2 columns on wider screens. */
+	#features-tags {
+		grid-template-columns: 1fr 1fr;
+		grid-column: 1 / 3;
+		margin-top: 1rem;
+	}
+}
+
+@media screen and (min-width: 783px) {
+	.theme-tags fieldset {
+		margin-bottom: 0.5rem;
+	}
+
+	.theme-tags legend {
+		margin-bottom: 0.5rem;
+	}
+
+	/* Checkboxes shrink to standard size. */
+	.theme-tag-form-control {
+		margin-bottom: 0;
+	}
+}
+
+@media screen and (min-width: 1440px) {
+	.theme-tags {
+		grid-template-columns: 1fr 1fr 1fr 1fr;
+	}
+
+	#features-tags {
+		grid-column: 3 / 5;
+		margin-top: 0;
+	}
 }