diff --git wordpress.org/public_html/style/wp4.css wordpress.org/public_html/style/wp4.css
index 352cf85d7..cc9a0fe4d 100644
--- wordpress.org/public_html/style/wp4.css
+++ wordpress.org/public_html/style/wp4.css
@@ -105,6 +105,37 @@ sup {
 	word-wrap: normal !important;
 }
 
+/* Override Screen Reader Test - This is from wporg base */
+.screen-reader-text {
+	clip: rect(1px,1px,1px,1px);
+    height: 1px;
+    overflow: hidden;
+    position: absolute!important;
+	width: 1px;
+}
+
+.screen-reader-text:focus {
+	background-color: #f1f1f1;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    -webkit-box-shadow: 0 0 2px 2px rgba(0,0,0,.6);
+    box-shadow: 0 0 2px 2px rgba(0,0,0,.6);
+    clip: auto!important;
+    color: #21759b;
+    display: block;
+    font-size: 14px;
+    font-size: .875rem;
+    font-weight: 700;
+    height: auto;
+    left: 5px;
+    line-height: normal;
+    padding: 15px 23px 14px;
+    text-decoration: none;
+    top: 5px;
+    width: auto;
+    z-index: 100000;
+}
+
 /* =WordPress Core
 -------------------------------------------------------------- */
 .alignnone {
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/header.php wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/header.php
index 9e061ccda..7bbd805f6 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/header.php
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/header.php
@@ -3,7 +3,7 @@ $GLOBALS['pagetitle'] = wp_get_document_title();
 global $wporg_global_header_options;
 if ( !isset( $wporg_global_header_options['in_wrapper'] ) )
 	$wporg_global_header_options['in_wrapper'] = '';
-$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#content">' . esc_html__( 'Skip to content', 'wporg' ) . '</a>';
+$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" tabindex="1" href="#content">' . esc_html__( 'Skip to content', 'wporg' ) . '</a>';
 require WPORGPATH . 'header.php';
 ?>
 <header id="masthead" class="site-header" role="banner">
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-main/Gruntfile.js wordpress.org/public_html/wp-content/themes/pub/wporg-main/Gruntfile.js
index ef6aef9a9..ee2519b7b 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-main/Gruntfile.js
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-main/Gruntfile.js
@@ -30,7 +30,8 @@ module.exports = function( grunt ) {
 					} ),
 					require( 'pixrem' ),
 					require('cssnano')({
-						mergeRules: false
+						mergeRules: false,
+						zindex: false
 					})
 				]
 			},
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-makehome/header.php wordpress.org/public_html/wp-content/themes/pub/wporg-makehome/header.php
index bd58fad12..38a7c9957 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-makehome/header.php
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-makehome/header.php
@@ -1,5 +1,11 @@
 <?php
 $GLOBALS['pagetitle'] = wp_get_document_title();
+
+global $wporg_global_header_options;
+if ( !isset( $wporg_global_header_options['in_wrapper'] ) )
+	$wporg_global_header_options['in_wrapper'] = '';
+$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" tabindex="1" href="#headline">' . esc_html__( 'Skip to content', 'wporg-themes' ) . '</a>';
+
 require( WPORGPATH . 'header.php' );
 ?>
 
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/Gruntfile.js wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/Gruntfile.js
index ad7cd22a4..6ffc96478 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/Gruntfile.js
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/Gruntfile.js
@@ -52,7 +52,8 @@ module.exports = function( grunt ) {
 					} ),
 					require( 'pixrem' ),
 					require('cssnano')({
-						mergeRules: false
+						mergeRules: false,
+						zindex: false
 					})
 				]
 			},
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/header.php wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/header.php
index fc04e3c69..51a738a5d 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/header.php
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/header.php
@@ -21,7 +21,7 @@ $GLOBALS['pagetitle'] = wp_get_document_title();
 global $wporg_global_header_options;
 if ( !isset( $wporg_global_header_options['in_wrapper'] ) )
 	$wporg_global_header_options['in_wrapper'] = '';
-$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#main">' . esc_html__( 'Skip to content', 'wporg-plugins' ) . '</a>';
+$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" tabindex="1" href="#main">' . esc_html__( 'Skip to content', 'wporg-plugins' ) . '</a>';
 require WPORGPATH . 'header.php';
 ?>
 <div id="page" class="site">
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/header.php wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/header.php
index 9c2acd1d6..a49e907a4 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/header.php
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/header.php
@@ -3,7 +3,7 @@ $GLOBALS['pagetitle'] = wp_get_document_title();
 global $wporg_global_header_options;
 if ( !isset( $wporg_global_header_options['in_wrapper'] ) )
 	$wporg_global_header_options['in_wrapper'] = '';
-$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#pagebody">' . esc_html__( 'Skip to content', 'wporg-showcase' ) . '</a>';
+$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" tabindex="1" href="#pagebody">' . esc_html__( 'Skip to content', 'wporg-showcase' ) . '</a>';
 
 $prefix = is_ssl() ? 'https://' : 'http://s.';
 wp_enqueue_style( 'blog-wp4', $prefix.'wordpress.org/style/blog-wp4.css', array(), 4 );
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php
index 742542ead..608672844 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php
@@ -188,6 +188,11 @@ add_filter( 'excerpt_length', 'wporg_support_excerpt_length' );
  */
 function wporg_get_global_header() {
 
+	global $wporg_global_header_options;
+	if ( !isset( $wporg_global_header_options['in_wrapper'] ) )
+		$wporg_global_header_options['in_wrapper'] = '';
+	$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" tabindex="1" href="#content">' . esc_html__( 'Skip to content', 'wporg-forums' ) . '</a>';
+
 	$GLOBALS['pagetitle'] = wp_title( '&#124;', false, 'right' );
 	// Suffix either "WordPress.org $LOCALE" or WordPress.org.
 	if ( isset( $GLOBALS['wporg_global_header_options']['rosetta_title'] ) ) {
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-support/header.php wordpress.org/public_html/wp-content/themes/pub/wporg-support/header.php
index c3e924364..bbe1eb276 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-support/header.php
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-support/header.php
@@ -18,16 +18,10 @@ $menu_items = array(
 	_x( 'https://make.wordpress.org/support/handbook/', 'header menu', 'wporg-forums' ) => _x( 'Get Involved', 'header menu', 'wporg-forums' ),
 );
 
-global $wporg_global_header_options;
-if ( !isset( $wporg_global_header_options['in_wrapper'] ) )
-	$wporg_global_header_options['in_wrapper'] = '';
-$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#content">' . esc_html__( 'Skip to content', 'wporg-forums' ) . '</a>';
 wporg_get_global_header();
 ?>
 
 <div id="page" class="site">
-	<a class="skip-link screen-reader-text" href="#main"><?php esc_html_e( 'Skip to content', 'wporg-forums' ); ?></a>
-
 	<div id="content" class="site-content">
 		<header id="masthead" class="site-header <?php echo is_front_page() ? 'home' : ''; ?>" role="banner">
 			<div class="site-branding">
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_bbpress.scss wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_bbpress.scss
index 1ae7f7444..3ff60e781 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_bbpress.scss
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_bbpress.scss
@@ -1150,3 +1150,13 @@ div.bbp-breadcrumb {
 		}
 	}
 }
+
+/*--------------------------------------------------------------
+# Generic Overrides /
+--------------------------------------------------------------*/
+
+//Conflicting with wporg accesibility skip links
+.screen-reader-text {
+	-webkit-clip-path: none;
+	clip-path: none;
+}
\ No newline at end of file
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-themes/Gruntfile.js wordpress.org/public_html/wp-content/themes/pub/wporg-themes/Gruntfile.js
index 5b948abce..da1805900 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-themes/Gruntfile.js
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-themes/Gruntfile.js
@@ -31,7 +31,8 @@ module.exports = function( grunt ) {
 					} ),
 					require( 'pixrem' ),
 					require('cssnano')({
-						mergeRules: false
+						mergeRules: false,
+						zindex: false 
 					})
 				]
 			},
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-themes/header.php wordpress.org/public_html/wp-content/themes/pub/wporg-themes/header.php
index d4e34de58..838442f1d 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-themes/header.php
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-themes/header.php
@@ -9,7 +9,7 @@ $GLOBALS['pagetitle'] = wp_get_document_title();
 global $wporg_global_header_options;
 if ( !isset( $wporg_global_header_options['in_wrapper'] ) )
 	$wporg_global_header_options['in_wrapper'] = '';
-$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#themes">' . esc_html__( 'Skip to content', 'wporg-themes' ) . '</a>';
+$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" tabindex="1" href="#themes">' . esc_html__( 'Skip to content', 'wporg-themes' ) . '</a>';
 
 require WPORGPATH . 'header.php';
 ?>
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg/header-wporg.php wordpress.org/public_html/wp-content/themes/pub/wporg/header-wporg.php
index b5c059338..c656a70ef 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg/header-wporg.php
+++ wordpress.org/public_html/wp-content/themes/pub/wporg/header-wporg.php
@@ -11,4 +11,9 @@
 
 namespace WordPressdotorg\Theme;
 
+global $wporg_global_header_options;
+if ( !isset( $wporg_global_header_options['in_wrapper'] ) )
+	$wporg_global_header_options['in_wrapper'] = '';
+$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" tabindex="1" href="#masthead">' . esc_html__( 'Skip to content', 'wporg' ) . '</a>';
+
 require WPORGPATH . 'header.php';
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg/header.php wordpress.org/public_html/wp-content/themes/pub/wporg/header.php
index 38ec122fb..e8618cc05 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg/header.php
+++ wordpress.org/public_html/wp-content/themes/pub/wporg/header.php
@@ -11,11 +11,6 @@
 
 namespace WordPressdotorg\Theme;
 
-global $wporg_global_header_options;
-if ( !isset( $wporg_global_header_options['in_wrapper'] ) )
-	$wporg_global_header_options['in_wrapper'] = '';
-$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#content">' . esc_html__( 'Skip to content', 'wporg' ) . '</a>';
-
 get_template_part( 'header', 'wporg' );
 ?>
 <div id="page" class="site">