--- bp-default/activity/index.php	2011-01-22 09:13:24.000000000 -0800
+++ bp-default/activity/index.php	2011-03-17 15:28:57.671875000 -0700
@@ -9,7 +9,7 @@
 
 ?>
 
-<?php get_header() ?>
+<?php get_header( 'buddypress' ) ?>
 
 	<div id="content">
 		<div class="padder">
@@ -142,6 +142,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar() ?>
+<?php get_sidebar( 'buddypress' ) ?>
 
-<?php get_footer() ?>
+<?php get_footer( 'buddypress' ) ?>
--- bp-default/blogs/create.php	2011-01-22 09:13:24.000000000 -0800
+++ bp-default/blogs/create.php	2011-03-17 15:28:57.687500000 -0700
@@ -9,7 +9,7 @@
 
 ?>
 
-<?php get_header(); ?>
+<?php get_header( 'buddypress' ); ?>
 
 	<?php do_action( 'bp_before_directory_blogs_content' ); ?>
 
@@ -41,6 +41,6 @@
 
 	<?php do_action( 'bp_after_directory_blogs_content' ); ?>
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php get_sidebar( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
 
--- bp-default/blogs/index.php	2011-01-22 09:13:24.000000000 -0800
+++ bp-default/blogs/index.php	2011-03-17 15:28:57.687500000 -0700
@@ -9,7 +9,7 @@
 
 ?>
 
-<?php get_header(); ?>
+<?php get_header( 'buddypress' ); ?>
 
 	<?php do_action( 'bp_before_directory_blogs_content' ); ?>
 
@@ -81,5 +81,5 @@
 
 	<?php do_action( 'bp_after_directory_blogs_content' ); ?>
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php get_sidebar( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
--- bp-default/forums/index.php	2011-02-02 06:35:08.000000000 -0800
+++ bp-default/forums/index.php	2011-03-17 15:28:57.703125000 -0700
@@ -9,7 +9,7 @@
 
 ?>
 
-<?php get_header(); ?>
+<?php get_header( 'buddypress' ); ?>
 
 	<?php do_action( 'bp_before_directory_forums_content' ); ?>
 
@@ -154,5 +154,5 @@
 
 	<?php do_action( 'bp_after_directory_forums_content' ); ?>
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php get_sidebar( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
--- bp-default/forums/single/forum.php	2011-02-02 07:52:58.000000000 -0800
+++ bp-default/forums/single/forum.php	2011-03-17 15:28:57.703125000 -0700
@@ -1,4 +1,4 @@
-<?php get_header(); ?>
+<?php get_header( 'buddypress' ); ?>
 
 	<div id="content">
 		<div class="padder">
@@ -64,5 +64,5 @@
 
 	<?php do_action( 'bp_after_directory_forums_content' ); ?>
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php get_sidebar( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
--- bp-default/forums/single/topic.php	2011-02-02 07:52:58.000000000 -0800
+++ bp-default/forums/single/topic.php	2011-03-17 15:28:57.718750000 -0700
@@ -1,4 +1,4 @@
-<?php get_header(); ?>
+<?php get_header( 'buddypress' ); ?>
 
 	<div id="content">
 		<div class="padder">
@@ -191,5 +191,5 @@
 
 <?php do_action( 'bp_after_group_forum_topic' ) ?>
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_sidebar( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
\ No newline at end of file
--- bp-default/groups/create.php	2011-01-22 13:14:08.000000000 -0800
+++ bp-default/groups/create.php	2011-03-17 15:28:57.718750000 -0700
@@ -9,7 +9,7 @@
 
 ?>
 
-<?php get_header(); ?>
+<?php get_header( 'buddypress' ); ?>
 
 	<div id="content">
 		<div class="padder">
@@ -289,5 +289,5 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php get_sidebar( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
--- bp-default/groups/index.php	2011-01-22 09:13:24.000000000 -0800
+++ bp-default/groups/index.php	2011-03-17 15:28:57.734375000 -0700
@@ -9,7 +9,7 @@
 
 ?>
 
-<?php get_header(); ?>
+<?php get_header( 'buddypress' ); ?>
 
 	<?php do_action( 'bp_before_directory_groups_content' ); ?>
 
@@ -82,6 +82,6 @@
 
 	<?php do_action( 'bp_after_directory_groups_content' ); ?>
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php get_sidebar( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
 
--- bp-default/groups/single/home.php	2011-02-02 06:35:08.000000000 -0800
+++ bp-default/groups/single/home.php	2011-03-17 15:28:57.765625000 -0700
@@ -1,4 +1,4 @@
-<?php get_header(); ?>
+<?php get_header( 'buddypress' ); ?>
 
 	<div id="content">
 		<div class="padder">
@@ -81,5 +81,5 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php get_sidebar( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
--- bp-default/groups/single/plugins.php	2011-01-20 12:50:20.000000000 -0800
+++ bp-default/groups/single/plugins.php	2011-03-17 15:28:57.765625000 -0700
@@ -1,4 +1,4 @@
-<?php get_header() ?>
+<?php get_header( 'buddypress' ) ?>
 
 	<div id="content">
 		<div class="padder">
@@ -36,6 +36,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar() ?>
+	<?php get_sidebar( 'buddypress' ) ?>
 
-<?php get_footer() ?>
\ No newline at end of file
+<?php get_footer( 'buddypress' ) ?>
\ No newline at end of file
--- bp-default/members/index.php	2011-01-25 22:18:22.000000000 -0800
+++ bp-default/members/index.php	2011-03-17 15:28:57.781250000 -0700
@@ -9,7 +9,7 @@
 
 ?>
 
-<?php get_header(); ?>
+<?php get_header( 'buddypress' ); ?>
 
 	<?php do_action( 'bp_before_directory_groups_content' ); ?>
 
@@ -86,5 +86,5 @@
 
 	<?php do_action( 'bp_after_directory_members_content' ); ?>
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php get_sidebar( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
--- bp-default/members/single/activity/permalink.php	2011-01-20 12:50:20.000000000 -0800
+++ bp-default/members/single/activity/permalink.php	2011-03-17 15:28:57.796875000 -0700
@@ -1,4 +1,4 @@
-<?php get_header() ?>
+<?php get_header( 'buddypress' ) ?>
 
 <div class="activity no-ajax" role="main">
 	<?php if ( bp_has_activities( 'display_comments=threaded&include=' . bp_current_action() ) ) : ?>
@@ -14,4 +14,4 @@
 	<?php endif; ?>
 </div>
 
-<?php get_footer() ?>
\ No newline at end of file
+<?php get_footer( 'buddypress' ) ?>
\ No newline at end of file
--- bp-default/members/single/home.php	2011-01-26 14:28:34.000000000 -0800
+++ bp-default/members/single/home.php	2011-03-17 15:28:57.593750000 -0700
@@ -9,7 +9,7 @@
 
 ?>
 
-<?php get_header(); ?>
+<?php get_header( 'buddypress' ); ?>
 
 	<div id="content">
 		<div class="padder">
@@ -74,5 +74,5 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php get_sidebar( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
--- bp-default/members/single/plugins.php	2011-01-22 09:13:24.000000000 -0800
+++ bp-default/members/single/plugins.php	2011-03-17 15:28:57.609375000 -0700
@@ -13,7 +13,7 @@
 
 ?>
 
-<?php get_header(); ?>
+<?php get_header( 'buddypress' ); ?>
 
 	<div id="content">
 		<div class="padder">
@@ -65,5 +65,5 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php get_sidebar( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
--- bp-default/members/single/settings/delete-account.php	2011-01-25 19:58:56.000000000 -0800
+++ bp-default/members/single/settings/delete-account.php	2011-03-17 15:28:57.625000000 -0700
@@ -8,7 +8,7 @@
  */
 ?>
 
-<?php get_header() ?>
+<?php get_header( 'buddypress' ) ?>
 
 	<div id="content">
 		<div class="padder">
@@ -77,6 +77,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar() ?>
+<?php get_sidebar( 'buddypress' ) ?>
 
-<?php get_footer() ?>
\ No newline at end of file
+<?php get_footer( 'buddypress' ) ?>
\ No newline at end of file
--- bp-default/members/single/settings/general.php	2011-01-22 14:59:48.000000000 -0800
+++ bp-default/members/single/settings/general.php	2011-03-17 15:28:57.640625000 -0700
@@ -8,7 +8,7 @@
  */
 ?>
 
-<?php get_header() ?>
+<?php get_header( 'buddypress' ) ?>
 
 	<div id="content">
 		<div class="padder">
@@ -84,6 +84,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar() ?>
+<?php get_sidebar( 'buddypress' ) ?>
 
-<?php get_footer() ?>
\ No newline at end of file
+<?php get_footer( 'buddypress' ) ?>
\ No newline at end of file
--- bp-default/members/single/settings/notifications.php	2011-03-12 19:28:40.000000000 -0800
+++ bp-default/members/single/settings/notifications.php	2011-03-17 15:28:57.640625000 -0700
@@ -8,7 +8,7 @@
  */
 ?>
 
-<?php get_header() ?>
+<?php get_header( 'buddypress' ) ?>
 
 	<div id="content">
 		<div class="padder">
@@ -77,6 +77,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar() ?>
+<?php get_sidebar( 'buddypress' ) ?>
 
-<?php get_footer() ?>
\ No newline at end of file
+<?php get_footer( 'buddypress' ) ?>
\ No newline at end of file
--- bp-default/registration/activate.php	2011-01-20 12:50:20.000000000 -0800
+++ bp-default/registration/activate.php	2011-03-17 15:28:57.656250000 -0700
@@ -1,4 +1,4 @@
-<?php get_header(); ?>
+<?php get_header( 'buddypress' ); ?>
 
 	<div id="content">
 		<div class="padder">
@@ -49,6 +49,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar() ?>
+	<?php get_sidebar( 'buddypress' ) ?>
 
-<?php get_footer(); ?>
+<?php get_footer( 'buddypress' ); ?>
--- bp-default/registration/register.php	2011-01-25 19:58:56.000000000 -0800
+++ bp-default/registration/register.php	2011-03-17 15:28:57.656250000 -0700
@@ -1,4 +1,4 @@
-<?php get_header() ?>
+<?php get_header( 'buddypress' ) ?>
 
 	<div id="content">
 		<div class="padder">
@@ -244,7 +244,7 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar() ?>
+	<?php get_sidebar( 'buddypress' ) ?>
 
 	<?php do_action( 'bp_after_directory_activity_content' ) ?>
 
@@ -259,4 +259,4 @@
 		});
 	</script>
 
-<?php get_footer() ?>
\ No newline at end of file
+<?php get_footer( 'buddypress' ) ?>
\ No newline at end of file