Index: bp-friends/bp-friends-templatetags.php
===================================================================
--- bp-friends/bp-friends-templatetags.php	(revision 2030)
+++ bp-friends/bp-friends-templatetags.php	(working copy)
@@ -385,23 +385,26 @@
 }
 
 function bp_friends_filter_title() {
-	global $bp;
-	
-	$current_filter = $bp->action_variables[0];
-	
-	switch ( $current_filter ) {
-		case 'recently-active': default:
-			_e( 'Recently Active', 'buddypress' );
-			break;
-		case 'newest':
-			_e( 'Newest', 'buddypress' );
-			break;
-		case 'alphabetically':
-			_e( 'Alphabetically', 'buddypress' );
-		break;
-	}
+	echo bp_get_friends_filter_title();
 }
 
+	function bp_get_friends_filter_title() {
+		global $bp;
+		
+		$current_filter = $bp->action_variables[0];
+		
+		switch ( $current_filter ) {
+			case 'recently-active': default:
+				return __( 'Recently Active', 'buddypress' );
+
+			case 'newest':
+				return __( 'Newest', 'buddypress' );
+
+			case 'alphabetically':
+				return __( 'Alphabetically', 'buddypress' );
+		}
+	}
+
 function bp_friends_random_friends() {
 	global $bp;
 	
Index: bp-themes/bp-sn-parent/404.php
===================================================================
--- bp-themes/bp-sn-parent/404.php	(revision 2030)
+++ bp-themes/bp-sn-parent/404.php	(working copy)
@@ -1,17 +1,17 @@
-<?php get_header(); ?>
+<?php get_header() ?>
 
 	<div id="content">
-	
+
 		<?php do_action( 'bp_before_404' ) ?>
-	
+
 		<div class="page 404">
-		
+
 			<h2 class="pagetitle"><?php _e( 'Page Not Found', 'buddypress' ) ?></h2>
 
 			<div id="message" class="info">
-			
+
 				<p><?php _e( 'The page you were looking for was not found.', 'buddypress' ) ?>
-		
+
 			</div>
 
 			<?php do_action( 'bp_404' ) ?>
@@ -19,9 +19,9 @@
 		</div>
 
 		<?php do_action( 'bp_after_404' ) ?>
-	
+
 	</div>
-	
+
 	<?php get_sidebar() ?>
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/activity/just-me.php
===================================================================
--- bp-themes/bp-sn-parent/activity/just-me.php	(revision 2030)
+++ bp-themes/bp-sn-parent/activity/just-me.php	(working copy)
@@ -1,69 +1,94 @@
 <?php get_header() ?>
 
 	<div class="content-header">
+
 		<?php bp_last_activity() ?>
+
 	</div>
 
 	<div id="content">
+
 		<?php do_action( 'template_notices' ) // (error/success feedback) ?>
 
 		<?php do_action( 'bp_before_my_activity_content' ) ?>
-	
+
 		<div class="left-menu">
+
 			<!-- Profile Menu (Avatar, Add Friend, Send Message buttons etc) -->
 			<?php locate_template( array( 'profile/profile-menu.php' ), true ) ?>
+
 		</div>
 
 		<div class="main-column">
-		
+
 			<?php bp_get_profile_header() ?>
 
 			<div class="bp-widget">
-				<h4><?php echo bp_word_or_name( __( "My Activity", 'buddypress' ), __( "%s's Activity", 'buddypress' ), true, false ) ?> <a href="<?php bp_activities_member_rss_link() ?>" title="<?php _e( 'RSS Feed', 'buddypress' ) ?>"><?php _e( 'RSS Feed', 'buddypress' ) ?></a></h4>
 
+				<h4><?php echo bp_word_or_name( __( "My Activity", 'buddypress' ), __( "%s's Activity", 'buddypress' ), true, false ) ?>
+
+					<a href="<?php bp_activities_member_rss_link() ?>" title="<?php esc_attr_e( 'RSS Feed', 'buddypress' ) ?>"><?php _e( 'RSS Feed', 'buddypress' ) ?></a></h4>
+
 				<ul id="activity-filter-links">
+
 					<?php bp_activity_filter_links() ?>
+
 				</ul>
 
 				<?php if ( bp_has_activities( 'type=personal&per_page=25&max=500' ) ) : ?>
-					
+
 					<div class="pagination">
-						
+
 						<div class="pag-count" id="activity-count">
+
 							<?php bp_activity_pagination_count() ?>
+
 						</div>
-		
+
 						<div class="pagination-links" id="activity-pag">
+
 							&nbsp; <?php bp_activity_pagination_links() ?>
+
 						</div>
-						
+
 					</div>
-					
+
 					<ul id="activity-list" class="item-list activity-list">
-					<?php while ( bp_activities() ) : bp_the_activity(); ?>
-						<li class="<?php bp_activity_css_class() ?>">
-							<div class="activity-avatar">
-								<?php bp_activity_avatar() ?>
-							</div>
-							
-							<?php bp_activity_content() ?>
-							
-							<?php do_action( 'bp_my_activity_item' ) ?>
-						</li>
-					<?php endwhile; ?>
+
+						<?php while ( bp_activities() ) : bp_the_activity() ?>
+
+							<li class="<?php bp_activity_css_class() ?>">
+
+								<div class="activity-avatar">
+
+									<?php bp_activity_avatar() ?>
+
+								</div>
+
+								<?php bp_activity_content() ?>
+
+								<?php do_action( 'bp_my_activity_item' ) ?>
+
+							</li>
+
+						<?php endwhile ?>
+
 					</ul>
-					
+
 					<?php do_action( 'bp_my_activity_content' ) ?>
 
-				<?php else: ?>
+				<?php else : ?>
 
 					<div id="message" class="info">
+
 						<p><?php echo bp_word_or_name( __( "You haven't done anything yet.", 'buddypress' ), __( "%s hasn't done anything yet.", 'buddypress' ), true, false ) ?></p>
+
 					</div>
 
-				<?php endif;?>
+				<?php endif ?>
+
 			</div>
-		
+
 		</div>
 
 		<?php do_action( 'bp_after_my_activity_content' ) ?>
Index: bp-themes/bp-sn-parent/activity/my-friends.php
===================================================================
--- bp-themes/bp-sn-parent/activity/my-friends.php	(revision 2030)
+++ bp-themes/bp-sn-parent/activity/my-friends.php	(working copy)
@@ -1,17 +1,22 @@
 <?php get_header() ?>
 
 	<div class="content-header">
+
 		<?php bp_last_activity() ?>
+
 	</div>
 
 	<div id="content">
+
 		<?php do_action( 'template_notices' ) // (error/success feedback) ?>
 
 		<?php do_action( 'bp_before_friends_activity_content' ) ?>
-	
+
 		<div class="left-menu">
+
 			<!-- Profile Menu (Avatar, Add Friend, Send Message buttons etc) -->
 			<?php locate_template( array( 'profile/profile-menu.php' ), true ) ?>
+
 		</div>
 
 		<div class="main-column">
@@ -19,56 +24,75 @@
 			<?php bp_get_profile_header() ?>
 
 			<div class="bp-widget">
-				<h4><?php _e( 'My Friends Activity', 'buddypress' ) ?> <a href="<?php bp_activities_member_rss_link() ?>" title="<?php _e( 'RSS Feed', 'buddypress' ) ?>"><?php _e( 'RSS Feed', 'buddypress' ) ?></a></h4>
 
+				<h4><?php _e( 'My Friends Activity', 'buddypress' ) ?>
+
+					<a href="<?php bp_activities_member_rss_link() ?>" title="<?php esc_attr_e( 'RSS Feed', 'buddypress' ) ?>"><?php _e( 'RSS Feed', 'buddypress' ) ?></a></h4>
+
 				<ul id="activity-filter-links">
+
 					<?php bp_activity_filter_links() ?>
+
 				</ul>
 
 				<?php if ( bp_has_activities( 'type=friends&per_page=25&max=500' ) ) : ?>
 
 					<div class="pagination">
-						
+
 						<div class="pag-count" id="activity-count">
+
 							<?php bp_activity_pagination_count() ?>
+
 						</div>
-		
+
 						<div class="pagination-links" id="activity-pag">
+
 							&nbsp; <?php bp_activity_pagination_links() ?>
+
 						</div>
-						
+
 					</div>
-					
+
 					<ul id="activity-list" class="item-list activity-list">
-					<?php while ( bp_activities() ) : bp_the_activity(); ?>
-						<li class="<?php bp_activity_css_class() ?>">
-							<div class="activity-avatar">
-								<?php bp_activity_avatar() ?>
-							</div>
-							
-							<?php bp_activity_content() ?>
 
-							<?php do_action( 'bp_friends_activity_item' ) ?>
-						</li>
-					<?php endwhile; ?>
+						<?php while ( bp_activities() ) : bp_the_activity() ?>
+
+							<li class="<?php bp_activity_css_class() ?>">
+
+								<div class="activity-avatar">
+
+									<?php bp_activity_avatar() ?>
+
+								</div>
+
+								<?php bp_activity_content() ?>
+
+								<?php do_action( 'bp_friends_activity_item' ) ?>
+
+							</li>
+
+						<?php endwhile ?>
+
 					</ul>
-					
+
 					<?php do_action( 'bp_friends_activity_content' ) ?>
 
-				<?php else: ?>
+				<?php else : ?>
 
 					<div id="message" class="info">
+
 						<p><?php _e( "Your friends haven't done anything yet.", 'buddypress' )  ?></p>
+
 					</div>
 
-				<?php endif;?>
+				<?php endif ?>
+
 			</div>
-		
+
 		</div>
 
 		<?php do_action( 'bp_after_friends_activity_content' ) ?>
 
 	</div>
 
-<?php get_footer() ?>
-
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/archive.php
===================================================================
--- bp-themes/bp-sn-parent/archive.php	(revision 2030)
+++ bp-themes/bp-sn-parent/archive.php	(working copy)
@@ -1,65 +1,78 @@
-<?php get_header(); ?>
+<?php get_header() ?>
 
 	<div id="content">
 
 		<?php do_action( 'bp_before_archive' ) ?>
-		
+
 		<div class="page" id="blog-archives">
-		
+
 			<h2 class="pagetitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
-			
+
 			<?php if ( have_posts() ) : ?>
 
-				<h3><?php printf( __( 'You are browsing the archive for %1$s.', 'buddypress' ), wp_title( false, false ) ); ?></h3>
+				<h3><?php printf( __( 'You are browsing the archive for %s.', 'buddypress' ), wp_title( false, false ) ) ?></h3>
 
 				<div class="navigation">
-					
+
 					<div class="alignleft"><?php next_posts_link( __( '&laquo; Previous Entries', 'buddypress' ) ) ?></div>
 					<div class="alignright"><?php previous_posts_link( __( 'Next Entries &raquo;', 'buddypress' ) ) ?></div>
-				
+
 				</div>
 
-				<?php while (have_posts()) : the_post(); ?>
+				<?php while ( have_posts() ) : the_post() ?>
 
 					<?php do_action( 'bp_before_blog_post' ) ?>
-				
-					<div class="post">
-						
-						<h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title(); ?>"><?php the_title(); ?></a></h3>
+
+					<div <?php post_class( $i++ & 1 ? '' : 'alt' ) ?> id="post-<?php the_ID() ?>">
+
+						<h3><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf( esc_attr__( 'Permanent Link to %s', 'buddypress' ), get_the_title() ) ?>"><?php the_title() ?></a></h3>
+
 						<small><?php the_time('F j, Y') ?></small>
 
 						<div class="entry">
+
 							<?php the_content() ?>
+
 						</div>
 
-						<p class="postmetadata"><?php _e( 'Posted in', 'buddypress' ) ?> <?php the_category(', ') ?> | <?php edit_post_link( __( 'Edit', 'buddypress' ), '', ' | '); ?>  <?php comments_popup_link( __( 'No Comments &#187;', 'buddypress' ), __( '1 Comment &#187;', 'buddypress' ), __( '% Comments &#187;', 'buddypress' ) ); ?></p>
+						<p class="postmetadata"><?php printf( __( 'Posted in %s', 'buddypress' ), get_the_category_list(',') ) ?>
 
+							<?php _e( '|', 'buddypress' ) ?>
+
+							<?php edit_post_link( __( 'Edit', 'buddypress' ), '', "\n\n" . __( '|', 'buddypress' ) ) ?>
+
+							<?php comments_popup_link(
+								__( 'No Comments &#187;', 'buddypress' ),
+								__( '1 Comment &#187;', 'buddypress' ),
+								__( '% Comments &#187;', 'buddypress' ) ) ?></p>
+
 					</div>
 
 					<?php do_action( 'bp_after_blog_post' ) ?>
 
-				<?php endwhile; ?>
+				<?php endwhile ?>
 
 				<div class="navigation">
-					
+
 					<div class="alignleft"><?php next_posts_link( __( '&laquo; Previous Entries', 'buddypress' ) ) ?></div>
 					<div class="alignright"><?php previous_posts_link( __( 'Next Entries &raquo;', 'buddypress' ) ) ?></div>
-				
+
 				</div>
 
 			<?php else : ?>
 
 				<h2 class="center"><?php _e( 'Not Found', 'buddypress' ) ?></h2>
+
 				<?php locate_template( array( 'searchform.php' ), true ) ?>
-			
-			<?php endif; ?>
 
+			<?php endif ?>
+
 		</div>
 
 		<?php do_action( 'bp_after_archive' ) ?>
-		
+
 	</div>
 
-		<?php get_sidebar(); ?>
+	<?php get_sidebar() ?>
 
-<?php get_footer(); ?>
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/attachment.php
===================================================================
--- bp-themes/bp-sn-parent/attachment.php	(revision 2030)
+++ bp-themes/bp-sn-parent/attachment.php	(working copy)
@@ -1,47 +1,63 @@
-<?php get_header(); ?>
+<?php get_header() ?>
 
 	<div id="content">
 
 		<?php do_action( 'bp_before_attachment' ) ?>
-		
+
 		<div class="page" id="attachments-page">
-		
+
 			<h2 class="pagetitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
-  		
-				<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
 
+			<?php if ( have_posts() ) : while ( have_posts() ) : the_post() ?>
+
 					<?php do_action( 'bp_before_blog_post' ) ?>
 
-					<?php $attachment_link = get_the_attachment_link($post->ID, true, array(450, 800)); // This also populates the iconsize for the next line ?>
-					<?php $_post = &get_post($post->ID); $classname = ($_post->iconsize[0] <= 128 ? 'small' : '') . 'attachment'; // This lets us style narrow icons specially ?>
-				
-					<div class="post" id="post-<?php the_ID(); ?>">
-				
-						<h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-				
+					<div <?php post_class( $i++ & 1 ? '' : 'alt' ) ?> id="post-<?php the_ID() ?>">
+
+						<h2><a href="<?php echo get_permalink( $post->post_parent ) ?>" rev="attachment"><?php echo get_the_title( $post->post_parent ) ?></a>
+
+						<?php _e( '&raquo;', 'buddypress' ) ?>
+
+						<a href="<?php the_permalink() ?>" rel="bookmark" title="<?php esc_attr_e( __( 'Permanent Link: %s', 'buddypress' ), get_the_title() ) ?>"><?php the_title() ?></a></h2>
+
 						<div class="entry">
-							<p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p>
 
-							<?php the_content( __('<p class="serif">Read the rest of this entry &raquo;</p>', 'buddypress' ) ); ?>
+							<p class="<?php
+								// This also populates the iconsize for the next line
+								$attachment_link = get_the_attachment_link( $post->ID, true, array( 450, 800 ) );
+								$_post = &get_post( $post->ID );
+								// This lets us style narrow icons specially
+								echo ( $_post->iconsize[0] <= 128 ? 'small ' : '' )
+							?>attachment"><?php echo $attachment_link ?>
 
-							<?php wp_link_pages( array( 'before' => __( '<p><strong>Pages:</strong> ', 'buddypress' ), 'after' => '</p>', 'next_or_number' => 'number')); ?>
+							<br />
+
+							<?php echo basename( $post->guid ) ?></p>
+
+							<?php the_content( '<p class="serif">' . __('Read the rest of this entry &raquo;', 'buddypress' ) . '</p>' ) ?>
+
+							<?php wp_link_pages( array( 'before' => '<p><strong>' . __( 'Pages:', 'buddypress' ) . '</strong> ', 'after' => '</p>', 'next_or_number' => 'number') ) ?>
+
 						</div>
-					
+
 					</div>
 
 					<?php do_action( 'bp_after_blog_post' ) ?>
 
-				<?php comments_template(); ?>
+					<?php comments_template() ?>
 
-				<?php endwhile; else: ?>
+				<?php endwhile ?>
 
-					<p><?php _e( 'Sorry, no attachments matched your criteria.', 'buddypress' ) ?></p>
+			<?php else : ?>
 
-				<?php endif; ?>
+				<p><?php _e( 'Sorry, no attachments matched your criteria.', 'buddypress' ) ?></p>
+
+			<?php endif ?>
+
 		</div>
 
 		<?php do_action( 'bp_after_attachment' ) ?>
 
 	</div>
 
-<?php get_footer(); ?>
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/blogs/create.php
===================================================================
--- bp-themes/bp-sn-parent/blogs/create.php	(revision 2030)
+++ bp-themes/bp-sn-parent/blogs/create.php	(working copy)
@@ -1,32 +1,35 @@
 <?php get_header() ?>
 
 	<div class="content-header">
+
 		<?php _e( 'Create a Blog', 'buddypress' ) ?>
+
 	</div>
 
 	<div id="content">
 
 		<?php do_action( 'template_notices' ) // (error/success feedback) ?>
-		
+
 		<h2><?php _e( 'Create a Blog', 'buddypress' ) ?></h2>
 
 		<?php do_action( 'bp_before_create_blog_content' ) ?>
 
 		<?php if ( bp_blog_signup_enabled() ) : ?>
-		
+
 			<?php bp_show_blog_signup_form() ?>
-	
-		<?php else: ?>
 
+		<?php else : ?>
+
 			<div id="message" class="info">
-				<p><?php _e( 'Blog registration is currently disabled', 'buddypress' ); ?></p>
+
+				<p><?php _e( 'Blog registration is currently disabled', 'buddypress' ) ?></p>
+
 			</div>
 
-		<?php endif; ?>
+		<?php endif ?>
 
 		<?php do_action( 'bp_after_create_blog_content' ) ?>
 
 	</div>
 
-<?php get_footer() ?>
-
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/blogs/my-blogs.php
===================================================================
--- bp-themes/bp-sn-parent/blogs/my-blogs.php	(revision 2030)
+++ bp-themes/bp-sn-parent/blogs/my-blogs.php	(working copy)
@@ -1,41 +1,52 @@
 <?php get_header() ?>
 
 	<div class="content-header">
+
 		<?php bp_blogs_blog_tabs() ?>
+
 	</div>
 
 	<div id="content">
 
 		<?php do_action( 'template_notices' ) // (error/success feedback) ?>
-		
+
 		<h2><?php bp_word_or_name( __( "My Blogs", 'buddypress' ), __( "%s's Blogs", 'buddypress' ) ) ?></h2>
 
 		<?php do_action( 'bp_before_my_blogs_content' ) ?>
 
 		<?php if ( bp_has_blogs() ) : ?>
-			
+
 			<ul id="blog-list" class="item-list">
-				<?php while ( bp_blogs() ) : bp_the_blog(); ?>
-					
-					<li>
+
+				<?php while ( bp_blogs() ) : bp_the_blog() ?>
+
+					<li<?php echo ( $i++ & 1 ? '' : ' class="alt"' ) ?>>
+
 						<h4><a href="<?php bp_blog_permalink() ?>"><?php bp_blog_title() ?></a></h4>
+
 						<p><?php bp_blog_description() ?></p>
 
 						<?php do_action( 'bp_my_blogs_item' ) ?>
+
 					</li>
-					
-				<?php endwhile; ?>
+
+				<?php endwhile ?>
+
 			</ul>
-			
+
 			<?php do_action( 'bp_my_blogs_content' ) ?>
-			
-		<?php else: ?>
 
+		<?php else : ?>
+
 			<div id="message" class="info">
-				<p><?php bp_word_or_name( __( "You haven't created any blogs yet.", 'buddypress' ), __( "%s hasn't created any public blogs yet.", 'buddypress' ) ) ?> <?php bp_create_blog_link() ?> </p>
+
+				<p><?php bp_word_or_name( __( "You haven't created any blogs yet.", 'buddypress' ), __( "%s hasn't created any public blogs yet.", 'buddypress' ) ) ?>
+
+					<?php bp_create_blog_link() ?></p>
+
 			</div>
 
-		<?php endif;?>
+		<?php endif ?>
 
 		<?php do_action( 'bp_after_my_blogs_content' ) ?>
 
Index: bp-themes/bp-sn-parent/blogs/recent-comments.php
===================================================================
--- bp-themes/bp-sn-parent/blogs/recent-comments.php	(revision 2030)
+++ bp-themes/bp-sn-parent/blogs/recent-comments.php	(working copy)
@@ -1,42 +1,52 @@
 <?php get_header() ?>
 
 	<div class="content-header">
+
 		<?php bp_blogs_blog_tabs() ?>
+
 	</div>
 
 	<div id="content">
 
 		<?php do_action( 'template_notices' ) // (error/success feedback) ?>
-			
-		<h2><?php _e("Recent Comments", "buddypress"); ?></h2>
 
+		<h2><?php _e( 'Recent Comments', 'buddypress' ) ?></h2>
+
 		<?php do_action( 'bp_before_recent_comments_content' ) ?>
 
 		<?php if ( bp_has_comments() ) : ?>
 
 			<ul id="comment-list" class="item-list">
-				<?php while ( bp_comments() ) : bp_the_comment(); ?>
-					
-					<li id="comment-<?php bp_comment_id() ?>">
-						<span class="small"><?php printf( __( 'On %1$s %2$s said:', 'buddypress' ), bp_comment_date( __( 'F jS, Y', 'buddypress' ), false ), bp_comment_author( false ) ); ?></span>
+
+				<?php while ( bp_comments() ) : bp_the_comment() ?>
+
+					<li<?php echo ( $i++ & 1 ? '' : ' class="alt"' ) ?> id="comment-<?php bp_comment_id() ?>">
+
+						<span class="small"><?php printf( __( 'On %1$s %2$s said:', 'buddypress' ), bp_comment_date( __( 'F jS, Y', 'buddypress' ), false ), bp_comment_author( false ) ) ?></span>
+
 						<p><?php bp_comment_content() ?></p>
-						<span class="small"><?php printf( __( 'Commented on the post <a href="%1$s">%2$s</a> on the blog <a href="%3$s">%4$s</a>.', 'buddypress' ), bp_comment_post_permalink( false ), bp_comment_post_title( false ), bp_comment_blog_permalink( false ), bp_comment_blog_name( false ) ); ?></span>
 
+						<span class="small"><?php printf( __( 'Commented on the post <a href="%1$s">%2$s</a> on the blog <a href="%3$s">%4$s</a>.', 'buddypress' ), bp_comment_post_permalink( false ), bp_comment_post_title( false ), bp_comment_blog_permalink( false ), bp_comment_blog_name( false ) ) ?></span>
+
 						<?php do_action( 'bp_recent_comments_item' ) ?>
+
 					</li>
-					
-				<?php endwhile; ?>
+
+				<?php endwhile ?>
+
 			</ul>
-			
+
 			<?php do_action( 'bp_recent_comments_content' ) ?>
 
-		<?php else: ?>
+		<?php else : ?>
 
 			<div id="message" class="info">
+
 				<p><?php bp_word_or_name( __( "You haven't posted any comments yet.", 'buddypress' ), __( "%s hasn't posted any comments yet.", 'buddypress' ) ) ?></p>
+
 			</div>
 
-		<?php endif;?>
+		<?php endif ?>
 
 		<?php do_action( 'bp_after_recent_comments_content' ) ?>
 
Index: bp-themes/bp-sn-parent/blogs/recent-posts.php
===================================================================
--- bp-themes/bp-sn-parent/blogs/recent-posts.php	(revision 2030)
+++ bp-themes/bp-sn-parent/blogs/recent-posts.php	(working copy)
@@ -1,48 +1,59 @@
 <?php get_header() ?>
 
 	<div class="content-header">
+
 		<?php bp_blogs_blog_tabs() ?>
+
 	</div>
 
 	<div id="content">
 
 		<?php do_action( 'template_notices' ) // (error/success feedback) ?>
 		
-		<h2><?php _e("Recent Posts", "buddypress"); ?></h2>
+		<h2><?php _e( 'Recent Posts', 'buddypress' ) ?></h2>
 
-		<?php do_action( 'bp_before_recent_posts_content' ) ?>		
+		<?php do_action( 'bp_before_recent_posts_content' ) ?>
 
 		<?php if ( bp_has_posts() ) : ?>
-			
-			<?php while ( bp_posts() ) : bp_the_post(); ?>
-			
-				<div class="post" id="post-<?php bp_post_id(); ?>">
-					
-					<h2><a href="<?php bp_post_permalink() ?>" rel="bookmark" title="<?php printf ( __( 'Permanent Link to %s', 'buddypress' ), bp_post_title( false ) ); ?>"><?php bp_post_title(); ?></a></h2>
-					
-					<p class="date"><?php printf( __( '%1$s <em>in %2$s by %3$s</em>', 'buddypress' ), bp_post_date(__('F jS, Y', 'buddypress'), false ), bp_post_category( ', ', '', null, false ), bp_post_author( false ) ); ?></p>
-					<?php bp_post_content(__('Read the rest of this entry &raquo;')); ?>
-					<p class="postmetadata"><?php bp_post_tags( '<span class="tags">', ', ', '</span>' ); ?>  <span class="comments"><?php bp_post_comments( __('No Comments'), __('1 Comment'), __('% Comments') ); ?></span></p>
-					
-					<?php do_action( 'bp_recent_posts_item' ) ?>		
 
+			<?php while ( bp_posts() ) : bp_the_post() ?>
+
+				<div <?php post_class( ( $i++ & 1 ? '' : 'alt' ), bp_get_post_id() ) ?> id="post-<?php bp_post_id() ?>">
+
+					<h2><a href="<?php bp_post_permalink() ?>" rel="bookmark" title="<?php printf ( esc_attr__( 'Permanent Link to %s', 'buddypress' ), bp_post_title( false ) ) ?>"><?php bp_post_title() ?></a></h2>
+
+					<p class="date"><?php printf( __( '%1$s <em>in %2$s by %3$s</em>', 'buddypress' ), bp_post_date( __('F jS, Y', 'buddypress' ), false ), bp_post_category( ', ', '', null, false ), bp_post_author( false ) ) ?></p>
+
+					<?php bp_post_content( __( 'Read the rest of this entry &raquo;', 'buddypress' ) ) ?>
+					<p class="postmetadata"><?php bp_post_tags( '<span class="tags">', ', ', '</span>' ) ?>
+
+						<span class="comments"><?php bp_post_comments(
+							__( 'No Comments', 'buddypress' ),
+							__( '1 Comment', 'buddypress' ),
+							__( '% Comments', 'buddypress' )
+						) ?></span></p>
+
+					<?php do_action( 'bp_recent_posts_item' ) ?>	
+
 					<hr />
-					
+
 				</div>
-			
-			<?php endwhile; ?>
 
-			<?php do_action( 'bp_recent_posts_content' ) ?>		
-				
-		<?php else: ?>
+			<?php endwhile ?>
 
+			<?php do_action( 'bp_recent_posts_content' ) ?>	
+
+		<?php else : ?>
+
 			<div id="message" class="info">
+
 				<p><?php bp_word_or_name( __( "You haven't made any posts yet.", 'buddypress' ), __( "%s hasn't made any posts yet.", 'buddypress' ) ) ?></p>
+
 			</div>
 
-		<?php endif;?>
+		<?php endif ?>
 
-		<?php do_action( 'bp_after_recent_posts_content' ) ?>		
+		<?php do_action( 'bp_after_recent_posts_content' ) ?>
 
 	</div>
 
Index: bp-themes/bp-sn-parent/comments.php
===================================================================
--- bp-themes/bp-sn-parent/comments.php	(revision 2030)
+++ bp-themes/bp-sn-parent/comments.php	(working copy)
@@ -1,136 +1,140 @@
-	<?php
-		if ( post_password_required() ) :
-			echo '<h3 class="comments-header">' . __('Password Protected', 'buddypress') . '</h3>';
-			echo '<p class="alert password-protected">' . __('Enter the password to view comments.', 'buddypress') . '</p>';
-			return;
-		endif;
+	<?php if ( post_password_required() ) : ?>
 
-		if ( is_page() && !have_comments() && !comments_open() && !pings_open() )
-			return;
-	?>
+		<h3 class="comments-header"><?php _e( 'Password Protected', 'buddypress' ) ?></h3>
 
+		<p class="alert password-protected"><?php _e( 'Enter the password to view comments.', 'buddypress' ) ?></p>
+
+		<?php return ?>
+
+	<?php endif ?>
+
+	<?php if ( is_page() && !have_comments() && !comments_open() && !pings_open() )
+		return ?>
+
 	<div id="comments-template">
 
 		<?php if ( have_comments() ) : ?>
 
 			<div id="comments">
 
-				<h3 id="comments-number" class="comments-header"><?php comments_number( sprintf( __('No responses to %1$s', 'buddypress'), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __('One response to %1$s', 'buddypress'), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __('%1$s responses to %2$s', 'buddypress'), '%', the_title( '&#8220;', '&#8221;', false ) ) ); ?></h3>
+				<h3 id="comments-number" class="comments-header"><?php comments_number(
+					sprintf( __( 'No responses to &#8220;%s&#8221;', 'buddypress' ), get_the_title() ),
+					sprintf( __( 'One response to &#8220;%s&#8221;', 'buddypress' ), get_the_title() ),
+					sprintf( __( '%1$s responses to &#8220;%2$s&#8221;', 'buddypress' ), '%', get_the_title() )
+				) ?></h3>
 
 				<?php do_action( 'bp_before_blog_comment_list' ) ?>
 
 				<ol class="commentlist">
-					<?php wp_list_comments( array( 'style' => 'ol', 'type' => 'all' ) ); ?>
-				</ol><!-- .comment-list -->
 
+					<?php wp_list_comments( array( 'style' => 'ol', 'type' => 'all' ) ) ?>
+
+				</ol><!-- .commentlist -->
+
 				<?php do_action( 'bp_after_blog_comment_list' ) ?>
 
 				<?php if ( get_option( 'page_comments' ) ) : ?>
-			
+
 					<div class="comment-navigation paged-navigation">
-				
-						<?php paginate_comments_links(); ?>
 
+						<?php paginate_comments_links() ?>
+
 					</div>
-				<?php endif; ?>
 
+				<?php endif ?>
+
 			</div><!-- #comments -->
 
 		<?php else : ?>
 
 			<?php if ( pings_open() && !comments_open() && is_single() ) : ?>
 
-				<p class="comments-closed pings-open">
-					<?php printf( __('Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', 'buddypress'), trackback_url( '0' ) ); ?>
-				</p>
+				<p class="comments-closed pings-open"><?php printf( __( 'Comments are closed, but <a href="%s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', 'buddypress' ), trackback_url( '0' ) ) ?></p>
 
 			<?php elseif ( !comments_open() && is_single() ) : ?>
 
-				<p class="comments-closed">
-					<?php _e('Comments are closed.', 'buddypress'); ?>
-				</p>
+				<p class="comments-closed"><?php _e( 'Comments are closed.', 'buddypress' ) ?></p>
 
-			<?php endif; ?>
+			<?php endif ?>
 
-		<?php endif; ?>
+		<?php endif ?>
 
 		<?php if ( comments_open() ) : ?>
 
 			<div id="respond">
 
-				<h3 id="reply" class="comments-header">
-					<?php comment_form_title( __('Leave a Reply', 'buddypress'), __('Leave a Reply to %s', 'buddypress'), true ); ?>
-				</h3>
+				<h3 id="reply" class="comments-header"><?php comment_form_title( __( 'Leave a Reply', 'buddypress' ), __( 'Leave a Reply to %s', 'buddypress' ), true ) ?></h3>
 
-				<p id="cancel-comment-reply">
-					<?php cancel_comment_reply_link( __('Click here to cancel reply.', 'buddypress') ); ?>
-				</p>
+				<p id="cancel-comment-reply"><?php cancel_comment_reply_link( __( 'Click here to cancel reply.', 'buddypress' ) ) ?></p>
 
 				<?php if ( get_option( 'comment_registration' ) && !$user_ID ) : ?>
 
-					<p class="alert">
-						<?php printf( __('You must be <a href="%1$s" title="Log in">logged in</a> to post a comment.', 'buddypress'), wp_login_url( get_permalink() ) ); ?>
-					</p>
+					<p class="alert"><?php printf( __( 'You must be <a href="%s" title="Log in">logged in</a> to post a comment.', 'buddypress'), wp_login_url( get_permalink() ) ) ?></p>
 
 				<?php else : ?>
 
 					<?php do_action( 'bp_before_blog_comment_form' ) ?>
-			
-					<form action="<?php echo get_option( 'siteurl' ); ?>/wp-comments-post.php" method="post" id="commentform" class="standard-form">
 
+					<form action="<?php echo get_option( 'siteurl' ) ?>/wp-comments-post.php" method="post" id="commentform" class="standard-form">
+
 						<?php if ( $user_ID ) : ?>
 
-							<p class="log-in-out">
-								<?php printf( __('Logged in as <a href="%1$s" title="%2$s">%2$s</a>.', 'buddypress'), bp_loggedin_user_domain(), $user_identity ); ?> <a href="<?php echo wp_logout_url( get_permalink() ); ?>" title="<?php _e('Log out of this account', 'buddypress'); ?>"><?php _e('Log out &raquo;', 'buddypress'); ?></a>
-							</p>
+							<p class="log-in-out"><?php printf( __( 'Logged in as <a href="%1$s" title="%2$s">%2$s</a>.', 'buddypress' ), bp_loggedin_user_domain(), $user_identity ) ?>
 
+								<a href="<?php echo wp_logout_url( get_permalink() ) ?>" title="<?php esc_attr_e( 'Log out of this account', 'buddypress' ) ?>"><?php _e('Log out &raquo;', 'buddypress') ?></a></p>
+
 						<?php else : ?>
 
-							<?php $req = get_option( 'require_name_email' ); ?>
+							<?php $req = get_option( 'require_name_email' ) ?>
 
-							<p class="form-author">
-								<label for="author"><?php _e('Name', 'buddypress'); ?> <?php if ( $req ) : ?><span class="required"><?php _e('*', 'buddypress'); ?></span><?php endif; ?></label>
-								<input type="text" class="text-input" name="author" id="author" value="<?php echo $comment_author; ?>" size="40" tabindex="1" />
-							</p>
+							<p class="form-author"><label for="author"><?php _e( 'Name', 'buddypress' );
 
-							<p class="form-email">
-								<label for="email"><?php _e('Email', 'buddypress'); ?>  <?php if ( $req ) : ?><span class="required"><?php _e('*', 'buddypress'); ?></span><?php endif; ?></label>
-								<input type="text" class="text-input" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="40" tabindex="2" />
-							</p>
+								if ( $req ) : ?>
 
-							<p class="form-url">
-								<label for="url"><?php _e('Website', 'buddypress'); ?></label>
-								<input type="text" class="text-input" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="40" tabindex="3" />
-							</p>
+									<span class="required"><?php _e( '*', 'buddypress' ) ?></span><?php endif ?></label>
 
-						<?php endif; ?>
+								<input type="text" class="text-input" name="author" id="author" value="<?php echo $comment_author; ?>" size="40" tabindex="1" /></p>
 
-						<p class="form-textarea">
-							<label for="comment"><?php _e('Comment', 'buddypress'); ?></label>
-							<textarea name="comment" id="comment" cols="60" rows="10" tabindex="4"></textarea>
-						</p>
+							<p class="form-email"><label for="email"><?php _e( 'Email', 'buddypress' );
 
+								if ( $req ) : ?>
+
+									<span class="required"><?php _e( '*', 'buddypress' ) ?></span><?php endif ?></label>
+
+								<input type="text" class="text-input" name="email" id="email" value="<?php echo $comment_author_email ?>" size="40" tabindex="2" /></p>
+
+							<p class="form-url"><label for="url"><?php _e( 'Website', 'buddypress' ) ?></label>
+
+								<input type="text" class="text-input" name="url" id="url" value="<?php echo $comment_author_url ?>" size="40" tabindex="3" /></p>
+
+						<?php endif ?>
+
+						<p class="form-textarea"><label for="comment"><?php _e( 'Comment', 'buddypress' ) ?></label>
+
+							<textarea name="comment" id="comment" cols="60" rows="10" tabindex="4"></textarea></p>
+
 						<?php do_action( 'bp_blog_comment_form' ) ?>
 
-						<p class="form-submit">
-							<input class="submit-comment button" name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit', 'buddypress'); ?>" />
-							<input class="reset-comment button" name="reset" type="reset" id="reset" tabindex="6" value="<?php _e('Reset', 'buddypress'); ?>" />
-							<?php comment_id_fields(); ?>
-						</p>
+						<p class="form-submit"><input class="submit-comment button" name="submit" type="submit" id="submit" tabindex="5" value="<?php _e( 'Submit', 'buddypress' ) ?>" />
 
+							<input class="reset-comment button" name="reset" type="reset" id="reset" tabindex="6" value="<?php _e( 'Reset', 'buddypress' ) ?>" />
+
+							<?php comment_id_fields() ?></p>
+
 						<div class="comment-action">
-							<?php do_action( 'comment_form', $post->ID ); ?>
+
+							<?php do_action( 'comment_form', $post->ID ) ?>
+
 						</div>
 
 					</form>
 
 					<?php do_action( 'bp_after_blog_comment_form' ) ?>
 
-				<?php endif; ?>
+				<?php endif ?>
 
 			</div>
 
-		<?php endif; ?>
-	
-	</div>
-	
\ No newline at end of file
+		<?php endif ?>
+
+	</div>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/directories/blogs/blogs-loop.php
===================================================================
--- bp-themes/bp-sn-parent/directories/blogs/blogs-loop.php	(revision 2030)
+++ bp-themes/bp-sn-parent/directories/blogs/blogs-loop.php	(working copy)
@@ -1,60 +1,81 @@
-<?php if ( bp_has_site_blogs( 'type=active&per_page=10' ) ) : ?>
-	
-	<div class="pagination">
-		
-		<div class="pag-count" id="blog-dir-count">
-			<?php bp_site_blogs_pagination_count() ?>
-		</div>
+	<?php if ( bp_has_site_blogs( 'type=active&per_page=10' ) ) : ?>
 
-		<div class="pagination-links" id="blog-dir-pag">
-			<?php bp_site_blogs_pagination_links() ?>
-		</div>
-		
-	</div>
+		<div class="pagination">
 
-	<?php do_action( 'bp_before_directory_blogs_list' ) ?>		
+			<div class="pag-count" id="blog-dir-count">
 
-	<ul id="blogs-list" class="item-list">
-	<?php while ( bp_site_blogs() ) : bp_the_site_blog(); ?>
+				<?php bp_site_blogs_pagination_count() ?>
 
-		<li>
-			<div class="item-avatar">
-				<a href="<?php bp_the_site_blog_link() ?>"><?php bp_the_site_blog_avatar_thumb() ?></a>
 			</div>
 
-			<div class="item">
-				<div class="item-title"><a href="<?php bp_the_site_blog_link() ?>"><?php bp_the_site_blog_name() ?></a></div>
-				<div class="item-meta"><span class="activity"><?php bp_the_site_blog_last_active() ?></span></div>
+			<div class="pagination-links" id="blog-dir-pag">
 
-				<?php do_action( 'bp_core_directory_blogs_item' ) ?>
+				<?php bp_site_blogs_pagination_links() ?>
+
 			</div>
 
-			<div class="action">
-				<div class="generic-button blog-button visit">
-					<a href="<?php bp_the_site_blog_link() ?>" class="visit" title="<?php _e( 'Visit Blog', 'buddypress' ) ?>"><?php _e( 'Visit Blog', 'buddypress' ) ?></a>
+		</div>
+
+		<?php do_action( 'bp_before_directory_blogs_list' ) ?>
+
+		<ul id="blogs-list" class="item-list">
+
+		<?php while ( bp_site_blogs() ) : bp_the_site_blog() ?>
+
+			<li<?php echo ( $i++ & 1 ? '' : ' class="alt"' ) ?>>
+
+				<div class="item-avatar">
+
+					<a href="<?php bp_the_site_blog_link() ?>"><?php bp_the_site_blog_avatar_thumb() ?></a>
+
 				</div>
-				
-				<div class="meta">
-					<?php bp_the_site_blog_latest_post() ?>
+
+				<div class="item">
+
+					<div class="item-title"><a href="<?php bp_the_site_blog_link() ?>"><?php bp_the_site_blog_name() ?></a></div>
+
+					<div class="item-meta"><span class="activity"><?php bp_the_site_blog_last_active() ?></span></div>
+
+					<?php do_action( 'bp_core_directory_blogs_item' ) ?>
+
 				</div>
-				
-				<?php do_action( 'bp_directory_blogs_actions' ) ?>
-			</div>
 
-			<div class="clear"></div>
-		</li>
+				<div class="action">
 
-	<?php endwhile; ?>
-	</ul>		
+					<div class="generic-button blog-button visit">
 
-	<?php do_action( 'bp_after_directory_blogs_list' ) ?>		
-			
-<?php else: ?>
+						<a href="<?php bp_the_site_blog_link() ?>" class="visit" title="<?php esc_attr_e( 'Visit Blog', 'buddypress' ) ?>"><?php _e( 'Visit Blog', 'buddypress' ) ?></a>
 
-	<div id="message" class="info">
-		<p><?php _e( 'No blogs found. Blogs must fill in at least one piece of profile data to show in blog lists.', 'buddypress' ) ?></p>
-	</div>
+					</div>
 
-<?php endif; ?>
+					<div class="meta">
 
-<?php bp_the_site_blog_hidden_fields() ?>
\ No newline at end of file
+						<?php bp_the_site_blog_latest_post() ?>
+
+					</div>
+
+					<?php do_action( 'bp_directory_blogs_actions' ) ?>
+
+				</div>
+
+				<div class="clear"></div>
+
+			</li>
+
+		<?php endwhile ?>
+
+		</ul>
+
+		<?php do_action( 'bp_after_directory_blogs_list' ) ?>
+
+	<?php else : ?>
+
+		<div id="message" class="info">
+
+			<p><?php _e( 'No blogs found. Blogs must fill in at least one piece of profile data to show in blog lists.', 'buddypress' ) ?></p>
+
+		</div>
+
+	<?php endif ?>
+
+	<?php bp_the_site_blog_hidden_fields() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/directories/blogs/index.php
===================================================================
--- bp-themes/bp-sn-parent/directories/blogs/index.php	(revision 2030)
+++ bp-themes/bp-sn-parent/directories/blogs/index.php	(working copy)
@@ -1,15 +1,17 @@
 <?php get_header() ?>
 
-	<?php do_action( 'bp_before_directory_blogs_content' ) ?>		
+	<?php do_action( 'bp_before_directory_blogs_content' ) ?>
 
 	<div id="content">
-	
+
 		<div class="page" id="blogs-directory-page">
-	
+
 			<form action="<?php echo site_url() . '/' ?>" method="post" id="blogs-directory-form">
+
 				<h3><?php _e( 'Blog Directory', 'buddypress' ) ?></h3>
-		
+
 				<ul id="letter-list">
+
 					<li><a href="#a" id="letter-a">A</a></li>
 					<li><a href="#b" id="letter-b">B</a></li>
 					<li><a href="#c" id="letter-c">C</a></li>
@@ -36,13 +38,17 @@
 					<li><a href="#x" id="letter-x">X</a></li>
 					<li><a href="#y" id="letter-y">Y</a></li>
 					<li><a href="#z" id="letter-z">Z</a></li>
+
 				</ul>
 
 				<div id="blogs-directory-listing" class="directory-listing">
+
 					<h3><?php _e( 'Blog Listing', 'buddypress' ) ?></h3>
 			
 					<div id="blog-dir-list">
+
 						<?php locate_template( array( 'directories/blogs/blogs-loop.php' ), true ) ?>
+
 					</div>
 
 				</div>
@@ -52,79 +58,94 @@
 				<?php wp_nonce_field( 'directory_blogs', '_wpnonce-blog-filter' ) ?>
 
 			</form>
-	
+
 		</div>
-	
+
 	</div>
 
-	<?php do_action( 'bp_after_directory_blogs_content' ) ?>		
-	<?php do_action( 'bp_before_directory_blogs_sidebar' ) ?>		
+	<?php do_action( 'bp_after_directory_blogs_content' ) ?>
+	<?php do_action( 'bp_before_directory_blogs_sidebar' ) ?>
 
 	<div id="sidebar" class="directory-sidebar">
 
-		<?php do_action( 'bp_before_directory_blogs_search' ) ?>	
+		<?php do_action( 'bp_before_directory_blogs_search' ) ?>
 
 		<div id="blogs-directory-search" class="directory-widget">
-			
+
 			<h3><?php _e( 'Find Blogs', 'buddypress' ) ?></h3>
 
 			<?php bp_directory_blogs_search_form() ?>
 
-			<?php do_action( 'bp_directory_blogs_search' ) ?>	
+			<?php do_action( 'bp_directory_blogs_search' ) ?>
 
 		</div>
 
-		<?php do_action( 'bp_after_directory_blogs_search' ) ?>	
-		<?php do_action( 'bp_before_directory_blogs_featured' ) ?>	
+		<?php do_action( 'bp_after_directory_blogs_search' ) ?>
+		<?php do_action( 'bp_before_directory_blogs_featured' ) ?>
 
 		<div id="blogs-directory-featured" class="directory-widget">
-			
+
 			<h3><?php _e( 'Random Blogs', 'buddypress' ) ?></h3>
-		
+
 			<?php if ( bp_has_site_blogs( 'type=random&max=3' ) ) : ?>
 
 				<ul id="featured-blogs-list" class="item-list">
-					<?php while ( bp_site_blogs() ) : bp_the_site_blog(); ?>
 
-						<li>
+					<?php while ( bp_site_blogs() ) : bp_the_site_blog() ?>
+
+						<li<?php echo ( $j++ & 1 ? '' : ' class="alt"' ) ?>>
+
 							<div class="item-avatar">
+
 								<a href="<?php bp_the_site_blog_link() ?>"><?php bp_the_site_blog_avatar_thumb() ?></a>
+
 							</div>
 
 							<div class="item">
+
 								<div class="item-title"><a href="<?php bp_the_site_blog_link() ?>"><?php bp_the_site_blog_name() ?></a></div>
 								<div class="item-meta"><span class="activity"><?php bp_the_site_blog_last_active() ?></span></div>
 						
 								<div class="field-data">
+
 									<div class="field-name">
+
 										<strong><?php _e( 'Description: ', 'buddypress' ) ?></strong>
+
 										<?php bp_the_site_blog_description() ?>
+
 									</div>
+
 								</div>
-						
+
 								<?php do_action( 'bp_directory_blogs_featured_item' ) ?>
+
 							</div>
+
 						</li>
 
-					<?php endwhile; ?>
-				</ul>			
+					<?php endwhile ?>
 
-				<?php do_action( 'bp_directory_blogs_featured' ) ?>	
+				</ul>
+
+				<?php do_action( 'bp_directory_blogs_featured' ) ?>
 		
-			<?php else: ?>
+			<?php else : ?>
 
 				<div id="message" class="info">
+
 					<p><?php _e( 'There are not enough blogs to feature.', 'buddypress' ) ?></p>
+
 				</div>
 
-			<?php endif; ?>
-	
+			<?php endif ?>
+
 		</div>
 
-		<?php do_action( 'bp_after_directory_blogs_featured' ) ?>	
+		<?php do_action( 'bp_after_directory_blogs_featured' ) ?>
 
 	</div>
 
-	<?php do_action( 'bp_after_directory_blogs_sidebar' ) ?>		
+	<?php do_action( 'bp_after_directory_blogs_sidebar' ) ?>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/directories/forums/forums-loop.php
===================================================================
--- bp-themes/bp-sn-parent/directories/forums/forums-loop.php	(revision 2030)
+++ bp-themes/bp-sn-parent/directories/forums/forums-loop.php	(working copy)
@@ -1,69 +1,99 @@
-<?php if ( bp_has_forum_topics( 'type=' . bp_get_forum_topic_type() . '&per_page=25&max=250' ) ) : ?>	
-		
-	<div class="pagination">
-	
-		<div id="post-count" class="pag-count">
-			<?php bp_forum_pagination_count() ?>
-		</div>
+	<?php if ( bp_has_forum_topics( 'type=' . bp_get_forum_topic_type() . '&per_page=25&max=250' ) ) : ?>
 
-		<div class="pagination-links" id="topic-pag">
-			<?php bp_forum_pagination() ?>
+		<div class="pagination">
+
+			<div id="post-count" class="pag-count">
+
+				<?php bp_forum_pagination_count() ?>
+
+			</div>
+
+			<div class="pagination-links" id="topic-pag">
+
+				<?php bp_forum_pagination() ?>
+
+			</div>
+
 		</div>
-	
-	</div>
 
-	<?php do_action( 'bp_before_directory_forums_list' ) ?>		
-	
-	<table id="global-forum-topic-list">
-		
-		<tr>
-			<th id="th-title"><?php _e( 'Topic Title', 'buddypress' ) ?></th>
-			<th id="th-poster"><?php _e( 'Last Poster', 'buddypress' ) ?></th>
-			<th id="th-group"><?php _e( 'Posted In', 'buddypress' ) ?></th>
-			<th id="th-postcount"><?php _e( 'Posts', 'buddypress' ) ?></th>
-			<th id="th-freshness"><?php _e( 'Freshness', 'buddypress' ) ?></th>
-		</tr>
-		
-		<?php while ( bp_forum_topics() ) : bp_the_forum_topic(); ?>
-			
-		<tr class="<?php bp_the_topic_css_class() ?>">
-			<td class="td-title">
-				<a class="topic-title" href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>">
-					<?php bp_the_topic_title() ?>
-				</a>
-			</td>
-			<td class="td-poster">
-				<a href="<?php bp_the_topic_permalink() ?>">
-					<?php bp_the_topic_last_poster_avatar( 'type=thumb&width=20&height=20' ) ?>
-				</a> 
-				<div class="poster-name"><?php bp_the_topic_last_poster_name() ?></div>
-			</td>
-			<td class="td-group">
-				<a href="<?php bp_the_topic_object_permalink() ?>"><?php bp_the_topic_object_avatar( 'type=thumb&width=20&height=20' ) ?></a> 
-				<div class="object-name"><a href="<?php bp_the_topic_object_permalink() ?>" title="<?php bp_the_topic_object_name() ?>"><?php bp_the_topic_object_name() ?></a></div>
-			</td>
-			<td class="td-postcount">
-				<?php bp_the_topic_total_posts() ?>
-			</td>
-			<td class="td-freshness">
-				<?php bp_the_topic_time_since_last_post() ?>
-			</td>
+		<?php do_action( 'bp_before_directory_forums_list' ) ?>
 
-			<?php do_action( 'bp_directory_forums_extra_cell' ) ?>		
-		</tr>
+		<table id="global-forum-topic-list">
 
-		<?php do_action( 'bp_directory_forums_extra_row' ) ?>		
+			<tr>
+
+				<th id="th-title"><?php _e( 'Topic Title', 'buddypress' ) ?></th>
+				<th id="th-poster"><?php _e( 'Last Poster', 'buddypress' ) ?></th>
+				<th id="th-group"><?php _e( 'Posted In', 'buddypress' ) ?></th>
+				<th id="th-postcount"><?php _e( 'Posts', 'buddypress' ) ?></th>
+				<th id="th-freshness"><?php _e( 'Freshness', 'buddypress' ) ?></th>
+
+			</tr>
+
+			<?php while ( bp_forum_topics() ) : bp_the_forum_topic() ?>
+
+				<tr class="<?php bp_the_topic_css_class() ?>">
+
+					<td class="td-title">
+
+						<a class="topic-title" href="<?php bp_the_topic_permalink() ?>" title="<?php printf( esc_attr__( '%s - Permalink', 'buddypress' ), bp_get_the_topic_title() ) ?>"><?php bp_the_topic_title() ?></a>
+
+					</td>
+
+					<td class="td-poster">
+
+						<a href="<?php bp_the_topic_permalink() ?>"><?php bp_the_topic_last_poster_avatar( 'type=thumb&width=20&height=20' ) ?></a>
+
+						<div class="poster-name">
+
+							<?php bp_the_topic_last_poster_name() ?>
+
+						</div>
+
+					</td>
+
+					<td class="td-group">
+
+						<a href="<?php bp_the_topic_object_permalink() ?>"><?php bp_the_topic_object_avatar( 'type=thumb&width=20&height=20' ) ?></a>
+
+						<div class="object-name">
+
+							<a href="<?php bp_the_topic_object_permalink() ?>" title="<?php bp_the_topic_object_name() ?>"><?php bp_the_topic_object_name() ?></a>
+
+						</div>
+
+					</td>
+
+					<td class="td-postcount">
+
+						<?php bp_the_topic_total_posts() ?>
+
+					</td>
+
+					<td class="td-freshness">
+
+						<?php bp_the_topic_time_since_last_post() ?>
+
+					</td>
+
+					<?php do_action( 'bp_directory_forums_extra_cell' ) ?>
+
+				</tr>
+
+				<?php do_action( 'bp_directory_forums_extra_row' ) ?>
+
+			<?php endwhile ?>
+
+		</table>
+
+		<?php do_action( 'bp_after_directory_forums_list' ) ?>
 		
-		<?php endwhile; ?>
-		
-	</table>
+	<?php else : ?>
 
-	<?php do_action( 'bp_after_directory_forums_list' ) ?>		
-	
-<?php else: ?>
+		<div id="message" class="info">
 
-	<div id="message" class="info">
-		<p><?php _e( 'Sorry, there were no forum topics found.', 'buddypress' ) ?></p>
-	</div>
+			<p><?php _e( 'Sorry, there were no forum topics found.', 'buddypress' ) ?></p>
 
-<?php endif;?>
\ No newline at end of file
+		</div>
+
+	<?php endif ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/directories/forums/index.php
===================================================================
--- bp-themes/bp-sn-parent/directories/forums/index.php	(revision 2030)
+++ bp-themes/bp-sn-parent/directories/forums/index.php	(working copy)
@@ -1,121 +1,147 @@
 <?php get_header() ?>
 
-	<?php do_action( 'bp_before_directory_forums_content' ) ?>		
+	<?php do_action( 'bp_before_directory_forums_content' ) ?>
 
 	<div id="content">
-	
+
 		<div class="page" id="forums-directory-page">
-	
-			<form action="<?php echo site_url() . '/' ?>" method="post" id="forums-directory-form">
 
+			<form action="<?php echo site_url() ?>/" method="post" id="forums-directory-form">
+
 				<?php if ( bp_has_site_groups( 'type=most-forum-topics&max=6' ) ) : ?>
 
 					<div id="popular-group-forum-listing">
+
 						<h3><?php _e( 'Popular Group Forums', 'buddypress' ) ?></h3>
-	
-						<?php do_action( 'bp_before_directory_popular_group_forums' ) ?>		
 
-						<?php while ( bp_site_groups() ) : bp_the_site_group(); ?>
+						<?php do_action( 'bp_before_directory_popular_group_forums' ) ?>
 
-							<div class="group-forum">
+						<?php while ( bp_site_groups() ) : bp_the_site_group() ?>
+
+							<div class="group-forum<?php echo ( $i++ & 1 ? '' : ' alt' ) ?>">
+
 								<div class="item-avatar">
+
 									<a href="<?php bp_the_site_group_link() ?>/forum/"><?php bp_the_site_group_avatar_thumb() ?></a>
+
 								</div>
 
 								<div class="item">
-									<div class="item-title"><a href="<?php bp_the_site_group_link() ?>/forum/"><?php bp_the_site_group_name() ?></a> (<?php bp_the_site_group_forum_topic_count( 'showtext=true' ) ?>, <?php bp_the_site_group_forum_post_count( 'showtext=true' ) ?>)</div>
-									<div class="item-meta desc"><?php bp_the_site_group_description_excerpt() ?></div>
 
+									<div class="item-title">
+
+										<a href="<?php bp_the_site_group_link() ?>/forum/"><?php bp_the_site_group_name() ?></a>
+
+										(<?php bp_the_site_group_forum_topic_count( 'showtext=true' ) ?>, <?php bp_the_site_group_forum_post_count( 'showtext=true' ) ?>)
+
+									</div>
+
+									<div class="item-meta desc">
+
+										<?php bp_the_site_group_description_excerpt() ?>
+
+									</div>
+
 									<?php do_action( 'bp_directory_popular_group_forums_item' ) ?>
+
 								</div>
+
 							</div>
 
-						<?php endwhile; ?>
+						<?php endwhile ?>
 
-						<?php do_action( 'bp_after_directory_popular_group_forums' ) ?>		
-	
+						<?php do_action( 'bp_after_directory_popular_group_forums' ) ?>
+
 					</div>
-					
-				<?php endif; ?>
 
+				<?php endif ?>
+
 				<div id="forums-directory-listing" class="directory-listing">
+
 					<h3><?php _e( 'Latest Forum Topics', 'buddypress' ) ?></h3>
-					
+
 					<div id="forum-dir-list">
-						
+
 						<?php do_action( 'bp_before_directory_forums_topic_filters' ) ?>
-						
+
 						<div id="global-forum-topic-filters">
+
 							<ul>
-								<li<?php if ( '' == bp_current_action() && !isset( $_GET['fs'] ) ) : ?> class="selected"<?php endif; ?> id="forums-newest"><a href="<?php bp_newest_forum_topics_link() ?>" title="<?php _e( 'Newest Topics', 'buddypress' ) ?>"><?php _e( 'Newest Topics', 'buddypress') ?></a></li>
-								<li<?php if ( 'popular' == bp_current_action() ) : ?> class="selected"<?php endif; ?> id="forums-popular"><a href="<?php bp_popular_forum_topics_link() ?>" title="<?php _e( 'Most Popular Topics', 'buddypress' ) ?>"><?php _e( 'Most Popular Topics', 'buddypress') ?></a></li>
-								<li<?php if ( 'unreplied' == bp_current_action() ) : ?> class="selected"<?php endif; ?> id="forums-unreplied"><a href="<?php bp_unreplied_forum_topics_link() ?>" title="<?php _e( 'Unreplied Topics', 'buddypress' ) ?>"><?php _e( 'Unreplied Topics', 'buddypress') ?></a></li>
-		
+
+								<li<?php if ( '' == bp_current_action() && !isset( $_GET['fs'] ) ) echo ' class="selected"' ?> id="forums-newest"><a href="<?php bp_newest_forum_topics_link() ?>" title="<?php esc_attr_e( 'Newest Topics', 'buddypress' ) ?>"><?php _e( 'Newest Topics', 'buddypress') ?></a></li>
+
+								<li<?php if ( 'popular' == bp_current_action() ) echo ' class="selected"' ?> id="forums-popular"><a href="<?php bp_popular_forum_topics_link() ?>" title="<?php esc_attr_e( 'Most Popular Topics', 'buddypress' ) ?>"><?php _e( 'Most Popular Topics', 'buddypress') ?></a></li>
+
+								<li<?php if ( 'unreplied' == bp_current_action() ) echo ' class="selected"' ?> id="forums-unreplied"><a href="<?php bp_unreplied_forum_topics_link() ?>" title="<?php esc_attr_e( 'Unreplied Topics', 'buddypress' ) ?>"><?php _e( 'Unreplied Topics', 'buddypress') ?></a></li>
+
 								<?php if ( is_user_logged_in() ) : ?>
-									<li<?php if ( 'personal' == bp_current_action() ) : ?> class="selected"<?php endif; ?> id="forums-personal"><a href="<?php bp_my_forum_topics_link() ?>" title="<?php _e( 'Topics I have started or replied to', 'buddypress' ) ?>"><?php _e( 'My Topics', 'buddypress') ?></a></li>
-								<?php endif; ?>
-								
+									<li<?php if ( 'personal' == bp_current_action() ) echo ' class="selected"' ?> id="forums-personal"><a href="<?php bp_my_forum_topics_link() ?>" title="<?php esc_attr_e( 'Topics I have started or replied to', 'buddypress' ) ?>"><?php _e( 'My Topics', 'buddypress') ?></a></li>
+								<?php endif ?>
+
 								<?php if ( 'tag' == bp_current_action() ) : ?>
-									<li class="selected" id="forums-tag"><a href="<?php bp_newest_forum_topics_link() ?>" title="<?php _e( 'Tag', 'buddypress' ) ?>"><?php printf( __( 'Tagged: %s', 'buddypress' ), bp_get_forums_tag_name() ) ?></a></li>
-								<?php endif; ?>
-								
+									<li class="selected" id="forums-tag"><a href="<?php bp_newest_forum_topics_link() ?>" title="<?php esc_attr_e( 'Tag', 'buddypress' ) ?>"><?php printf( __( 'Tagged: %s', 'buddypress' ), bp_get_forums_tag_name() ) ?></a></li>
+								<?php endif ?>
+
 								<?php if ( isset( $_GET['fs'] ) ) : ?>
-									<li class="selected" id="forums-search"><a href="<?php bp_newest_forum_topics_link() ?>" title="<?php _e( 'Search', 'buddypress' ) ?>"><?php printf( __( 'Matching: %s', 'buddypress' ), attribute_escape( $_GET['fs'] ) ) ?></a></li>
-								<?php endif; ?>
-								
+									<li class="selected" id="forums-search"><a href="<?php bp_newest_forum_topics_link() ?>" title="<?php esc_attr_e( 'Search', 'buddypress' ) ?>"><?php printf( __( 'Matching: %s', 'buddypress' ), attribute_escape( $_GET['fs'] ) ) ?></a></li>
+								<?php endif ?>
+
 								<?php do_action( 'bp_directory_forums_topic_filters' ) ?>
-							</ul>								
+
+							</ul>
+
 						</div>
-						
+
 						<?php do_action( 'bp_after_directory_forums_topic_filters' ) ?>
 
 						<?php locate_template( array( 'directories/forums/forums-loop.php' ), true ) ?>
+
 					</div>
 
 				</div>
-			
+
 				<?php do_action( 'bp_directory_forums_content' ) ?>
 
 			</form>
-	
+
 		</div>
-	
+
 	</div>
 
-	<?php do_action( 'bp_after_directory_forums_content' ) ?>		
-	<?php do_action( 'bp_before_directory_forums_sidebar' ) ?>		
+	<?php do_action( 'bp_after_directory_forums_content' ) ?>
+	<?php do_action( 'bp_before_directory_forums_sidebar' ) ?>
 
 	<div id="sidebar" class="directory-sidebar">
 
-		<?php do_action( 'bp_before_directory_forums_search' ) ?>	
+		<?php do_action( 'bp_before_directory_forums_search' ) ?>
 
 		<div id="forums-directory-search" class="directory-widget">
-			
+
 			<h3><?php _e( 'Forum Topic Search', 'buddypress' ) ?></h3>
 
 			<?php bp_directory_forums_search_form() ?>
 
 			<?php do_action( 'bp_directory_forums_search' ) ?>
-				
+
 		</div>
 
 		<?php do_action( 'bp_after_directory_forums_search' ) ?>
-		<?php do_action( 'bp_before_directory_forums_tags' ) ?>	
+		<?php do_action( 'bp_before_directory_forums_tags' ) ?>
 
 		<div id="forums-directory-tags" class="directory-widget">
-			
+
 			<h3><?php _e( 'Forum Topic Tags', 'buddypress' ) ?></h3>
 
-			<?php bp_forums_tag_heat_map(); ?>
+			<?php bp_forums_tag_heat_map() ?>
 
 			<?php do_action( 'bp_directory_forums_search' ) ?>
-				
+
 		</div>
 
-		<?php do_action( 'bp_after_directory_forums_search' ) ?>	
+		<?php do_action( 'bp_after_directory_forums_search' ) ?>
 
 	</div>
-	
-	<?php do_action( 'bp_after_directory_forums_sidebar' ) ?> 
 
+	<?php do_action( 'bp_after_directory_forums_sidebar' ) ?>
+
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/directories/groups/groups-loop.php
===================================================================
--- bp-themes/bp-sn-parent/directories/groups/groups-loop.php	(revision 2030)
+++ bp-themes/bp-sn-parent/directories/groups/groups-loop.php	(working copy)
@@ -1,60 +1,95 @@
-<?php if ( bp_has_site_groups( 'type=active&per_page=10' ) ) : ?>
-	
-	<div class="pagination">
-		
-		<div class="pag-count" id="group-dir-count">
-			<?php bp_site_groups_pagination_count() ?>
-		</div>
+	<?php if ( bp_has_site_groups( 'type=active&per_page=10' ) ) : ?>
 
-		<div class="pagination-links" id="group-dir-pag">
-			<?php bp_site_groups_pagination_links() ?>
-		</div>
-	
-	</div>
-	
-	<?php do_action( 'bp_before_directory_groups_list' ) ?>		
+		<div class="pagination">
 
-	<ul id="groups-list" class="item-list">
-	<?php while ( bp_site_groups() ) : bp_the_site_group(); ?>
+			<div class="pag-count" id="group-dir-count">
 
-		<li>
-			<div class="item-avatar">
-				<a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_avatar_thumb() ?></a>
+				<?php bp_site_groups_pagination_count() ?>
+
 			</div>
 
-			<div class="item">
-				<div class="item-title"><a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_name() ?></a></div>
-				<div class="item-meta"><span class="activity"><?php bp_the_site_group_last_active() ?></span></div>
+			<div class="pagination-links" id="group-dir-pag">
 
-				<div class="item-meta desc"><?php bp_the_site_group_description_excerpt() ?></div>
+				<?php bp_site_groups_pagination_links() ?>
 
-				<?php do_action( 'bp_directory_groups_item' ) ?>
 			</div>
 
-			<div class="action">
-				<?php bp_the_site_group_join_button() ?>
+		</div>
 
-				<div class="meta">
-					<?php bp_the_site_group_type() ?> / <?php bp_the_site_group_member_count() ?>
+		<?php do_action( 'bp_before_directory_groups_list' ) ?>
+
+		<ul id="groups-list" class="item-list">
+
+		<?php while ( bp_site_groups() ) : bp_the_site_group() ?>
+
+			<li<?php echo ( $i++ & 1 ? '' : ' class="alt"' ) ?>>
+
+				<div class="item-avatar">
+
+					<a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_avatar_thumb() ?></a>
+
 				</div>
-				
-				<?php do_action( 'bp_directory_groups_actions' ) ?>
-			</div>
 
-			<div class="clear"></div>
-		</li>
+				<div class="item">
 
-	<?php endwhile; ?>
-	</ul>		
+					<div class="item-title">
 
-	<?php do_action( 'bp_after_directory_groups_list' ) ?>		
-			
-<?php else: ?>
+						<a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_name() ?></a>
 
-	<div id="message" class="info">
-		<p><?php _e( 'There were no groups found.', 'buddypress' ) ?></p>
-	</div>
+					</div>
 
-<?php endif; ?>
+					<div class="item-meta">
 
-<?php bp_the_site_group_hidden_fields() ?>
\ No newline at end of file
+						<span class="activity"><?php bp_the_site_group_last_active() ?></span>
+
+					</div>
+
+					<div class="item-meta desc">
+
+						<?php bp_the_site_group_description_excerpt() ?>
+
+					</div>
+
+					<?php do_action( 'bp_directory_groups_item' ) ?>
+
+				</div>
+
+				<div class="action">
+
+					<?php bp_the_site_group_join_button() ?>
+
+					<div class="meta">
+
+						<?php bp_the_site_group_type() ?>
+
+						<?php _e( '/', 'buddypress' ) ?>
+
+						<?php bp_the_site_group_member_count() ?>
+
+					</div>
+
+					<?php do_action( 'bp_directory_groups_actions' ) ?>
+
+				</div>
+
+				<div class="clear"></div>
+
+			</li>
+
+		<?php endwhile ?>
+
+		</ul>
+
+		<?php do_action( 'bp_after_directory_groups_list' ) ?>
+
+	<?php else : ?>
+
+		<div id="message" class="info">
+
+			<p><?php _e( 'There were no groups found.', 'buddypress' ) ?></p>
+
+		</div>
+
+	<?php endif ?>
+
+	<?php bp_the_site_group_hidden_fields() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/directories/groups/index.php
===================================================================
--- bp-themes/bp-sn-parent/directories/groups/index.php	(revision 2030)
+++ bp-themes/bp-sn-parent/directories/groups/index.php	(working copy)
@@ -1,15 +1,17 @@
 <?php get_header() ?>
 
-	<?php do_action( 'bp_before_directory_groups_content' ) ?>		
+	<?php do_action( 'bp_before_directory_groups_content' ) ?>
 
 	<div id="content">
-	
+
 		<div class="page" id="groups-directory-page">
-	
+
 			<form action="<?php echo site_url() . '/' ?>" method="post" id="groups-directory-form">
+
 				<h3><?php _e( 'Groups Directory', 'buddypress' ) ?></h3>
-		
+
 				<ul id="letter-list">
+
 					<li><a href="#a" id="letter-a">A</a></li>
 					<li><a href="#b" id="letter-b">B</a></li>
 					<li><a href="#c" id="letter-c">C</a></li>
@@ -36,17 +38,21 @@
 					<li><a href="#x" id="letter-x">X</a></li>
 					<li><a href="#y" id="letter-y">Y</a></li>
 					<li><a href="#z" id="letter-z">Z</a></li>
+
 				</ul>
 
 				<div id="groups-directory-listing" class="directory-listing">
+
 					<h3><?php _e( 'Groups Listing', 'buddypress' ) ?></h3>
-			
+
 					<div id="group-dir-list">
+
 						<?php locate_template( array( 'directories/groups/groups-loop.php' ), true ) ?>
+
 					</div>
 
 				</div>
-			
+
 				<?php do_action( 'bp_directory_groups_content' ) ?>
 
 				<?php wp_nonce_field( 'directory_groups', '_wpnonce-group-filter' ) ?>
@@ -57,82 +63,106 @@
 	
 	</div>
 
-	<?php do_action( 'bp_after_directory_groups_content' ) ?>		
-	<?php do_action( 'bp_before_directory_groups_sidebar' ) ?>		
+	<?php do_action( 'bp_after_directory_groups_content' ) ?>
+	<?php do_action( 'bp_before_directory_groups_sidebar' ) ?>
 
 	<div id="sidebar" class="directory-sidebar">
 
-		<?php do_action( 'bp_before_directory_groups_search' ) ?>	
+		<?php do_action( 'bp_before_directory_groups_search' ) ?>
 
 		<div id="groups-directory-search" class="directory-widget">
-			
+
 			<h3><?php _e( 'Find Groups', 'buddypress' ) ?></h3>
 
 			<?php bp_directory_groups_search_form() ?>
 
 			<?php do_action( 'bp_directory_groups_search' ) ?>
-				
+
 		</div>
 
-		<?php do_action( 'bp_after_directory_groups_search' ) ?>	
-		<?php do_action( 'bp_before_directory_groups_featured' ) ?>	
+		<?php do_action( 'bp_after_directory_groups_search' ) ?>
+		<?php do_action( 'bp_before_directory_groups_featured' ) ?>
 
 		<div id="groups-directory-featured" class="directory-widget">
-			
+
 			<h3><?php _e( 'Random Groups', 'buddypress' ) ?></h3>
-		
+
 			<?php if ( bp_has_site_groups( 'type=random&max=3' ) ) : ?>
 
 				<ul id="groups-list" class="item-list">
-					<?php while ( bp_site_groups() ) : bp_the_site_group(); ?>
 
-						<li>
+					<?php while ( bp_site_groups() ) : bp_the_site_group() ?>
+
+						<li<?php echo ( $j++ & 1 ? '' : ' class="alt"' ) ?>>
+
 							<div class="item-avatar">
+
 								<a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_avatar_thumb() ?></a>
+
 							</div>
 
 							<div class="item">
-							
-								<div class="item-title"><a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_name() ?></a></div>
-								<div class="item-meta"><span class="activity"><?php bp_the_site_group_last_active() ?></span></div>
-						
+
+								<div class="item-title">
+
+									<a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_name() ?></a>
+
+								</div>
+
+								<div class="item-meta">
+
+									<span class="activity"><?php bp_the_site_group_last_active() ?></span>
+
+								</div>
+
 								<div class="field-data">
+
 									<div class="field-name">
+
 										<strong><?php _e( 'Members:', 'buddypress' ) ?></strong>
+
 										<?php bp_the_site_group_member_count() ?>
+
 									</div>
-							
+
 									<div class="field-name">
+
 										<strong><?php _e( 'Description:', 'buddypress' ) ?></strong>
+
 										<?php bp_the_site_group_description_excerpt() ?>
+
 									</div>
+
 								</div>
-						
+
 								<?php do_action( 'bp_directory_groups_featured_item' ) ?>
-							
+
 							</div>
 
 						</li>
 
-					<?php endwhile; ?>
-				</ul>		
+					<?php endwhile ?>
 
-				<?php do_action( 'bp_directory_groups_featured' ) ?>	
-				
-			<?php else: ?>
+				</ul>
 
+				<?php do_action( 'bp_directory_groups_featured' ) ?>
+
+			<?php else : ?>
+
 				<div id="message" class="info">
+
 					<p><?php _e( 'No groups found.', 'buddypress' ) ?></p>
+
 				</div>
 
-			<?php endif; ?>
-	
+			<?php endif ?>
+
 		</div>
 
-		<?php do_action( 'bp_after_directory_groups_featured' ) ?>	
+		<?php do_action( 'bp_after_directory_groups_featured' ) ?>
 
 	</div>
-	
-	<?php do_action( 'bp_after_directory_groups_sidebar' ) ?> 
 
+	<?php do_action( 'bp_after_directory_groups_sidebar' ) ?>
+
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/directories/members/index.php
===================================================================
--- bp-themes/bp-sn-parent/directories/members/index.php	(revision 2030)
+++ bp-themes/bp-sn-parent/directories/members/index.php	(working copy)
@@ -1,15 +1,17 @@
 <?php get_header() ?>
 
-	<?php do_action( 'bp_before_directory_members_content' ) ?>		
+	<?php do_action( 'bp_before_directory_members_content' ) ?>
 
 	<div id="content">
-	
+
 		<div class="page" id="members-directory-page">
-	
+
 			<form action="<?php echo site_url() . '/' ?>" method="post" id="members-directory-form">
+
 				<h3><?php _e( 'Members Directory', 'buddypress' ) ?></h3>
-		
+
 				<ul id="letter-list">
+
 					<li><a href="#a" id="letter-a">A</a></li>
 					<li><a href="#b" id="letter-b">B</a></li>
 					<li><a href="#c" id="letter-c">C</a></li>
@@ -36,90 +38,127 @@
 					<li><a href="#x" id="letter-x">X</a></li>
 					<li><a href="#y" id="letter-y">Y</a></li>
 					<li><a href="#z" id="letter-z">Z</a></li>
+
 				</ul>
 
 				<div id="members-directory-listing" class="directory-widget">
+
 					<h3><?php _e( 'Member Listing', 'buddypress' ) ?></h3>
-			
+
 					<div id="member-dir-list">
+
 						<?php locate_template( array( 'directories/members/members-loop.php' ), true ) ?>
+
 					</div>
 
 				</div>
 
 				<?php do_action( 'bp_directory_members_content' ) ?>
-				
-				<?php wp_nonce_field( 'directory_members', '_wpnonce-member-filter' ) ?> 
-				
+
+				<?php wp_nonce_field( 'directory_members', '_wpnonce-member-filter' ) ?>
+
 			</form>
-	
+
 		</div>
 
 	</div>
-	
-	<?php do_action( 'bp_after_directory_members_content' ) ?>		
-	<?php do_action( 'bp_before_directory_members_sidebar' ) ?>		
 
+	<?php do_action( 'bp_after_directory_members_content' ) ?>
+	<?php do_action( 'bp_before_directory_members_sidebar' ) ?>
+
 	<div id="sidebar" class="directory-sidebar">
-		
+
 		<?php do_action( 'bp_before_directory_members_search' ) ?>
 
 		<div id="members-directory-search" class="directory-widget">
+
 			<h3><?php _e( 'Find Members', 'buddypress' ) ?></h3>
 
 			<?php bp_directory_members_search_form() ?>
 
 			<?php do_action( 'bp_directory_members_search' ) ?>
+
 		</div>
 
-		<?php do_action( 'bp_after_directory_members_search' ) ?>	
-		<?php do_action( 'bp_before_directory_members_featured' ) ?>	
+		<?php do_action( 'bp_after_directory_members_search' ) ?>
+		<?php do_action( 'bp_before_directory_members_featured' ) ?>
 
 		<div id="members-directory-featured" class="directory-widget">
+
 			<h3><?php _e( 'Random Members', 'buddypress' ) ?></h3>
-		
+
 			<?php if ( bp_has_site_members( 'type=random&max=3' ) ) : ?>
 
 				<ul id="featured-members-list" class="item-list">
-				<?php while ( bp_site_members() ) : bp_the_site_member(); ?>
 
-					<li>
-						<div class="item-avatar">
-							<a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_avatar() ?></a>
-						</div>
+					<?php while ( bp_site_members() ) : bp_the_site_member() ?>
 
-						<div class="item">
-							<div class="item-title"><a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_name() ?></a></div>
-							<div class="item-meta"><span class="activity"><?php bp_the_site_member_last_active() ?></span></div>
-						
-							<div class="field-data">
-								<div class="field-name"><?php bp_the_site_member_total_friend_count() ?></div>
-								<div class="field-name xprofile-data"><?php bp_the_site_member_random_profile_data() ?></div>
+						<li<?php echo ( $j++ & 1 ? '' : ' class="alt"' ) ?>>
+
+							<div class="item-avatar">
+
+								<a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_avatar() ?></a>
+
 							</div>
-						
-							<?php do_action( 'bp_directory_members_featured_item' ) ?>
-						</div>
-					</li>
 
-				<?php endwhile; ?>
-				</ul>			
+							<div class="item">
 
-				<?php do_action( 'bp_directory_members_featured' ) ?>	
-			
-			<?php else: ?>
+								<div class="item-title">
 
+									<a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_name() ?></a>
+
+								</div>
+
+								<div class="item-meta">
+
+									<span class="activity"><?php bp_the_site_member_last_active() ?></span>
+
+								</div>
+
+								<div class="field-data">
+
+									<div class="field-name">
+
+										<?php bp_the_site_member_total_friend_count() ?>
+
+									</div>
+
+									<div class="field-name xprofile-data">
+
+										<?php bp_the_site_member_random_profile_data() ?>
+
+									</div>
+
+								</div>
+
+								<?php do_action( 'bp_directory_members_featured_item' ) ?>
+
+							</div>
+
+						</li>
+
+					<?php endwhile ?>
+
+				</ul>
+
+				<?php do_action( 'bp_directory_members_featured' ) ?>
+
+			<?php else : ?>
+
 				<div id="message" class="info">
+
 					<p><?php _e( 'There are not enough members to feature.', 'buddypress' ) ?></p>
+
 				</div>
 
-			<?php endif; ?>
-	
+			<?php endif ?>
+
 		</div>
 
-		<?php do_action( 'bp_after_directory_members_featured' ) ?>	
+		<?php do_action( 'bp_after_directory_members_featured' ) ?>
 
 	</div>
 
-	<?php do_action( 'bp_after_directory_members_sidebar' ) ?>		
+	<?php do_action( 'bp_after_directory_members_sidebar' ) ?>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/directories/members/members-loop.php
===================================================================
--- bp-themes/bp-sn-parent/directories/members/members-loop.php	(revision 2030)
+++ bp-themes/bp-sn-parent/directories/members/members-loop.php	(working copy)
@@ -1,54 +1,79 @@
-<?php if ( bp_has_site_members( 'type=active&per_page=10' ) ) : ?>
-	
-	<div class="pagination">
-		
-		<div class="pag-count" id="member-dir-count">
-			<?php bp_site_members_pagination_count() ?>
-		</div>
+	<?php if ( bp_has_site_members( 'type=active&per_page=10' ) ) : ?>
 
-		<div class="pagination-links" id="member-dir-pag">
-			<?php bp_site_members_pagination_links() ?>
-		</div>
+		<div class="pagination">
 
-	</div>
-	
-	<?php do_action( 'bp_before_directory_members_list' ) ?>		
+			<div class="pag-count" id="member-dir-count">
 
-	<ul id="members-list" class="item-list">
-	<?php while ( bp_site_members() ) : bp_the_site_member(); ?>
+				<?php bp_site_members_pagination_count() ?>
 
-		<li>
-			<div class="item-avatar">
-				<a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_avatar() ?></a>
 			</div>
 
-			<div class="item">
-				<div class="item-title"><a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_name() ?></a></div>
-				<div class="item-meta"><span class="activity"><?php bp_the_site_member_last_active() ?></span></div>
+			<div class="pagination-links" id="member-dir-pag">
 
-				<?php do_action( 'bp_directory_members_item' ) ?>
+				<?php bp_site_members_pagination_links() ?>
+
 			</div>
 
-			<div class="action">
-				<?php bp_the_site_member_add_friend_button() ?>
+		</div>
 
-				<?php do_action( 'bp_directory_members_actions' ) ?>
-			</div>
+		<?php do_action( 'bp_before_directory_members_list' ) ?>
 
-			<div class="clear"></div>
-		</li>
+		<ul id="members-list" class="item-list">
 
-	<?php endwhile; ?>
-	</ul>		
+		<?php while ( bp_site_members() ) : bp_the_site_member() ?>
 
-	<?php do_action( 'bp_after_directory_members_list' ) ?>		
-			
-<?php else: ?>
+			<li<?php echo ( $i++ & 1 ? '' : ' class="alt"' ) ?>>
 
-	<div id="message" class="info">
-		<p><?php _e( 'No members found. Members must fill in at least one piece of profile data to show in member lists.', 'buddypress' ) ?></p>
-	</div>
+				<div class="item-avatar">
 
-<?php endif; ?>
+					<a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_avatar() ?></a>
 
-<?php bp_the_site_member_hidden_fields() ?>
\ No newline at end of file
+				</div>
+
+				<div class="item">
+
+					<div class="item-title">
+
+						<a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_name() ?></a>
+
+					</div>
+
+					<div class="item-meta">
+
+						<span class="activity"><?php bp_the_site_member_last_active() ?></span>
+
+					</div>
+
+					<?php do_action( 'bp_directory_members_item' ) ?>
+
+				</div>
+
+				<div class="action">
+
+					<?php bp_the_site_member_add_friend_button() ?>
+
+					<?php do_action( 'bp_directory_members_actions' ) ?>
+
+				</div>
+
+				<div class="clear"></div>
+
+			</li>
+
+		<?php endwhile ?>
+
+		</ul>		
+
+		<?php do_action( 'bp_after_directory_members_list' ) ?>
+
+	<?php else : ?>
+
+		<div id="message" class="info">
+
+			<p><?php _e( 'No members found. Members must fill in at least one piece of profile data to show in member lists.', 'buddypress' ) ?></p>
+
+		</div>
+
+	<?php endif ?>
+
+	<?php bp_the_site_member_hidden_fields() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/footer.php
===================================================================
--- bp-themes/bp-sn-parent/footer.php	(revision 2030)
+++ bp-themes/bp-sn-parent/footer.php	(working copy)
@@ -1,21 +1,23 @@
-		</div> <!-- #container -->
-		
+		</div><!-- #container -->
+
 		<?php do_action( 'bp_after_container' ) ?>
-	
+
 		<div class="clear"></div>
-	
-		<?php do_action( 'bp_before_footer' ) ?>		
 
+		<?php do_action( 'bp_before_footer' ) ?>
+
 		<div id="footer">
-		    <p><?php printf( __( '%s is proudly powered by <a href="http://mu.wordpress.org">WordPress MU</a> and <a href="http://buddypress.org">BuddyPress</a>', 'buddypress' ), bloginfo('name') ); ?></p>
-	
+
+		    <p><?php printf( __( '%s is proudly powered by <a href="http://mu.wordpress.org">WordPress MU</a> and <a href="http://buddypress.org">BuddyPress</a>', 'buddypress' ), bloginfo( 'name' ) ) ?></p>
+
 			<?php do_action( 'bp_footer' ) ?>
+
 		</div>
 
 		<?php do_action( 'bp_after_footer' ) ?>
 
-		<?php wp_footer(); ?>
-	
+		<?php wp_footer() ?>
+
 	</body>
 
 </html>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/friends/friends-loop.php
===================================================================
--- bp-themes/bp-sn-parent/friends/friends-loop.php	(revision 2030)
+++ bp-themes/bp-sn-parent/friends/friends-loop.php	(working copy)
@@ -1,74 +1,91 @@
-<?php do_action( 'bp_before_my_friends_loop' ) ?>		
+	<?php do_action( 'bp_before_my_friends_loop' ) ?>
 
-<div id="friends-loop">
-	
-	<?php if ( bp_has_friendships() ) : ?>
-		
-		<div class="pagination">
+	<div id="friends-loop">
 
-			<div class="pag-count">
-				<?php bp_friend_pagination_count() ?>
+		<?php if ( bp_has_friendships() ) : ?>
+
+			<div class="pagination">
+
+				<div class="pag-count">
+
+					<?php bp_friend_pagination_count() ?>
+
+				</div>
+
+				<div class="pagination-links" id="pag">
+
+					<?php bp_friend_pagination() ?>
+
+				</div>
+
 			</div>
-			
-			<div class="pagination-links" id="pag">
-				<?php bp_friend_pagination() ?>
-			</div>
-		
-		</div>
-		
-		<?php do_action( 'bp_before_my_friends_list' ) ?>
-		
-		<ul id="friend-list" class="item-list">
-			<?php while ( bp_user_friendships() ) : bp_the_friendship(); ?>
-			
-				<li>
-					<?php bp_friend_avatar_thumb() ?>
-					<h4><?php bp_friend_link() ?></h4>
-					<span class="activity"><?php bp_friend_last_active() ?></span>
 
-					<?php do_action( 'bp_my_friends_list_item' ) ?>	
-								
-					<div class="action">
-						<?php bp_add_friend_button() ?>
-						
-						<?php do_action( 'bp_my_friends_list_item_action' ) ?>
-					</div>
-				</li>
-		
-			<?php endwhile; ?>
-		</ul>
+			<?php do_action( 'bp_before_my_friends_list' ) ?>
 
-		<?php do_action( 'bp_after_my_friends_list' ) ?>
-		
-	<?php else: ?>
+			<ul id="friend-list" class="item-list">
 
-		<?php if ( bp_friends_is_filtered() ) : ?>
-			
-			<div id="message" class="info">
-				<p><?php _e( "No friends matched your search filter terms", 'buddypress' ) ?></p>
-			</div>			
-			
+				<?php while ( bp_user_friendships() ) : bp_the_friendship() ?>
+
+					<li<?php echo ( $i++ & 1 ? '' : ' class="alt"' ) ?>>
+
+						<?php bp_friend_avatar_thumb() ?>
+
+						<h4><?php bp_friend_link() ?></h4>
+
+						<span class="activity"><?php bp_friend_last_active() ?></span>
+
+						<?php do_action( 'bp_my_friends_list_item' ) ?>
+
+						<div class="action">
+
+							<?php bp_add_friend_button() ?>
+
+							<?php do_action( 'bp_my_friends_list_item_action' ) ?>
+
+						</div>
+
+					</li>
+
+				<?php endwhile ?>
+
+			</ul>
+
+			<?php do_action( 'bp_after_my_friends_list' ) ?>
+
 		<?php else : ?>
-			
-			<div id="message" class="info">
-				<p><?php bp_word_or_name( __( "Your friends list is currently empty", 'buddypress' ), __( "%s's friends list is currently empty", 'buddypress' ) ) ?></p>
-			</div>
-			
-		<?php endif; ?>
-		
-		<?php if ( bp_is_home() && !bp_friends_is_filtered() ) : ?>
 
-			<?php do_action( 'bp_before_random_members_list' ) ?>
-						
-			<h3><?php _e( 'Why not make friends with some of these members?', 'buddypress' ) ?></h3>
-			<?php bp_friends_random_members() ?>
+			<?php if ( bp_friends_is_filtered() ) : ?>
 
-			<?php do_action( 'bp_after_random_members_list' ) ?>
-		
-		<?php endif; ?>
-		
-	<?php endif;?>
-	
-</div>
+				<div id="message" class="info">
 
-<?php do_action( 'bp_after_my_friends_loop' ) ?>	
\ No newline at end of file
+					<p><?php _e( "No friends matched your search filter terms", 'buddypress' ) ?></p>
+
+				</div>
+
+			<?php else : ?>
+
+				<div id="message" class="info">
+
+					<p><?php bp_word_or_name( __( "Your friends list is currently empty", 'buddypress' ), __( "%s's friends list is currently empty", 'buddypress' ) ) ?></p>
+
+				</div>
+
+			<?php endif ?>
+
+			<?php if ( bp_is_home() && !bp_friends_is_filtered() ) : ?>
+
+				<?php do_action( 'bp_before_random_members_list' ) ?>
+
+				<h3><?php _e( 'Why not make friends with some of these members?', 'buddypress' ) ?></h3>
+
+				<?php bp_friends_random_members() ?>
+
+				<?php do_action( 'bp_after_random_members_list' ) ?>
+
+			<?php endif ?>
+
+		<?php endif ?>
+
+	</div>
+
+	<?php do_action( 'bp_after_my_friends_loop' ) ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/friends/index.php
===================================================================
--- bp-themes/bp-sn-parent/friends/index.php	(revision 2030)
+++ bp-themes/bp-sn-parent/friends/index.php	(working copy)
@@ -1,31 +1,41 @@
 <?php get_header() ?>
 
 	<div class="content-header">
+
 		<ul class="content-header-nav">
+
 			<?php bp_friends_header_tabs() ?>
+
 		</ul>
+
 	</div>
 
 	<div id="content">
-		<h2><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?> &raquo; <?php bp_friends_filter_title() ?></h2>
 
-		<?php do_action( 'bp_before_my_friends_content' ) ?>		
-	
+		<h2><?php printf( __( '%1$s &raquo; %2$s', 'buddypress' ), bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ), true, false ), bp_get_friends_filter_title() ) ?></h2>
+
+		<?php do_action( 'bp_before_my_friends_content' ) ?>
+
 		<div class="left-menu">
+
 			<?php do_action( 'bp_before_my_friends_search' ) ?>
 
 			<?php bp_friend_search_form() ?>
-			
+
 			<?php do_action( 'bp_after_my_friends_search' ) ?>
+
 		</div>
 
 		<div class="main-column">
+
 			<?php do_action( 'template_notices' ) // (error/success feedback) ?>
-		
+
 			<?php locate_template( array( 'friends/friends-loop.php' ), true ) ?>
+
 		</div>
 
-		<?php do_action( 'bp_after_my_friends_content' ) ?>		
+		<?php do_action( 'bp_after_my_friends_content' ) ?>
+
 	</div>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/friends/requests.php
===================================================================
--- bp-themes/bp-sn-parent/friends/requests.php	(revision 2030)
+++ bp-themes/bp-sn-parent/friends/requests.php	(working copy)
@@ -1,65 +1,81 @@
 <?php get_header() ?>
 
-	<div class="content-header">
-	</div>
+	<div class="content-header"><!-- --></div>
 
 	<div id="content">
-		
+
 		<div class="pagination">
-		
+
 			<div class="pagination-links" id="pag">
+
 				<?php bp_friend_pagination() ?>
+
 			</div>
-		
+
 		</div>
-		
-		<h2><?php _e( 'Friendship Requests', 'buddypress' ); ?></h2>
+
+		<h2><?php _e( 'Friendship Requests', 'buddypress' ) ?></h2>
+
 		<?php do_action( 'template_notices' ) // (error/success feedback) ?>
 
-		<?php do_action( 'bp_before_friend_requests_content' ) ?>		
-	
+		<?php do_action( 'bp_before_friend_requests_content' ) ?>
+
 		<?php if ( bp_has_friendships() ) : ?>
-			
+
 			<ul id="friend-list" class="item-list">
-				<?php while ( bp_user_friendships() ) : bp_the_friendship(); ?>
-					
-					<li>
+
+				<?php while ( bp_user_friendships() ) : bp_the_friendship() ?>
+
+					<li<?php echo ( $i++ & 1 ? '' : ' class="alt"' ) ?>>
+
 						<?php bp_friend_avatar_thumb() ?>
+
 						<h4><?php bp_friend_link() ?></h4>
+
 						<span class="activity"><?php bp_friend_time_since_requested() ?></span>
-						
-						<?php do_action( 'bp_friend_requests_item' ) ?>	
-						
+
+						<?php do_action( 'bp_friend_requests_item' ) ?>
+
 						<div class="action">
+
 							<div class="generic-button accept">
-								<a href="<?php bp_friend_accept_request_link() ?>"><?php _e( 'Accept', 'buddypress' ); ?></a>
+
+								<a href="<?php bp_friend_accept_request_link() ?>"><?php _e( 'Accept', 'buddypress' ) ?></a>
+
 							</div>
-					
-							 &nbsp; 
-					
+
+							&nbsp;
+
 							<div class="generic-button reject">
-								<a href="<?php bp_friend_reject_request_link() ?>"><?php _e( 'Reject', 'buddypress' ); ?></a>
+
+								<a href="<?php bp_friend_reject_request_link() ?>"><?php _e( 'Reject', 'buddypress' ) ?></a>
+
 							</div>
-							
-							<?php do_action( 'bp_friend_requests_item_action' ) ?>	
+
+							<?php do_action( 'bp_friend_requests_item_action' ) ?>
+
 						</div>
+
 					</li>
-					
-				<?php endwhile; ?>
+
+				<?php endwhile ?>
+
 			</ul>
-			
-			<?php do_action( 'bp_friend_requests_content' ) ?>		
-			
-		<?php else: ?>
 
+			<?php do_action( 'bp_friend_requests_content' ) ?>
+
+		<?php else : ?>
+
 			<div id="message" class="info">
-				<p><?php _e( 'You have no pending friendship requests.', 'buddypress' ); ?></p>
+
+				<p><?php _e( 'You have no pending friendship requests.', 'buddypress' ) ?></p>
+
 			</div>
 
-		<?php endif;?>
+		<?php endif ?>
 
-		<?php do_action( 'bp_after_friend_requests_content' ) ?>		
-		
+		<?php do_action( 'bp_after_friend_requests_content' ) ?>
+
 	</div>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/functions.php
===================================================================
--- bp-themes/bp-sn-parent/functions.php	(revision 2030)
+++ bp-themes/bp-sn-parent/functions.php	(working copy)
@@ -1,44 +1,44 @@
 <?php
 
 /* Register the widget columns */
-register_sidebars( 1, 
-	array( 
+register_sidebars( 1,
+	array(
 		'name' => 'first-section',
 		'before_widget' => '<div id="%1$s" class="widget %2$s">',
-        'after_widget' => '</div>',
-        'before_title' => '<h2 class="widgettitle">',
-        'after_title' => '</h2>'
-	) 
+		'after_widget' => '</div>',
+		'before_title' => '<h2 class="widgettitle">',
+		'after_title' => '</h2>'
+	)
 );
 
 register_sidebars( 1,
-	array( 
+	array(
 		'name' => 'second-section',
 		'before_widget' => '<div id="%1$s" class="widget %2$s">',
-        'after_widget' => '</div>',
-        'before_title' => '<h2 class="widgettitle">',
-        'after_title' => '</h2>'
-	) 
+		'after_widget' => '</div>',
+		'before_title' => '<h2 class="widgettitle">',
+		'after_title' => '</h2>'
+	)
 );
 
 register_sidebars( 1,
-	array( 
+	array(
 		'name' => 'third-section',
 		'before_widget' => '<div id="%1$s" class="widget %2$s">',
-        'after_widget' => '</div>',
-        'before_title' => '<h2 class="widgettitle">',
-        'after_title' => '</h2>'
-	) 
+		'after_widget' => '</div>',
+		'before_title' => '<h2 class="widgettitle">',
+		'after_title' => '</h2>'
+	)
 );
 
 register_sidebars( 1,
-	array( 
+	array(
 		'name' => 'blog-sidebar',
 		'before_widget' => '<div id="%1$s" class="widget %2$s">',
-        'after_widget' => '</div>',
-        'before_title' => '<h2 class="widgettitle">',
-        'after_title' => '</h2>'
-	) 
+		'after_widget' => '</div>',
+		'before_title' => '<h2 class="widgettitle">',
+		'after_title' => '</h2>'
+	)
 );
 
 /* Load the AJAX functions for the theme */
@@ -51,17 +51,17 @@
 /* Make sure the blog index page shows under /[HOME_BLOG_SLUG] if enabled */
 function bp_dtheme_show_home_blog() {
 	global $bp, $query_string, $paged;
-	
-	if ( $bp->current_component == BP_HOME_BLOG_SLUG && ( !$bp->current_action || 'page' == $bp->current_action ) ) {				
+
+	if ( $bp->current_component == BP_HOME_BLOG_SLUG && ( !$bp->current_action || 'page' == $bp->current_action ) ) {
 		unset( $query_string );
-		
+
 		if ( ( 'page' == $bp->current_action && $bp->action_variables[0] ) && false === strpos( $query_string, 'paged' ) ) {
 			$query_string .= '&paged=' . $bp->action_variables[0];
 			$paged = $bp->action_variables[0];
 		}
 
-		query_posts($query_string);
-		
+		query_posts( $query_string );
+
 		bp_core_load_template( 'index', true );
 	}
 }
Index: bp-themes/bp-sn-parent/header.php
===================================================================
--- bp-themes/bp-sn-parent/header.php	(revision 2030)
+++ bp-themes/bp-sn-parent/header.php	(working copy)
@@ -1,120 +1,141 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes() ?>>
 
 	<head profile="http://gmpg.org/xfn/11">
 
-		<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
+		<meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ) ?>; charset=<?php bloginfo( 'charset' ) ?>" />
 
 		<title><?php bp_page_title() ?></title>
 
 		<?php do_action( 'bp_head' ) ?>
 
-		<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats -->
+		<meta name="generator" content="WordPress <?php bloginfo( 'version' ) ?>" /><!-- leave this for stats -->
 
-		<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
+		<link rel="stylesheet" href="<?php bloginfo( 'stylesheet_url' ) ?>" type="text/css" media="screen" />
 
 		<?php if ( function_exists( 'bp_sitewide_activity_feed_link' ) ) : ?>
-			<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> <?php _e('Site Wide Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_sitewide_activity_feed_link() ?>" />
-		<?php endif; ?>
+			<link rel="alternate" type="application/rss+xml" title="<?php bloginfo( 'name' ) ?> <?php _e( 'Site Wide Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_sitewide_activity_feed_link() ?>" />
+		<?php endif ?>
 
-		<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> <?php _e( 'Blog Posts RSS Feed', 'buddypress' ) ?>" href="<?php bloginfo('rss2_url'); ?>" />
-		<link rel="alternate" type="application/atom+xml" title="<?php bloginfo('name'); ?> <?php _e( 'Blog Posts Atom Feed', 'buddypress' ) ?>" href="<?php bloginfo('atom_url'); ?>" />
+		<link rel="alternate" type="application/rss+xml" title="<?php bloginfo( 'name' ) ?> <?php _e( 'Blog Posts RSS Feed', 'buddypress' ) ?>" href="<?php bloginfo( 'rss2_url' ) ?>" />
 
-		<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
+		<link rel="alternate" type="application/atom+xml" title="<?php bloginfo( 'name' ) ?> <?php _e( 'Blog Posts Atom Feed', 'buddypress' ) ?>" href="<?php bloginfo( 'atom_url' ) ?>" />
 
-		<?php wp_head(); ?>
+		<link rel="pingback" href="<?php bloginfo( 'pingback_url' ) ?>" />
 
+		<?php wp_head() ?>
+
 	</head>
 
 	<body <?php body_class() ?>>
-		
-		<?php do_action( 'bp_before_search_login_bar' ) ?>	
-		
+
+		<?php do_action( 'bp_before_search_login_bar' ) ?>
+
 		<div id="search-login-bar">
-	
+
 			<form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
-				<input type="text" id="search-terms" name="search-terms" value="" /> 
+
+				<input type="text" id="search-terms" name="search-terms" value="" />
+
 				<?php echo bp_search_form_type_select() ?>
 	
 				<input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
+
 				<?php wp_nonce_field( 'bp_search_form' ) ?>
+
 			</form>
-			
+
 			<?php if ( !is_user_logged_in() ) : ?>
-		
+
 				<form name="login-form" id="login-form" action="<?php echo site_url( 'wp-login.php' ) ?>" method="post">
+
 					<input type="text" name="log" id="user_login" value="<?php _e( 'Username', 'buddypress' ) ?>" onfocus="if (this.value == '<?php _e( 'Username', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Username', 'buddypress' ) ?>';}" />
+
 					<input type="password" name="pwd" id="user_pass" class="input" value="" />
-			
+
 					<input type="checkbox" name="rememberme" id="rememberme" value="forever" title="<?php _e( 'Remember Me', 'buddypress' ) ?>" />
-			
-					<input type="submit" name="wp-submit" id="wp-submit" value="<?php _e( 'Log In', 'buddypress' ) ?>"/>		
-					
-					<?php if ( 'none' != bp_get_signup_allowed() && 'blog' != bp_get_signup_allowed() ) : ?>		
+
+					<input type="submit" name="wp-submit" id="wp-submit" value="<?php _e( 'Log In', 'buddypress' ) ?>"/>
+
+					<?php if ( 'none' != bp_get_signup_allowed() && 'blog' != bp_get_signup_allowed() ) : ?>
 						<input type="button" name="signup-submit" id="signup-submit" value="<?php _e( 'Sign Up', 'buddypress' ) ?>" onclick="location.href='<?php echo bp_signup_page() ?>'" />
-					<?php endif; ?>
-					
+					<?php endif ?>
+
 					<input type="hidden" name="redirect_to" value="<?php echo bp_root_domain() ?>" />
+
 					<input type="hidden" name="testcookie" value="1" />
-						
+
 					<?php do_action( 'bp_login_bar_logged_out' ) ?>
+
 				</form>
-	
+
 			<?php else : ?>
-		
+
 				<div id="logout-link">
-					<?php bp_loggedin_user_avatar( 'width=20&height=20' ) ?> &nbsp; <?php bp_loggedinuser_link() ?> / <?php bp_log_out_link() ?>
-					
+
+					<?php bp_loggedin_user_avatar( 'width=20&height=20' ) ?> &nbsp;
+
+					<?php bp_loggedinuser_link() ?>
+
+					<?php _e( '/', 'buddypress' ) ?>
+
+					<?php bp_log_out_link() ?>
+
 					<?php do_action( 'bp_login_bar_logged_in' ) ?>
+
 				</div>
-		
-			<?php endif; ?>
-			
+
+			<?php endif ?>
+
 			<?php do_action( 'bp_search_login_bar' ) ?>
 
 		</div>
 
-		<?php do_action( 'bp_after_search_login_bar' ) ?>			
-		<?php do_action( 'bp_before_header' ) ?>		
+		<?php do_action( 'bp_after_search_login_bar' ) ?>
+		<?php do_action( 'bp_before_header' ) ?>
 
-		<div id="header">	
-		
-			<h1 id="logo"><a href="<?php echo get_option('home') ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
-	
+		<div id="header">
+
+			<h1 id="logo"><a href="<?php echo get_option( 'home' ) ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
+
 			<ul id="nav">
-				<li<?php if ( bp_is_page( 'home' ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a></li>
-				<li<?php if ( bp_is_page( BP_HOME_BLOG_SLUG ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_HOME_BLOG_SLUG ?>" title="<?php _e( 'Blog', 'buddypress' ) ?>"><?php _e( 'Blog', 'buddypress' ) ?></a></li>
-				<li<?php if ( bp_is_page( BP_MEMBERS_SLUG ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_MEMBERS_SLUG ?>" title="<?php _e( 'Members', 'buddypress' ) ?>"><?php _e( 'Members', 'buddypress' ) ?></a></li>
 
+				<li<?php if ( bp_is_page( 'home' ) ) echo ' class="selected"' ?>><a href="<?php echo get_option( 'home' ) ?>" title="<?php esc_attr_e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a></li>
+
+				<li<?php if ( bp_is_page( BP_HOME_BLOG_SLUG ) ) echo ' class="selected"' ?>><a href="<?php echo get_option( 'home' ) ?>/<?php echo BP_HOME_BLOG_SLUG ?>" title="<?php esc_attr_e( 'Blog', 'buddypress' ) ?>"><?php _e( 'Blog', 'buddypress' ) ?></a></li>
+
+				<li<?php if ( bp_is_page( BP_MEMBERS_SLUG ) ) echo ' class="selected"' ?>><a href="<?php echo get_option( 'home' ) ?>/<?php echo BP_MEMBERS_SLUG ?>" title="<?php esc_attr_e( 'Members', 'buddypress' ) ?>"><?php _e( 'Members', 'buddypress' ) ?></a></li>
+
 				<?php if ( function_exists( 'groups_install' ) ) : ?>
-					<li<?php if ( bp_is_page( BP_GROUPS_SLUG ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_GROUPS_SLUG ?>" title="<?php _e( 'Groups', 'buddypress' ) ?>"><?php _e( 'Groups', 'buddypress' ) ?></a></li>
-				<?php endif; ?>
+					<li<?php if ( bp_is_page( BP_GROUPS_SLUG ) ) echo ' class="selected"' ?>><a href="<?php echo get_option( 'home' ) ?>/<?php echo BP_GROUPS_SLUG ?>" title="<?php esc_attr_e( 'Groups', 'buddypress' ) ?>"><?php _e( 'Groups', 'buddypress' ) ?></a></li>
+				<?php endif ?>
 
 				<?php if ( function_exists( 'groups_install' ) && ( function_exists( 'bp_forums_setup' ) && !(int) get_site_option( 'bp-disable-forum-directory' ) ) ) : ?>
-					<li<?php if ( bp_is_page( BP_FORUMS_SLUG ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_FORUMS_SLUG ?>" title="<?php _e( 'Forums', 'buddypress' ) ?>"><?php _e( 'Forums', 'buddypress' ) ?></a></li>
-				<?php endif; ?>
-				
+					<li<?php if ( bp_is_page( BP_FORUMS_SLUG ) ) echo ' class="selected"' ?>><a href="<?php echo get_option( 'home' ) ?>/<?php echo BP_FORUMS_SLUG ?>" title="<?php esc_attr_e( 'Forums', 'buddypress' ) ?>"><?php _e( 'Forums', 'buddypress' ) ?></a></li>
+				<?php endif ?>
+
 				<?php if ( function_exists( 'bp_blogs_install' ) ) : ?>
-					<li<?php if ( bp_is_page( BP_BLOGS_SLUG ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_BLOGS_SLUG ?>" title="<?php _e( 'Blogs', 'buddypress' ) ?>"><?php _e( 'Blogs', 'buddypress' ) ?></a></li>
-				<?php endif; ?>
+					<li<?php if ( bp_is_page( BP_BLOGS_SLUG ) ) echo ' class="selected"' ?>><a href="<?php echo get_option( 'home' ) ?>/<?php echo BP_BLOGS_SLUG ?>" title="<?php esc_attr_e( 'Blogs', 'buddypress' ) ?>"><?php _e( 'Blogs', 'buddypress' ) ?></a></li>
+				<?php endif ?>
 
-				<?php do_action( 'bp_nav_items' ); ?>
+				<?php do_action( 'bp_nav_items' ) ?>
+
 			</ul>
 
 			<?php do_action( 'bp_header' ) ?>
-	
+
 		</div>
 
 		<?php do_action( 'bp_after_header' ) ?>
 		<?php do_action( 'bp_before_container' ) ?>
-		
+
 		<div id="container">
-	
+
 			<?php if ( !bp_is_blog_page() && !bp_is_directory() && !bp_is_register_page() && !bp_is_activation_page() ) : ?>
-		
+
 				<?php locate_template( array( 'userbar.php' ), true ) /* Load the user navigation */ ?>
+
 				<?php locate_template( array( 'optionsbar.php' ), true ) /* Load the currently displayed object navigation */ ?>
-		
-			<?php endif; ?>
-			
\ No newline at end of file
+
+			<?php endif ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/home.php
===================================================================
--- bp-themes/bp-sn-parent/home.php	(revision 2030)
+++ bp-themes/bp-sn-parent/home.php	(working copy)
@@ -1,44 +1,62 @@
-<?php get_header(); ?>
+<?php get_header() ?>
 
 	<div id="content">
 
 		<?php do_action( 'bp_before_home' ) ?>
 
 		<div id="third-section" class="widget-section">
+
 			<?php if ( !function_exists('dynamic_sidebar')
-			        || !dynamic_sidebar('third-section') ) : ?>
-		
+				|| !dynamic_sidebar('third-section') ) : ?>
+
 			<div class="widget-error">
-				<?php _e( 'Please log in and add widgets to this section.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=first-section"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
+
+				<?php _e( 'Please log in and add widgets to this section.', 'buddypress' ) ?>
+
+				<a href="<?php echo get_option( 'siteurl' ) ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=first-section"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
+
 			</div>
-		
-			<?php endif; ?>
+
+			<?php endif ?>
+
 		</div>
-		
+
 		<div id="second-section" class="widget-section">
+
 			<?php if ( !function_exists('dynamic_sidebar')
-			        || !dynamic_sidebar('second-section') ) : ?>
-		
+				|| !dynamic_sidebar('second-section') ) : ?>
+
 			<div class="widget-error">
-				<?php _e( 'Please log in and add widgets to this section.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=second-section"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
+
+				<?php _e( 'Please log in and add widgets to this section.', 'buddypress' ) ?>
+
+				<a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=second-section"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
+
 			</div>
-		
-			<?php endif; ?>
+
+			<?php endif ?>
+
 		</div>
 
 		<div id="first-section" class="widget-section">
+
 			<?php if ( !function_exists('dynamic_sidebar')
-			        || !dynamic_sidebar('first-section') ) : ?>
+				|| !dynamic_sidebar('first-section') ) : ?>
 
 			<div class="widget-error">
-				<?php _e( 'Please log in and add widgets to this section.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=third-section"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
-			</div>		
-		
-			<?php endif; ?>
+
+				<?php _e( 'Please log in and add widgets to this section.', 'buddypress' ) ?>
+
+				<a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=third-section"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
+
+			</div>
+
+			<?php endif ?>
+
 		</div>
 
 		<?php do_action( 'bp_after_home' ) ?>
 
 	</div>
 
-<?php get_footer(); ?>
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/index.php
===================================================================
--- bp-themes/bp-sn-parent/index.php	(revision 2030)
+++ bp-themes/bp-sn-parent/index.php	(working copy)
@@ -1,58 +1,70 @@
-<?php get_header(); ?>
+<?php get_header() ?>
 
 	<div id="content">
 
 		<?php do_action( 'bp_before_blog_home' ) ?>
 
 		<div class="page" id="blog-latest">
-		
+
 			<h2 class="pagetitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
-		
-			<?php if ( have_posts() ) : ?>
 
-				<?php while (have_posts()) : the_post(); ?>
-				
+			<?php if ( have_posts() ) : while ( have_posts() ) : the_post() ?>
+
 					<?php do_action( 'bp_before_blog_post' ) ?>
-				
-					<div class="post" id="post-<?php the_ID(); ?>">
-					
-						<h3><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
-					
-						<p class="date"><?php the_time('F j, Y') ?> <em><?php _e( 'in', 'buddypress' ) ?> <?php the_category(', ') ?> <?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink($post->post_author) ) ?></em></p>
 
+					<div <?php post_class( $i++ & 1 ? '' : 'alt' ) ?> id="post-<?php the_ID() ?>">
+
+						<h3><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf( esc_attr__( 'Permanent Link to %s', 'buddypress' ), get_the_title() ) ?>"><?php the_title() ?></a></h3>
+
+						<p class="date"><?php the_time('F j, Y') ?>
+
+							<em><?php printf( __( 'in %s', 'buddypress' ), get_the_category_list(',') ) ?>
+
+								<?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></em></p>
+
 						<div class="entry">
-							<?php the_content( __( 'Read the rest of this entry &raquo;', 'buddypress' ) ); ?>
+
+							<?php the_content( __( 'Read the rest of this entry &raquo;', 'buddypress' ) ) ?>
+
 						</div>
 
-						<p class="postmetadata"><span class="tags"><?php the_tags( __( 'Tags: ', 'buddypress' ), ', ', '<br />'); ?></span> <span class="comments"><?php comments_popup_link( __( 'No Comments &#187;', 'buddypress' ), __( '1 Comment &#187;', 'buddypress' ), __( '% Comments &#187;', 'buddypress' ) ); ?></span></p>
+						<p class="postmetadata"><span class="tags"><?php the_tags( __( 'Tags: ', 'buddypress' ), ', ', '<br />') ?></span>
 
+							<span class="comments"><?php comments_popup_link(
+								__( 'No Comments &#187;', 'buddypress' ),
+								__( '1 Comment &#187;', 'buddypress' ),
+								__( '% Comments &#187;', 'buddypress' )
+							) ?></span></p>
+
 					</div>
 
 					<?php do_action( 'bp_after_blog_post' ) ?>
 
-				<?php endwhile; ?>
+				<?php endwhile ?>
 
 				<div class="navigation">
-				
+
 					<div class="alignleft"><?php next_posts_link( __( '&laquo; Previous Entries', 'buddypress' ) ) ?></div>
 					<div class="alignright"><?php previous_posts_link( __( 'Next Entries &raquo;', 'buddypress' ) ) ?></div>
-				
+
 				</div>
 
 			<?php else : ?>
 
 				<h2 class="center"><?php _e( 'Not Found', 'buddypress' ) ?></h2>
-				<p class="center"><?php _e( 'Sorry, but you are looking for something that isn\'t here.', 'buddypress' ) ?></p>
 
+				<p class="center"><?php _e( "Sorry, but you are looking for something that isn't here.", 'buddypress' ) ?></p>
+
 				<?php locate_template( array( 'searchform.php' ), true ) ?>
 
-			<?php endif; ?>
+			<?php endif ?>
+
 		</div>
 
 		<?php do_action( 'bp_after_blog_home' ) ?>
 
 	</div>
 
-	<?php get_sidebar(); ?>
+	<?php get_sidebar() ?>
 
-<?php get_footer(); ?>
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/links.php
===================================================================
--- bp-themes/bp-sn-parent/links.php	(revision 2030)
+++ bp-themes/bp-sn-parent/links.php	(working copy)
@@ -4,24 +4,26 @@
 */
 ?>
 
-<?php get_header(); ?>
+<?php get_header() ?>
 
 	<div id="content">
 
 		<?php do_action( 'bp_before_blog_links' ) ?>
 
-		<div class="page" id="blog-latest">
-		
+		<div <?php post_class() ?> id="blog-latest">
+
 			<h2 class="pagetitle"><?php _e( 'Links', 'buddypress' ) ?></h2>
 
 			<ul id="links-list">
-				<?php get_links_list(); ?>
+
+				<?php get_links_list() ?>
+
 			</ul>
-		
+
 		</div>
 
 		<?php do_action( 'bp_after_blog_links' ) ?>
 
 	</div>
 
-<?php get_footer(); ?>
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/messages/compose.php
===================================================================
--- bp-themes/bp-sn-parent/messages/compose.php	(revision 2030)
+++ bp-themes/bp-sn-parent/messages/compose.php	(working copy)
@@ -1,51 +1,59 @@
 <?php get_header() ?>
 
-	<div class="content-header">
+	<div class="content-header"><!-- --></div>
 
-	</div>
+	<div id="content">
 
-	<div id="content">
-		<h2><?php _e( 'Compose Message', 'buddypress' ); ?></h2>
-	
+		<h2><?php _e( 'Compose Message', 'buddypress' ) ?></h2>
+
 		<?php do_action( 'template_notices' ) ?>
-		
+
 		<form action="<?php bp_messages_form_action('compose') ?>" method="post" id="send_message_form" class="standard-form">
 
 			<?php do_action( 'bp_before_messages_compose_content' ) ?>
-			
-			<label for="send-to-input"><?php _e("Send To", 'buddypress') ?> &nbsp; <span class="ajax-loader"></span></label>
+
+			<label for="send-to-input"><?php _e( 'Send To', 'buddypress') ?> &nbsp; <span class="ajax-loader"></span></label>
+
 			<ul class="first acfb-holder">
+
 				<li>
+
 					<?php bp_message_get_recipient_tabs() ?>
+
 					<input type="text" name="send-to-input" class="send-to-input" id="send-to-input" />
+
 				</li>
+
 			</ul>
-		
+
 			<?php if ( is_site_admin() ) : ?>
-				<input type="checkbox" id="send-notice" name="send-notice" value="1" /> <?php _e( "This is a notice to all users.", "buddypress" ) ?>
-			<?php endif; ?>
 
+				<input type="checkbox" id="send-notice" name="send-notice" value="1" /> <?php _e( 'This is a notice to all users.', 'buddypress' ) ?>
+
+			<?php endif ?>
+
 			<label for="subject"><?php _e( 'Subject', 'buddypress') ?></label>
+
 			<input type="text" name="subject" id="subject" value="<?php bp_messages_subject_value() ?>" />
 
 			<label for="content"><?php _e( 'Message', 'buddypress') ?></label>
+
 			<textarea name="content" id="message_content" rows="15" cols="40"><?php bp_messages_content_value() ?></textarea>
 
-			<input type="hidden" name="send_to_usernames" id="send-to-usernames" value="<?php bp_message_get_recipient_usernames(); ?>" class="<?php bp_message_get_recipient_usernames() ?>" />
-		
+			<input type="hidden" name="send_to_usernames" id="send-to-usernames" value="<?php bp_message_get_recipient_usernames() ?>" class="<?php bp_message_get_recipient_usernames() ?>" />
+
 			<?php do_action( 'bp_after_messages_compose_content' ) ?>
 
-			<p class="submit">
-				<input type="submit" value="<?php _e("Send", 'buddypress') ?> &raquo;" name="send" id="send" />
-			</p>
-		
+			<p class="submit"><input type="submit" value="<?php esc_attr_e( 'Send &raquo;', 'buddypress' ) ?>" name="send" id="send" /></p>
+
 			<?php wp_nonce_field( 'messages_send_message' ) ?>
+
 		</form>
-	
+
 		<script type="text/javascript">
-			document.getElementById("send-to-input").focus();
+			document.getElementById( 'send-to-input' ).focus();
 		</script>
+
 	</div>
 
-<?php get_footer() ?>
-
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/messages/index.php
===================================================================
--- bp-themes/bp-sn-parent/messages/index.php	(revision 2030)
+++ bp-themes/bp-sn-parent/messages/index.php	(working copy)
@@ -3,70 +3,105 @@
 	<form action="<?php bp_messages_form_action() ?>" method="post" id="messages-form">
 
 		<div class="content-header">
-			<div class="messages-options">	
+
+			<div class="messages-options">
+
 				<?php bp_messages_options() ?>
+
 			</div>
+
 		</div>
 
 		<div id="content">
-			<h2><?php _e( "Inbox", "buddypress" ); ?></h2>
-			
+
+			<h2><?php _e( 'Inbox', 'buddypress' ) ?></h2>
+
 			<?php do_action( 'template_notices' ) // (error/success feedback) ?>
 
 			<?php do_action( 'bp_before_messages_inbox_content' ) ?>
-	
-			<?php bp_message_get_notices(); // (admin created site wide notices) ?>
 
+			<?php bp_message_get_notices() // (admin created site wide notices) ?>
+
 			<?php if ( bp_has_message_threads() ) : ?>
-				
+
 				<div class="pagination">
 
 					<div class="pagination-links">
+
 						<?php bp_messages_pagination() ?>
+
 					</div>
 
 				</div>
-				
+
 				<?php do_action( 'bp_before_messages_inbox_list' ) ?>
-	
+
 				<table id="message-threads">
-					<?php while ( bp_message_threads() ) : bp_message_thread(); ?>
-					
-						<tr id="m-<?php bp_message_thread_id() ?>"<?php if ( bp_message_thread_has_unread() ) : ?> class="unread"<?php else: ?> class="read"<?php endif; ?>>
+
+					<?php while ( bp_message_threads() ) : bp_message_thread() ?>
+
+						<tr id="m-<?php bp_message_thread_id() ?>" class="<?php echo ( $i++ & 1 ? '' : 'alt ' );
+							if ( bp_message_thread_has_unread() )
+								echo 'unread';
+							else
+								echo 'read' ?>">
+
 							<td width="1%">
+
 								<span class="unread-count"><?php bp_message_thread_unread_count() ?></span>
+
 							</td>
-							<td width="1%"><?php bp_message_thread_avatar() ?></td>
+
+							<td width="1%">
+
+								<?php bp_message_thread_avatar() ?>
+
+							</td>
+
 							<td width="27%">
-								<p><?php _e("From:", "buddypress"); ?> <?php bp_message_thread_from() ?></p>
+
+								<p><?php printf( __( 'From: %s', 'buddypress' ), bp_get_message_thread_from() ) ?></p>
+
 								<p class="date"><?php bp_message_thread_last_post_date() ?></p>
+
 							</td>
+
 							<td width="40%">
-								<p><a href="<?php bp_message_thread_view_link() ?>" title="<?php _e("View Message", "buddypress"); ?>"><?php bp_message_thread_subject() ?></a></p>
+
+								<p><a href="<?php bp_message_thread_view_link() ?>" title="<?php esc_attr_e( 'View Message', 'buddypress' ) ?>"><?php bp_message_thread_subject() ?></a></p>
+
 								<p><?php bp_message_thread_excerpt() ?></p>
+
 							</td>
-							
+
 							<?php do_action( 'bp_messages_inbox_list_item' ) ?>
-							
+
 							<td width="10%">
-								<a href="<?php bp_message_thread_delete_link() ?>" title="<?php _e("Delete Message", "buddypress"); ?>" class="delete confirm"><?php _e("Delete", "buddypress"); ?></a> &nbsp; 
+
+								<a href="<?php bp_message_thread_delete_link() ?>" title="<?php esc_attr_e( 'Delete Message', 'buddypress' ) ?>" class="delete confirm"><?php _e( 'Delete', 'buddypress' ) ?></a> &nbsp;
+
 								<input type="checkbox" name="message_ids[]" value="<?php bp_message_thread_id() ?>" />
+
 							</td>
+
 						</tr>
-					
-					<?php endwhile; ?>
+
+					<?php endwhile ?>
+
 				</table>
 
 				<?php do_action( 'bp_after_messages_inbox_list' ) ?>
-		
-			<?php else: ?>
-		
+
+			<?php else : ?>
+
 				<div id="message" class="info">
-					<p><?php _e( 'You have no messages in your inbox.', 'buddypress' ); ?></p>
-				</div>	
-		
-			<?php endif;?>
 
+					<p><?php _e( 'You have no messages in your inbox.', 'buddypress' ) ?></p>
+
+				</div>
+
+			<?php endif ?>
+
 			<?php do_action( 'bp_after_messages_inbox_content' ) ?>
 
 		</div>
Index: bp-themes/bp-sn-parent/messages/notices.php
===================================================================
--- bp-themes/bp-sn-parent/messages/notices.php	(revision 2030)
+++ bp-themes/bp-sn-parent/messages/notices.php	(working copy)
@@ -1,21 +1,21 @@
 <?php get_header() ?>
 
-	<div class="content-header">
+	<div class="content-header"><!-- --></div>
 
-	</div>
+	<div id="content">
 
-	<div id="content">
-		
 		<div class="pagination">
-		
+
 			<div class="pagination-links">
+
 				<?php bp_messages_pagination() ?>
+
 			</div>
-		
+
 		</div>
-	
-		<h2><?php _e( 'Sent Notices', 'buddypress' ); ?></h2>
-	
+
+		<h2><?php _e( 'Sent Notices', 'buddypress' ) ?></h2>
+
 		<?php do_action( 'template_notices' ) ?>
 
 		<?php do_action( 'bp_before_messages_notices_content' ) ?>
@@ -23,42 +23,58 @@
 		<?php if ( bp_has_message_threads() ) : ?>
 
 			<?php do_action( 'bp_before_messages_notices_list' ) ?>
-		
+
 			<table id="message-threads" class="notices">
-				<?php while ( bp_message_threads() ) : bp_message_thread(); ?>
 
+				<?php while ( bp_message_threads() ) : bp_message_thread() ?>
+
 					<tr>
-						<td width="1%">
-						</td>
+
+						<td width="1%"><!-- --></td>
+
 						<td width="40%">
+
 							<p><strong><?php bp_message_notice_subject() ?></strong></p>
+
 							<p><?php bp_message_notice_text() ?></p>
+
 						</td>
+
 						<td width="27%">
+
 							<p><?php bp_message_is_active_notice() ?></p>
-							<p class="date"><?php _e("Sent:", "buddypress"); ?> <?php bp_message_notice_post_date() ?></p>
+
+							<p class="date"><?php printf( __('Sent: %s', 'buddypress'), bp_get_message_notice_post_date() ) ?></p>
+
 						</td>
-							
+
 						<?php do_action( 'bp_messages_notices_list_item' ) ?>
 
 						<td width="4%">
-							<a href="<?php bp_message_activate_deactivate_link() ?>" class="confirm"><?php bp_message_activate_deactivate_text() ?></a> 
-							<a href="<?php bp_message_notice_delete_link() ?>" class="confirm" title="<?php _e("Delete Message", "buddypress"); ?>"><?php _e("Delete", "buddypress"); ?></a> 
+
+							<a href="<?php bp_message_activate_deactivate_link() ?>" class="confirm"><?php bp_message_activate_deactivate_text() ?></a>
+
+							<a href="<?php bp_message_notice_delete_link() ?>" class="confirm" title="<?php esc_attr_e( 'Delete Message', 'buddypress' ) ?>"><?php _e( 'Delete', 'buddypress' ) ?></a>
+
 						</td>
+
 					</tr>
-					
-				<?php endwhile; ?>
+
+				<?php endwhile ?>
+
 			</table>
 
 			<?php do_action( 'bp_after_messages_notices_list' ) ?>
 		
-		<?php else: ?>
-		
+		<?php else : ?>
+
 			<div id="message" class="info">
-				<p><?php _e("You have not sent any notices.", "buddypress"); ?></p>
+
+				<p><?php _e( 'You have not sent any notices.', 'buddypress' ) ?></p>
+
 			</div>	
 
-		<?php endif; ?>
+		<?php endif ?>
 
 		<?php do_action( 'bp_after_messages_notices_content' ) ?>
 
Index: bp-themes/bp-sn-parent/messages/sentbox.php
===================================================================
--- bp-themes/bp-sn-parent/messages/sentbox.php	(revision 2030)
+++ bp-themes/bp-sn-parent/messages/sentbox.php	(working copy)
@@ -1,69 +1,92 @@
 <?php get_header() ?>
 
 	<div class="content-header">
-		<div class="messages-options">	
+		<div class="messages-options">
 			<?php bp_messages_options() ?>
 		</div>
 	</div>
 
-	<div id="content">	
-		<h2><?php _e("Sent Messages", "buddypress"); ?></h2>
-	
+	<div id="content">
+		<h2><?php _e( 'Sent Messages', 'buddypress' ) ?></h2>
+
 		<?php do_action( 'template_notices' ) // (error/success feedback) ?>
 
 		<?php do_action( 'bp_before_messages_sentbox_content' ) ?>
 
 		<?php if ( bp_has_message_threads() ) : ?>
-			
+
 			<div class="pagination">
 
 				<div class="pagination-links">
+
 					<?php bp_messages_pagination() ?>
+
 				</div>
-			
+
 			</div>
 
 			<?php do_action( 'bp_before_messages_sentbox_list' ) ?>
-				
+
 			<table id="message-threads">
-				<?php while ( bp_message_threads() ) : bp_message_thread(); ?>
-				
-					<tr id="m-<?php bp_message_thread_id() ?>">
+
+				<?php while ( bp_message_threads() ) : bp_message_thread() ?>
+
+					<tr<?php echo ( $i++ & 1 ? '' : ' class="alt"' ) ?> id="m-<?php bp_message_thread_id() ?>">
+
+						<td width="1%"><!-- --></td>
+
 						<td width="1%">
+
+							<?php bp_message_thread_avatar() ?>
+
 						</td>
-						<td width="1%"><?php bp_message_thread_avatar() ?></td>
+
 						<td width="27%">
-							<p><?php _e("To:", "buddypress"); ?> <?php bp_message_thread_to() ?></p>
+
+							<p><?php printf( __( 'To: %s', 'buddypress' ), bp_get_message_thread_to() ) ?></p>
+
 							<p class="date"><?php bp_message_thread_last_post_date() ?></p>
+
 						</td>
+
 						<td width="40%">
-							<p><a href="<?php bp_message_thread_view_link() ?>" title="<?php _e("View Message", "buddypress"); ?>"><?php bp_message_thread_subject() ?></a></p>
+
+							<p><a href="<?php bp_message_thread_view_link() ?>" title="<?php esc_attr_e( 'View Message', 'buddypress' ) ?>"><?php bp_message_thread_subject() ?></a></p>
+
 							<p><?php bp_message_thread_excerpt() ?></p>
+
 						</td>
 
 						<?php do_action( 'bp_messages_sentbox_list' ) ?>
 
 						<td width="10%">
-							<a href="<?php bp_message_thread_delete_link() ?>" title="<?php _e("Delete Message", "buddypress"); ?>" class="delete confirm"><?php _e("Delete", "buddypress"); ?></a> &nbsp;  
+
+							<a href="<?php bp_message_thread_delete_link() ?>" title="<?php esc_attr_e( 'Delete Message', 'buddypress' ) ?>" class="delete confirm"><?php _e( 'Delete', 'buddypress' ) ?></a> &nbsp;
+
 							<input type="checkbox" name="message_ids[]" value="<?php bp_message_thread_id() ?>" />
+
 						</td>
+
 					</tr>
-				
-				<?php endwhile; ?>
+
+				<?php endwhile ?>
+
 			</table>
-		
+
 			<?php do_action( 'bp_after_messages_sentbox_list' ) ?>
-			
-		<?php else: ?>
-		
+
+		<?php else : ?>
+
 			<div id="message" class="info">
-				<p><?php _e("You have no sent messages.", "buddypress"); ?></p>
-			</div>	
 
-		<?php endif;?>
+				<p><?php _e( 'You have no sent messages.', 'buddypress' ) ?></p>
 
+			</div>
+
+		<?php endif ?>
+
 		<?php do_action( 'bp_after_messages_sentbox_content' ) ?>
-		
+
 	</div>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/messages/view.php
===================================================================
--- bp-themes/bp-sn-parent/messages/view.php	(revision 2030)
+++ bp-themes/bp-sn-parent/messages/view.php	(working copy)
@@ -1,108 +1,105 @@
 <?php get_header() ?>
 
-	<div class="content-header">
-	
-	</div>
+	<div class="content-header"><!-- --></div>
 
 	<div id="content">
-	
+
 		<?php do_action( 'template_notices' ) ?>
 
 		<?php do_action( 'bp_before_message_thread_content' ) ?>
-	
+
 		<?php if ( bp_thread_has_messages() ) : ?>
-			
+
 			<h2 id="message-subject"><?php bp_the_thread_subject() ?></h2>
-			
-			<p id="message-recipients">
-				<?php printf( __('Sent between %s and %s', 'buddypress'), bp_get_the_thread_recipients(), '<a href="' . bp_get_loggedin_user_link() . '" title="' . bp_get_loggedin_user_fullname() . '">' . bp_get_loggedin_user_fullname() . '</a>' ) ?>
-			</p>
-			
+
+			<p id="message-recipients"><?php printf( __('Sent between %s and %s', 'buddypress'), bp_get_the_thread_recipients(), '<a href="' . bp_get_loggedin_user_link() . '" title="' . bp_get_loggedin_user_fullname() . '">' . bp_get_loggedin_user_fullname() . '</a>' ) ?></p>
+
 			<?php do_action( 'bp_before_message_thread_list' ) ?>
-			
-			<?php while ( bp_thread_messages() ) : bp_thread_the_message(); ?>
-				
+
+			<?php while ( bp_thread_messages() ) : bp_thread_the_message() ?>
+
 				<div class="message-box<?php bp_the_thread_message_alt_class() ?>">
-					
+
 					<div class="message-metadata">
-						
+
 						<?php do_action( 'bp_before_message_meta' ) ?>
-						
+
 						<?php bp_the_thread_message_sender_avatar( 'type=thumb&width=30&height=30' ) ?>
+
 						<h3><a href="<?php bp_the_thread_message_sender_link() ?>" title="<?php bp_the_thread_message_sender_name() ?>"><?php bp_the_thread_message_sender_name() ?></a></h3>
-						
-						<small>
-							<?php bp_the_thread_message_time_since() ?>
-						</small>
-						
+
+						<small><?php bp_the_thread_message_time_since() ?></small>
+
 						<?php do_action( 'bp_after_message_meta' ) ?>
-					
+
 					</div>
-					
+
 					<?php do_action( 'bp_before_message_content' ) ?>
-					
+
 					<div class="message-content">
-						
+
 						<?php bp_the_thread_message_content() ?>
-					
+
 					</div>
-					
+
 					<?php do_action( 'bp_after_message_content' ) ?>
-	
+
 					<div class="clear"></div>
-					
+
 				</div>
-				
-			<?php endwhile; ?>
-		
+
+			<?php endwhile ?>
+
 			<?php do_action( 'bp_after_message_thread_list' ) ?>
 
 			<?php do_action( 'bp_before_message_thread_reply' ) ?>
-		
+
 			<form id="send-reply" action="<?php bp_messages_form_action() ?>" method="post" class="standard-form">
-		
+
 				<div class="message-box">
-					
+
 					<div class="message-metadata">
-						
-						<?php do_action( 'bp_before_message_meta' ) ?>					
-						
+
+						<?php do_action( 'bp_before_message_meta' ) ?>
+
 						<div class="avatar-box">
-							<?php echo bp_core_fetch_avatar( array( 'item_id' => bp_loggedin_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30 ) ); ?>
 
+							<?php echo bp_core_fetch_avatar( array( 'item_id' => bp_loggedin_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30 ) ) ?>
+
 							<h3><?php _e( 'Reply: ', 'buddypress' ) ?></h3>
+
 						</div>
 
 						<?php do_action( 'bp_after_message_meta' ) ?>
-						
+
 					</div>
-				
+
 					<div class="message-content">
-				
+
 						<?php do_action( 'bp_before_message_reply_box' ) ?>
-					
+
 						<textarea name="content" id="message_content" rows="15" cols="40"></textarea>
 
 						<?php do_action( 'bp_after_message_reply_box' ) ?>
-					
-						<p class="submit">
-							<input type="submit" name="send" value="<?php _e( 'Send Reply', 'buddypress' ) ?> &rarr;" id="send_reply_button"/>
-						</p>
 
-						<input type="hidden" id="thread_id" name="thread_id" value="<?php bp_the_thread_id(); ?>" />
-						<input type="hidden" name="subject" id="subject" value="<?php _e( 'Re: ', 'buddypress' ); echo str_replace( 'Re: ', '', bp_get_the_thread_subject() ); ?>" />
+						<p class="submit"><input type="submit" name="send" value="<?php _e( 'Send Reply &rarr;', 'buddypress' ) ?> " id="send_reply_button"/></p>
+
+						<input type="hidden" id="thread_id" name="thread_id" value="<?php bp_the_thread_id() ?>" />
+
+						<input type="hidden" name="subject" id="subject" value="<?php printf( __( 'Re: %s', 'buddypress' ), str_replace( 'Re: ', '', bp_get_the_thread_subject() ) ) ?>" />
+
 						<?php wp_nonce_field( 'messages_send_message', 'send_message_nonce' ) ?>
-						
+
 					</div>
-					
+
 				</div>
-		
+
 			</form>
-			
+
 			<?php do_action( 'bp_after_message_thread_reply' ) ?>
-		
-		<?php endif; ?>
 
+		<?php endif ?>
+
 		<?php do_action( 'bp_after_message_thread_content' ) ?>
 
 	</div>
Index: bp-themes/bp-sn-parent/optionsbar.php
===================================================================
--- bp-themes/bp-sn-parent/optionsbar.php	(revision 2030)
+++ bp-themes/bp-sn-parent/optionsbar.php	(working copy)
@@ -1,23 +1,23 @@
 <?php do_action( 'bp_before_options_bar' ) ?>
 
 <div id="optionsbar">
-	
+
 	<h3><?php bp_get_options_title() ?></h3>
 
 	<?php do_action( 'bp_inside_before_options_bar' ) ?>
-	
+
 	<?php if ( bp_has_options_avatar() ) : ?>
 
-		<p class="avatar">
-			<?php bp_get_options_avatar() ?>
-		</p>
+		<p class="avatar"><?php bp_get_options_avatar() ?></p>
 
-	<?php endif; ?>
-		
-		<ul id="options-nav">
-			<?php bp_get_options_nav() ?>
-		</ul>
-	
+	<?php endif ?>
+
+	<ul id="options-nav">
+
+		<?php bp_get_options_nav() ?>
+
+	</ul>
+
 	<?php do_action( 'bp_inside_after_options_bar' ) ?>
 
 </div>
Index: bp-themes/bp-sn-parent/page.php
===================================================================
--- bp-themes/bp-sn-parent/page.php	(revision 2030)
+++ bp-themes/bp-sn-parent/page.php	(working copy)
@@ -1,36 +1,37 @@
-<?php get_header(); ?>
+<?php get_header() ?>
 
 	<div id="content" class="narrowcolumn">
 
 		<?php do_action( 'bp_before_blog_page' ) ?>
-	
+
 		<div class="page" id="blog-page">
-			
-			<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
-			
-				<h2 class="pagetitle"><?php the_title(); ?></h2>
 
-				<div class="post" id="post-<?php the_ID(); ?>">
-					
+			<?php if ( have_posts() ) : while ( have_posts() ) : the_post() ?>
+
+				<h2 class="pagetitle"><?php the_title() ?></h2>
+
+				<div <?php post_class() ?> id="post-<?php the_ID() ?>">
+
 					<div class="entry">
-						
-						<?php the_content( __( '<p class="serif">Read the rest of this page &raquo;</p>', 'buddypress' ) ); ?>
 
-						<?php wp_link_pages( array( 'before' => __( '<p><strong>Pages:</strong> ', 'buddypress' ), 'after' => '</p>', 'next_or_number' => 'number')); ?>
-						<?php edit_post_link( __( 'Edit this entry.', 'buddypress' ), '<p>', '</p>'); ?>
-						
+						<?php the_content( '<p class="serif">' . __( 'Read the rest of this page &raquo;', 'buddypress' ) . '</p>' ) ?>
+
+						<?php wp_link_pages( array( 'before' => '<p><strong>' . __( 'Pages:', 'buddypress' ) . '</strong> ', 'after' => '</p>', 'next_or_number' => 'number') ) ?>
+
+						<?php edit_post_link( __( 'Edit this entry.', 'buddypress' ), '<p>', '</p>') ?>
+
 					</div>
-					
+
 				</div>
-				
-			<?php endwhile; endif; ?>
-			
+
+			<?php endwhile; endif ?>
+
 		</div>
 
 		<?php do_action( 'bp_after_blog_page' ) ?>
-	
+
 	</div>
 
-<?php get_sidebar(); ?>
+	<?php get_sidebar() ?>
 
-<?php get_footer(); ?>
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/plugin-template.php
===================================================================
--- bp-themes/bp-sn-parent/plugin-template.php	(revision 2030)
+++ bp-themes/bp-sn-parent/plugin-template.php	(working copy)
@@ -1,13 +1,17 @@
 <?php get_header() ?>
 
 	<div class="content-header">
+
 		<?php do_action('bp_template_content_header') ?>
+
 	</div>
 
 	<div id="content">
+
 		<h2><?php do_action('bp_template_title') ?></h2>
-	
+
 		<?php do_action('bp_template_content') ?>
+
 	</div>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/profile/change-avatar.php
===================================================================
--- bp-themes/bp-sn-parent/profile/change-avatar.php	(revision 2030)
+++ bp-themes/bp-sn-parent/profile/change-avatar.php	(working copy)
@@ -1,62 +1,65 @@
 <?php get_header() ?>
 
-	<div class="content-header">
+	<div class="content-header"><!-- --></div>
 
-	</div>
+	<div id="content">
 
-	<div id="content">
-	
 		<h2><?php _e( 'Change Avatar', 'buddypress' ) ?></h2>
-		
+
 		<?php do_action( 'template_notices' ) ?>
-	
+
 		<?php do_action( 'bp_before_profile_avatar_upload_content' ) ?>
 
 		<p><?php _e( 'Your avatar will be used on your profile and throughout the site. If there is a <a href="http://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'buddypress') ?></p>
-		
+
 		<form action="" method="post" id="avatar-upload-form" enctype="multipart/form-data">	
-			
+
 			<?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
-			
+
 				<h3><?php _e( 'Your Current Avatar', 'buddypress' ) ?></h3>
-		
-				<p id="current-avatar">
-					<?php bp_displayed_user_avatar( 'type=full') ?>
-					<?php bp_displayed_user_avatar( 'type=thumb' ) ?>
-				</p>
-				
+
+				<p id="current-avatar"><?php bp_displayed_user_avatar( 'type=full') ?>
+
+					<?php bp_displayed_user_avatar( 'type=thumb' ) ?></p>
+
 				<?php if ( bp_get_user_has_avatar() ) : ?>
+
 					<div class="generic-button" id="delete-avatar-button">
-						<a class="edit" href="<?php bp_avatar_delete_link() ?>" title="<?php _e( 'Delete Avatar', 'buddypress' ) ?>"><?php _e( 'Delete Avatar', 'buddypress' ) ?></a>
+
+						<a class="edit" href="<?php bp_avatar_delete_link() ?>" title="<?php esc_attr_e( 'Delete Avatar', 'buddypress' ) ?>"><?php _e( 'Delete Avatar', 'buddypress' ) ?></a>
+
 					</div>
-				<?php endif; ?>
-				
+
+				<?php endif ?>
+
 				<h3><?php _e( 'Upload a New Avatar', 'buddypress' ) ?></h3>
 
-				<p><?php _e( 'Click below to select a JPG, GIF or PNG format photo from your computer and then click \'Upload Image\' to proceed.', 'buddypress' ) ?></p>
-				
-				<p id="avatar-upload">
-					<input type="file" name="file" id="file" /> 
-					<input type="submit" name="upload" id="upload" value="<?php _e( 'Upload Image', 'buddypress' ) ?>" />
-					<input type="hidden" name="action" id="action" value="bp_avatar_upload" />
-				</p>
+				<p><?php _e( "Click below to select a JPG, GIF or PNG format photo from your computer and then click 'Upload Image' to proceed.", 'buddypress' ) ?></p>
 
+				<p id="avatar-upload"><input type="file" name="file" id="file" />
+
+					<input type="submit" name="upload" id="upload" value="<?php esc_attr_e( 'Upload Image', 'buddypress' ) ?>" />
+
+					<input type="hidden" name="action" id="action" value="bp_avatar_upload" /></p>
+
 				<?php wp_nonce_field( 'bp_avatar_upload' ) ?>
-				
-			<?php endif; ?>
-			
+
+			<?php endif ?>
+
 			<?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
-			
+
 				<h3><?php _e( 'Crop Your New Avatar', 'buddypress' ) ?></h3>
-				
+
 				<img src="<?php bp_avatar_to_crop() ?>" id="avatar-to-crop" class="avatar" alt="<?php _e( 'Avatar to crop', 'buddypress' ) ?>" />
-				
+
 				<div id="avatar-crop-pane">
-					<img src="<?php bp_avatar_to_crop() ?>" id="avatar-crop-preview" class="avatar" alt="<?php _e( 'Avatar preview', 'buddypress' ) ?>" />
+
+					<img src="<?php bp_avatar_to_crop() ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Avatar preview', 'buddypress' ) ?>" />
+
 				</div>
 
-				<input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php _e( 'Crop Image', 'buddypress' ) ?>" />
-				
+				<input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php esc_attr_e( 'Crop Image', 'buddypress' ) ?>" />
+
 				<input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src() ?>" />
 				<input type="hidden" id="x" name="x" />
 				<input type="hidden" id="y" name="y" />
@@ -64,13 +67,13 @@
 				<input type="hidden" id="h" name="h" />
 
 				<?php wp_nonce_field( 'bp_avatar_cropstore' ) ?>
-				
-			<?php endif; ?>
-			
+
+			<?php endif ?>
+
 		</form>
-		
+
 		<?php do_action( 'bp_after_profile_avatar_upload_content' ) ?>
-		
+
 	</div>
 
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/profile/edit.php
===================================================================
--- bp-themes/bp-sn-parent/profile/edit.php	(revision 2030)
+++ bp-themes/bp-sn-parent/profile/edit.php	(working copy)
@@ -1,125 +1,161 @@
 <?php get_header() ?>
 
 	<div class="content-header">
-	
+
 		<ul class="content-header-nav">
-			<?php bp_profile_group_tabs(); ?>
+
+			<?php bp_profile_group_tabs() ?>
+
 		</ul>
-	
+
 	</div>
 
 	<div id="content">
 
 		<?php do_action( 'template_notices' ) // (error/success feedback) ?>
-	
+
 		<?php do_action( 'bp_before_profile_edit_content' ) ?>
-		
-		<?php if ( bp_has_profile( 'profile_group_id=' . bp_get_current_profile_group_id() ) ) : while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
 
+		<?php if ( bp_has_profile( 'profile_group_id=' . bp_get_current_profile_group_id() ) ) : while ( bp_profile_groups() ) : bp_the_profile_group() ?>
+
 		<form action="<?php bp_the_profile_group_edit_form_action() ?>" method="post" id="profile-edit-form" class="standard-form <?php bp_the_profile_group_slug() ?>">
 
 			<?php do_action( 'bp_before_profile_field_content' ) ?>
-		
-				<h2><?php printf( __( "Editing '%s'", "buddypress" ), bp_get_the_profile_group_name() ); ?></h2>
-			
-				<?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>
-				
+
+				<h2><?php printf( __( "Editing '%s'", 'buddypress' ), bp_get_the_profile_group_name() ) ?></h2>
+
+				<?php while ( bp_profile_fields() ) : bp_the_profile_field() ?>
+
 					<div<?php bp_field_css_class( 'editfield' ) ?>>
-					
+
 						<?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?>
-					
-							<label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+
+							<label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name();
+								if ( bp_get_the_profile_field_is_required() )
+									_e( ' (required)', 'buddypress' ) ?></label>
+
 							<input type="text" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" value="<?php bp_the_profile_field_edit_value() ?>" />
-						
-						<?php endif; ?>
-				
+
+						<?php endif ?>
+
 						<?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?>
-						
-							<label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+
+							<label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name();
+								if ( bp_get_the_profile_field_is_required() )
+									_e( ' (required)', 'buddypress' ) ?></label>
+
 							<textarea rows="5" cols="40" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_edit_value() ?></textarea>
-						
-						<?php endif; ?>
 
+						<?php endif ?>
+
 						<?php if ( 'selectbox' == bp_get_the_profile_field_type() ) : ?>
 					
-							<label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+							<label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name();
+								if ( bp_get_the_profile_field_is_required() )
+									_e( ' (required)', 'buddypress' ) ?></label>
+
 							<select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>">
+
 								<?php bp_the_profile_field_options() ?>
+
 							</select>
-						
-						<?php endif; ?>
 
+						<?php endif ?>
+
 						<?php if ( 'multiselectbox' == bp_get_the_profile_field_type() ) : ?>
-					
-							<label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+
+							<label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name();
+								if ( bp_get_the_profile_field_is_required() )
+									_e( ' (required)', 'buddypress' ) ?></label>
+
 							<select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" multiple="multiple">
+
 								<?php bp_the_profile_field_options() ?>
+
 							</select>
-					
-						<?php endif; ?>
 
+						<?php endif ?>
+
 						<?php if ( 'radio' == bp_get_the_profile_field_type() ) : ?>
-					
+
 							<div class="radio">
-								<span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
-							
+
+								<span class="label"><?php bp_the_profile_field_name();
+									if ( bp_get_the_profile_field_is_required() )
+										_e( ' (required)', 'buddypress' ) ?></span>
+
 								<?php bp_the_profile_field_options() ?>
-							
+
 								<?php if ( !bp_get_the_profile_field_is_required() ) : ?>
 									<a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' ) ?></a>
-								<?php endif; ?>
+								<?php endif ?>
+
 							</div>
-					
-						<?php endif; ?>	
-				
+
+						<?php endif ?>
+
 						<?php if ( 'checkbox' == bp_get_the_profile_field_type() ) : ?>
-					
+
 							<div class="checkbox">
-								<span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
-							
+
+								<span class="label"><?php bp_the_profile_field_name();
+									if ( bp_get_the_profile_field_is_required() )
+										_e( ' (required)', 'buddypress' ) ?></span>
+
 								<?php bp_the_profile_field_options() ?>
-							</div>	
-					
-						<?php endif; ?>					
 
+							</div>
+
+						<?php endif ?>
+
 						<?php if ( 'datebox' == bp_get_the_profile_field_type() ) : ?>
-					
+
 							<div class="datebox">
-								<label for="<?php bp_the_profile_field_input_name() ?>_day"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
-							
+								<label for="<?php bp_the_profile_field_input_name() ?>_day"><?php bp_the_profile_field_name();
+									if ( bp_get_the_profile_field_is_required() )
+										_e( ' (required)', 'buddypress' ) ?></label>
+
 								<select name="<?php bp_the_profile_field_input_name() ?>_day" id="<?php bp_the_profile_field_input_name() ?>_day">
+
 									<?php bp_the_profile_field_options( 'type=day' ) ?>
+
 								</select>
-							
+
 								<select name="<?php bp_the_profile_field_input_name() ?>_month" id="<?php bp_the_profile_field_input_name() ?>_month">
+
 									<?php bp_the_profile_field_options( 'type=month' ) ?>
+
 								</select>
-							
+
 								<select name="<?php bp_the_profile_field_input_name() ?>_year" id="<?php bp_the_profile_field_input_name() ?>_year">
+
 									<?php bp_the_profile_field_options( 'type=year' ) ?>
-								</select>								
+
+								</select>
+
 							</div>
-					
-						<?php endif; ?>	
-					
+
+						<?php endif ?>
+
 						<?php do_action( 'bp_custom_profile_edit_fields' ) ?>
-				
+
 						<p class="description"><?php bp_the_profile_field_description() ?></p>
+
 					</div>
 
-				<?php endwhile; ?>
+				<?php endwhile ?>
 
 			<?php do_action( 'bp_after_profile_field_content' ) ?>
-			
+
 			<input type="submit" name="profile-group-edit-submit" id="profile-group-edit-submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?> " />
-			
+
 			<input type="hidden" name="field_ids" id="field_ids" value="<?php bp_the_profile_group_field_ids() ?>" />
 			<?php wp_nonce_field( 'bp_xprofile_edit' ) ?>
-			
+
 		</form>
-		
-		<?php endwhile; endif; ?>
-		
+
+		<?php endwhile; endif ?>
+
 		<?php do_action( 'bp_after_profile_edit_content' ) ?>
 
 	</div>
Index: bp-themes/bp-sn-parent/profile/index.php
===================================================================
--- bp-themes/bp-sn-parent/profile/index.php	(revision 2030)
+++ bp-themes/bp-sn-parent/profile/index.php	(working copy)
@@ -1,150 +1,193 @@
 <?php get_header() ?>
 
-<div class="content-header">
-	<?php bp_last_activity() ?>
-</div>
+	<div class="content-header">
 
-<div id="content" class="vcard">
+		<?php bp_last_activity() ?>
 
-	<?php do_action( 'template_notices' ) // (error/success feedback) ?>
-
-	<?php do_action( 'bp_before_profile_content' ) ?>
-	
-	<div class="left-menu">
-		<!-- Profile Menu (Avatar, Add Friend, Send Message buttons etc) -->
-		<?php locate_template( array( 'profile/profile-menu.php' ), true ) ?>
 	</div>
 
-	<div class="main-column">
-		<div class="inner-tube">
-						
-			<?php /* Profile Header (Name & Status) */ ?>
-			<?php locate_template( array( 'profile/profile-header.php' ), true ) ?>
-		
-			<?php /* Profile Data Loop */ ?>
-			<?php locate_template( array( 'profile/profile-loop.php' ), true ) ?>
+	<div id="content" class="vcard">
 
-			<?php do_action( 'bp_before_profile_activity_loop' ) ?>
-			
-			<?php /* Latest Activity Loop */ ?>
-			<?php if ( function_exists( 'bp_activity_install')) : ?>
-				
-				<?php do_action( 'bp_before_profile_activity_widget' ) ?>
+		<?php do_action( 'template_notices' ) // (error/success feedback) ?>
 
-				<div class="bp-widget">
-					<h4><?php echo bp_word_or_name( __( "My Latest Activity", 'buddypress' ), __( "%s's Latest Activity", 'buddypress' ), true, false ) ?> <span><a href="<?php echo bp_displayed_user_domain() . BP_ACTIVITY_SLUG ?>"><?php _e( 'See All', 'buddypress' ) ?> &rarr;</a></span></h4>
+		<?php do_action( 'bp_before_profile_content' ) ?>
 
-					<?php if ( bp_has_activities( 'type=personal&max=5' ) ) : ?>
+		<div class="left-menu">
 
-						<div id="activity-rss">
-							<p><a href="<?php bp_activities_member_rss_link() ?>" title="<?php _e( 'RSS Feed', 'buddypress' ) ?>"><?php _e( 'RSS Feed', 'buddypress' ) ?></a></p>
-						</div>
+			<!-- Profile Menu (Avatar, Add Friend, Send Message buttons etc) -->
+			<?php locate_template( array( 'profile/profile-menu.php' ), true ) ?>
 
-						<ul id="activity-list" class="activity-list item-list">
-						<?php while ( bp_activities() ) : bp_the_activity(); ?>
-							<li class="<?php bp_activity_css_class() ?>">
-								<div class="activity-avatar">
-									<?php bp_activity_avatar() ?>
-								</div>
-							
-								<?php bp_activity_content() ?>
-							</li>
-						<?php endwhile; ?>
-						</ul>
+		</div>
 
-					<?php else: ?>
+		<div class="main-column">
 
-						<div id="message" class="info">
-							<p><?php echo bp_word_or_name( __( "You haven't done anything recently.", 'buddypress' ), __( "%s hasn't done anything recently.", 'buddypress' ), true, false ) ?></p>
-						</div>
+			<div class="inner-tube">
 
-					<?php endif;?>
-				</div>
-	
-				<?php do_action( 'bp_after_profile_activity_widget' ) ?>
-			
-			<?php endif; ?>
+				<?php /* Profile Header (Name & Status) */
+				locate_template( array( 'profile/profile-header.php' ), true ) ?>
 
-			<?php do_action( 'bp_after_profile_activity_loop' ) ?>
-			<?php do_action( 'bp_before_profile_random_groups_loop' ) ?>
-		
-			<?php /* Random Groups Loop */ ?>
-			<?php if ( function_exists( 'bp_has_groups' ) ) : ?>
+				<?php /* Profile Data Loop */
+				locate_template( array( 'profile/profile-loop.php' ), true ) ?>
 
-				<?php do_action( 'bp_before_profile_groups_widget' ) ?>
+				<?php do_action( 'bp_before_profile_activity_loop' ) ?>
 
-				<?php if ( bp_has_groups( 'type=random&max=5' ) ) : ?>
-					
+				<?php /* Latest Activity Loop */
+				if ( function_exists( 'bp_activity_install')) : ?>
+
+					<?php do_action( 'bp_before_profile_activity_widget' ) ?>
+
 					<div class="bp-widget">
-						<h4><?php bp_word_or_name( __( "My Groups", 'buddypress' ), __( "%s's Groups", 'buddypress' ) ) ?> (<?php bp_group_total_for_member() ?>) <span><a href="<?php echo bp_displayed_user_domain() . BP_GROUPS_SLUG ?>"><?php _e( 'See All', 'buddypress' ) ?> &rarr;</a></span></h4>
-						
-						<ul class="horiz-gallery">
-						<?php while ( bp_groups() ) : bp_the_group(); ?>
-							<li>
-								<a href="<?php bp_group_permalink() ?>"><?php bp_group_avatar_thumb() ?></a>
-								<h5><a href="<?php bp_group_permalink() ?>"><?php bp_group_name() ?></a></h5>
-							</li>
-						<?php endwhile; ?>
-						</ul>
+
+						<h4><?php echo bp_word_or_name( __( "My Latest Activity", 'buddypress' ), __( "%s's Latest Activity", 'buddypress' ), true, false ) ?>
+
+							<span><a href="<?php echo bp_displayed_user_domain() . BP_ACTIVITY_SLUG ?>"><?php _e( 'See All &rarr;', 'buddypress' ) ?></a></span></h4>
+
+						<?php if ( bp_has_activities( 'type=personal&max=5' ) ) : ?>
+
+							<div id="activity-rss">
+
+								<p><a href="<?php bp_activities_member_rss_link() ?>" title="<?php esc_attr_e( 'RSS Feed', 'buddypress' ) ?>"><?php _e( 'RSS Feed', 'buddypress' ) ?></a></p>
+
+							</div>
+
+							<ul id="activity-list" class="activity-list item-list">
+
+								<?php while ( bp_activities() ) : bp_the_activity(); ?>
+
+									<li class="<?php bp_activity_css_class() ?>">
+
+										<div class="activity-avatar">
+
+											<?php bp_activity_avatar() ?>
+
+										</div>
+
+										<?php bp_activity_content() ?>
+
+									</li>
+
+								<?php endwhile ?>
+
+							</ul>
+
+						<?php else : ?>
+
+							<div id="message" class="info">
+
+								<p><?php echo bp_word_or_name( __( "You haven't done anything recently.", 'buddypress' ), __( "%s hasn't done anything recently.", 'buddypress' ), true, false ) ?></p>
+
+							</div>
+
+						<?php endif ?>
+
 					</div>
 
-					<?php do_action( 'bp_after_profile_groups_widget' ) ?>
-					
-				<?php endif; ?>
-					
-			<?php endif; ?>
-	
-			<?php do_action( 'bp_after_profile_random_groups_loop' ) ?>
-			<?php do_action( 'bp_before_profile_random_friends_loop' ) ?>
-		
-			<?php /* Random Friends Loop */ ?>
-			<?php if ( function_exists( 'bp_has_friendships' ) ) : ?>
+					<?php do_action( 'bp_after_profile_activity_widget' ) ?>
 
-				<?php do_action( 'bp_before_profile_friends_widget' ) ?>
+				<?php endif ?>
 
-				<?php if ( bp_has_friendships( 'type=random&max=5' ) ) : ?>
-					
-					<div class="bp-widget">
-						<h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?> (<?php bp_friend_total_for_member() ?>) <span><a href="<?php echo bp_displayed_user_domain() . BP_FRIENDS_SLUG ?>"><?php _e( 'See All', 'buddypress' ) ?> &rarr;</a></span></h4>
+				<?php do_action( 'bp_after_profile_activity_loop' ) ?>
+				<?php do_action( 'bp_before_profile_random_groups_loop' ) ?>
+
+				<?php /* Random Groups Loop */
+				if ( function_exists( 'bp_has_groups' ) ) : ?>
+
+					<?php do_action( 'bp_before_profile_groups_widget' ) ?>
+
+					<?php if ( bp_has_groups( 'type=random&max=5' ) ) : ?>
+
+						<div class="bp-widget">
+
+							<h4><?php bp_word_or_name( __( "My Groups", 'buddypress' ), __( "%s's Groups", 'buddypress' ) ) ?>
+
+								(<?php bp_group_total_for_member() ?>) <span><a href="<?php echo bp_displayed_user_domain() . BP_GROUPS_SLUG ?>"><?php _e( 'See All &rarr;', 'buddypress' ) ?></a></span></h4>
+
+							<ul class="horiz-gallery">
+
+								<?php while ( bp_groups() ) : bp_the_group() ?>
+
+									<li<?php echo ( $i++ & 1 ? '' : ' class="alt"' ) ?>>
+
+										<a href="<?php bp_group_permalink() ?>"><?php bp_group_avatar_thumb() ?></a>
+
+										<h5><a href="<?php bp_group_permalink() ?>"><?php bp_group_name() ?></a></h5>
+
+									</li>
+
+								<?php endwhile ?>
+
+							</ul>
+
+						</div>
+
+						<?php do_action( 'bp_after_profile_groups_widget' ) ?>
 						
-						<ul class="horiz-gallery">
-						<?php while ( bp_user_friendships() ) : bp_the_friendship(); ?>
-							<li>
-								<a href="<?php bp_friend_url() ?>"><?php bp_friend_avatar_thumb() ?></a>
-								<h5><a href="<?php bp_friend_url() ?>"><?php bp_friend_name() ?></a></h5>
-							</li>
-						<?php endwhile; ?>
-						</ul>	
-					</div>
-					
-				<?php endif; ?>
-		
-				<?php do_action( 'bp_after_profile_friends_widget' ) ?>
-			
-			<?php endif; ?>
-	
-			<?php do_action( 'bp_after_profile_random_friends_loop' ) ?>
-			<?php do_action( 'bp_before_profile_wire_loop' ); /* Deprecated -> */ do_action( 'bp_custom_profile_boxes' ) ?>
+					<?php endif ?>
 
-			<?php /* Profile Wire Loop - uses [TEMPLATEPATH]/wire/post-list.php */ ?>
-			<?php if ( function_exists('bp_wire_get_post_list') && function_exists( 'xprofile_install' ) ) : ?>
+				<?php endif ?>
 
-				<?php do_action( 'bp_before_profile_wire_widget' ) ?>
+				<?php do_action( 'bp_after_profile_random_groups_loop' ) ?>
+				<?php do_action( 'bp_before_profile_random_friends_loop' ) ?>
 
-				<?php bp_wire_get_post_list( bp_current_user_id(), bp_word_or_name( __( "My Wire", 'buddypress' ), __( "%s's Wire", 'buddypress' ), true, false ), bp_word_or_name( __( "No one has posted to your wire yet.", 'buddypress' ), __( "No one has posted to %s's wire yet.", 'buddypress' ), true, false ), bp_profile_wire_can_post() ) ?>
+				<?php /* Random Friends Loop */
+				if ( function_exists( 'bp_has_friendships' ) ) : ?>
 
-				<?php do_action( 'bp_after_profile_wire_widget' ) ?>
+					<?php do_action( 'bp_before_profile_friends_widget' ) ?>
 
-			<?php endif; ?>
+					<?php if ( bp_has_friendships( 'type=random&max=5' ) ) : ?>
 
-			<?php do_action( 'bp_after_profile_wire_loop' ) ?>
-			
+						<div class="bp-widget">
+
+							<h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?>
+
+								(<?php bp_friend_total_for_member() ?>) <span><a href="<?php echo bp_displayed_user_domain() . BP_FRIENDS_SLUG ?>"><?php _e( 'See All &rarr;', 'buddypress' ) ?></a></span></h4>
+
+							<ul class="horiz-gallery">
+
+								<?php while ( bp_user_friendships() ) : bp_the_friendship() ?>
+
+									<li<?php echo ( $j++ & 1 ? '' : ' class="alt"' ) ?>>
+
+										<a href="<?php bp_friend_url() ?>"><?php bp_friend_avatar_thumb() ?></a>
+
+										<h5><a href="<?php bp_friend_url() ?>"><?php bp_friend_name() ?></a></h5>
+
+									</li>
+
+								<?php endwhile ?>
+
+							</ul>
+
+						</div>
+
+					<?php endif ?>
+
+					<?php do_action( 'bp_after_profile_friends_widget' ) ?>
+
+				<?php endif ?>
+
+				<?php do_action( 'bp_after_profile_random_friends_loop' ) ?>
+				<?php do_action( 'bp_before_profile_wire_loop' ); /* Deprecated -> */ do_action( 'bp_custom_profile_boxes' ) ?>
+
+				<?php /* Profile Wire Loop - uses [TEMPLATEPATH]/wire/post-list.php */
+				if ( function_exists('bp_wire_get_post_list') && function_exists( 'xprofile_install' ) ) : ?>
+
+					<?php do_action( 'bp_before_profile_wire_widget' ) ?>
+
+					<?php bp_wire_get_post_list( bp_current_user_id(), bp_word_or_name( __( "My Wire", 'buddypress' ), __( "%s's Wire", 'buddypress' ), true, false ), bp_word_or_name( __( "No one has posted to your wire yet.", 'buddypress' ), __( "No one has posted to %s's wire yet.", 'buddypress' ), true, false ), bp_profile_wire_can_post() ) ?>
+
+					<?php do_action( 'bp_after_profile_wire_widget' ) ?>
+
+				<?php endif ?>
+
+				<?php do_action( 'bp_after_profile_wire_loop' ) ?>
+
+			</div>
+
+		<?php do_action( 'bp_after_profile_content' ) ?>
+
 		</div>
 
-	<?php do_action( 'bp_after_profile_content' ) ?>
-
 	</div>
 
-</div>
-
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/profile/profile-header.php
===================================================================
--- bp-themes/bp-sn-parent/profile/profile-header.php	(revision 2030)
+++ bp-themes/bp-sn-parent/profile/profile-header.php	(working copy)
@@ -1,17 +1,21 @@
-<?php do_action( 'bp_before_profile_header_content' ) ?>
+	<?php do_action( 'bp_before_profile_header_content' ) ?>
 
-<div id="profile-name">
-	<h1 class="fn"><a href="<?php bp_user_link() ?>"><?php bp_user_fullname() ?></a></h1>
-	
-	<?php if ( function_exists( 'bp_the_status' ) ) : ?>
+	<div id="profile-name">
 
-		<div id="user-status" class="<?php bp_the_status_css_class() ?>">
-			<?php bp_the_status() ?>
-		</div>
+		<h1 class="fn"><a href="<?php bp_user_link() ?>"><?php bp_user_fullname() ?></a></h1>
+		
+		<?php if ( function_exists( 'bp_the_status' ) ) : ?>
 
-	<?php endif; ?>
-	
-	<?php do_action( 'bp_profile_header_content' ) ?>
-</div>
+			<div id="user-status" class="<?php bp_the_status_css_class() ?>">
 
-<?php do_action( 'bp_after_profile_header_content' ) ?>
\ No newline at end of file
+				<?php bp_the_status() ?>
+
+			</div>
+
+		<?php endif ?>
+		
+		<?php do_action( 'bp_profile_header_content' ) ?>
+
+	</div>
+
+	<?php do_action( 'bp_after_profile_header_content' ) ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/profile/profile-loop.php
===================================================================
--- bp-themes/bp-sn-parent/profile/profile-loop.php	(revision 2030)
+++ bp-themes/bp-sn-parent/profile/profile-loop.php	(working copy)
@@ -1,64 +1,77 @@
-<?php if ( function_exists('xprofile_get_profile') ) : ?>
-	
-	<?php if ( bp_has_profile() ) : ?>	
-		
-		<?php while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
+	<?php if ( function_exists('xprofile_get_profile') ) : ?>
 
-			<?php if ( bp_profile_group_has_fields() ) : ?>
-				
-				<?php do_action( 'bp_before_profile_field_content' ) ?>
-				
-				<div class="bp-widget <?php bp_the_profile_group_slug() ?>">
-					<h4><?php bp_the_profile_group_name() ?></h4>
-				
-					<table class="profile-fields">
-						<?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>
+		<?php if ( bp_has_profile() ) : while ( bp_profile_groups() ) : bp_the_profile_group() ?>
 
-							<?php if ( bp_field_has_data() ) : ?>
-								<tr<?php bp_field_css_class() ?>>
-								
-									<td class="label">
-										<?php bp_the_profile_field_name() ?>
-									</td>
-									<td class="data">
-										<?php bp_the_profile_field_value() ?>
-									</td>
-									
-								</tr>
-							<?php endif; ?>
-							
-							<?php do_action( 'bp_profile_field_item' ) ?>
+				<?php if ( bp_profile_group_has_fields() ) : ?>
 
-						<?php endwhile; ?>
-					</table>
-				</div>
+					<?php do_action( 'bp_before_profile_field_content' ) ?>
 
-				<?php do_action( 'bp_after_profile_field_content' ) ?>
-				
-			<?php endif; ?>	
-		
-		<?php endwhile; ?>
-	
-		<div class="button-block">
-			<?php if ( bp_is_home() || is_site_admin() ) : ?>
-				
-				<?php bp_edit_profile_button() ?>
-				
-			<?php endif; ?>
-			
-			<?php do_action( 'bp_profile_field_buttons' ) ?>
-		</div>
-	
-	<?php else: ?>
-	
-		<div id="message" class="info">
-			<p><?php _e( 'Sorry, this person does not have a public profile.', 'buddypress' ) ?></p>
-		</div>
-	
-	<?php endif;?>
+					<div class="bp-widget <?php bp_the_profile_group_slug() ?>">
 
-<?php else : ?>
-	
-	<?php bp_core_get_wp_profile() ?>
+						<h4><?php bp_the_profile_group_name() ?></h4>
 
-<?php endif; ?>
+						<table class="profile-fields">
+
+							<?php while ( bp_profile_fields() ) : bp_the_profile_field() ?>
+
+								<?php if ( bp_field_has_data() ) : ?>
+
+									<tr<?php bp_field_css_class() ?>>
+
+										<td class="label">
+
+											<?php bp_the_profile_field_name() ?>
+
+										</td>
+
+										<td class="data">
+
+											<?php bp_the_profile_field_value() ?>
+
+										</td>
+
+									</tr>
+
+								<?php endif ?>
+
+								<?php do_action( 'bp_profile_field_item' ) ?>
+
+							<?php endwhile ?>
+
+						</table>
+
+					</div>
+
+					<?php do_action( 'bp_after_profile_field_content' ) ?>
+
+				<?php endif ?>
+
+			<?php endwhile ?>
+
+			<div class="button-block">
+
+				<?php if ( bp_is_home() || is_site_admin() ) : ?>
+
+					<?php bp_edit_profile_button() ?>
+
+				<?php endif ?>
+
+				<?php do_action( 'bp_profile_field_buttons' ) ?>
+
+			</div>
+
+		<?php else : ?>
+
+			<div id="message" class="info">
+
+				<p><?php _e( 'Sorry, this person does not have a public profile.', 'buddypress' ) ?></p>
+
+			</div>
+
+		<?php endif ?>
+
+	<?php else : ?>
+
+		<?php bp_core_get_wp_profile() ?>
+
+	<?php endif ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/profile/profile-menu.php
===================================================================
--- bp-themes/bp-sn-parent/profile/profile-menu.php	(revision 2030)
+++ bp-themes/bp-sn-parent/profile/profile-menu.php	(working copy)
@@ -1,23 +1,23 @@
-<?php do_action( 'bp_before_profile_menu' ) ?>
+	<?php do_action( 'bp_before_profile_menu' ) ?>
 
-<?php bp_displayed_user_avatar( 'type=full' ) ?>
+	<?php bp_displayed_user_avatar( 'type=full' ) ?>
 
-<div class="button-block">
-	
-	<?php if ( function_exists('bp_add_friend_button') ) : ?>
-		
-		<?php bp_add_friend_button() ?>
-		
-	<?php endif; ?>
-	
-	<?php if ( function_exists('bp_send_message_button') ) : ?>
-		
-		<?php bp_send_message_button() ?>
-		
-	<?php endif; ?>
-	
-	<?php do_action( 'bp_before_profile_menu_buttons' ) ?>
+	<div class="button-block">
 
-</div>
+		<?php if ( function_exists('bp_add_friend_button') ) : ?>
 
-<?php do_action( 'bp_after_profile_menu' ); /* Deprecated -> */ bp_custom_profile_sidebar_boxes(); ?>
+			<?php bp_add_friend_button() ?>
+
+		<?php endif ?>
+
+		<?php if ( function_exists('bp_send_message_button') ) : ?>
+
+			<?php bp_send_message_button() ?>
+
+		<?php endif ?>
+
+		<?php do_action( 'bp_before_profile_menu_buttons' ) ?>
+
+	</div>
+
+	<?php do_action( 'bp_after_profile_menu' ); /* Deprecated -> */ bp_custom_profile_sidebar_boxes() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/registration/activate.php
===================================================================
--- bp-themes/bp-sn-parent/registration/activate.php	(revision 2030)
+++ bp-themes/bp-sn-parent/registration/activate.php	(working copy)
@@ -1,55 +1,53 @@
-<?php get_header(); ?>
+<?php get_header() ?>
 
 	<div id="content">
 
 		<?php do_action( 'bp_before_activation_page' ) ?>
 
 		<div class="page" id="activate-page">
-		
+
 			<div class="register bp_core_widget_welcome">
-			
+
 				<?php do_action( 'template_notices' ) ?>
 
 				<?php if ( bp_account_was_activated() ) : ?>
-		
+
 					<h2 class="widgettitle"><?php _e( 'Account Activated', 'buddypress' ) ?></h2>
-					
+
 					<?php do_action( 'bp_before_activate_content' ) ?>
-	
+
 					<p><?php _e( 'Your account was activated successfully! You can now log in with the username and password you provided when you signed up.', 'buddypress' ) ?></p>
-			
-				
+
 				<?php else : ?>
-				
+
 					<h2 class="widgettitle"><?php _e( 'Activate your Account', 'buddypress' ) ?></h2>
-					
+
 					<?php do_action( 'bp_before_activate_content' ) ?>
-	
+
 					<p><?php _e( 'Please provide a valid activation key.', 'buddypress' ) ?></p>
-					
+
 					<form action="" method="get" class="standard-form" id="activation-form">
-						
+
 						<label for="key"><?php _e( 'Activation Key:', 'buddypress' ) ?></label>
+
 						<input type="text" name="key" id="key" value="" />
-						
-						<p class="submit">
-							<input type="submit" name="submit" value="<?php _e( 'Activate', 'buddypress' ) ?> &rarr;" />
-						</p>
-						
+
+						<p class="submit"><input type="submit" name="submit" value="<?php esc_attr_e( 'Activate &rarr;', 'buddypress' ) ?>" /></p>
+
 					</form>
-					
-				<?php endif; ?>
 
+				<?php endif ?>
+
 				<?php do_action( 'bp_after_activate_content' ) ?>
-			
+
 			</div>
-		
+
 		</div>
 
 		<?php do_action( 'bp_after_activation_page' ) ?>
 
 	</div>
-	
+
 	<?php get_sidebar() ?>
 
-<?php get_footer(); ?>
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/search.php
===================================================================
--- bp-themes/bp-sn-parent/search.php	(revision 2030)
+++ bp-themes/bp-sn-parent/search.php	(working copy)
@@ -1,59 +1,74 @@
-<?php get_header(); ?>
+<?php get_header() ?>
 
 	<div id="content">
 
 		<?php do_action( 'bp_before_blog_search' ) ?>
-		
+
 		<div class="page" id="blog-search">
-			
+
 			<h2 class="pagetitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
 
-			<?php if (have_posts()) : ?>
-		
+			<?php if ( have_posts() ) : ?>
+
 				<h3 class="pagetitle"><?php _e( 'Search Results', 'buddypress' ) ?></h3>
 
 				<div class="navigation">
+
 					<div class="alignleft"><?php next_posts_link( __( '&laquo; Previous Entries', 'buddypress' ) ) ?></div>
 					<div class="alignright"><?php previous_posts_link( __( 'Next Entries &raquo;', 'buddypress' ) ) ?></div>
+
 				</div>
 
-				<?php while (have_posts()) : the_post(); ?>
+				<?php while ( have_posts() ) : the_post() ?>
 
 					<?php do_action( 'bp_before_blog_post' ) ?>
 
-					<div class="post">
-						
-						<h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title(); ?>"><?php the_title(); ?></a></h3>
+					<div <?php post_class( $i++ & 1 ? '' : 'alt' ) ?> id="post-<?php the_ID() ?>">
+
+						<h3><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf( esc_attr__( 'Permanent Link to %s', 'buddypress' ), get_the_title() ) ?>"><?php the_title() ?></a></h3>
+
 						<small><?php the_time('l, F jS, Y') ?></small>
 
-						<p class="postmetadata"><?php _e( 'Posted in', 'buddypress' ) ?> <?php the_category(', ') ?> | <?php edit_post_link( __( 'Edit', 'buddypress' ), '', ' | '); ?>  <?php comments_popup_link( __( 'No Comments &#187;', 'buddypress' ), __( '1 Comment &#187;', 'buddypress' ), __( '% Comments &#187;', 'buddypress' ) ); ?></p>
-					
+						<p class="postmetadata"><?php printf( __( 'Posted in %s', 'buddypress' ), get_the_category_list(',') ) ?>
+
+							<?php _e( '|', 'buddypress' ) ?>
+
+							<?php edit_post_link( __( 'Edit', 'buddypress' ), '', "\n\n" . __( '|', 'buddypress' ) ) ?>
+
+							<?php comments_popup_link(
+								__( 'No Comments &#187;', 'buddypress' ),
+								__( '1 Comment &#187;', 'buddypress' ),
+								__( '% Comments &#187;', 'buddypress' ) ) ?></p>
+
 						<?php do_action( 'bp_blog_post' ) ?>
 
 					</div>
 
 					<?php do_action( 'bp_after_blog_post' ) ?>
 
-				<?php endwhile; ?>
+				<?php endwhile ?>
 
 				<div class="navigation">
+
 					<div class="alignleft"><?php next_posts_link( __( '&laquo; Previous Entries', 'buddypress' ) ) ?></div>
 					<div class="alignright"><?php previous_posts_link( __( 'Next Entries &raquo;', 'buddypress' ) ) ?></div>
+
 				</div>
 
 			<?php else : ?>
 
 				<h2 class="center"><?php _e( 'No posts found. Try a different search?', 'buddypress' ) ?></h2>
+
 				<?php locate_template( array( '/searchform.php'), true ) ?>
 
-			<?php endif; ?>
+			<?php endif ?>
 
 		</div>
-		
+
 		<?php do_action( 'bp_after_blog_search' ) ?>
-		
+
 	</div>
 
-<?php get_sidebar(); ?>
+	<?php get_sidebar() ?>
 
-<?php get_footer(); ?>
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/searchform.php
===================================================================
--- bp-themes/bp-sn-parent/searchform.php	(revision 2030)
+++ bp-themes/bp-sn-parent/searchform.php	(working copy)
@@ -1,10 +1,13 @@
 <?php do_action( 'bp_before_blog_search_form' ) ?>
 
-<form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
-	<input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
+<form method="get" id="searchform" action="<?php bloginfo( 'url' ) ?>/">
+
+	<input type="text" value="<?php the_search_query() ?>" name="s" id="s" />
+
 	<input type="submit" id="searchsubmit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
 
 	<?php do_action( 'bp_blog_search_form' ) ?>
+
 </form>
 
-<?php do_action( 'bp_after_blog_search_form' ) ?>
+<?php do_action( 'bp_after_blog_search_form' ) ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/sidebar.php
===================================================================
--- bp-themes/bp-sn-parent/sidebar.php	(revision 2030)
+++ bp-themes/bp-sn-parent/sidebar.php	(working copy)
@@ -1,18 +1,24 @@
-<?php do_action( 'bp_before_blog_sidebar' ) ?>
+	<?php do_action( 'bp_before_blog_sidebar' ) ?>
 
-<div id="sidebar">
-	<?php do_action( 'bp_inside_before_blog_sidebar' ) ?>
-	
-	<?php if ( !function_exists('dynamic_sidebar')
-	        || !dynamic_sidebar('blog-sidebar') ) : ?>
-	
+	<div id="sidebar">
+
+		<?php do_action( 'bp_inside_before_blog_sidebar' ) ?>
+		
+		<?php if ( !function_exists('dynamic_sidebar')
+			|| !dynamic_sidebar('blog-sidebar') ) : ?>
+
 			<div class="widget-error">
-				<?php _e( 'Please log in and add widgets to this column.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=blog-sidebar"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
+
+				<?php _e( 'Please log in and add widgets to this column.', 'buddypress' ) ?>
+
+				<a href="<?php echo get_option( 'siteurl' ) ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=blog-sidebar"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
+
 			</div>
 
-	<?php endif; ?>
-	
-	<?php do_action( 'bp_inside_after_blog_sidebar' ) ?>
-</div>
+		<?php endif ?>
 
-<?php do_action( 'bp_after_blog_sidebar' ) ?>
+		<?php do_action( 'bp_inside_after_blog_sidebar' ) ?>
+
+	</div>
+
+	<?php do_action( 'bp_after_blog_sidebar' ) ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/single.php
===================================================================
--- bp-themes/bp-sn-parent/single.php	(revision 2030)
+++ bp-themes/bp-sn-parent/single.php	(working copy)
@@ -1,54 +1,56 @@
-<?php get_header(); ?>
+<?php get_header() ?>
 
 	<div id="content">
 
 		<?php do_action( 'bp_before_blog_single_post' ) ?>
 	
 		<div class="page" id="blog-single">
-		
+
 			<h2 class="pagetitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
 
-			<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
-			
-				<div class="item-options">
-				
-					<div class="alignleft"><?php next_posts_link( __( '&laquo; Previous Entries', 'buddypress' ) ) ?></div>
-					<div class="alignright"><?php previous_posts_link( __( 'Next Entries &raquo;', 'buddypress' ) ) ?></div>
-				
-				</div>
+			<?php if ( have_posts() ) : while ( have_posts() ) : the_post() ?>
 
-				<div class="post" id="post-<?php the_ID(); ?>">
+					<div class="item-options">
 
-					<?php do_action( 'bp_before_blog_post' ) ?>
-			
-					<h3><a href="<?php echo get_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent link to', 'buddypress' ) ?> <?php the_title(); ?>"><?php the_title(); ?></a></h3>
+						<div class="alignleft"><?php next_posts_link( __( '&laquo; Previous Entries', 'buddypress' ) ) ?></div>
+						<div class="alignright"><?php previous_posts_link( __( 'Next Entries &raquo;', 'buddypress' ) ) ?></div>
 
-					<div class="entry">
-						
-						<?php the_content( __( '<p class="serif">Read the rest of this entry &raquo;</p>', 'buddypress' ) ); ?>
+					</div>
 
-						<?php wp_link_pages(array('before' => __( '<p><strong>Pages:</strong> ', 'buddypress' ), 'after' => '</p>', 'next_or_number' => 'number')); ?>
+					<div <?php post_class() ?> id="post-<?php the_ID() ?>">
 
+						<?php do_action( 'bp_before_blog_post' ) ?>
+
+						<h3><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf( esc_attr__( 'Permanent Link to %s', 'buddypress' ), get_the_title() ) ?>"><?php the_title() ?></a></h3>
+
+						<div class="entry">
+
+							<?php the_content( '<p class="serif">' . __( 'Read the rest of this entry &raquo;', 'buddypress' ) . '</p>' ) ?>
+
+							<?php wp_link_pages( array( 'before' => '<p><strong>' . __( 'Pages:', 'buddypress' ) . '</strong> ', 'after' => '</p>', 'next_or_number' => 'number' ) ) ?>
+
+						</div>
+
+						<?php do_action( 'bp_after_blog_post' ) ?>
+
 					</div>
 
-					<?php do_action( 'bp_after_blog_post' ) ?>
+					<?php comments_template() ?>
 
-				</div>
+				<?php endwhile ?>
 
-			<?php comments_template(); ?>
+			<?php else : ?>
 
-			<?php endwhile; else: ?>
-
 				<p><?php _e( 'Sorry, no posts matched your criteria.', 'buddypress' ) ?></p>
 
-			<?php endif; ?>
-		
+			<?php endif ?>
+
 		</div>
 
 		<?php do_action( 'bp_after_blog_single_post' ) ?>
 
 	</div>
 
-	<?php get_sidebar(); ?>
+	<?php get_sidebar() ?>
 
-<?php get_footer(); ?>
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/status/post-form.php
===================================================================
--- bp-themes/bp-sn-parent/status/post-form.php	(revision 2030)
+++ bp-themes/bp-sn-parent/status/post-form.php	(working copy)
@@ -1,20 +1,25 @@
-<?php do_action( 'bp_before_status_update_form' ) ?>
+	<?php do_action( 'bp_before_status_update_form' ) ?>
 
-<form action="<?php bp_status_form_action() ?>" id="status-update-form" method="post" class="standard-form">
-	<?php do_action( 'bp_before_status_update_input' ) ?>
+	<form action="<?php bp_status_form_action() ?>" id="status-update-form" method="post" class="standard-form">
 
-	<label for="status-update-input"><?php _e( 'What are you up to?', 'buddypress' ) ?></label>
-	<textarea id="status-update-input" name="status-update-input" tabindex="99"></textarea>
-	
-	<?php do_action( 'bp_after_status_update_input' ) ?>
-	
-	<div id="status-update-buttons">
-		<input type="submit" name="status-update-post" id="status-update-post" tabindex="100" value="<?php _e( 'Update', 'buddypress' ) ?>" />
-		
-		<?php do_action( 'bp_status_update_buttons' ) ?>
-	</div>
-	
-	<?php wp_nonce_field( 'bp_status_add_status', '_wpnonce_add_status' ) ?>
-</form>
+		<?php do_action( 'bp_before_status_update_input' ) ?>
 
-<?php do_action( 'bp_after_status_update_form' ) ?>
+		<label for="status-update-input"><?php _e( 'What are you up to?', 'buddypress' ) ?></label>
+
+		<textarea id="status-update-input" name="status-update-input" tabindex="99"></textarea>
+
+		<?php do_action( 'bp_after_status_update_input' ) ?>
+
+		<div id="status-update-buttons">
+
+			<input type="submit" name="status-update-post" id="status-update-post" tabindex="100" value="<?php esc_attr_e( 'Update', 'buddypress' ) ?>" />
+
+			<?php do_action( 'bp_status_update_buttons' ) ?>
+
+		</div>
+
+		<?php wp_nonce_field( 'bp_status_add_status', '_wpnonce_add_status' ) ?>
+
+	</form>
+
+	<?php do_action( 'bp_after_status_update_form' ) ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/userbar.php
===================================================================
--- bp-themes/bp-sn-parent/userbar.php	(revision 2030)
+++ bp-themes/bp-sn-parent/userbar.php	(working copy)
@@ -1,49 +1,51 @@
-<?php do_action( 'bp_before_user_bar' ) ?>
+	<?php do_action( 'bp_before_user_bar' ) ?>
 
-<div id="userbar">
-	<h3><?php _e( 'Me', 'buddypress' ) ?></h3>
+	<div id="userbar">
 
-	<?php do_action( 'bp_inside_before_user_bar' ) ?>
-	
-	<?php if ( is_user_logged_in() ) : ?>
-		
-		<p class="avatar">
-			<?php bp_loggedin_user_avatar( 'type=thumb' ) ?>
-		</p>
-		
-		<ul id="bp-nav">
-			<?php bp_get_loggedin_user_nav() ?>
-		</ul>
-		
-	<?php else : ?>
-		
-		<p class="avatar">
-			<img src="<?php echo get_template_directory_uri() . '/_inc/images/mystery-man.jpg' ?>" alt="No User" width="50" height="50" />
-		</p>
-		
-		<p id="login-text"><?php _e( 'You must log in to access your account.', 'buddypress' ) ?></p>
-	
-		<form name="userbar_loginform" id="userbar_loginform" action="<?php echo site_url( 'wp-login.php', 'login' ) ?>" method="post">
-			<p>
-				<label><?php _e( 'Username', 'buddypress' ) ?><br />
-				<input type="text" name="log" id="userbar_user_login" class="input" value="<?php echo attribute_escape(stripslashes($user_login)); ?>" /></label>
-			</p>
-			<p>
-				<label><?php _e( 'Password', 'buddypress' ) ?><br />
-				<input type="password" name="pwd" id="userbar_user_pass" class="input" value="" /></label>
-			</p>
-			<p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="userbar_rememberme" value="forever" /> <?php _e( 'Remember Me', 'buddypress' ) ?></label></p>
-			<p class="submit">
-				<input type="submit" name="wp-submit" id="userbar_wp-submit" value="<?php _e('Log In'); ?>" tabindex="100" />
-				<input type="hidden" name="redirect_to" value="<?php echo bp_root_domain() ?>" />
-				<input type="hidden" name="testcookie" value="1" />
-			</p>
-		</form>
-	
-	<?php endif ?>
-	
-	<?php do_action( 'bp_inside_after_user_bar' ) ?>
+		<h3><?php _e( 'Me', 'buddypress' ) ?></h3>
 
-</div>
+		<?php do_action( 'bp_inside_before_user_bar' ) ?>
 
-<?php do_action( 'bp_after_user_bar' ) ?>
+		<?php if ( is_user_logged_in() ) : ?>
+
+			<p class="avatar"><?php bp_loggedin_user_avatar( 'type=thumb' ) ?></p>
+
+			<ul id="bp-nav">
+
+				<?php bp_get_loggedin_user_nav() ?>
+
+			</ul>
+
+		<?php else : ?>
+
+			<p class="avatar"><img src="<?php echo get_template_directory_uri() ?>/_inc/images/mystery-man.jpg" alt="<?php esc_attr_e( 'No User', 'buddypress' ) ?>" width="50" height="50" /></p>
+
+			<p id="login-text"><?php _e( 'You must log in to access your account.', 'buddypress' ) ?></p>
+
+			<form name="userbar_loginform" id="userbar_loginform" action="<?php echo site_url( 'wp-login.php', 'login' ) ?>" method="post">
+
+				<p><label><?php _e( 'Username', 'buddypress' ) ?>
+					<br />
+					<input type="text" name="log" id="userbar_user_login" class="input" value="<?php echo esc_attr( stripslashes( $user_login ) ) ?>" /></label></p>
+
+				<p><label><?php _e( 'Password', 'buddypress' ) ?>
+					<br />
+					<input type="password" name="pwd" id="userbar_user_pass" class="input" value="" /></label></p>
+
+				<p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="userbar_rememberme" value="forever" /> <?php _e( 'Remember Me', 'buddypress' ) ?></label></p>
+
+				<p class="submit"><input type="submit" name="wp-submit" id="userbar_wp-submit" value="<?php _e( 'Log In', 'buddypress' ) ?>" tabindex="100" />
+
+					<input type="hidden" name="redirect_to" value="<?php echo bp_root_domain() ?>" />
+
+					<input type="hidden" name="testcookie" value="1" /></p>
+
+			</form>
+
+		<?php endif ?>
+
+		<?php do_action( 'bp_inside_after_user_bar' ) ?>
+
+	</div>
+
+	<?php do_action( 'bp_after_user_bar' ) ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/wire/latest.php
===================================================================
--- bp-themes/bp-sn-parent/wire/latest.php	(revision 2030)
+++ bp-themes/bp-sn-parent/wire/latest.php	(working copy)
@@ -1,26 +1,35 @@
 <?php get_header() ?>
 
-	<div class="content-header">
+	<div class="content-header"><!-- --></div>
 
-	</div>
+	<div id="content">
 
-	<div id="content">
 		<?php do_action( 'template_notices' ) // (error/success feedback) ?>
 
 		<?php do_action( 'bp_before_profile_wire_latest_content' ) ?>
-	
+
 		<div class="left-menu">
+
 			<!-- Profile Menu (Avatar, Add Friend, Send Message buttons etc) -->
 			<?php locate_template( array( 'profile/profile-menu.php' ), true ) ?>
+
 		</div>
 
 		<div class="main-column">
+
 			<!-- Profile Header (Name & Status) -->
 			<?php locate_template( array( 'profile/profile-header.php' ), true ) ?>
-					
+
 			<?php if ( function_exists('bp_wire_get_post_list') ) : ?>
-				<?php bp_wire_get_post_list( bp_current_user_id(), bp_word_or_name( __( "Your Wire", 'buddypress' ), __( "%s's Wire", 'buddypress' ), true, false ), bp_word_or_name( __( "No one has posted to your wire yet.", 'buddypress' ), __( "No one has posted to %s's wire yet.", 'buddypress' ), true, false ), bp_profile_wire_can_post() ) ?>
-			<?php endif; ?>
+
+				<?php bp_wire_get_post_list(
+					bp_current_user_id(),
+					bp_word_or_name( __( "Your Wire", 'buddypress' ), __( "%s's Wire", 'buddypress' ), true, false ),
+					bp_word_or_name( __( "No one has posted to your wire yet.", 'buddypress' ), __( "No one has posted to %s's wire yet.", 'buddypress' ), true, false ),
+					bp_profile_wire_can_post() ) ?>
+
+			<?php endif ?>
+
 		</div>
 
 		<?php do_action( 'bp_after_profile_wire_latest_content' ) ?>
Index: bp-themes/bp-sn-parent/wire/post-form.php
===================================================================
--- bp-themes/bp-sn-parent/wire/post-form.php	(revision 2030)
+++ bp-themes/bp-sn-parent/wire/post-form.php	(working copy)
@@ -1,49 +1,51 @@
-<?php do_action( 'bp_before_wire_post_content' ) ?>
+	<?php do_action( 'bp_before_wire_post_content' ) ?>
 
-<div id="wire-post-new">
-	
-	<form action="<?php bp_wire_get_action() ?>" id="wire-post-new-form" method="post">
+	<div id="wire-post-new">
 
-		<div id="wire-post-new-avatar">
-			
-			<?php do_action( 'bp_before_wire_post_avatar' ) ?>
-			
-			<?php bp_wire_poster_avatar() ?>
-			
-			<?php do_action( 'bp_before_wire_post_avatar' ) ?>
-		
-		</div>
-		
-		<div id="wire-post-new-metadata">
-			
-			<?php do_action( 'bp_before_wire_post_metadata' ) ?>
-			
-			<span id="wire-by-text"><?php printf ( __( 'On %1$s %2$s said:', "buddypress" ), bp_wire_poster_date( null, false ), bp_wire_poster_name( false ) ) ?></span>
-			
-			<?php if ( bp_wire_show_email_notify() ) : ?>
-				<span id="wire-email-notify"><input type="checkbox" name="wire-post-email-notify" id="wire-post-email-notify" value="1" /> <?php _e( 'Notify members via email (will slow down posting)', 'buddypress' ) ?></span>
-			<?php endif; ?>
-			
-			<?php do_action( 'bp_after_wire_post_metadata' ) ?>
-			
-		</div>
-	
-		<div id="wire-post-new-input">
-			
-			<?php do_action( 'bp_before_wire_post_form' ); /* Deprecated -> */ do_action( 'bp_wire_custom_wire_boxes_after' ); ?>
-			
-			<textarea name="wire-post-textarea" id="wire-post-textarea" onfocus="if (this.value == '<?php _e( 'Start writing a short message...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Start writing a short message...', 'buddypress' ) ?>';}"><?php _e( 'Start writing a short message...', 'buddypress' ) ?></textarea>
-			
-			<?php do_action( 'bp_after_wire_post_form' ); /* Deprecated -> */ do_action( 'bp_wire_custom_wire_boxes_after' ); ?>
-			
-			<input type="submit" name="wire-post-submit" id="wire-post-submit" value="<?php _e( 'Post &raquo;', 'buddypress' ) ?>" />
-			<input type="hidden" name="bp_wire_item_id" id="bp_wire_item_id" value="<?php echo bp_get_wire_item_id() ?>" />
+		<form action="<?php bp_wire_get_action() ?>" id="wire-post-new-form" method="post">
 
-			<?php wp_nonce_field( 'bp_wire_post' ) ?>
-			
-		</div>
-	</form>
-	
-</div>
+			<div id="wire-post-new-avatar">
 
-<?php do_action( 'bp_after_wire_post_content' ) ?>
\ No newline at end of file
+				<?php do_action( 'bp_before_wire_post_avatar' ) ?>
+
+				<?php bp_wire_poster_avatar() ?>
+
+				<?php do_action( 'bp_before_wire_post_avatar' ) ?>
+
+			</div>
+
+			<div id="wire-post-new-metadata">
+
+				<?php do_action( 'bp_before_wire_post_metadata' ) ?>
+
+				<span id="wire-by-text"><?php printf ( __( 'On %1$s %2$s said:', "buddypress" ), bp_wire_poster_date( null, false ), bp_wire_poster_name( false ) ) ?></span>
+
+				<?php if ( bp_wire_show_email_notify() ) : ?>
+
+					<span id="wire-email-notify"><input type="checkbox" name="wire-post-email-notify" id="wire-post-email-notify" value="1" /> <?php _e( 'Notify members via email (will slow down posting)', 'buddypress' ) ?></span>
+
+				<?php endif ?>
+
+				<?php do_action( 'bp_after_wire_post_metadata' ) ?>
+
+			</div>
+
+			<div id="wire-post-new-input">
+
+				<?php do_action( 'bp_before_wire_post_form' ); /* Deprecated -> */ do_action( 'bp_wire_custom_wire_boxes_after' ) ?>
+
+				<textarea name="wire-post-textarea" id="wire-post-textarea" onfocus="if (this.value == '<?php _e( 'Start writing a short message&#8230;', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Start writing a short message&#8230;', 'buddypress' ) ?>';}"><?php _e( 'Start writing a short message&#8230;', 'buddypress' ) ?></textarea>
+
+				<?php do_action( 'bp_after_wire_post_form' ); /* Deprecated -> */ do_action( 'bp_wire_custom_wire_boxes_after' ) ?>
+
+				<input type="submit" name="wire-post-submit" id="wire-post-submit" value="<?php esc_attr_e( 'Post &raquo;', 'buddypress' ) ?>" />
+				<input type="hidden" name="bp_wire_item_id" id="bp_wire_item_id" value="<?php echo bp_get_wire_item_id() ?>" />
+
+				<?php wp_nonce_field( 'bp_wire_post' ) ?>
+
+			</div>
+		</form>
+
+	</div>
+
+	<?php do_action( 'bp_after_wire_post_content' ) ?>
\ No newline at end of file
Index: bp-themes/bp-sn-parent/wire/post-list.php
===================================================================
--- bp-themes/bp-sn-parent/wire/post-list.php	(revision 2030)
+++ bp-themes/bp-sn-parent/wire/post-list.php	(working copy)
@@ -1,76 +1,100 @@
-<?php do_action( 'bp_before_wire_post_list_content' ) ?>
+	<?php do_action( 'bp_before_wire_post_list_content' ) ?>
 
-<div class="bp-widget">
-	<h4><?php bp_wire_title() ?> <span><a href="<?php bp_wire_see_all_link() ?>"><?php _e( "See All", "buddypress" ) ?> &rarr;</a></span></h4>
+	<div class="bp-widget">
 
-	<?php do_action( 'bp_before_wire_post_list_form' ) ?>
-	
-	<?php if ( bp_has_wire_posts( 'item_id=' . bp_get_wire_item_id() . '&can_post=' . bp_wire_can_post() ) ) : ?>
-		
-		<?php bp_wire_get_post_form() ?>	
+		<h4><?php bp_wire_title() ?>
 
-	<div id="wire-post-list-content">
+			<span><a href="<?php bp_wire_see_all_link() ?>"><?php _e( 'See All &rarr;', 'buddypress' ) ?></a></span></h4>
 
-		<?php if ( bp_wire_needs_pagination() ) : ?>
-			<div class="pagination">
+		<?php do_action( 'bp_before_wire_post_list_form' ) ?>
 
-				<div id="wire-count" class="pag-count">
-					<?php bp_wire_pagination_count() ?> &nbsp;
-					<span class="ajax-loader"></span>
-				</div>
-		
-				<div id="wire-pagination" class="pagination-links">
-					<?php bp_wire_pagination() ?>
-				</div>
+		<?php if ( bp_has_wire_posts( 'item_id=' . bp_get_wire_item_id() . '&can_post=' . bp_wire_can_post() ) ) : ?>
 
-			</div>
-		<?php endif; ?>
+			<?php bp_wire_get_post_form() ?>
 
-		<?php do_action( 'bp_before_wire_post_list' ) ?>
-				
-		<ul id="wire-post-list" class="item-list">
-		<?php while ( bp_wire_posts() ) : bp_the_wire_post(); ?>
-			
-			<li>
-				<?php do_action( 'bp_before_wire_post_list_metadata' ) ?>
-				
-				<div class="wire-post-metadata">
-					<?php bp_wire_post_author_avatar() ?>
-					<?php printf ( __( 'On %1$s %2$s said:', "buddypress" ), bp_get_wire_post_date(), bp_get_wire_post_author_name() ) ?>
-					<?php bp_wire_delete_link() ?>
-					
-					<?php do_action( 'bp_wire_post_list_metadata' ) ?>
-				</div>
-				
-				<?php do_action( 'bp_after_wire_post_list_metadata' ) ?>
-				<?php do_action( 'bp_before_wire_post_list_item' ) ?>
-				
-				<div class="wire-post-content">
-					<?php bp_wire_post_content() ?>
-					
-					<?php do_action( 'bp_wire_post_list_item' ) ?>
-				</div>
-				
-				<?php do_action( 'bp_after_wire_post_list_item' ) ?>
-			</li>
-			
-		<?php endwhile; ?>
-		</ul>
-		
-		<?php do_action( 'bp_after_wire_post_list' ) ?>
-	
-	</div>
-	<?php else: ?>
+			<div id="wire-post-list-content">
 
-		<div id="message" class="info">
-			<p><?php bp_wire_no_posts_message() ?></p>
+				<?php if ( bp_wire_needs_pagination() ) : ?>
+
+					<div class="pagination">
+
+						<div id="wire-count" class="pag-count">
+
+							<?php bp_wire_pagination_count() ?> &nbsp;
+
+							<span class="ajax-loader"></span>
+
+						</div>
+
+						<div id="wire-pagination" class="pagination-links">
+
+							<?php bp_wire_pagination() ?>
+
+						</div>
+
+					</div>
+
+				<?php endif ?>
+
+			<?php do_action( 'bp_before_wire_post_list' ) ?>
+
+			<ul id="wire-post-list" class="item-list">
+
+				<?php while ( bp_wire_posts() ) : bp_the_wire_post() ?>
+
+					<li<?php echo ( $i++ & 1 ? '' : ' class="alt"' ) ?>>
+
+						<?php do_action( 'bp_before_wire_post_list_metadata' ) ?>
+
+						<div class="wire-post-metadata">
+
+							<?php bp_wire_post_author_avatar() ?>
+
+							<?php printf ( __( 'On %1$s %2$s said:', 'buddypress' ), bp_get_wire_post_date(), bp_get_wire_post_author_name() ) ?>
+
+							<?php bp_wire_delete_link() ?>
+
+							<?php do_action( 'bp_wire_post_list_metadata' ) ?>
+
+						</div>
+
+						<?php do_action( 'bp_after_wire_post_list_metadata' ) ?>
+						<?php do_action( 'bp_before_wire_post_list_item' ) ?>
+
+						<div class="wire-post-content">
+
+							<?php bp_wire_post_content() ?>
+
+							<?php do_action( 'bp_wire_post_list_item' ) ?>
+
+						</div>
+
+						<?php do_action( 'bp_after_wire_post_list_item' ) ?>
+
+					</li>
+
+				<?php endwhile ?>
+
+			</ul>
+
+			<?php do_action( 'bp_after_wire_post_list' ) ?>
+
 		</div>
 
-	<?php endif;?>
-	
-	<?php do_action( 'bp_after_wire_post_list_form' ) ?>
+		<?php else : ?>
 
-	<?php bp_wire_get_post_form() ?>		
-</div>
+			<div id="message" class="info">
 
-<?php do_action( 'bp_after_wire_post_list_content' ) ?>
+				<p><?php bp_wire_no_posts_message() ?></p>
+
+			</div>
+
+		<?php endif ?>
+
+		<?php do_action( 'bp_after_wire_post_list_form' ) ?>
+
+		<?php bp_wire_get_post_form() ?>
+
+	</div>
+
+	<?php do_action( 'bp_after_wire_post_list_content' ) ?>
\ No newline at end of file
