diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-admin/freedoms.php
--- a/wp/wp-admin/freedoms.php	Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-admin/freedoms.php	Tue Dec 15 13:49:49 2020 +0100
@@ -7,138 +7,112 @@
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once __DIR__ . '/admin.php';
+
+// This file was used to also display the Privacy tab on the About screen from 4.9.6 until 5.3.0.
+if ( isset( $_GET['privacy-notice'] ) ) {
+	wp_redirect( admin_url( 'privacy.php' ), 301 );
+	exit;
+}
 
 $title = __( 'Freedoms' );
 
 list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
-
-$is_privacy_notice = isset( $_GET['privacy-notice'] );
-
-if ( $is_privacy_notice ) {
-	$freedoms_class        = '';
-	$privacy_class         = ' nav-tab-active';
-	$freedoms_aria_current = '';
-	$privacy_aria_current  = ' aria-current="page"';
-} else {
-	$freedoms_class        = ' nav-tab-active';
-	$privacy_class         = '';
-	$freedoms_aria_current = ' aria-current="page"';
-	$privacy_aria_current  = '';
-}
-
+require_once ABSPATH . 'wp-admin/admin-header.php';
 ?>
-<div class="wrap about-wrap full-width-layout">
-
-<h1>
-	<?php
-	/* translators: %s: The current WordPress version number */
-	printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version );
-	?>
-</h1>
+<div class="wrap about__container">
 
-<p class="about-text">
-	<?php
-	printf(
-		/* translators: %s: The current WordPress version number */
-		__( 'Congratulations on updating to WordPress %s! This update makes it easier than ever to fix your site if something goes wrong.' ),
-		$display_version
-	);
-	?>
-</p>
+	<div class="about__header">
+		<div class="about__header-text">
+			<?php _e( 'Speed. Search. Security.' ); ?>
+		</div>
 
-<div class="wp-badge">
-	<?php
-	/* translators: %s: The current WordPress version number */
-	printf( __( 'Version %s' ), $display_version );
-	?>
-</div>
-
-<nav class="nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
-	<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
-	<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-	<a href="freedoms.php" class="nav-tab<?php echo $freedoms_class; ?>"<?php echo $freedoms_aria_current; ?>><?php _e( 'Freedoms' ); ?></a>
-	<a href="freedoms.php?privacy-notice" class="nav-tab<?php echo $privacy_class; ?>"<?php echo $privacy_aria_current; ?>><?php _e( 'Privacy' ); ?></a>
-</nav>
-
-<?php if ( $is_privacy_notice ) : ?>
-
-<div class="about-wrap-content">
-	<p class="about-description"><?php _e( 'From time to time, your WordPress site may send data to WordPress.org &#8212; including, but not limited to &#8212; the version of WordPress you are using, and a list of installed plugins and themes.' ); ?></p>
+		<div class="about__header-title">
+			<p>
+				<?php _e( 'WordPress' ); ?>
+				<span><?php echo $display_version; ?></span>
+			</p>
+		</div>
 
-	<p>
-		<?php
-		/* translators: %s: https://wordpress.org/about/stats/ */
-		printf( __( 'This data is used to provide general enhancements to WordPress, which includes helping to protect your site by finding and automatically installing new updates. It is also used to calculate statistics, such as those shown on the <a href="%s">WordPress.org stats page</a>.' ), 'https://wordpress.org/about/stats/' );
-		?>
-	</p>
+		<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
+			<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
+			<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
+			<a href="freedoms.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Freedoms' ); ?></a>
+			<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
+		</nav>
+	</div>
 
-	<p>
-		<?php
-		/* translators: %s: https://wordpress.org/about/privacy/ */
-		printf( __( 'We take privacy and transparency very seriously. To learn more about what data we collect, and how we use it, please visit <a href="%s">WordPress.org/about/privacy</a>.' ), 'https://wordpress.org/about/privacy/' );
-		?>
-	</p>
-</div>
+	<div class="about__section has-subtle-background-color is-feature">
+		<h1><?php _e( 'Freedoms' ); ?></h1>
 
-<?php else : ?>
-<div class="about-wrap-content">
-	<div class="feature-section has-1-columns">
-		<h2><?php _e( 'Freedoms' ); ?></h2>
 		<p class="about-description">
 		<?php
+		printf(
 			/* translators: %s: https://wordpress.org/about/license/ */
-			printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'https://wordpress.org/about/license/' );
+			__( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ),
+			__( 'https://wordpress.org/about/license/' )
+		);
 		?>
 		</p>
 	</div>
 
-	<div class="feature-section has-4-columns is-fullwidth">
+	<hr />
+
+	<div class="about__section has-4-columns">
 		<div class="column">
 			<div class="freedoms-image"></div>
-			<h3><?php _e( 'The 1st Freedom' ); ?></h3>
+			<h2 class="is-smaller-heading"><?php _e( 'The 1st Freedom' ); ?></h2>
 			<p><?php _e( 'To run the program for any purpose.' ); ?></p>
 		</div>
 		<div class="column">
 			<div class="freedoms-image"></div>
-			<h3><?php _e( 'The 2nd Freedom' ); ?></h3>
+			<h2 class="is-smaller-heading"><?php _e( 'The 2nd Freedom' ); ?></h2>
 			<p><?php _e( 'To study how the program works and change it to make it do what you wish.' ); ?></p>
 		</div>
 		<div class="column">
 			<div class="freedoms-image"></div>
-			<h3><?php _e( 'The 3rd Freedom' ); ?></h3>
+			<h2 class="is-smaller-heading"><?php _e( 'The 3rd Freedom' ); ?></h2>
 			<p><?php _e( 'To redistribute.' ); ?></p>
 		</div>
 		<div class="column">
 			<div class="freedoms-image"></div>
-			<h3><?php _e( 'The 4th Freedom' ); ?></h3>
+			<h2 class="is-smaller-heading"><?php _e( 'The 4th Freedom' ); ?></h2>
 			<p><?php _e( 'To distribute copies of your modified versions to others.' ); ?></p>
 		</div>
 	</div>
 
-	<div class="feature-section has-1-columns">
-		<p>
-		<?php
-			/* translators: %s: https://wordpressfoundation.org/trademark-policy/ */
-			printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'https://wordpressfoundation.org/trademark-policy/' );
-		?>
-		</p>
+	<hr />
 
-		<p>
-		<?php
+	<div class="about__section">
+		<div class="column">
+			<p>
+			<?php
+			printf(
+				/* translators: %s: https://wordpressfoundation.org/trademark-policy/ */
+				__( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ),
+				'https://wordpressfoundation.org/trademark-policy/'
+			);
+			?>
+			</p>
+
+			<p>
+			<?php
 			$plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : __( 'https://wordpress.org/plugins/' );
 			$themes_url  = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
-			/* translators: %s: https://wordpress.org/about/license/ */
-			printf( __( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' );
-		?>
-		</p>
+			printf(
+				/* translators: 1: URL to Plugins screen, 2: URL to Themes screen, 3: https://wordpress.org/about/license/ */
+				__( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ),
+				$plugins_url,
+				$themes_url,
+				__( 'https://wordpress.org/about/license/' )
+			);
+			?>
+			</p>
 
-		<p><?php _e( 'Don&#8217;t you wish all software came with these freedoms? So do we! For more information, check out the <a href="https://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
+			<p><?php _e( 'Don&#8217;t you wish all software came with these freedoms? So do we! For more information, check out the <a href="https://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
+		</div>
 	</div>
-</div>
 
-<?php endif; ?>
 </div>
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php require_once ABSPATH . 'wp-admin/admin-footer.php'; ?>