diff --git src/bp-templates/bp-legacy/css/twentyfifteen.scss src/bp-templates/bp-legacy/css/twentyfifteen.scss
index a08af03..29b55d0 100644
--- src/bp-templates/bp-legacy/css/twentyfifteen.scss
+++ src/bp-templates/bp-legacy/css/twentyfifteen.scss
@@ -1502,22 +1502,21 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 				#invite-list {
 					height: auto;
 					width: auto;
+				}
 			}
-		}
 
 			.main-column {
 				margin-left: 0;
-		}
+			}
 
 			.submit {
 				input {
 					display: inline-block;
 					width: 100%;
+				}
 			}
 		}
 	}
- }
-
 }
 
 /**
@@ -1727,7 +1726,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 	#buddypress {
 
 		#message-thread {
-		//Single message view
+			//Single message view
 			a {
 				border-bottom: 0;
 			}
@@ -1892,7 +1891,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 			}
 		}
 
-	/* Auto Complete background */
+		/* Auto Complete background */
 		.acfb-holder {
 
 			li.friend-tab {
@@ -1935,7 +1934,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 			}
 
 			td:first-child + td + td {
-			// notice date
+				// notice date
 				border-bottom: 0;
 
 				span {
@@ -1944,13 +1943,13 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 			}
 
 			td:last-child {
-			// notice actions
+				// notice actions
 				border-bottom-color: darken($border-light, 20%);
 				line-height: 1;
 				text-align: right;
 
 				a:last-child {
-				// hide the 'x' text
+					// hide the 'x' text
 					line-height: 0;
 					margin-left: 0.7em;
 					text-indent: -999em;
@@ -2031,8 +2030,8 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 
 #buddypress {
 
-// Match BP form elements to Themes(2015) styling where styles
-// are not inherited or being overriden.
+	// Match BP form elements to Themes(2015) styling where styles
+	// are not inherited or being overriden.
 
 	div.activity-comments {
 		form {
@@ -2083,8 +2082,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 
 	div.dir-search,
 	div.message-search,
-	li.groups-members-search
-	 {
+	li.groups-members-search {
 		float: none;
 		margin: $spacing-val-sm 0;
 
@@ -2149,15 +2147,15 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 	} // close @media
 
 	// Attempt to replicate the 2015 breakpoint font resizing for buttons/submits
-//	@media screen and (min-width: 59.6875em) {
-//		.dir-search,
-//	 .message-search {
-	//		form {
-	//			input[type='text'] { @include font-size(14) ;}
-	//			input[type='submit'] {@include font-size(14);}
-	//		}
-	//	}
-//	}
+	// @media screen and (min-width: 59.6875em) {
+		// .dir-search,
+		// message-search {
+			// form {
+				// input[type='text'] { @include font-size(14) ;}
+				// input[type='submit'] {@include font-size(14);}
+			// }
+		// }
+	// }
 
 	@media screen and (min-width: 77.5em) {
 
@@ -2317,6 +2315,6 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 		li.friend-tab {
 			background: $notice-info;
 			border: inherit;
-	 }
+		}
 	}
 }
diff --git src/bp-templates/bp-legacy/css/twentyfourteen.scss src/bp-templates/bp-legacy/css/twentyfourteen.scss
index efeab0c..a225020 100644
--- src/bp-templates/bp-legacy/css/twentyfourteen.scss
+++ src/bp-templates/bp-legacy/css/twentyfourteen.scss
@@ -829,7 +829,7 @@ body.activity-permalink {
 #buddypress {
 	.activity {
 		.activity-comments {
-		//	border-left: 1px solid $border-light;
+			//	border-left: 1px solid $border-light;
 			margin-left: 0;
 			margin-top: 5px;
 
@@ -1427,7 +1427,7 @@ body.activity-permalink {
 			td.bulk-select-check,
 			td.thread-from {
 				border-top: 1px solid $border-med;
-		 }
+			}
 		}
 
 		tr {
@@ -1580,7 +1580,7 @@ body.activity-permalink {
 		}
 
 		td:first-child + td + td {
-		// notice date
+			// notice date
 			border-bottom: 0;
 
 			span {
@@ -1589,13 +1589,13 @@ body.activity-permalink {
 		}
 
 		td:last-child {
-		// notice actions
+			// notice actions
 			border-bottom-color: $border-med;
 			line-height: 1;
 			text-align: right;
 
 			a:last-child {
-			// hide the 'x' text
+				// hide the 'x' text
 				line-height: 0;
 				margin-left: 0.7em;
 				text-indent: -999em;
@@ -1708,8 +1708,8 @@ body.activity-permalink {
 		float: none;
 		margin: $spacing-val-sm 0;
 
-// Stylise the seach form elements, in part this deals with padding
-// issues on the submit & sizing issues between bp styles & twentyfourteen
+		// Stylise the seach form elements, in part this deals with padding
+		// issues on the submit & sizing issues between bp styles & twentyfourteen
 		form {
 			border: 1px solid #ccc;
 			overflow: hidden;
@@ -1746,7 +1746,7 @@ body.activity-permalink {
 				width: 20%;
 			}
 
-			}// close form
+		}// close form
 
 	} // close .dir-search, .message-search
 
@@ -1852,6 +1852,6 @@ body.activity-permalink {
 		li.friend-tab {
 			background: $notice-info;
 			border: inherit;
-	 }
+		}
 	}
 }
diff --git src/bp-templates/bp-legacy/css/twentysixteen.scss src/bp-templates/bp-legacy/css/twentysixteen.scss
index 112a4ed..e29d1dd 100644
--- src/bp-templates/bp-legacy/css/twentysixteen.scss
+++ src/bp-templates/bp-legacy/css/twentysixteen.scss
@@ -420,7 +420,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 	}
 }
 
-	/*__ Horizontal menus __*/
+/*__ Horizontal menus __*/
 #buddypress {
 
 	#object-nav {
@@ -501,7 +501,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 } // close #buddypress
 
 
-	/*__ Vertical menu User Account / Group single screens __*/
+/*__ Vertical menu User Account / Group single screens __*/
 
 // This block contains rules to re-factor the item-body structural element
 // to sit alongside the vert menu
@@ -1783,7 +1783,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 	#buddypress {
 
 		#message-thread {
-		//Single message view
+			//Single message view
 			a {
 				border-bottom: 0;
 			}
@@ -1986,7 +1986,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 			}
 
 			td:first-child + td + td {
-			// notice date
+				// notice date
 				border-bottom: 0;
 
 				span {
@@ -1995,13 +1995,13 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 			}
 
 			td:last-child {
-			// notice actions
+				// notice actions
 				border-bottom-color: darken($border-light, 20%);
 				line-height: 1;
 				text-align: right;
 
 				a:last-child {
-				// hide the 'x' text
+					// hide the 'x' text
 					line-height: 0;
 					margin-left: 0.7em;
 					text-indent: -999em;
@@ -2078,7 +2078,8 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 * @section 7.0 - Forms  - General
 *-------------------------------------------------------------------------------
 */
-	// Attempt to reset form control widths
+
+// Attempt to reset form control widths
 #main {
 	#buddypress {
 		.standard-form {
@@ -2097,8 +2098,8 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 
 #buddypress {
 
-// Match BP form elements to Themes(2016) styling where styles
-// are not inherited or being overriden.
+	// Match BP form elements to Themes(2016) styling where styles
+	// are not inherited or being overriden.
 	div.activity-comments {
 
 		form {
diff --git src/bp-templates/bp-legacy/css/twentythirteen.scss src/bp-templates/bp-legacy/css/twentythirteen.scss
index 1386008..0626ab5 100644
--- src/bp-templates/bp-legacy/css/twentythirteen.scss
+++ src/bp-templates/bp-legacy/css/twentythirteen.scss
@@ -321,8 +321,8 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 		} // close @media
 	}
 }
-	/*__ Horizontal menus & small screen __*/
 
+/*__ Horizontal menus & small screen __*/
 #buddypress {
 
 	#object-nav {
@@ -415,7 +415,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 
 } // close #buddypress
 
-	/*__ Vertical menu User Account / Group single screens __*/
+/*__ Vertical menu User Account / Group single screens __*/
 
 // This block contains rules to re-factor the item-body structural element
 // to sit alongside the vert menu
@@ -426,7 +426,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 
 	.bp-user #buddypress,
 	.single-item.groups #buddypress {
-	//	background: $light-background;
+		//	background: $light-background;
 	}
 
 	body:not(.sidebar) {
@@ -1322,8 +1322,8 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 			} // close @media
 
 			#item-header-cover-image {
-	//			#item-header-content {
-	//			}
+				//	#item-header-content {
+				//	}
 
 				#item-actions {
 					border: 0;
@@ -1822,7 +1822,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 	#buddypress {
 
 		#message-thread {
-		//Single message view
+			//Single message view
 			a {
 				border-bottom: 0;
 			}
@@ -1995,7 +1995,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 			}
 		}
 
-	/* Auto Complete background */
+		/* Auto Complete background */
 		.acfb-holder {
 
 			li.friend-tab {
@@ -2047,7 +2047,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 
 		#settings-form {
 			padding: 0 $spacing-val-sm;
-		// 'p' = email notification screen sub heading
+			// 'p' = email notification screen sub heading
 			> p {
 				@include font-size(20);
 				margin: $spacing-val-md 0 $spacing-val-sm;
@@ -2095,7 +2095,8 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 * @section 7.0 - Forms  - General
 *-------------------------------------------------------------------------------
 */
-	// Attempt to reset form control widths
+
+// Attempt to reset form control widths
 #main {
 	#buddypress {
 		.standard-form {
@@ -2114,8 +2115,8 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 
 #buddypress {
 
-// Match BP form elements to Themes(2013) styling where styles
-// are not inherited or being overriden.
+	// Match BP form elements to Themes(2013) styling where styles
+	// are not inherited or being overriden.
 	div.activity-comments {
 
 		form {
@@ -2390,6 +2391,6 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 		li.friend-tab {
 			background: $notice-info;
 			border: inherit;
-	 }
+		}
 	}
 }
diff --git src/bp-templates/bp-legacy/css/twentytwelve.scss src/bp-templates/bp-legacy/css/twentytwelve.scss
index e2429fe..40f5f63 100644
--- src/bp-templates/bp-legacy/css/twentytwelve.scss
+++ src/bp-templates/bp-legacy/css/twentytwelve.scss
@@ -352,7 +352,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 	}
 }
 
-	/*__ Horizontal menus __*/
+/*__ Horizontal menus __*/
 #buddypress {
 
 	#object-nav {
@@ -456,7 +456,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 	}
 }
 
-	/*__ Vertical menu User Account / Group single screens __*/
+/*__ Vertical menu User Account / Group single screens __*/
 
 // This block contains rules to re-factor the item-body structural element
 // to sit alongside the vert menu
@@ -1203,8 +1203,8 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 
 .bp-user {
 	#buddypress {
-	// On object nav links, table links (notifications etc) we don't really need :visited
-	// inheritance, so set pseudo class to :link color.
+		// On object nav links, table links (notifications etc) we don't really need :visited
+		// inheritance, so set pseudo class to :link color.
 		a {
 			&:visited {
 				color: #21759b;
@@ -1376,9 +1376,9 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 					float: left;
 				}
 
-//				#item-header-avatar {
-//					width: 21%;
-//				}
+				//	#item-header-avatar {
+				//		width: 21%;
+				//	}
 
 				#item-header-content {
 					margin-left: 4%;
@@ -1835,7 +1835,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 	#buddypress {
 
 		#message-thread {
-		//Single message view
+			//Single message view
 			a {
 				border-bottom: 0;
 			}
@@ -2060,7 +2060,7 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 			}
 
 			td:first-child + td + td {
-			// notice date
+				// notice date
 				border-bottom: 0;
 
 				span {
@@ -2069,13 +2069,13 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 			}
 
 			td:last-child {
-			// notice actions
+				// notice actions
 				line-height: 1;
 				padding-bottom: 1em;
 				text-align: right;
 
 				a:last-child {
-				// hide the 'x' text
+					// hide the 'x' text
 					line-height: 0;
 					margin-left: 0.7em;
 					text-indent: -999em;
@@ -2161,7 +2161,8 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 * @section 7.0 - Forms  - General
 *-------------------------------------------------------------------------------
 */
-	// Attempt to reset form control widths
+
+// Attempt to reset form control widths
 #main {
 	#buddypress {
 		.standard-form {
@@ -2180,8 +2181,8 @@ http://codex.buddypress.org/themes/buddypress-companion-stylesheets/
 
 #buddypress {
 
-// Match BP form elements to Themes(2012) styling where styles
-// are not inherited or being overriden.
+	// Match BP form elements to Themes(2012) styling where styles
+	// are not inherited or being overriden.
 	div.activity-comments {
 
 		form {
