Index: bp-themes/bp-default/searchform.php
===================================================================
--- bp-themes/bp-default/searchform.php	(revision 4581)
+++ bp-themes/bp-default/searchform.php	(working copy)
@@ -1,10 +1,8 @@
-<?php do_action( 'bp_before_blog_search_form' ) ?>
-
-<form role="search" method="get" id="searchform" action="<?php echo home_url() ?>/">
+<div id="searchform">
+<form id="search">
 	<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' ) ?>
+	<span class="ajax-loader"></span>
 </form>
 
-<?php do_action( 'bp_after_blog_search_form' ) ?>
+</div>
\ No newline at end of file
Index: bp-themes/bp-default/search.php
===================================================================
--- bp-themes/bp-default/search.php	(revision 4581)
+++ bp-themes/bp-default/search.php	(working copy)
@@ -1,65 +1,19 @@
 <?php get_header() ?>
-
 	<div id="content">
 		<div class="padder">
-
-		<?php do_action( 'bp_before_blog_search' ) ?>
-
-		<div class="page" id="blog-search" role="main">
-
-			<h2 class="pagetitle"><?php _e( 'Site', 'buddypress' ) ?></h2>
-
-			<?php if (have_posts()) : ?>
-
-				<h3 class="pagetitle"><?php _e( 'Search Results', 'buddypress' ) ?></h3>
-
-				<?php bp_dtheme_content_nav( 'nav-above' ); ?>
-
-				<?php while (have_posts()) : the_post(); ?>
-
-					<?php do_action( 'bp_before_blog_post' ) ?>
-
-					<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-
-						<div class="author-box">
-							<?php echo get_avatar( get_the_author_meta( 'email' ), '50' ); ?>
-							<p><?php printf( _x( 'by %s', 'Post written by...', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></p>
-						</div>
-
-						<div class="post-content">
-							<h2 class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
-
-							<p class="date"><?php printf( __( '%1$s <span>in %2$s</span>', 'buddypress' ), get_the_date(), get_the_category_list( ', ' ) ); ?></p>
-
-							<div class="entry">
-								<?php the_content( __( 'Read the rest of this entry &rarr;', 'buddypress' ) ); ?>
-							</div>
-
-							<p class="postmetadata"><?php the_tags( '<span class="tags">' . __( 'Tags: ', 'buddypress' ), ', ', '</span>' ); ?> <span class="comments"><?php comments_popup_link( __( 'No Comments &#187;', 'buddypress' ), __( '1 Comment &#187;', 'buddypress' ), __( '% Comments &#187;', 'buddypress' ) ); ?></span></p>
-						</div>
-
-					</div>
-
-					<?php do_action( 'bp_after_blog_post' ) ?>
-
-				<?php endwhile; ?>
-
-				<?php bp_dtheme_content_nav( 'nav-below' ); ?>
-
-			<?php else : ?>
-
-				<h2 class="center"><?php _e( 'No posts found. Try a different search?', 'buddypress' ) ?></h2>
-				<?php get_search_form() ?>
-
-			<?php endif; ?>
-
-		</div>
-
-		<?php do_action( 'bp_after_blog_search' ) ?>
-
+				<?php do_action( 'bp_before_blog_search' ) ?>
+			<h2 class="pagetitle"><?php _e( 'Search', 'buddypress' ) ?></h2>
+				<?php locate_template( array( 'searchform.php'), true ) ?>
+		
+			<div id="search-content">
+			<div id="search-loop">
+			<div id="search-tab"></div>
+				<?php locate_template( array( 'search-loop.php' ), true ) ?>
+			</div>
+			</div>
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar() ?>
+	<?php locate_template( array( 'sidebar.php' ), true ) ?>
 
 <?php get_footer() ?>
Index: bp-themes/bp-default/search-loop.php
===================================================================
--- bp-themes/bp-default/search-loop.php	(revision 0)
+++ bp-themes/bp-default/search-loop.php	(revision 0)
@@ -0,0 +1,189 @@
+
+<div id="search-loop-results">
+<?php $searchVar = $_GET["s"]; ?>
+
+<!-- ********************* blog search loop ********************* -->
+<div id="search-section">
+	<div id="search-left-column">
+	<h3>Blog Posts</h3>
+	</div>
+		
+	<div id="search-right-column">
+			<?php if (have_posts()) : ?>
+
+				<?php while (have_posts()) : the_post(); ?>
+
+					<div class="search-post" id="post-<?php the_ID(); ?>">
+
+						<div class="search-author-box">
+							<?php echo get_avatar( get_the_author_meta( 'email' ), '25' ); ?>
+						</div>
+
+						<div class="search-post-content">
+							<h4 class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h4>
+
+							<div class="search-entry">
+								<?php the_excerpt( __( 'Read the rest of this entry &rarr;', 'buddypress' ) ); ?>
+							</div>
+						</div>
+
+					</div>
+
+				<?php endwhile; ?>
+
+			<?php else : ?>
+
+
+				<div id="message" class="info">
+				<p><?php _e( 'No posts found. Try a different search?', 'buddypress' ) ?></p>
+				</div>
+
+			<?php endif; ?>
+	</div>
+</div>
+
+<!-- ********************* forum search loop ********************* -->
+<div id="search-section">
+<div id="search-left-column">
+<h3>Forum Topics</h3>
+</div>
+
+<div id="search-right-column">
+<?php if ( bp_has_forum_topics( array( 'search_terms' => $searchVar ) )) : ?>
+
+	<table class="forumsearch">
+
+		<tr>
+			<th id="th-title"><?php _e( 'Topic Title', 'buddypress' ) ?></th>
+			<th id="th-poster"><?php _e( 'Latest Poster', 'buddypress' ) ?></th>
+
+			<?php if ( !bp_is_group_forum() ) : ?>
+				<th id="th-group"><?php _e( 'Posted In Group', 'buddypress' ) ?></th>
+			<?php endif; ?>
+		</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>
+
+			<?php if ( !bp_is_group_forum() ) : ?>
+				<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>
+			<?php endif; ?>
+		</tr>
+
+		<?php endwhile; ?>
+
+	</table>
+
+<?php else: ?>
+
+	<div id="message" class="info">
+		<p><?php _e( 'Sorry, no forum topics were found.', 'buddypress' ) ?></p>
+	</div>
+
+<?php endif;?>
+
+</div>
+</div>
+<!-- ********************* members search loop ********************* -->
+<div id="search-section">
+<div id="search-left-column">
+<h3>Members</h3>
+</div>
+
+<div id="search-right-column">
+<?php if ( bp_has_members( array( 'search_terms' => $searchVar ) )) : ?>
+
+
+	<ul id="members-list-search" class="item-list">
+	<?php while ( bp_members() ) : bp_the_member(); ?>
+
+		<li>
+			<div class="item-avatar">
+				<a href="<?php bp_member_permalink() ?>"><?php bp_member_avatar('type=thumb&width=25&height=25') ?></a>
+			</div>
+
+			<div class="item">
+				<div class="item-title">
+					<a href="<?php bp_member_permalink() ?>"><?php bp_member_name() ?></a>
+				</div>
+			</div>
+			<div class="action">
+				<?php do_action( 'bp_directory_members_actions' ) ?>
+			</div>
+			<div class="clear"></div>
+		</li>
+
+	<?php endwhile; ?>
+	</ul>
+
+	<?php bp_member_hidden_fields() ?>
+
+<?php else: ?>
+
+	<div id="message" class="info">
+		<p><?php _e( "Sorry, no members were found.", 'buddypress' ) ?></p>
+	</div>
+
+<?php endif; ?>
+</div>
+</div>
+
+<!-- ********************* group search loop ********************* -->
+<div id="search-section">
+<div id="search-left-column">
+<h3>Groups</h3>
+</div>
+
+<div id="search-right-column">
+<?php if ( bp_has_groups( array( 'search_terms' => $searchVar ) )) : ?>
+
+
+	<ul id="group-list-search" class="item-list">
+	<?php while ( bp_groups() ) : bp_the_group(); ?>
+
+		<li>
+			<div class="item-avatar">
+				<a href="<?php bp_group_permalink() ?>"><?php bp_group_avatar('type=thumb&width=25&height=25') ?></a>
+			</div>
+
+			<div class="item">
+				<div class="item-title">
+					<a href="<?php bp_group_permalink() ?>"><?php bp_group_name() ?></a>
+				</div>
+			</div>
+			<div class="action">
+				<?php do_action( 'bp_directory_group_actions' ) ?>
+			</div>
+			<div class="clear"></div>
+		</li>
+
+	<?php endwhile; ?>
+	</ul>
+
+	<?php bp_member_hidden_fields() ?>
+
+<?php else: ?>
+
+	<div id="message" class="info">
+		<p><?php _e( "Sorry, no groups were found.", 'buddypress' ) ?></p>
+	</div>
+
+<?php endif; ?>
+</div>
+</div>
+
+
+</div>
\ No newline at end of file
Index: bp-themes/bp-default/_inc/css/default.css
===================================================================
--- bp-themes/bp-default/_inc/css/default.css	(revision 4581)
+++ bp-themes/bp-default/_inc/css/default.css	(working copy)
@@ -22,6 +22,7 @@
 	5.3 - Gallery
 	5.4 - Images
 	5.5 - Posts
+	5.6 - Search
 6.0 - BuddyPress
 	6.1 - Activity
 		6.1.1 - Activity Listing
@@ -1061,6 +1062,77 @@
 
 
 /*--------------------------------------------------------------
+5.6 - Search
+--------------------------------------------------------------*/
+#search-content {
+	background: #f7f7f7;
+	border: 1px solid #ececec;
+	-moz-border-radius: 7px;
+	-webkit-border-radius: 7px;
+	border-radius: 7px;
+	margin: 20px 0 20px;
+	padding: 0 10px;
+	position: relative;
+	width: 650px;
+}
+#search-tab {
+	background: url(../images/search.png) no-repeat 20px top;
+	height: 16px;
+	margin-top: -16px;
+}
+#search-loop {
+	min-height: 75px;
+}
+#search-left-column h3 {
+	color: #707070;
+	font-size: 16px;
+}
+#search-left-column {
+	float: left;
+	padding: 10px 10px 0 0;
+	text-align: right;
+	width: 20%;
+}
+#search-right-column {
+	border-left: 1px solid #e1e3e3;
+	float: left;
+	padding: 10px 0 42px 10px;
+	width: 76%;
+}
+#search-section {
+	display: inline-block;
+	width: 100%;
+}
+input#s {
+	border: 1px inset #c3c5c5;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	color: #696a6a;
+	font-size: 20px;
+	height: 30px;
+	width: 300px;
+}
+input#searchsubmit {
+	background-position: 0 bottom;
+	height: 35px;
+}
+div.search-post-content h4.posttitle {
+	font-size: 14px;
+	margin: 10px 0 10px 35px;
+}
+div.search-entry {
+	margin: 0 0 10px 35px;
+}
+div.search-post-content {
+	border-bottom: 1px solid #eaeaea;
+}
+#search-section ul.item-list li {
+	padding-bottom: 0;
+}
+
+
+/*--------------------------------------------------------------
 6.0 - BuddyPress
 --------------------------------------------------------------*/
 /*--------------------------------------------------------------
Index: bp-themes/bp-default/_inc/global.js
===================================================================
--- bp-themes/bp-default/_inc/global.js	(revision 4581)
+++ bp-themes/bp-default/_inc/global.js	(working copy)
@@ -1067,6 +1067,18 @@
 			jq.cookie('bp-' + objects[i] + '-extras', null, {path: '/'} );
 		});
 	});
+
+	/* search template */
+	jq("#searchsubmit").click(function(e) {
+		e.preventDefault();
+		jq('form#search span.ajax-loader').show();
+
+		jq("#search-loop-results").load("/?s=" + escape(jq("#s").val()) + " #search-loop-results", function(response, status, xhr) {
+			if (status == "success") {
+				jq('span.ajax-loader').hide();
+			}
+		});
+	});
 });
 
 /* Setup activity scope and filter based on the current cookie settings. */