Index: bp-settings/bp-settings-actions.php
===================================================================
--- bp-settings/bp-settings-actions.php
+++ bp-settings/bp-settings-actions.php
@@ -109,7 +109,7 @@ function bp_core_screen_general_settings() {
 	}
 
 	// Load the template
-	bp_core_load_template( apply_filters( 'bp_core_screen_general_settings', 'members/single/settings/general' ) );
+	bp_core_load_template( apply_filters( 'bp_core_screen_general_settings', 'members/single/home' ) );
 }
 
 /** Notifications *************************************************************/
@@ -137,7 +137,7 @@ function bp_core_screen_notification_settings() {
 		do_action( 'bp_core_notification_settings_after_save' );
 	}
 
-	bp_core_load_template( apply_filters( 'bp_core_screen_notification_settings', 'members/single/settings/notifications' ) );
+	bp_core_load_template( apply_filters( 'bp_core_screen_notification_settings', 'members/single/home' ) );
 }
 
 /** Delete Account ************************************************************/
@@ -161,7 +161,7 @@ function bp_core_screen_delete_account() {
 	}
 
 	// Load the template
-	bp_core_load_template( apply_filters( 'bp_core_screen_delete_account', 'members/single/settings/delete-account' ) );
+	bp_core_load_template( apply_filters( 'bp_core_screen_delete_account', 'members/single/home' ) );
 }
 
 ?>
\ No newline at end of file
Index: bp-themes/bp-default/members/single/settings/delete-account.php
===================================================================
--- bp-themes/bp-default/members/single/settings/delete-account.php
+++ bp-themes/bp-default/members/single/settings/delete-account.php
@@ -1,54 +1,7 @@
-<?php
-
-/**
- * BuddyPress Delete Account
- *
- * @package BuddyPress
- * @subpackage bp-default
- */
-?>
-
-<?php get_header( 'buddypress' ) ?>
-
-	<div id="content">
-		<div class="padder">
-
-			<?php do_action( 'bp_before_member_settings_template' ); ?>
-
-			<div id="item-header">
-
-				<?php locate_template( array( 'members/single/member-header.php' ), true ); ?>
-
-			</div><!-- #item-header -->
-
-			<div id="item-nav">
-				<div class="item-list-tabs no-ajax" id="object-nav" role="navigation">
-					<ul>
-
-						<?php bp_get_displayed_user_nav(); ?>
-
-						<?php do_action( 'bp_member_options_nav' ); ?>
-
-					</ul>
-				</div>
-			</div><!-- #item-nav -->
-
-			<div id="item-body" role="main">
-
-				<?php do_action( 'bp_before_member_body' ); ?>
-
-				<div class="item-list-tabs no-ajax" id="subnav">
-					<ul>
-
-						<?php bp_get_options_nav(); ?>
-
-						<?php do_action( 'bp_member_plugin_options_nav' ); ?>
-
-					</ul>
-				</div><!-- .item-list-tabs -->
-
 				<h3><?php _e( 'Delete Account', 'buddypress' ); ?></h3>
 
+				<?php do_action( 'bp_before_member_settings_delete_account' ); ?>
+
 				<form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
 
 					<div id="message" class="info">
@@ -68,15 +21,4 @@
 					<?php wp_nonce_field( 'delete-account' ); ?>
 				</form>
 
-				<?php do_action( 'bp_after_member_body' ); ?>
-
-			</div><!-- #item-body -->
-
-			<?php do_action( 'bp_after_member_settings_template' ); ?>
-
-		</div><!-- .padder -->
-	</div><!-- #content -->
-
-<?php get_sidebar( 'buddypress' ) ?>
-
-<?php get_footer( 'buddypress' ) ?>
\ No newline at end of file
+				<?php do_action( 'bp_after_member_settings_delete_account' ); ?>
Index: bp-themes/bp-default/members/single/settings/general.php
===================================================================
--- bp-themes/bp-default/members/single/settings/general.php
+++ bp-themes/bp-default/members/single/settings/general.php
@@ -1,55 +1,6 @@
-<?php
-
-/**
- * BuddyPress Member Settings
- *
- * @package BuddyPress
- * @subpackage bp-default
- */
-?>
-
-<?php get_header( 'buddypress' ) ?>
-
-	<div id="content">
-		<div class="padder">
-
-			<?php do_action( 'bp_before_member_settings_template' ); ?>
-
-			<div id="item-header">
-
-				<?php locate_template( array( 'members/single/member-header.php' ), true ); ?>
-
-			</div><!-- #item-header -->
-
-			<div id="item-nav">
-				<div class="item-list-tabs no-ajax" id="object-nav" role="navigation">
-					<ul>
-
-						<?php bp_get_displayed_user_nav(); ?>
-
-						<?php do_action( 'bp_member_options_nav' ); ?>
-
-					</ul>
-				</div>
-			</div><!-- #item-nav -->
-
-			<div id="item-body" role="main">
-
-				<?php do_action( 'bp_before_member_body' ); ?>
-
-				<div class="item-list-tabs no-ajax" id="subnav">
-					<ul>
-
-						<?php bp_get_options_nav(); ?>
-
-						<?php do_action( 'bp_member_plugin_options_nav' ); ?>
-
-					</ul>
-				</div><!-- .item-list-tabs -->
-
 				<h3><?php _e( 'General Settings', 'buddypress' ); ?></h3>
 
-				<?php do_action( 'bp_template_content' ) ?>
+				<?php do_action( 'bp_before_member_settings_general' ) ?>
 
 				<form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/general'; ?>" method="post" class="standard-form" id="settings-form">
 
@@ -75,15 +26,4 @@
 
 				</form>
 
-				<?php do_action( 'bp_after_member_body' ); ?>
-
-			</div><!-- #item-body -->
-
-			<?php do_action( 'bp_after_member_settings_template' ); ?>
-
-		</div><!-- .padder -->
-	</div><!-- #content -->
-
-<?php get_sidebar( 'buddypress' ) ?>
-
-<?php get_footer( 'buddypress' ) ?>
\ No newline at end of file
+				<?php do_action( 'bp_after_member_settings_general' ); ?>
Index: bp-themes/bp-default/members/single/settings/notifications.php
===================================================================
--- bp-themes/bp-default/members/single/settings/notifications.php
+++ bp-themes/bp-default/members/single/settings/notifications.php
@@ -1,55 +1,6 @@
-<?php
-
-/**
- * BuddyPress Notification Settings
- *
- * @package BuddyPress
- * @subpackage bp-default
- */
-?>
-
-<?php get_header( 'buddypress' ) ?>
-
-	<div id="content">
-		<div class="padder">
-
-			<?php do_action( 'bp_before_member_settings_template' ); ?>
-
-			<div id="item-header">
-
-				<?php locate_template( array( 'members/single/member-header.php' ), true ); ?>
-
-			</div><!-- #item-header -->
-
-			<div id="item-nav">
-				<div class="item-list-tabs no-ajax" id="object-nav" role="navigation">
-					<ul>
-
-						<?php bp_get_displayed_user_nav(); ?>
-
-						<?php do_action( 'bp_member_options_nav' ); ?>
-
-					</ul>
-				</div>
-			</div><!-- #item-nav -->
-
-			<div id="item-body" role="main">
-
-				<?php do_action( 'bp_before_member_body' ); ?>
-
-				<div class="item-list-tabs no-ajax" id="subnav">
-					<ul>
-
-						<?php bp_get_options_nav(); ?>
-
-						<?php do_action( 'bp_member_plugin_options_nav' ); ?>
-
-					</ul>
-				</div><!-- .item-list-tabs -->
-
 				<h3><?php _e( 'Email Notification', 'buddypress' ); ?></h3>
 
-				<?php do_action( 'bp_template_content' ) ?>
+				<?php do_action( 'bp_before_member_settings_notifications' ); ?>
 
 				<form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications'; ?>" method="post" class="standard-form" id="settings-form">
 					<p><?php _e( 'Send a notification by email when:', 'buddypress' ); ?></p>
@@ -68,15 +19,4 @@
 
 				</form>
 
-				<?php do_action( 'bp_after_member_body' ); ?>
-
-			</div><!-- #item-body -->
-
-			<?php do_action( 'bp_after_member_settings_template' ); ?>
-
-		</div><!-- .padder -->
-	</div><!-- #content -->
-
-<?php get_sidebar( 'buddypress' ) ?>
-
-<?php get_footer( 'buddypress' ) ?>
\ No newline at end of file
+				<?php do_action( 'bp_after_member_settings_notifications' ); ?>