Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-forums-homepage.php
===================================================================
diff --git a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-forums-homepage.php b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-forums-homepage.php
--- a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-forums-homepage.php	(revision 11003)
+++ b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-forums-homepage.php	(date 1622305781126)
@@ -1,30 +1,21 @@
 <?php do_action( 'bbp_template_before_forums_loop' ); ?>
 
-<div id="forums-list-<?php bbp_forum_id(); ?>" class="bbp-forums three-up">
+<table id="forums-list-<?php bbp_forum_id(); ?>" class="bbp-forums">
+	<thead>
+		<tr>
+			<th><?php _e( 'Forum', 'wporg-forums' ); ?></th>
+			<th><?php _e( 'Topics', 'wporg-forums' ); ?></th>
+		</tr>
+	</thead>
 
-
+	<tbody>
 		<?php while ( bbp_forums() ) : bbp_the_forum(); ?>
 
 			<?php bbp_get_template_part( 'loop', 'single-forum-homepage' ); ?>
 
 		<?php endwhile; ?>
+	</tbody>
 
+</table><!-- .forums-directory -->
 
-</div><!-- .forums-directory -->
-
-<div class="themes-plugins">
-	
-	<h3><?php _e( 'Themes and Plugins', 'wporg-forums' ); ?></h3>
-	<p><?php
-		/* translators: 1: Theme Directory URL, 2: Appearance icon, 3: Plugin Directory URL, 4: Plugins icon */
-		printf( __( 'Looking for help with a specific <a href="%1$s">%2$s theme</a> or <a href="%3$s">%4$s plugin</a>? Head to the theme or plugin\'s page and find the "View support forum" link to visit the theme or plugin\'s individual forum.', 'wporg-forums' ),
-			esc_url( __( 'https://wordpress.org/themes/', 'wporg-forums' ) ),
-			'<span class="dashicons dashicons-admin-appearance"></span>',
-			esc_url( __( 'https://wordpress.org/plugins/', 'wporg-forums' ) ),
-			'<span class="dashicons dashicons-admin-plugins"></span>'
-		);
-	?></p>
-
-</div>
-
 <?php do_action( 'bbp_template_after_forums_loop' ); ?>
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-forum-homepage.php
===================================================================
diff --git a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-forum-homepage.php b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-forum-homepage.php
--- a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-forum-homepage.php	(revision 11003)
+++ b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-forum-homepage.php	(date 1622302816020)
@@ -1,10 +1,10 @@
-<div id="bbp-forum-<?php bbp_forum_id(); ?>" <?php bbp_forum_class( bbp_get_forum_id(), array( '' ) ); ?>>
+<tr id="bbp-forum-<?php bbp_forum_id(); ?>" <?php bbp_forum_class( bbp_get_forum_id(), array( '' ) ); ?>>
 
-	<a class="bbp-forum-title" href="<?php bbp_forum_permalink(); ?>" title="<?php bbp_forum_title(); ?>"><h3><?php bbp_forum_title(); ?></h3></a>
+	<td class="topic-details">
+		<a class="bbp-forum-title" href="<?php bbp_forum_permalink(); ?>" title="<?php bbp_forum_title(); ?>"><?php bbp_forum_title(); ?></a>
 
-	<p><?php bbp_forum_content(); ?></p>
+		<p><?php bbp_forum_content(); ?></p>
 
-	<p>
 		<?php $subforums = bbp_forum_get_subforums( bbp_get_forum_id() ); ?>
 
 		<?php if ( $subforums ) : ?>
@@ -14,12 +14,9 @@
 			<?php endforeach; ?>
 
 		<?php endif; ?>
-
-		<?php if ( ! bbp_is_forum_category() ) : ?>
+	</td>
 
-			<a href="<?php bbp_forum_permalink(); ?>" title="<?php bbp_forum_title(); ?>" class="viewmore"><?php _e( 'View forum', 'wporg-forums' ); ?></a>
-
-		<?php endif; ?>
-	</p>
-
-</div><!-- #bbp-forum-<?php bbp_forum_id(); ?> -->
+	<td class="topic-count">
+		<?php bbp_forum_topic_count(); ?>
+	</td>
+</tr><!-- #bbp-forum-<?php bbp_forum_id(); ?> -->
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_forum-welcome.scss
===================================================================
diff --git a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_forum-welcome.scss b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_forum-welcome.scss
new file mode 100644
--- /dev/null	(date 1622308670724)
+++ b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_forum-welcome.scss	(date 1622308670724)
@@ -0,0 +1,77 @@
+#forum-welcome {
+	display: grid;
+	grid-template-columns: 100%;
+	justify-content: space-between;
+	width: 100%;
+	font-size: 14px;
+
+	@media (min-width: $ms-breakpoint) {
+		grid-template-columns: 45% 50%;
+	}
+
+	> section {
+		padding-top: 0;
+		width: 100%;
+	}
+
+	.info-box {
+
+		h2 {
+			display: inline-block;
+			font-size: 1.5rem;
+			margin-bottom: 0;
+			margin-top: 0;
+		}
+
+		.title {
+			display: flex;
+			align-items: center;
+
+			.dashicons {
+				font-size: 30px;
+				height: 30px;
+				margin-right: 10px;
+				width: 30px;
+			}
+		}
+	}
+
+	#bbpress-forums {
+		font-size: inherit;
+	}
+
+	#viewdiv {
+		text-align: center;
+	}
+
+	.bbp-forums {
+
+		tr {
+			th,
+			td {
+				padding: 5px 10px;
+			}
+		}
+
+		thead {
+			th {
+				background-color: $color__wp-blue;
+				color: #fff;
+			}
+		}
+
+		tbody {
+			td {
+				border-bottom: 1px solid $color__base-gray;
+			}
+
+			.topic-details {
+				padding-top: 1em;
+			}
+
+			.topic-count {
+				text-align: right;
+			}
+		}
+	}
+}
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/style.scss
===================================================================
diff --git a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/style.scss b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/style.scss
--- a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/style.scss	(revision 11003)
+++ b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/style.scss	(date 1622308670727)
@@ -87,6 +87,7 @@
 # bbPress Specific
 --------------------------------------------------------------*/
 @import "site/bbpress";
+@import "site/forum-welcome";
 
 /*--------------------------------------------------------------
 # HelpHub Specific
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/template-parts/bbpress-front.php
===================================================================
diff --git a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/template-parts/bbpress-front.php b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/template-parts/bbpress-front.php
--- a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/template-parts/bbpress-front.php	(revision 11003)
+++ b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/template-parts/bbpress-front.php	(date 1622310449858)
@@ -13,58 +13,77 @@
 
 <?php do_action( 'bbp_template_notices' ); ?>
 
-<section class="three-up" id="forum-welcome">
-	<div>
-		<div class="info-box">
+<div id="forum-welcome">
+	<section>
+		<?php
+		get_sidebar( 'forum-welcome-sidebar' );
+		if ( ! is_active_sidebar( 'forum-welcome-sidebar' ) ) :
+		?>
+
+			<div class="info-box">
+				<div class="title">
 					<span class="dashicons
 					<?php
 					/* translators: dashicon class name for 'Welcome to Support' section. Do not translate into your own language. */
 					esc_attr_e( 'dashicons-sos', 'wporg-forums' );
 					?>
 					"></span>
-			<h3><?php _e( 'Welcome to Support', 'wporg-forums' ); ?></h3>
-			<p><?php _e( 'Our community-based Support Forums are a great place to learn, share, and troubleshoot.', 'wporg-forums' ); ?></p>
-			<p><?php _e( '<a href="https://wordpress.org/support/welcome/">Get started</a>', 'wporg-forums' ); ?></p>
-		</div>
-	</div>
-	<div>
-		<div class="info-box">
+
+					<h2><?php _e( 'Welcome to Support', 'wporg-forums' ); ?></h2>
+				</div>
+				<div class="description">
+					<p><?php _e( 'Our community-based Support Forums are a great place to learn, share, and troubleshoot.', 'wporg-forums' ); ?></p>
+					<p><?php _e( '<a href="https://wordpress.org/support/welcome/">Get started</a>', 'wporg-forums' ); ?></p>
+				</div>
+			</div>
+
+
+			<div class="info-box">
+				<div class="title">
 					<span class="dashicons
 					<?php
 					/* translators: dashicon class name for 'Documentation' section. Do not translate into your own language. */
 					esc_attr_e( 'dashicons-portfolio', 'wporg-forums' );
 					?>
 					"></span>
-			<h3><?php _e( 'Documentation', 'wporg-forums' ); ?></h3>
-			<p><?php _e( 'Your first stop where you\'ll find information on everything from installing to creating plugins.', 'wporg-forums' ); ?></p>
-			<p><?php _e( '<a href="https://wordpress.org/support/">Explore documentation</a>', 'wporg-forums' ); ?></p>
-		</div>
-	</div>
-	<div>
-		<div class="info-box">
+
+					<h2><?php _e( 'Documentation', 'wporg-forums' ); ?></h2>
+				</div>
+				<div class="description">
+					<p><?php _e( 'Your first stop where you\'ll find information on everything from installing to creating plugins.', 'wporg-forums' ); ?></p>
+					<p><?php _e( '<a href="https://wordpress.org/support/">Explore documentation</a>', 'wporg-forums' ); ?></p>
+				</div>
+			</div>
+
+			<div class="info-box">
+				<div class="title">
 					<span class="dashicons
 					<?php
 					/* translators: dashicon class name for 'Get Involved' section. Do not translate into your own language. */
 					esc_attr_e( 'dashicons-hammer', 'wporg-forums' );
 					?>
 					"></span>
-			<h3><?php _e( 'Get Involved', 'wporg-forums' ); ?></h3>
-			<p><?php _e( 'The Support Handbook is great for tips, tricks, and advice regarding giving the best support possible.', 'wporg-forums' ); ?></p>
-			<p><?php _e( '<a href="https://make.wordpress.org/support/handbook/">Explore the Handbook</a>', 'wporg-forums' ); ?></p>
-		</div>
-	</div>
-</section>
+
+					<h2><?php _e( 'Get Involved', 'wporg-forums' ); ?></h2>
+				</div>
+				<div class="description">
+					<p><?php _e( 'The Support Handbook is great for tips, tricks, and advice regarding giving the best support possible.', 'wporg-forums' ); ?></p>
+					<p><?php _e( '<a href="https://make.wordpress.org/support/handbook/">Explore the Handbook</a>', 'wporg-forums' ); ?></p>
+				</div>
+			</div>
+		<?php endif; ?>
+	</section>
 
-<hr />
-
-<section>
-	<?php bbp_get_template_part( 'content', 'archive-forum' ); ?>
+	<section>
+		<?php bbp_get_template_part( 'content', 'archive-forum' ); ?>
 
-	<div id="viewdiv">
-		<ul id="views">
-			<?php wporg_support_get_views(); ?>
-		</ul>
-	</div><!-- #viewdiv -->
-</section>
+		<div id="viewdiv">
+			<ul id="views">
+				<?php wporg_support_get_views(); ?>
+			</ul>
+		</div><!-- #viewdiv -->
+	</section>
+</div>
+
 
 <?php do_action( 'bbp_after_main_content' ); ?>
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/footer.php
===================================================================
diff --git a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/footer.php b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/footer.php
--- a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/footer.php	(revision 11003)
+++ b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/footer.php	(date 1622292011938)
@@ -9,4 +9,5 @@
 	</div><!-- #content -->
 </div><!-- #page -->
 
-<?php require WPORGPATH . 'footer.php';
+<?php wporg_get_global_footer();
+
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php
===================================================================
diff --git a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php
--- a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php	(revision 11003)
+++ b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php	(date 1622310480119)
@@ -68,6 +68,13 @@
 		'before_widget' => '<div id="%1$s" class="widget %2$s">',
 		'after_widget'  => '</div>',
 	) );
+	register_sidebar( array(
+		'name'          => __( 'Forum Welcome', 'wporg-forums' ),
+		'id'            => 'forum-welcome-sidebar',
+		'description'   => __( 'Customize the forum welcome section', 'wporg-forums' ),
+		'before_widget' => '<div id="%1$s" class="widget info-box %2$s">',
+		'after_widget'  => '</div>',
+	) );
 }
 add_action( 'widgets_init', 'wporg_support_register_widget_areas' );
 
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sidebar-forum-welcome-sidebar.php
===================================================================
diff --git a/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sidebar-forum-welcome-sidebar.php b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sidebar-forum-welcome-sidebar.php
new file mode 100644
--- /dev/null	(date 1622308321977)
+++ b/sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sidebar-forum-welcome-sidebar.php	(date 1622308321977)
@@ -0,0 +1,4 @@
+<?php
+if ( is_active_sidebar( 'forum-welcome-sidebar' ) ) {
+	dynamic_sidebar( 'forum-welcome-sidebar' );
+}