diff --git a/src/bp-core/bp-core-theme-compatibility.php b/src/bp-core/bp-core-theme-compatibility.php
index 74505bf8d..a4b6423c0 100644
--- a/src/bp-core/bp-core-theme-compatibility.php
+++ b/src/bp-core/bp-core-theme-compatibility.php
@@ -987,3 +987,22 @@ function bp_theme_compat_loop_end( $query ) {
 	unset( $bp->theme_compat->is_page_toggled );
 }
 add_action( 'loop_end', 'bp_theme_compat_loop_end' );
+
+/**
+ * Get the absolute path to the shared theme assets folder.
+ *
+ * @since 3.0.0
+ *
+ * @return string The absolute path to the shared theme assets folder.
+ */
+function bp_get_shared_theme_assets_dir() {
+
+	/**
+	 * Filters the absolute path to the shared theme assets folder.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string $dir The absolute path to the shared theme assets folder.
+	 */
+	return apply_filters( 'bp_get_theme_compat_dir', buddypress()->themes_dir . '/shared' );
+}
diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/camera.php b/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/camera.php
deleted file mode 100644
index 9b1119896..000000000
--- a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/camera.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * BuddyPress Avatars camera template.
- *
- * This template is used to create the camera Backbone views.
- *
- * @since 2.3.0
- */
-
-?>
-<script id="tmpl-bp-avatar-webcam" type="text/html">
-	<# if ( ! data.user_media ) { #>
-		<div id="bp-webcam-message">
-			<p class="warning"><?php esc_html_e( 'Your browser does not support this feature.', 'buddypress' );?></p>
-		</div>
-	<# } else { #>
-		<div id="avatar-to-crop"></div>
-		<div class="avatar-crop-management">
-			<div id="avatar-crop-pane" class="avatar" style="width:{{data.w}}px; height:{{data.h}}px"></div>
-			<div id="avatar-crop-actions">
-				<button type="button" class="button avatar-webcam-capture"><?php esc_html_e( 'Capture', 'buddypress' );?></button>
-				<button type="button" class="button avatar-webcam-save"><?php esc_html_e( 'Save', 'buddypress' );?></button>
-			</div>
-		</div>
-	<# } #>
-</script>
diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/crop.php b/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/crop.php
deleted file mode 100644
index e392166c9..000000000
--- a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/crop.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * BuddyPress Avatars crop template.
- *
- * This template is used to create the crop Backbone views.
- *
- * @since 2.3.0
- */
-
-?>
-<script id="tmpl-bp-avatar-item" type="text/html">
-	<div id="avatar-to-crop">
-		<img src="{{data.url}}"/>
-	</div>
-	<div class="avatar-crop-management">
-		<div id="avatar-crop-pane" class="avatar" style="width:{{data.full_w}}px; height:{{data.full_h}}px">
-			<img src="{{data.url}}" id="avatar-crop-preview"/>
-		</div>
-		<div id="avatar-crop-actions">
-			<button type="button" class="button avatar-crop-submit"><?php esc_html_e( 'Crop Image', 'buddypress' ); ?></button>
-		</div>
-	</div>
-</script>
diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/index.php b/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/index.php
deleted file mode 100644
index c46ebca45..000000000
--- a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/index.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * BuddyPress Avatars main template.
- *
- * This template is used to inject the BuddyPress Backbone views
- * dealing with avatars.
- *
- * It's also used to create the common Backbone views.
- *
- * @since 2.3.0
- */
-
-/**
- * This action is for internal use, please do not use it
- */
-do_action( 'bp_attachments_avatar_check_template' );
-?>
-<div class="bp-avatar-nav"></div>
-<div class="bp-avatar"></div>
-<div class="bp-avatar-status"></div>
-
-<script type="text/html" id="tmpl-bp-avatar-nav">
-	<a href="{{data.href}}" class="bp-avatar-nav-item" data-nav="{{data.id}}">{{data.name}}</a>
-</script>
-
-<?php bp_attachments_get_template_part( 'uploader' ); ?>
-
-<?php bp_attachments_get_template_part( 'avatars/crop' ); ?>
-
-<?php bp_attachments_get_template_part( 'avatars/camera' ); ?>
-
-<script id="tmpl-bp-avatar-delete" type="text/html">
-	<# if ( 'user' === data.object ) { #>
-		<p><?php _e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
-		<button type="button" class="button edit" id="bp-delete-avatar"><?php esc_html_e( 'Delete My Profile Photo', 'buddypress' ); ?></button>
-	<# } else if ( 'group' === data.object ) { #>
-		<?php bp_nouveau_user_feedback( 'group-avatar-delete-info' ); ?>
-		<button type="button" class="button edit" id="bp-delete-avatar"><?php esc_html_e( 'Delete Group Profile Photo', 'buddypress' ); ?></button>
-	<# } else { #>
-		<?php do_action( 'bp_attachments_avatar_delete_template' ); ?>
-	<# } #>
-</script>
-
-<?php do_action( 'bp_attachments_avatar_main_template' ); ?>
diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/cover-images/index.php b/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/cover-images/index.php
deleted file mode 100644
index 64e924875..000000000
--- a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/cover-images/index.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * BuddyPress Cover Images main template.
- *
- * This template is used to inject the BuddyPress Backbone views
- * dealing with cover images.
- *
- * It's also used to create the common Backbone views.
- *
- * @since 2.4.0
- */
-
-?>
-
-<div class="bp-cover-image"></div>
-<div class="bp-cover-image-status"></div>
-<div class="bp-cover-image-manage"></div>
-
-<?php bp_attachments_get_template_part( 'uploader' ); ?>
-
-<script id="tmpl-bp-cover-image-delete" type="text/html">
-	<# if ( 'user' === data.object ) { #>
-		<p><?php _e( "If you'd like to delete your current cover image but not upload a new one, please use the delete Cover Image button.", 'buddypress' ); ?></p>
-		<button type="button" class="button edit" id="bp-delete-cover-image"><?php esc_html_e( 'Delete My Cover Image', 'buddypress' ); ?></button>
-	<# } else if ( 'group' === data.object ) { #>
-		<p><?php _e( "If you'd like to remove the existing group cover image but not upload a new one, please use the delete group cover image button.", 'buddypress' ); ?></p>
-		<button type="button" class="button edit" id="bp-delete-cover-image"><?php esc_html_e( 'Delete Group Cover Image', 'buddypress' ); ?></button>
-	<# } else { #>
-		<?php do_action( 'bp_attachments_cover_image_delete_template' ); ?>
-	<# } #>
-</script>
-
-<?php do_action( 'bp_attachments_cover_image_main_template' ); ?>
diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/uploader.php b/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/uploader.php
deleted file mode 100644
index 67b2322b9..000000000
--- a/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/uploader.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * BuddyPress Uploader templates.
- *
- * This template is used to create the BuddyPress Uploader Backbone views.
- *
- * @since 2.3.0
- */
-
-?>
-<script type="text/html" id="tmpl-upload-window">
-	<?php if ( ! _device_can_upload() ) : ?>
-		<h3 class="upload-instructions"><?php esc_html_e( 'The web browser on your device cannot be used to upload files.', 'buddypress' ); ?></h3>
-	<?php elseif ( is_multisite() && ! is_upload_space_available() ) : ?>
-		<h3 class="upload-instructions"><?php esc_html_e( 'Upload Limit Exceeded', 'buddypress' ); ?></h3>
-	<?php else : ?>
-		<div id="{{data.container}}">
-			<div id="{{data.drop_element}}">
-				<div class="drag-drop-inside">
-					<p class="drag-drop-info"><?php esc_html_e( 'Drop your file here', 'buddypress' ); ?></p>
-					<p><?php _ex( 'or', 'Uploader: Drop your file here - or - Select your File', 'buddypress' ); ?></p>
-					<p class="drag-drop-buttons"><label for="{{data.browse_button}}" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php esc_html_e( 'Select your File', 'buddypress' ); ?></label><input id="{{data.browse_button}}" type="button" value="<?php esc_attr_e( 'Select your File', 'buddypress' ); ?>" class="button" /></p>
-				</div>
-			</div>
-		</div>
-	<?php endif; ?>
-</script>
-
-<script type="text/html" id="tmpl-progress-window">
-	<div id="{{data.id}}">
-		<div class="bp-progress">
-			<div class="bp-bar"></div>
-		</div>
-		<div class="filename">{{data.filename}}</div>
-	</div>
-</script>
diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php b/src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php
deleted file mode 100644
index 633cafa27..000000000
--- a/src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * BuddyPress email template.
- *
- * Magic numbers:
- *  1.618 = golden mean.
- *  1.35  = default body_text_size multipler. Gives default heading of 20px.
- *
- * @since 2.5.0
- *
- * @package BuddyPress
- * @subpackage Core
- */
-
-/*
-Based on the Cerberus "Fluid" template by Ted Goas (http://tedgoas.github.io/Cerberus/).
-License for the original template:
-
-
-The MIT License (MIT)
-
-Copyright (c) 2017 Ted Goas
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-// Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
-
-$settings = bp_email_get_appearance_settings();
-
-?><!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
-<head>
-	<meta charset="<?php echo esc_attr( get_bloginfo( 'charset' ) ); ?>">
-	<meta name="viewport" content="width=device-width"> <!-- Forcing initial-scale shouldn't be necessary -->
-	<meta http-equiv="X-UA-Compatible" content="IE=edge"> <!-- Use the latest (edge) version of IE rendering engine -->
-	<meta name="x-apple-disable-message-reformatting">  <!-- Disable auto-scale in iOS 10 Mail entirely -->
-	<title></title> <!-- The title tag shows in email notifications, like Android 4.4. -->
-
-	<!-- CSS Reset -->
-	<style type="text/css">
-		/* What it does: Remove spaces around the email design added by some email clients. */
-		/* Beware: It can remove the padding / margin and add a background color to the compose a reply window. */
-		html,
-		body {
-			Margin: 0 !important;
-			padding: 0 !important;
-			height: 100% !important;
-			width: 100% !important;
-		}
-
-		/* What it does: Stops email clients resizing small text. */
-		* {
-			-ms-text-size-adjust: 100%;
-			-webkit-text-size-adjust: 100%;
-		}
-
-		/* What is does: Centers email on Android 4.4 */
-		div[style*="margin: 16px 0"] {
-			margin: 0 !important;
-		}
-
-		/* What it does: Stops Outlook from adding extra spacing to tables. */
-		table,
-		td {
-			mso-table-lspace: 0pt !important;
-			mso-table-rspace: 0pt !important;
-		}
-
-		/* What it does: Fixes webkit padding issue. Fix for Yahoo mail table alignment bug. Applies table-layout to the first 2 tables then removes for anything nested deeper. */
-		table {
-			border-spacing: 0 !important;
-			border-collapse: collapse !important;
-			table-layout: fixed !important;
-			Margin: 0 auto !important;
-		}
-		table table table {
-			table-layout: auto;
-		}
-
-		/* What it does: Uses a better rendering method when resizing images in IE. */
-		/* & manages img max widths to ensure content body images don't exceed template width. */
-		img {
-			-ms-interpolation-mode:bicubic;
-			height: auto;
-			max-width: 100%;
-		}
-
-		/* What it does: A work-around for email clients meddling in triggered links. */
-		*[x-apple-data-detectors],  /* iOS */
-		.x-gmail-data-detectors,    /* Gmail */
-		.x-gmail-data-detectors *,
-		.aBn {
-			border-bottom: 0 !important;
-			cursor: default !important;
-			color: inherit !important;
-			text-decoration: none !important;
-			font-size: inherit !important;
-			font-family: inherit !important;
-			font-weight: inherit !important;
-			line-height: inherit !important;
-		}
-
-		/* What it does: Prevents Gmail from displaying an download button on large, non-linked images. */
-		.a6S {
-			display: none !important;
-			opacity: 0.01 !important;
-		}
-
-		/* If the above doesn't work, add a .g-img class to any image in question. */
-			img.g-img + div {
-			display: none !important;
-		}
-
-		/* What it does: Prevents underlining the button text in Windows 10 */
-		.button-link {
-			text-decoration: none !important;
-		}
-	</style>
-
-</head>
-<body class="email_bg" width="100%" bgcolor="<?php echo esc_attr( $settings['email_bg'] ); ?>" style="margin: 0; mso-line-height-rule: exactly;">
-<table cellpadding="0" cellspacing="0" border="0" height="100%" width="100%" bgcolor="<?php echo esc_attr( $settings['email_bg'] ); ?>" style="border-collapse:collapse;" class="email_bg"><tr><td valign="top">
-	<center style="width: 100%; text-align: <?php echo esc_attr( $settings['direction'] ); ?>;">
-
-		<!-- Visually Hidden Preheader Text : BEGIN -->
-		<div style="display: none; font-size: 1px; line-height: 1px; max-height: 0px; max-width: 0px; opacity: 0; overflow: hidden; mso-hide: all; font-family: sans-serif;">
-			{{email.preheader}}
-		</div>
-		<!-- Visually Hidden Preheader Text : END -->
-
-		<div style="max-width: 600px; margin: auto;" class="email-container">
-			<!--[if mso]>
-			<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="600" align="center">
-			<tr>
-			<td>
-			<![endif]-->
-
-			<!-- Email Header : BEGIN -->
-			<table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 600px; border-top: 7px solid <?php echo esc_attr( $settings['highlight_color'] ); ?>" bgcolor="<?php echo esc_attr( $settings['header_bg'] ); ?>" class="header_bg">
-				<tr>
-					<td style="text-align: center; padding: 15px 0; font-family: sans-serif; mso-height-rule: exactly; font-weight: bold; color: <?php echo esc_attr( $settings['header_text_color'] ); ?>; font-size: <?php echo esc_attr( $settings['header_text_size'] . 'px' ); ?>" class="header_text_color header_text_size">
-						<?php
-						/**
-						 * Fires before the display of the email template header.
-						 *
-						 * @since 2.5.0
-						 */
-						do_action( 'bp_before_email_header' );
-
-						echo bp_get_option( 'blogname' );
-
-						/**
-						 * Fires after the display of the email template header.
-						 *
-						 * @since 2.5.0
-						 */
-						do_action( 'bp_after_email_header' );
-						?>
-					</td>
-				</tr>
-			</table>
-			<!-- Email Header : END -->
-
-			<!-- Email Body : BEGIN -->
-			<table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" bgcolor="<?php echo esc_attr( $settings['body_bg'] ); ?>" width="100%" style="max-width: 600px; border-radius: 5px;" class="body_bg">
-
-				<!-- 1 Column Text : BEGIN -->
-				<tr>
-					<td>
-						<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
-							<tr>
-								<td style="padding: 20px; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.618 ) . 'px' ) ?>; color: <?php echo esc_attr( $settings['body_text_color'] ); ?>; font-size: <?php echo esc_attr( $settings['body_text_size'] . 'px' ); ?>" class="body_text_color body_text_size">
-									<span style="font-weight: bold; font-size: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.35 ) . 'px' ); ?>" class="welcome"><?php bp_email_the_salutation( $settings ); ?></span>
-									<hr color="<?php echo esc_attr( $settings['email_bg'] ); ?>"><br>
-									{{{content}}}
-								</td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-				<!-- 1 Column Text : BEGIN -->
-
-			</table>
-			<!-- Email Body : END -->
-
-			<!-- Email Footer : BEGIN -->
-			<br>
-			<table role="presentation" cellspacing="0" cellpadding="0" border="0" align="<?php echo esc_attr( $settings['direction'] ); ?>" width="100%" style="max-width: 600px; border-radius: 5px;" bgcolor="<?php echo esc_attr( $settings['footer_bg'] ); ?>" class="footer_bg">
-				<tr>
-					<td style="padding: 20px; width: 100%; font-size: <?php echo esc_attr( $settings['footer_text_size'] . 'px' ); ?>; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['footer_text_size'] * 1.618 ) . 'px' ) ?>; text-align: <?php echo esc_attr( $settings['direction'] ); ?>; color: <?php echo esc_attr( $settings['footer_text_color'] ); ?>;" class="footer_text_color footer_text_size">
-						<?php
-						/**
-						 * Fires before the display of the email template footer.
-						 *
-						 * @since 2.5.0
-						 */
-						do_action( 'bp_before_email_footer' );
-						?>
-
-						<span class="footer_text"><?php echo nl2br( stripslashes( $settings['footer_text'] ) ); ?></span>
-						<br><br>
-						<a href="{{{unsubscribe}}}" style="text-decoration: underline;"><?php _ex( 'unsubscribe', 'email', 'buddypress' ); ?></a>
-
-						<?php
-						/**
-						 * Fires after the display of the email template footer.
-						 *
-						 * @since 2.5.0
-						 */
-						do_action( 'bp_after_email_footer' );
-						?>
-					</td>
-				</tr>
-			</table>
-			<!-- Email Footer : END -->
-
-			<!--[if mso]>
-			</td>
-			</tr>
-			</table>
-			<![endif]-->
-		</div>
-	</center>
-</td></tr></table>
-<?php if ( function_exists( 'is_customize_preview' ) && is_customize_preview() ) wp_footer(); ?>
-</body>
-</html>
diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/embeds/activity.php b/src/bp-templates/bp-nouveau/buddypress/assets/embeds/activity.php
deleted file mode 100644
index aeae8075d..000000000
--- a/src/bp-templates/bp-nouveau/buddypress/assets/embeds/activity.php
+++ /dev/null
@@ -1,11 +0,0 @@
-
-		<?php if ( bp_activity_embed_has_activity( bp_current_action() ) ) : ?>
-
-			<?php while ( bp_activities() ) : bp_the_activity(); ?>
-				<div class="bp-embed-excerpt"><?php bp_activity_embed_excerpt(); ?></div>
-
-				<?php bp_activity_embed_media(); ?>
-
-			<?php endwhile; ?>
-
-		<?php endif; ?>
diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/embeds/footer.php b/src/bp-templates/bp-nouveau/buddypress/assets/embeds/footer.php
deleted file mode 100644
index 6214ab1d0..000000000
--- a/src/bp-templates/bp-nouveau/buddypress/assets/embeds/footer.php
+++ /dev/null
@@ -1,9 +0,0 @@
-			<div class="wp-embed-footer">
-				<?php the_embed_site_title() ?>
-
-				<div class="wp-embed-meta">
-					<?php
-					/** This action is documented in wp-includes/theme-compat/embed-content.php */
-					do_action( 'embed_content_meta' ); ?>
-				</div>
-			</div>
diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/embeds/header-activity.php b/src/bp-templates/bp-nouveau/buddypress/assets/embeds/header-activity.php
deleted file mode 100644
index d668707fc..000000000
--- a/src/bp-templates/bp-nouveau/buddypress/assets/embeds/header-activity.php
+++ /dev/null
@@ -1,26 +0,0 @@
-
-		<div id="bp-embed-header">
-			<div class="bp-embed-avatar">
-				<a href="<?php bp_displayed_user_link(); ?>">
-					<?php bp_displayed_user_avatar( 'type=thumb&width=45&height=45' ); ?>
-				</a>
-			</div>
-
-			<?php if ( bp_activity_embed_has_activity( bp_current_action() ) ) : ?>
-
-				<?php while ( bp_activities() ) : bp_the_activity(); ?>
-					<p class="bp-embed-activity-action">
-						<?php bp_activity_action( array( 'no_timestamp' => true ) ); ?>
-					</p>
-				<?php endwhile; ?>
-
-			<?php endif; ?>
-
-			<p class="bp-embed-header-meta">
-				<?php if ( bp_is_active( 'activity' ) && bp_activity_do_mentions() ) : ?>
-					<span class="bp-embed-mentionname">@<?php bp_displayed_user_mentionname(); ?> &middot; </span>
-				<?php endif; ?>
-
-				<span class="bp-embed-timestamp"><a href="<?php bp_activity_thread_permalink(); ?>"><?php echo date_i18n( get_option( 'time_format' ) . ' - ' . get_option( 'date_format' ), strtotime( bp_get_activity_date_recorded() ) ); ?></a></span>
-			</p>
-		</div>
diff --git a/src/bp-templates/bp-nouveau/buddypress/assets/embeds/header.php b/src/bp-templates/bp-nouveau/buddypress/assets/embeds/header.php
deleted file mode 100644
index e3d012ebd..000000000
--- a/src/bp-templates/bp-nouveau/buddypress/assets/embeds/header.php
+++ /dev/null
@@ -1,18 +0,0 @@
-
-		<div id="bp-embed-header">
-			<div class="bp-embed-avatar">
-				<a href="<?php bp_displayed_user_link(); ?>">
-					<?php bp_displayed_user_avatar( 'type=thumb&width=36&height=36' ); ?>
-				</a>
-			</div>
-
-			<p class="wp-embed-heading">
-				<a href="<?php bp_displayed_user_link(); ?>">
-					<?php bp_displayed_user_fullname(); ?>
-				</a>
-			</p>
-
-			<?php if ( bp_is_active( 'activity' ) && bp_activity_do_mentions() ) : ?>
-				<p class="bp-embed-mentionname">@<?php bp_displayed_user_mentionname(); ?></p>
-			<?php endif; ?>
-		</div>
diff --git a/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/camera.php b/src/bp-templates/shared/buddypress/assets/_attachments/avatars/camera.php
similarity index 100%
rename from src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/camera.php
rename to src/bp-templates/shared/buddypress/assets/_attachments/avatars/camera.php
diff --git a/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/crop.php b/src/bp-templates/shared/buddypress/assets/_attachments/avatars/crop.php
similarity index 100%
rename from src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/crop.php
rename to src/bp-templates/shared/buddypress/assets/_attachments/avatars/crop.php
diff --git a/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/index.php b/src/bp-templates/shared/buddypress/assets/_attachments/avatars/index.php
similarity index 100%
rename from src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/index.php
rename to src/bp-templates/shared/buddypress/assets/_attachments/avatars/index.php
diff --git a/src/bp-templates/bp-legacy/buddypress/assets/_attachments/cover-images/index.php b/src/bp-templates/shared/buddypress/assets/_attachments/cover-images/index.php
similarity index 100%
rename from src/bp-templates/bp-legacy/buddypress/assets/_attachments/cover-images/index.php
rename to src/bp-templates/shared/buddypress/assets/_attachments/cover-images/index.php
diff --git a/src/bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php b/src/bp-templates/shared/buddypress/assets/_attachments/uploader.php
similarity index 100%
rename from src/bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php
rename to src/bp-templates/shared/buddypress/assets/_attachments/uploader.php
diff --git a/src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php b/src/bp-templates/shared/buddypress/assets/emails/single-bp-email.php
similarity index 100%
rename from src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php
rename to src/bp-templates/shared/buddypress/assets/emails/single-bp-email.php
diff --git a/src/bp-templates/bp-legacy/buddypress/assets/embeds/activity.php b/src/bp-templates/shared/buddypress/assets/embeds/activity.php
similarity index 100%
rename from src/bp-templates/bp-legacy/buddypress/assets/embeds/activity.php
rename to src/bp-templates/shared/buddypress/assets/embeds/activity.php
diff --git a/src/bp-templates/bp-legacy/buddypress/assets/embeds/footer.php b/src/bp-templates/shared/buddypress/assets/embeds/footer.php
similarity index 100%
rename from src/bp-templates/bp-legacy/buddypress/assets/embeds/footer.php
rename to src/bp-templates/shared/buddypress/assets/embeds/footer.php
diff --git a/src/bp-templates/bp-legacy/buddypress/assets/embeds/header-activity.php b/src/bp-templates/shared/buddypress/assets/embeds/header-activity.php
similarity index 100%
rename from src/bp-templates/bp-legacy/buddypress/assets/embeds/header-activity.php
rename to src/bp-templates/shared/buddypress/assets/embeds/header-activity.php
diff --git a/src/bp-templates/bp-legacy/buddypress/assets/embeds/header.php b/src/bp-templates/shared/buddypress/assets/embeds/header.php
similarity index 100%
rename from src/bp-templates/bp-legacy/buddypress/assets/embeds/header.php
rename to src/bp-templates/shared/buddypress/assets/embeds/header.php
diff --git a/src/class-buddypress.php b/src/class-buddypress.php
index 7f328c3fc..f5118c8c4 100644
--- a/src/class-buddypress.php
+++ b/src/class-buddypress.php
@@ -732,8 +732,9 @@ class BuddyPress {
 
 		// Register the basic theme stack. This is really dope.
 		bp_register_template_stack( 'get_stylesheet_directory', 10 );
-		bp_register_template_stack( 'get_template_directory',   12 );
-		bp_register_template_stack( 'bp_get_theme_compat_dir',  14 );
+		bp_register_template_stack( 'get_template_directory', 12 );
+		bp_register_template_stack( 'bp_get_theme_compat_dir', 14 );
+		bp_register_template_stack( 'bp_get_shared_theme_assets_dir', 16 );
 	}
 
 	/**