Index: bp-themes/bp-default/_inc/css/default.css
===================================================================
--- bp-themes/bp-default/_inc/css/default.css	(revision 3634)
+++ bp-themes/bp-default/_inc/css/default.css	(working copy)
@@ -93,10 +93,10 @@
 }
 
 hr {
-	background-color:#e7e7e7;
-	border:0 none;
-	clear:both;
-	height:1px;
+	background-color: #e7e7e7;
+	border: 0 none;
+	clear: both;
+	height: 1px;
 	margin: 20px 0;
 }
 
@@ -589,7 +589,7 @@
 div#item-header a.button {
 	float: left;
 	margin: 10px 10px 0 0;
-	}
+}
 
 div#item-header div#message.info {
 	line-height: 80%;
@@ -856,7 +856,7 @@
 div#message p {
 	padding: 10px 15px;
 	font-size: 12px;
-	display:block;
+	display: block;
 }
 
 div#message.error p {
@@ -921,7 +921,8 @@
 }
 
 /* Buttons that are disabled */
-div.pending a, a.disabled {
+div.pending a,
+a.disabled {
 	border-color: #eee;
 	color: #bbb;
 	cursor: default;
@@ -948,8 +949,10 @@
 	font-weight: bold;
 }
 
+
 /* > AJAX Loaders
 -------------------------------------------------------------- */
+
 .ajax-loader {
 	background: url( ../images/ajax-loader.gif ) center left no-repeat !important;
 	padding: 8px;
@@ -980,6 +983,7 @@
 	font: inherit;
 	font-size: 14px;
 	color: #888;
+	background-color: #fffeff;
 }
 
 .standard-form select {
@@ -1039,7 +1043,7 @@
 
 .standard-form textarea {
 	width: 75%;
-	height: 120px;
+	height: 80px;
 }
 
 .standard-form textarea#message_content {
@@ -1098,7 +1102,7 @@
 .standard-form input:focus,
 .standard-form textarea:focus,
 .standard-form select:focus {
-	background: #fafafa;
+	background: #fffeff;
 	color: #555;
 }
 
@@ -1145,7 +1149,8 @@
 	width: 117%;
 }
 
-table tr td, table tr th {
+table tr td,
+table tr th {
 	padding: 8px;
 	vertical-align: middle;
 }
@@ -1201,9 +1206,9 @@
 }
 
 table.forum tr.sticky td {
-	background: #fff9db;
-	border-top: 1px solid #ffe8C4;
-	border-bottom: 1px solid #ffe8c4;
+	background: #FFF9DB;
+	border-top: 1px solid #FFE8C4;
+	border-bottom: 1px solid #FFE8C4;
 }
 
 table.forum tr.closed td.td-title {
@@ -1246,7 +1251,8 @@
 	margin-right: 5px;
 }
 
-table.forum td.td-poster, table.forum td.td-group  {
+table.forum td.td-poster,
+table.forum td.td-group {
 	min-width: 130px;
 }
 
@@ -1547,7 +1553,7 @@
 }
 
 .activity-list li.load-more {
-	margin: 15px  0 !important;
+	margin: 15px 0 !important;
 	padding: 10px 15px !important;
 	background: #f0f0f0 !important;
 	text-align: center;
@@ -1629,7 +1635,8 @@
 	padding: 0 10px 0;
 }
 
-div.activity-comments ul, div.activity-comments ul li {
+div.activity-comments ul,
+div.activity-comments ul li {
 	border: none;
 	list-style: none;
 }
@@ -2006,16 +2013,16 @@
 
 div.post blockquote {
 	quotes: none;
-	font-style:italic;
-	padding:0 3em;
+	font-style: italic;
+	padding: 0 3em;
 	font-family: georgia, times, serif;
 	font-size: 16px;
 	line-height: 150%;
 }
 
 div.post table {
-	border-collapse:collapse;
-	border-spacing:0;
+	border-collapse: collapse;
+	border-spacing: 0;
 	border: 1px solid #eee;
 }
 
@@ -2028,8 +2035,7 @@
 	border-top: 1px solid #eee;
 }
 
-div.post div.author-box,
-div.comment-avatar-box {
+div.post div.author-box {
 	background: #f0f0f0;
 	padding: 10px;
 	float: left;
@@ -2053,20 +2059,18 @@
 	text-decoration: none;
 }
 
-div.post div.author-box img,
-div.comment-avatar-box img {
+div.post div.author-box img {
 	float: none;
 	border: 4px solid #fff;
 	margin: 0;
 }
 
-div.post div.post-content,
-div.comment-content {
+div.post div.post-content {
 	margin-left: 105px;
 }
 
-div.post p.date, div.post p.postmetadata,
-div.comment-meta, div.comment-options {
+div.post p.date,
+div.post p.postmetadata {
 	color: #888;
 	font-size: 12px;
 	font-family: Georgia, times, serif;
@@ -2102,7 +2106,8 @@
 	clear: none !important;
 }
 
-div.post img.centered, img.aligncenter {
+div.post img.centered,
+img.aligncenter {
 	display: block;
 	margin-left: auto;
 	margin-right: auto;
@@ -2155,53 +2160,204 @@
 	color: #555;
 }
 
-/* > WordPress Blog Comment Styles
+
+/* > BuddyPress Blog Comment Styles
 -------------------------------------------------------------- */
 
 #trackbacks {
 	margin-top: 30px;
 }
 
-#comments h3,
-#trackbacks h3,
-#respond h3 {
-	font-size: 20px;
-	margin: 5px 0 25px 0;
-	font-weight: normal;
-	color: #555;
+#comments ol.commentlist {
+	margin-bottom: 30px;
+	border-bottom: 1px solid #e4e4e4;
 }
 
-#comments span.title,
-#trackbacks span.title {
-	color: #aaa;
+ol.commentlist div.comment-avatar-box {
+	float: left;
+	margin: 10px 10px 10px 0;
 }
 
-ol.commentlist li {
-	margin: 0 0 30px 0;
+ul.children div.comment-avatar-box {
+	float: left;
+	margin: 0px 10px 10px 0;
 }
 
-div.comment-meta {
-	border-top: none;
-	padding-top: 0;
+div.comment-avatar-box img {
+	border: 2px solid #eee;
 }
 
-div.comment-meta h5 {
-	font-weight: normal;
+div.comment-content {
+	border-top: 1px solid #e4e4e4;
+	padding-left: 75px;
 }
 
+div.comment-meta,
+div.comment-options {
+	color: #888;
+	padding: 0 0 3px;
+	font: 12px;
+	margin: 10px 0;
+}
+
 div.comment-meta em {
-	float: right;
+	font-style: normal;
 }
 
-div.comment-options {
-	border-bottom: none;
+div.comment-meta span.comment-highlight a {
+	text-decoration: none;
+	background: #EBF7FF;
+	border-bottom: 1px solid #a1dcfa;
+	border-right: 1px solid #a1dcfa;
+	color: #059AE7;
+	padding: 3px 8px;
+	text-decoration: none;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	margin-right: 3px;
 }
 
-ol.commentlist ul.children {
-	margin-left: 105px;
+div.comment-meta .comment-highlight a:hover {
+	background: #059AE7;
+	color: #fff;
+	border-color: #059AE7;
 }
 
+div.comment-options a.comment-reply-link {
+	background: #FFF9DB;
+	border-bottom: 1px solid #FFE8C4;
+	border-right: 1px solid #FFE8C4;
+	color: #ffa200;
+	padding: 3px 8px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	text-decoration: none;
+	margin-right: 10px;
+}
 
+div.comment-options a.comment-reply-link:hover {
+	background: #f7740a;
+	color: #fff;
+	border-color: #f7740a;
+}
+
+div.comment-options a.comment-edit-link {
+	background: #f4f4f4;
+	border-bottom: 1px solid #ddd;
+	border-right: 1px solid #ddd;
+	color: #999;
+	padding: 3px 8px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	text-decoration: none;
+}
+
+div.comment-options a.comment-edit-link:hover {
+	background: #aaa;
+	color: #fff;
+	border-color: #aaa;
+}
+
+ul.children {
+	margin-left: 75px;
+	background: #f5f5f5;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	margin-bottom: 20px;
+	padding: 1px 10px;
+}
+
+ul.children ul {
+	margin-left: 20px;
+	margin-bottom: 0;
+	padding: 0;
+}
+
+ul.children img.avatar {
+	width: 25px;
+	height: 25px;
+	margin: 0;
+	border-style: none;
+}
+
+ul.children div.comment-content {
+	padding-left: 35px;
+	border-top: none;
+}
+
+ul.children div.comment-meta {
+	margin-top: 0;
+	font-size: 11px;
+}
+
+ul.children div.comment-options {
+	margin-top: 0;
+	margin-bottom: 5px;
+}
+
+ul.children li {
+	border-top: 2px solid #fffeff;
+	padding-top: 10px;
+}
+
+ul.children li:first-child {
+	border-top: none;
+}
+
+ul.children ul li:first-child {
+	border-top: 2px solid #fffeff;
+}
+
+ul.children div.comment-options a.comment-reply-link,
+ul.children div.comment-options a.comment-edit-link {
+	background: transparent;
+	color: #1fb3dd;
+	padding: 3px 8px;
+	text-decoration: underline;
+	border-style: none;
+	margin-right: 0;
+}
+
+ul.children div.comment-options a.comment-edit-link:hover,
+ul.children div.comment-options a.comment-reply-link:hover {
+	background: transparent;
+	color: #1fb3dd;
+	border-style: none;
+}
+
+#respond-box {
+	border: 1px solid #e5e5e5;
+	background-color: #fafafa;
+	padding: 10px;
+	margin-bottom: 20px;
+	margin-left: 75px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+
+ul.children #respond-box {
+	margin-left: 35px;
+	margin-right: 20px;
+	margin-bottom: 10px;
+}
+
+h3#reply.comments-header {
+	font-size: 14px;
+}
+
+#respond-box div.comment-avatar-box {
+	margin-top: 0;
+}
+
+#respond-box div.comment-content {
+	border-style: none;
+}
+
+
 /* > Footer
 -------------------------------------------------------------- */
 
Index: bp-themes/bp-default/comments.php
===================================================================
--- bp-themes/bp-default/comments.php	(revision 3634)
+++ bp-themes/bp-default/comments.php	(working copy)
@@ -54,7 +54,7 @@
 <?php endif; ?>
 
 <?php if ( comments_open() ) : ?>
-	<div id="respond">
+	<div id="respond-box">
 
 		<div class="comment-avatar-box">
 			<div class="avb">
@@ -72,7 +72,7 @@
 			<?php comment_form() ?>
 		</div><!-- .comment-content -->
 
-	</div><!-- #respond -->
+	</div><!-- #respond-box -->
 <?php endif; ?>
 
 <?php if ( !empty( $num_trackbacks ) ) : ?>