Index: bp-themes/bp-default/groups/single/plugins.php
===================================================================
--- bp-themes/bp-default/groups/single/plugins.php	(revision 3275)
+++ bp-themes/bp-default/groups/single/plugins.php	(working copy)
@@ -33,6 +33,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-default/groups/single/home.php
===================================================================
--- bp-themes/bp-default/groups/single/home.php	(revision 3275)
+++ bp-themes/bp-default/groups/single/home.php	(working copy)
@@ -68,6 +68,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer() ?>
Index: bp-themes/bp-default/groups/create.php
===================================================================
--- bp-themes/bp-default/groups/create.php	(revision 3275)
+++ bp-themes/bp-default/groups/create.php	(working copy)
@@ -257,6 +257,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer() ?>
Index: bp-themes/bp-default/groups/index.php
===================================================================
--- bp-themes/bp-default/groups/index.php	(revision 3275)
+++ bp-themes/bp-default/groups/index.php	(working copy)
@@ -54,6 +54,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-default/members/single/plugins.php
===================================================================
--- bp-themes/bp-default/members/single/plugins.php	(revision 3275)
+++ bp-themes/bp-default/members/single/plugins.php	(working copy)
@@ -36,7 +36,7 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 	<?php do_action( 'bp_after_member_plugin_template' ) ?>
 
Index: bp-themes/bp-default/members/single/home.php
===================================================================
--- bp-themes/bp-default/members/single/home.php	(revision 3275)
+++ bp-themes/bp-default/members/single/home.php	(working copy)
@@ -51,6 +51,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-default/members/index.php
===================================================================
--- bp-themes/bp-default/members/index.php	(revision 3275)
+++ bp-themes/bp-default/members/index.php	(working copy)
@@ -57,6 +57,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-default/search.php
===================================================================
--- bp-themes/bp-default/search.php	(revision 3275)
+++ bp-themes/bp-default/search.php	(working copy)
@@ -66,6 +66,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer() ?>
Index: bp-themes/bp-default/activity/index.php
===================================================================
--- bp-themes/bp-default/activity/index.php	(revision 3275)
+++ bp-themes/bp-default/activity/index.php	(working copy)
@@ -106,6 +106,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-default/404.php
===================================================================
--- bp-themes/bp-default/404.php	(revision 3275)
+++ bp-themes/bp-default/404.php	(working copy)
@@ -24,6 +24,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer(); ?>
\ No newline at end of file
Index: bp-themes/bp-default/index.php
===================================================================
--- bp-themes/bp-default/index.php	(revision 3275)
+++ bp-themes/bp-default/index.php	(working copy)
@@ -60,6 +60,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer() ?>
Index: bp-themes/bp-default/page.php
===================================================================
--- bp-themes/bp-default/page.php	(revision 3275)
+++ bp-themes/bp-default/page.php	(working copy)
@@ -33,6 +33,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer(); ?>
Index: bp-themes/bp-default/blogs/create.php
===================================================================
--- bp-themes/bp-default/blogs/create.php	(revision 3275)
+++ bp-themes/bp-default/blogs/create.php	(working copy)
@@ -28,7 +28,7 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 	<?php do_action( 'bp_after_directory_blogs_content' ) ?>
 
Index: bp-themes/bp-default/blogs/index.php
===================================================================
--- bp-themes/bp-default/blogs/index.php	(revision 3275)
+++ bp-themes/bp-default/blogs/index.php	(working copy)
@@ -54,6 +54,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-default/archive.php
===================================================================
--- bp-themes/bp-default/archive.php	(revision 3275)
+++ bp-themes/bp-default/archive.php	(working copy)
@@ -68,6 +68,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer(); ?>
Index: bp-themes/bp-default/single.php
===================================================================
--- bp-themes/bp-default/single.php	(revision 3275)
+++ bp-themes/bp-default/single.php	(working copy)
@@ -54,6 +54,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-default/registration/activate.php
===================================================================
--- bp-themes/bp-default/registration/activate.php	(revision 3275)
+++ bp-themes/bp-default/registration/activate.php	(working copy)
@@ -53,6 +53,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer(); ?>
Index: bp-themes/bp-default/registration/register.php
===================================================================
--- bp-themes/bp-default/registration/register.php	(revision 3275)
+++ bp-themes/bp-default/registration/register.php	(working copy)
@@ -291,7 +291,7 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 	<?php do_action( 'bp_after_directory_activity_content' ) ?>
 
Index: bp-themes/bp-default/forums/index.php
===================================================================
--- bp-themes/bp-default/forums/index.php	(revision 3275)
+++ bp-themes/bp-default/forums/index.php	(working copy)
@@ -108,6 +108,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php locate_template( array( 'sidebar.php' ), true ) ?>
+	<?php get_sidebar() ?>
 
 <?php get_footer() ?>
\ No newline at end of file