Index: src/bp-templates/bp-legacy/css/twentyseventeen-rtl.css
===================================================================
--- src/bp-templates/bp-legacy/css/twentyseventeen-rtl.css	(revision 11282)
+++ src/bp-templates/bp-legacy/css/twentyseventeen-rtl.css	(working copy)
@@ -92,24 +92,12 @@
 	}
 }
 
-.buddypress article.page .entry-header .entry-title {
-	font-size: 22px;
-	font-size: 1.375rem;
-}
-
-@media screen and (min-width: 55em) {
-	.buddypress article.page .entry-header .entry-title {
-		font-size: 28px;
-		font-size: 1.75rem;
-	}
-}
-
-@media screen and (min-width: 55em) {
+@media screen and (min-width: 48em) {
 	body.buddypress.page.page-two-column #primary .entry-header {
-		width: 20%;
+		width: 30%;
 	}
 	body.buddypress.page.page-two-column #primary .entry-content {
-		width: 80%;
+		width: 68%;
 	}
 	body.buddypress:not(.has-sidebar) #primary.content-area,
 	body.buddypress:not(.page-two-column) #primary.content-area {
@@ -150,7 +138,7 @@
 }
 
 #buddypress div.item-list-tabs ul {
-	background-color: #faf9f1;
+	background-color: #fafafa;
 	border-bottom: 1px solid rgba(234, 234, 234, 0.9);
 	border-top: 1px solid rgba(234, 234, 234, 0.9);
 	overflow: hidden;
@@ -167,7 +155,7 @@
 
 @media screen and (max-width: 38.75em) {
 	.bp-user #buddypress #object-nav {
-		background: #faf9f1;
+		background: #fafafa;
 		border: 1px solid #eaeaea;
 		overflow: visible;
 		padding: 10px;
@@ -346,7 +334,7 @@
 	#main #buddypress #group-create-tabs.item-list-tabs ul li.selected a,
 	#main #buddypress #group-create-tabs.item-list-tabs ul li.current a {
 		background: none;
-		color: #141412;
+		color: #333;
 		outline: none;
 	}
 	#main #buddypress #subnav ul {
@@ -557,7 +545,7 @@
 	width: 100%;
 }
 
-@media screen and (min-width: 48em) {
+@media screen and (min-width: 30em) {
 	#buddypress ul.item-list li div.action div {
 		margin: 0 0 10px 10px;
 		width: auto;
@@ -599,7 +587,7 @@
 }
 
 #buddypress form#whats-new-form #whats-new-content.active #whats-new-options[style] #whats-new-post-in-box {
-	border: 1px solid rgba(212, 208, 186, 0.5);
+	border: 1px solid rgba(190, 190, 190, 0.5);
 	float: right;
 	line-height: 1.5em;
 	margin-top: 12px;
@@ -726,10 +714,11 @@
 	margin-bottom: 5px;
 }
 
-@media screen and (min-width: 38.75em) {
+@media screen and (min-width: 30em) {
 	#buddypress #activity-stream .activity-content .activity-meta a {
 		display: inline-block;
 		margin-bottom: 0;
+		width: auto;
 	}
 }
 
@@ -800,7 +789,7 @@
 
 #buddypress #activity-stream .activity-comments .ac-form input[type="submit"],
 #buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel {
-	color: rgba(20, 20, 18, 0.8);
+	color: rgba(51, 51, 51, 0.8);
 	display: inline-block;
 	font-family: inherit;
 	font-size: 12px;
@@ -813,7 +802,7 @@
 }
 
 #buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel {
-	border: 1px solid rgba(212, 208, 186, 0.7);
+	border: 1px solid rgba(190, 190, 190, 0.7);
 	text-align: center;
 }
 
@@ -1120,7 +1109,7 @@
 }
 
 .groups.group-settings #group-settings-form div.radio label ul {
-	color: rgba(20, 20, 18, 0.6);
+	color: rgba(51, 51, 51, 0.6);
 	font-size: 14px;
 	font-size: 0.875rem;
 }
@@ -1254,7 +1243,7 @@
 }
 
 .bp-user #buddypress .notifications-options-nav {
-	border: 1px solid rgba(212, 208, 186, 0.5);
+	border: 1px solid rgba(190, 190, 190, 0.5);
 	float: right;
 	width: 100%;
 }
@@ -1434,9 +1423,18 @@
 }
 
 .bp-user #buddypress #message-threads thead tr {
-	background: #6f6f6f;
+	background: none;
+	border-bottom: 1px solid #bebebe;
 }
 
+.bp-user #buddypress #message-threads thead tr th {
+	background: #555;
+}
+
+.bp-user #buddypress #message-threads tr {
+	border-bottom: 5px solid #878787;
+}
+
 .bp-user #buddypress #message-threads tr td {
 	background: #fff;
 	display: inline-block;
@@ -1445,8 +1443,8 @@
 
 .bp-user #buddypress #message-threads tr td.thread-star,
 .bp-user #buddypress #message-threads tr td.thread-options {
-	border-bottom-color: #ccc;
-	border-bottom-width: 2px;
+	border-bottom-color: #bebebe;
+	border-bottom-width: 1px;
 	height: 2.4em;
 	padding-bottom: 0.2em;
 	padding-top: 0.2em;
@@ -1459,6 +1457,14 @@
 	}
 }
 
+.bp-user #buddypress #message-threads tr td.bulk-select-check,
+.bp-user #buddypress #message-threads tr td.thread-star,
+.bp-user #buddypress #message-threads tr td.thread-from,
+.bp-user #buddypress #message-threads tr td.thread-info,
+.bp-user #buddypress #message-threads tr td.thread-options {
+	border-top: 0;
+}
+
 .bp-user #buddypress #message-threads tr td.thread-star {
 	vertical-align: middle;
 }
@@ -1529,8 +1535,8 @@
 }
 
 .bp-user #buddypress #message-threads tr.unread td {
-	background: #eee;
-	border-color: #d4d0ba;
+	background: none;
+	border-color: #bebebe;
 }
 
 .bp-user #buddypress #message-threads th {
@@ -1717,7 +1723,7 @@
 
 #buddypress div.activity-comments form .ac-textarea {
 	background: #f7f7f7;
-	border: 1px solid rgba(212, 208, 186, 0.5);
+	border: 1px solid rgba(190, 190, 190, 0.5);
 }
 
 #buddypress div.activity-comments form .ac-textarea textarea {
@@ -1735,7 +1741,7 @@
 #buddypress .standard-form button,
 #buddypress .standard-form select,
 #buddypress .standard-form textarea {
-	border-color: rgba(212, 208, 186, 0.5);
+	border-color: rgba(190, 190, 190, 0.5);
 	border-width: 1px;
 }
 
@@ -1761,7 +1767,7 @@
 #buddypress div.dir-search form,
 #buddypress div.message-search form,
 #buddypress li.groups-members-search form {
-	border: 1px solid rgba(212, 208, 186, 0.6);
+	border: 1px solid rgba(190, 190, 190, 0.6);
 	overflow: hidden;
 }
 
@@ -1795,7 +1801,7 @@
 #buddypress div.dir-search form input[type='text'],
 #buddypress div.message-search form input[type='text'],
 #buddypress li.groups-members-search form input[type='text'] {
-	border-left: 1px solid rgba(212, 208, 186, 0.6);
+	border-left: 1px solid rgba(190, 190, 190, 0.6);
 	padding: 0.2em 0.2em 0.2em 0;
 }
 
@@ -1855,9 +1861,9 @@
 }
 
 #buddypress table tr th {
-	background: #6f6f6f;
-	border-color: #b7b7b7;
-	color: #fff;
+	background: #f7f7f7;
+	border-color: #eaeaea;
+	color: #333;
 }
 
 #buddypress table p {
Index: src/bp-templates/bp-legacy/css/twentyseventeen.css
===================================================================
--- src/bp-templates/bp-legacy/css/twentyseventeen.css	(revision 11282)
+++ src/bp-templates/bp-legacy/css/twentyseventeen.css	(working copy)
@@ -92,24 +92,12 @@
 	}
 }
 
-.buddypress article.page .entry-header .entry-title {
-	font-size: 22px;
-	font-size: 1.375rem;
-}
-
-@media screen and (min-width: 55em) {
-	.buddypress article.page .entry-header .entry-title {
-		font-size: 28px;
-		font-size: 1.75rem;
-	}
-}
-
-@media screen and (min-width: 55em) {
+@media screen and (min-width: 48em) {
 	body.buddypress.page.page-two-column #primary .entry-header {
-		width: 20%;
+		width: 30%;
 	}
 	body.buddypress.page.page-two-column #primary .entry-content {
-		width: 80%;
+		width: 68%;
 	}
 	body.buddypress:not(.has-sidebar) #primary.content-area,
 	body.buddypress:not(.page-two-column) #primary.content-area {
@@ -150,7 +138,7 @@
 }
 
 #buddypress div.item-list-tabs ul {
-	background-color: #faf9f1;
+	background-color: #fafafa;
 	border-bottom: 1px solid rgba(234, 234, 234, 0.9);
 	border-top: 1px solid rgba(234, 234, 234, 0.9);
 	overflow: hidden;
@@ -167,7 +155,7 @@
 
 @media screen and (max-width: 38.75em) {
 	.bp-user #buddypress #object-nav {
-		background: #faf9f1;
+		background: #fafafa;
 		border: 1px solid #eaeaea;
 		overflow: visible;
 		padding: 10px;
@@ -346,7 +334,7 @@
 	#main #buddypress #group-create-tabs.item-list-tabs ul li.selected a,
 	#main #buddypress #group-create-tabs.item-list-tabs ul li.current a {
 		background: none;
-		color: #141412;
+		color: #333;
 		outline: none;
 	}
 	#main #buddypress #subnav ul {
@@ -557,7 +545,7 @@
 	width: 100%;
 }
 
-@media screen and (min-width: 48em) {
+@media screen and (min-width: 30em) {
 	#buddypress ul.item-list li div.action div {
 		margin: 0 10px 10px 0;
 		width: auto;
@@ -599,7 +587,7 @@
 }
 
 #buddypress form#whats-new-form #whats-new-content.active #whats-new-options[style] #whats-new-post-in-box {
-	border: 1px solid rgba(212, 208, 186, 0.5);
+	border: 1px solid rgba(190, 190, 190, 0.5);
 	float: left;
 	line-height: 1.5em;
 	margin-top: 12px;
@@ -704,7 +692,6 @@
 }
 
 #buddypress #activity-stream .activity-content .activity-header {
-	line-height: inherit;
 	margin-right: 0;
 }
 
@@ -717,8 +704,10 @@
 }
 
 #buddypress #activity-stream .activity-content .activity-header img.avatar {
+	box-shadow: none;
 	display: inline-block;
-	margin-bottom: 0 !important;
+	margin: 0 5px !important;
+	vertical-align: middle;
 }
 
 #buddypress #activity-stream .activity-content .activity-meta a {
@@ -726,10 +715,11 @@
 	margin-bottom: 5px;
 }
 
-@media screen and (min-width: 38.75em) {
+@media screen and (min-width: 30em) {
 	#buddypress #activity-stream .activity-content .activity-meta a {
 		display: inline-block;
 		margin-bottom: 0;
+		width: auto;
 	}
 }
 
@@ -781,11 +771,22 @@
 */
 #buddypress #activity-stream .activity-comments {
 	border-left: 1px solid #eaeaea;
-	margin-top: 5px;
+	margin: 20px 0 20px;
 }
 
+@media screen and (min-width: 30em) {
+	#buddypress #activity-stream .activity-comments {
+		margin-left: 20px;
+	}
+}
+
+@media screen and (min-width: 55em) {
+	#buddypress #activity-stream .activity-comments {
+		margin-left: 40px;
+	}
+}
+
 #buddypress #activity-stream .activity-comments ul {
-	background: rgba(247, 247, 247, 0.6);
 	color: #737373;
 	margin: 15px 0 0 2px;
 }
@@ -800,7 +801,7 @@
 
 #buddypress #activity-stream .activity-comments .ac-form input[type="submit"],
 #buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel {
-	color: rgba(20, 20, 18, 0.8);
+	color: rgba(51, 51, 51, 0.8);
 	display: inline-block;
 	font-family: inherit;
 	font-size: 12px;
@@ -813,7 +814,7 @@
 }
 
 #buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel {
-	border: 1px solid rgba(212, 208, 186, 0.7);
+	border: 1px solid rgba(190, 190, 190, 0.7);
 	text-align: center;
 }
 
@@ -1120,7 +1121,7 @@
 }
 
 .groups.group-settings #group-settings-form div.radio label ul {
-	color: rgba(20, 20, 18, 0.6);
+	color: rgba(51, 51, 51, 0.6);
 	font-size: 14px;
 	font-size: 0.875rem;
 }
@@ -1253,25 +1254,28 @@
 	font-style: italic;
 }
 
-.bp-user #buddypress .notifications-options-nav {
-	border: 1px solid rgba(212, 208, 186, 0.5);
+.bp-user #buddypress .notifications-options-nav,
+.bp-user #buddypress .messages-options-nav {
 	float: left;
 	width: 100%;
 }
 
 @media screen and (min-width: 38.75em) {
-	.bp-user #buddypress .notifications-options-nav {
+	.bp-user #buddypress .notifications-options-nav,
+	.bp-user #buddypress .messages-options-nav {
 		width: 300px;
 	}
 }
 
-.bp-user #buddypress .notifications-options-nav select {
+.bp-user #buddypress .notifications-options-nav select,
+.bp-user #buddypress .messages-options-nav select {
 	height: auto;
 }
 
 .bp-user #buddypress .notifications-options-nav select,
-.bp-user #buddypress .notifications-options-nav input {
-	border: 0;
+.bp-user #buddypress .notifications-options-nav input,
+.bp-user #buddypress .messages-options-nav select,
+.bp-user #buddypress .messages-options-nav input {
 	font-size: 14px;
 	font-size: 0.875rem;
 	outline: 0;
@@ -1278,13 +1282,15 @@
 	padding: 0;
 }
 
-.bp-user #buddypress .notifications-options-nav select {
+.bp-user #buddypress .notifications-options-nav select,
+.bp-user #buddypress .messages-options-nav select {
 	float: left;
-	margin-right: 0;
-	width: 60%;
+	margin-right: 1%;
+	width: 59%;
 }
 
-.bp-user #buddypress .notifications-options-nav input {
+.bp-user #buddypress .notifications-options-nav input,
+.bp-user #buddypress .messages-options-nav input {
 	float: right;
 	font-family: inherit;
 	line-height: 20px;
@@ -1291,6 +1297,13 @@
 	width: 40%;
 }
 
+.bp-user #buddypress .notifications-options-nav input[disabled="disabled"]:focus,
+.bp-user #buddypress .notifications-options-nav input[disabled="disabled"]:hover,
+.bp-user #buddypress .messages-options-nav input[disabled="disabled"]:focus,
+.bp-user #buddypress .messages-options-nav input[disabled="disabled"]:hover {
+	background: none;
+}
+
 /**
 	*-------------------------------------------
 	* @subsection 6.2.2.2 - Extended Profiles
@@ -1311,6 +1324,10 @@
 	margin-top: 0;
 }
 
+.bp-user #buddypress .profile .bp-widget .profile-fields tr:last-child {
+	border-bottom: none;
+}
+
 .bp-user #buddypress .profile #profile-edit-form .button-nav:before,
 .bp-user #buddypress .profile #profile-edit-form .button-nav:after {
 	content: " ";
@@ -1434,9 +1451,18 @@
 }
 
 .bp-user #buddypress #message-threads thead tr {
-	background: #6f6f6f;
+	background: none;
+	border-bottom: 1px solid #bebebe;
 }
 
+.bp-user #buddypress #message-threads thead tr th {
+	background: #555;
+}
+
+.bp-user #buddypress #message-threads tr {
+	border-bottom: 5px solid #878787;
+}
+
 .bp-user #buddypress #message-threads tr td {
 	background: #fff;
 	display: inline-block;
@@ -1445,8 +1471,8 @@
 
 .bp-user #buddypress #message-threads tr td.thread-star,
 .bp-user #buddypress #message-threads tr td.thread-options {
-	border-bottom-color: #ccc;
-	border-bottom-width: 2px;
+	border-bottom-color: #bebebe;
+	border-bottom-width: 1px;
 	height: 2.4em;
 	padding-bottom: 0.2em;
 	padding-top: 0.2em;
@@ -1459,6 +1485,14 @@
 	}
 }
 
+.bp-user #buddypress #message-threads tr td.bulk-select-check,
+.bp-user #buddypress #message-threads tr td.thread-star,
+.bp-user #buddypress #message-threads tr td.thread-from,
+.bp-user #buddypress #message-threads tr td.thread-info,
+.bp-user #buddypress #message-threads tr td.thread-options {
+	border-top: 0;
+}
+
 .bp-user #buddypress #message-threads tr td.thread-star {
 	vertical-align: middle;
 }
@@ -1529,8 +1563,8 @@
 }
 
 .bp-user #buddypress #message-threads tr.unread td {
-	background: #eee;
-	border-color: #d4d0ba;
+	background: none;
+	border-color: #bebebe;
 }
 
 .bp-user #buddypress #message-threads th {
@@ -1550,10 +1584,6 @@
 	width: 30px;
 }
 
-.bp-user #buddypress .messages-options-nav select {
-	height: auto;
-}
-
 .bp-user #buddypress .acfb-holder {
 	list-style: none;
 }
@@ -1717,7 +1747,7 @@
 
 #buddypress div.activity-comments form .ac-textarea {
 	background: #f7f7f7;
-	border: 1px solid rgba(212, 208, 186, 0.5);
+	border: 1px solid rgba(190, 190, 190, 0.5);
 }
 
 #buddypress div.activity-comments form .ac-textarea textarea {
@@ -1735,7 +1765,7 @@
 #buddypress .standard-form button,
 #buddypress .standard-form select,
 #buddypress .standard-form textarea {
-	border-color: rgba(212, 208, 186, 0.5);
+	border-color: rgba(190, 190, 190, 0.5);
 	border-width: 1px;
 }
 
@@ -1761,7 +1791,7 @@
 #buddypress div.dir-search form,
 #buddypress div.message-search form,
 #buddypress li.groups-members-search form {
-	border: 1px solid rgba(212, 208, 186, 0.6);
+	border: 1px solid rgba(190, 190, 190, 0.6);
 	overflow: hidden;
 }
 
@@ -1795,7 +1825,7 @@
 #buddypress div.dir-search form input[type='text'],
 #buddypress div.message-search form input[type='text'],
 #buddypress li.groups-members-search form input[type='text'] {
-	border-right: 1px solid rgba(212, 208, 186, 0.6);
+	border-right: 1px solid rgba(190, 190, 190, 0.6);
 	padding: 0.2em 0 0.2em 0.2em;
 }
 
@@ -1855,9 +1885,9 @@
 }
 
 #buddypress table tr th {
-	background: #6f6f6f;
-	border-color: #b7b7b7;
-	color: #fff;
+	background: #f7f7f7;
+	border-color: #eaeaea;
+	color: #333;
 }
 
 #buddypress table p {
@@ -1914,6 +1944,10 @@
 	text-align: center;
 }
 
+#buddypress .notifications .actions {
+	text-align: center;
+}
+
 /**
 *-------------------------------------------------------------------------------
 * @section 9.0 - Error / Success messages
Index: src/bp-templates/bp-legacy/css/twentyseventeen.scss
===================================================================
--- src/bp-templates/bp-legacy/css/twentyseventeen.scss	(revision 11282)
+++ src/bp-templates/bp-legacy/css/twentyseventeen.scss	(working copy)
@@ -192,14 +192,21 @@
 }
 
 // Variables: color definitions
-$body-text:          #141412;
+
+$dark-grey:     #555;
+$medium-grey:   #878787;
+$light-grey:    #dcdcdc;
+$x-light-grey:  #f7f7f7;
+
+$body-text:          #333;
+$bp-light-text:      $medium-grey;
 $content-background: #fff;
-$off-white:          lighten(#f9f8ee, 0.7);
+$off-white:          #fafafa;
 $cream-background:   #f7f5e7;
-$light-background:   #f7f7f7;
-$medium-background:  #ccc;
-$dark-background:    #555;
-$border-color:       #d4d0ba;    // border color is varied using rgba
+$light-background:   $x-light-grey;
+$medium-background:  $medium-grey;
+$dark-background:    $dark-grey;
+$border-color:       #bebebe;
 $border-light:       #eaeaea; // BP dividers
 $border-med:         #ddd;
 $background-hover:   #db572f; // 2017 link background hover
@@ -210,7 +217,7 @@
 $notice-update:      #ced98c;
 $stripe-odd:         #ebf0ff;
 $stripe-even:        #dbe5ff;
-$unread:             #eee;
+$unread:             $x-light-grey;
 $link-action:        #c82b2b;
 /*--------------------------------------------------------------
 
@@ -310,27 +317,12 @@
 		}
 	}
 }
-// 2017 has very small page entry title headings
-// enlarge slightly for BP screens.
-.buddypress {
-	article.page {
-		.entry-header {
-			.entry-title {
-				@include font-size(22);
 
-				@include medium-up {
-					@include font-size(28);
-				}
-			}
-		}
-	}
-}
-
 // Open up the content width areas for BP screens to allow max widths.
-// This takes into account the ability to add/remove sidebars in 2017.
+// This takes into account the ability to columnize pages in 2017.
 // Only effect changes based on breakpoints.
 
-@include medium-up {
+@include med-small-up {
 
 	body.buddypress.page.page-two-column {
 
@@ -337,11 +329,11 @@
 		#primary {
 
 			.entry-header {
-				width: 20%;
+				width: 30%;
 			}
 
 			.entry-content {
-				width: 80%;
+				width: 68%;
 			}
 		}
 	}
@@ -357,7 +349,6 @@
 			.content-bottom-widgets {
 				margin-left: 0;
 				margin-right: 0;
-//				width: auto;
 			}
 		}
 
@@ -770,8 +761,11 @@
 	}
 
 	.action {
+
 		.generic-button {
+
 			a {
+
 				&:focus,
 				&:hover {
 					background: inherit;
@@ -917,7 +911,7 @@
 					// Provisionally lets keep the 'action' div
 					// position but inline-block the buttons
 
-					@include med-small-up {
+					@include small-up {
 						// keep buttons to a row small tablet up
 						margin: 0 $spacing-val-sm $spacing-val-sm 0;
 						width: auto;
@@ -1088,7 +1082,9 @@
 		li.mini {
 
 			.activity-avatar {
+
 				a {
+
 					img.avatar {
 						height: 30px;
 						margin-left: 15px;
@@ -1109,7 +1105,7 @@
 			margin-top: -12px;
 
 			.activity-header {
-				line-height: inherit;
+				//line-height: inherit;
 				margin-right: 0;
 
 				p {
@@ -1121,19 +1117,23 @@
 				}
 
 				img.avatar {
+					box-shadow: none;
 					display: inline-block;
-					margin-bottom: 0 !important; // have to match to BP
+					margin: 0 5px !important; // have to match to BP
+					vertical-align: middle;
 				}
 			} // close .activity-header
 
 			.activity-meta {
+
 				a {
 					display: block;
 					margin-bottom: $spacing-val-xs;
 
-					@include small-up-bp {
+					@include small-up {
 						display: inline-block;
 						margin-bottom: 0;
+						width: auto;
 					}
 				}
 			}
@@ -1197,10 +1197,18 @@
 
 		.activity-comments {
 			border-left: 1px solid $border-light;
-			margin-top: 5px;
 
+			margin: $spacing-val-md 0 $spacing-val-md ;
+
+			@include small-up {
+				margin-left: $spacing-val-md;
+			}
+
+			@include medium-up {
+				margin-left: $spacing-val-lg;
+			}
+
 			ul {
-				background: rgba($light-background, 0.6);
 				color: #737373;
 				margin: 15px 0 0 2px;
 
@@ -1778,8 +1786,9 @@
 
 		.pag-count {font-style: italic;}
 
-		.notifications-options-nav {
-			border: 1px solid rgba($border-color, 0.5);
+		.notifications-options-nav,
+		.messages-options-nav {
+
 			float: left;
 			width: 100%;
 
@@ -1793,7 +1802,7 @@
 
 			select,
 			input {
-				border: 0;
+
 				@include font-size(14);
 				outline: 0;
 				padding: 0;
@@ -1801,8 +1810,8 @@
 
 			select {
 				float: left;
-				margin-right: 0;
-				width: 60%;
+				margin-right: 1%;
+				width: 59%;
 			}
 
 			input {
@@ -1812,8 +1821,14 @@
 				width: 40%;
 			}
 
-		} // close .notifications-options-nav
+			input[disabled="disabled"]:focus,
+			input[disabled="disabled"]:hover {
+				background: none;
+			}
 
+
+		} // close .notifications-options-nav/.messages-options-nav
+
 	} //close #buddypress
 } // close .bp-user
 
@@ -1837,7 +1852,15 @@
 				}
 
 				table {margin-top: 0;}
+
+				.profile-fields {
+					tr:last-child {
+						border-bottom: none;
+					}
+				}
+
 			}
+
 			/* Edit profile */
 
 			#profile-edit-form {
@@ -1932,6 +1955,7 @@
 
 		#message-thread {
 			//Single message view
+
 			a {
 				border-bottom: 0;
 			}
@@ -1979,6 +2003,7 @@
 			}
 
 			#send-reply {
+
 				.message-content {
 					background: $content-background;
 					border: 0;
@@ -1994,12 +2019,21 @@
 		#message-threads {
 
 			thead {
+
 				tr {
-					background: lighten($dark-background, 10%);
+					background: none;
+					border-bottom: 1px solid $border-color;
+
+
+					th {
+						background: #555;
+					}
 				}
 			}
 
 			tr {
+				border-bottom: 5px solid $medium-grey;
+
 				td {
 					background: $content-background;
 					display: inline-block;
@@ -2008,8 +2042,8 @@
 
 				td.thread-star,
 				td.thread-options {
-					border-bottom-color: $medium-background;
-					border-bottom-width: 2px;
+					border-bottom-color: $border-color;
+					border-bottom-width: 1px;
 					height: 2.4em;
 					padding-bottom: 0.2em;
 					padding-top: 0.2em;
@@ -2019,6 +2053,14 @@
 					}
 				}
 
+				td.bulk-select-check,
+				td.thread-star,
+				td.thread-from,
+				td.thread-info,
+				td.thread-options {
+					border-top: 0;
+				}
+
 				td.thread-star {
 					vertical-align: middle;
 
@@ -2080,8 +2122,9 @@
 			}
 
 			tr.unread {
+
 				td {
-					background: $unread;
+					background: none;
 					border-color: $border-color;
 				}
 			}
@@ -2104,12 +2147,6 @@
 			}
 		}
 
-		.messages-options-nav {
-			select {
-				height: auto;
-			}
-		}
-
 		.acfb-holder {
 			list-style: none;
 
@@ -2295,10 +2332,15 @@
 
 // Attempt to reset form control widths
 #main {
+
 	#buddypress {
+
 		.standard-form {
 
-			li {float: none;}
+			li {
+				float: none;
+			}
+
 			input[type='text'],
 			input[type='email'],
 			input[type='password'],
@@ -2309,7 +2351,6 @@
 	}
 }
 
-
 #buddypress {
 
 	// Match BP form elements to Themes(2017) styling where styles
@@ -2472,9 +2513,9 @@
 		margin: $spacing-val-md 0;
 
 		tr th {
-			background: lighten($dark-background, 10%);
-			border-color: darken($border-light, 20%);
-			color: $content-background;
+			background: $light-background;
+			border-color: $border-light;
+			color: $body-text;
 		}
 
 		// Reduce the themes inherited paragraph margins in tables
@@ -2536,6 +2577,12 @@
 		}
 
 	} // .notifications, .message-notices
+
+	.notifications { // table element
+		.actions { // th element
+			text-align: center;
+		}
+	}
 } // #buddypress
 
 /**