fix lightbox; finished dark, now on to light

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

1 files changed, 710 insertions, 720 deletions

diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index 6d76044ba..40c8835e6 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -807,9 +807,9 @@ nav #nav-notifications-linkmenu {
 		span {
 			float: left;
 			margin: 10px 20px 2px 0px;
-		a {
-			display: block;
-		}
+			a {
+				display: block;
+			}
 		}
 		.perms {
 			float: right;
@@ -858,13 +858,13 @@ nav #nav-notifications-linkmenu {
 }
 #profile-jot-text_tbl {
 	margin-bottom: 10px;
-	background: #777;
+	background: darken(@main_alt_colour, 46.8%);
 }
 #profile-jot-text_ifr {
 	width: 99.900002% !important;
 }
 #profile-jot-text_toolbargroup, .mceCenter tr {
-	background: #777;
+	background: darken(@main_alt_colour, 46.8%);
 }
 [id$="jot-text_ifr"] {
 	width: 99.900002% !important;
@@ -877,7 +877,7 @@ nav #nav-notifications-linkmenu {
 }
 .defaultSkin {
 	tr.mceFirst {
-		background: #777;
+		background: darken(@main_alt_colour, 46.8%);
 	}
 	td {
 		&.mceFirst, &.mceLast {
@@ -1071,9 +1071,8 @@ nav #nav-notifications-linkmenu {
  * tabs
  */
 .tabs {
-	list-style: none;
+	.list_reset;
 	margin: 10px 0;
-	padding: 0;
 	li {
 		display: inline;
 		font-size: smaller;
@@ -1081,7 +1080,7 @@ nav #nav-notifications-linkmenu {
 	}
 }
 .tab {
-	border: 1px solid @link_colour;
+	.borders(1px, solid, @link_colour);
 	padding: 4px;
 	&:hover, &.active:hover, &:active {
 		background: @link_colour;
@@ -1187,11 +1186,10 @@ nav #nav-notifications-linkmenu {
 	padding: 0;
 }
 .wall-item-subtools2 {
-	height: 25px;
+	.box(25px, 25px);
 	list-style: none outside none;
 	margin: -75px 0 0 5px;
 	padding: 0;
-	width: 25px;
 }
 .wall-item-title {
 	font-size: 1.2em;
@@ -1213,14 +1211,14 @@ nav #nav-notifications-linkmenu {
 .wall-item-like {
 	clear: left;
 	font-size: 0.8em;
-	color: #878883;
+	color: lighten(@menu_bg_colour, 20%);
 	margin: 5px 0 5px 120px;
 }
 .wall-item-author,
 .wall-item-actions-author {
 	clear: left;
 	font-size: 0.8em;
-	color: #878883;
+	color: lighten(@menu_bg_colour, 20%);
 	margin: 20px 20px 0 110px;
 }
 .wall-item-ago {
@@ -1234,8 +1232,7 @@ nav #nav-notifications-linkmenu {
 	margin-top: 15px;
 	width: 100px;
 	overflow: hidden;
-	text-overflow: ellipsis;
-	-o-text-overflow: ellipsis;
+	.text_overflow;
 	.icon {
 		float: left;
 	}
@@ -1254,7 +1251,6 @@ nav #nav-notifications-linkmenu {
 		margin: 0;
 		position: absolute;
 		top: 75px;
-		width: 30px;
 		z-index: 10001;
 		.box(30px, 30px);
 		img {
@@ -1276,7 +1272,7 @@ nav #nav-notifications-linkmenu {
 	min-width: 92px;
 	.borders(2px, solid, white);
 	border-top: 0px;
-	background: #555753;
+	background: @menu_bg_colour;
 	position: absolute;
 	left: -2px;
 	top: 101px;
@@ -1289,7 +1285,7 @@ nav #nav-notifications-linkmenu {
 		padding: 5px 2px;
 		color: @main_alt_colour;
 		&:hover {
-			color: #555753;
+			color: @menu_bg_colour;
 			background: @main_alt_colour;
 		}
 	}
@@ -1318,12 +1314,11 @@ nav #nav-notifications-linkmenu {
 .wall-item-outside-wrapper.comment {
 	margin-left: 80px;
 	.wall-item-photo {
-		width: 40px!important;
-		height: 40px!important;
+		width: 40px !important;
+		height: 40px !important;
 	}
 	.wall-item-photo-wrapper {
-		width: 40px;
-		height: 40px;
+		.box(40px, 40px);
 	}
 	.wall-item-photo-menu-button {
 		width: 50px;
@@ -1381,11 +1376,11 @@ nav #nav-notifications-linkmenu {
 .comment-edit-text-empty {
 	height: 20px;
 	border: 2px #c8bebe solid;
-	border-radius: 5px;
+	.rounded_corners;
 	color: #c8bebe;
 	.transition;
 	&:hover {
-		color: #999999;
+		color: darken(@main_alt_colour, 33.5%);
 	}
 }
 .comment-edit-text-full {
@@ -1400,7 +1395,7 @@ nav #nav-notifications-linkmenu {
 }
 .comment-edit-submit {
 	height: 22px;
-	background-color: #555753;
+	background-color: @menu_bg_colour;
 	color: @main_alt_colour;
 	.rounded_corners;
 	border: 0;
@@ -1411,11 +1406,10 @@ nav #nav-notifications-linkmenu {
  * item text style
  */
 .wall-item-body code {
-    background-color: #444;
-    border-bottom: 1px dashed #ccc;
-    border-left-style: solid;
-    border-left-width: 10px;
-    border-top: 1px dashed #ccc;
+    background-color: darken(@main_alt_colour, 66.5%);
+    border-bottom: 1px dashed darken(@main_alt_colour, 13.5%);
+    border-left: 5px solid darken(@main_alt_colour, 13.5%);
+    border-top: 1px dashed darken(@main_alt_colour, 13.5%);
     display: block;
     overflow-x: auto;
     padding: 5px 0 15px 10px;
@@ -1432,7 +1426,7 @@ nav #nav-notifications-linkmenu {
 div {
 	&[id$="text"] {
 		font-weight: bold;
-		border-bottom: 1px solid #ccc;
+		border-bottom: 1px solid darken(@main_alt_colour, 13.5%);
 	}
 	&[id$="wrapper"] {
 		height: 100%;
@@ -1471,339 +1465,310 @@ div {
 	margin: auto auto auto 23px;
 }
 #advanced-profile-with {
-  margin-left: 200px; }
+	margin-left: 200px;
+}
+
 
 /**
  * photos
  */
-
 .photos {
-  height: auto;
-  overflow: auto; }
-
+	height: auto;
+	overflow: auto;
+}
 #photo-top-links {
-  margin-bottom: 30px; }
-
-.photo-album-image-wrapper, .photo-top-image-wrapper {
+	margin-bottom: 30px;
+}
+.photo-album-image-wrapper,
+.photo-top-image-wrapper {
 	float: left;
 	.box_shadow;
-	background-color: #222;
+	background-color: darken(@main_alt_colour, 80%);
 	color: @bg_colour;
 	.rounded_corners;
 	padding-bottom: 30px;
 	position: relative;
 	margin: 0 10px 10px 0;
 }
-
 #photo-photo {
 	max-width: 100%;
 	img {
-		max-width: 100%; } }
-
+		max-width: 100%; }
+}
 .photo-top-image-wrapper a:hover,
 #photo-photo a:hover,
 .photo-album-image-wrapper a:hover {
 	border-bottom: 0;
 }
-
 .photo-top-photo, .photo-album-photo {
 	.rounded_corners(5px 5px 0 0);
 }
-
 .photo-top-album-name, .caption {
 	position: absolute;
 	bottom: 0;
 	padding: 0 5px;
 }
-
 #photo-photo {
 	position: relative;
-	float: left; }
-
-#photo-prev-link, #photo-next-link {
+	// float: left;
+	margin: 5px 45%;
+}
+#photo-prev-link,
+#photo-next-link {
 	position: absolute;
-	.box(30%, 100%);
+	// .box(30%, 100%);
+	.box(50px, 150px);
 	background: white center center no-repeat;
 	opacity: 0;
-	.transition(all, 0.2s);
-}
-
-#photo-prev-link {
-	background-image: url(dark/prev.png);
-    height: 350px;
-    left: 1%;
-    top: 215px;
-    width: 50px;
-    z-index: 10;
-}
-
-#photo-next-link {
-	background-image: url(dark/next.png);
-    height: 350px;
-    right: 45%;
-    top: 215px;
-    width: 50px;
-}
-
-#photo-prev-link a, #photo-next-link a {
-  display: block;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  text-indent: -900000px; }
-
-#photo-prev-link:hover {
-	opacity: 1;
-	.transition(all, 0.2s);
-}
-
-#photo-next-link {
+	.transition(all, 0.5s);
+	z-index: 10;
+	top: 175px;
+	.rounded_corners;
 	&:hover {
-		opacity: 1;
-		.transition(all, 0.2s);
+		opacity: 0.6;
+		.transition(all, 0.5s);
 	}
 	.icon {
 		display: none;
 	}
 }
-
-#photo-prev-link .icon {
-  display: none; }
-
+#photo-prev-link {
+	// background-image: url(dark/prev.png);
+	background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII=");
+    left: 22%;
+}
+#photo-next-link {
+	// background-image: url(dark/next.png);
+	background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII=");
+    left: 44%;
+}
+#photo-prev-link a,
+#photo-next-link a {
+	display: block;
+	.box(100%, 100%);
+	.rounded_corners;
+	overflow: hidden;
+	text-indent: -900000px;
+}
 #photos-upload-spacer,
 #photos-upload-new-wrapper,
 #photos-upload-exist-wrapper {
-  margin-bottom: 1em; }
-
+	margin-bottom: 1em;
+}
 #photos-upload-existing-album-text,
 #photos-upload-newalbum-div {
-  background-color: #555753;
-  color: @main_alt_colour;
-  padding: 1px; }
-
+	background-color: @menu_bg_colour;
+	color: @main_alt_colour;
+	padding: 1px;
+}
 #photos-upload-album-select,
 #photos-upload-newalbum {
-  width: 99%; }
-
+	width: 99%;
+}
 #photos-upload-perms-menu {
-  text-align: right; }
-
+	text-align: right;
+}
 #photo-edit-caption,
 #photo-edit-newtag,
 #photo-edit-albumname {
-  float: left;
-  margin-bottom: 25px; }
-
+	float: left;
+	margin-bottom: 25px;
+}
 #photo-edit-link-wrap {
-  margin-bottom: 15px; }
-
+	margin-bottom: 15px;
+}
 #photo-edit-caption,
 #photo-edit-newtag {
-  width: 100%; }
-
+	width: 100%;
+}
 #photo-like-div {
-  margin-bottom: 25px; }
-
-#photo-edit-caption-end,
-#photo-edit-tags-end,
-#photo-edit-albumname-end {
-  clear: both; }
-
+	margin-bottom: 25px;
+}
 #photo-edit-delete-button {
-  margin-left: 200px; }
-
+	margin-left: 200px;
+}
 #photo-edit-end {
-  margin-bottom: 35px; }
-
+	margin-bottom: 35px;
+}
 #photo-caption {
-  font-size: 110%;
-  font-weight: bold;
-  margin-top: 15px;
-  margin-bottom: 15px; }
+	font-size: 110%;
+	font-weight: bold;
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
 
 /**
  * message
  */
-
 .prvmail-text {
 	width: 100%;
 }
-
 #prvmail-subject {
 	width: 100%;
 	color: @bg_colour;
 	background: @main_colour;
 }
-
 #prvmail-submit-wrapper {
-  margin-top: 10px; }
-
+	margin-top: 10px;
+}
 #prvmail-submit {
-  float: right;
-  margin-top: 0; }
-
+	float: right;
+	margin-top: 0;
+}
 #prvmail-submit-wrapper div {
-  margin-right: 5px;
-  float: left; }
-
+	margin-right: 5px;
+	float: left;
+}
 .mail-list-outside-wrapper {
-  margin-top: 20px; }
-
+	margin-top: 20px;
+}
 .mail-list-sender {
-  float: left; }
-
+	float: left;
+}
 .mail-list-detail {
-  margin-left: 90px; }
-
+	margin-left: 90px;
+}
 .mail-list-sender-name {
-  display: inline;
-  font-size: 1.1em; }
-
+	display: inline;
+	font-size: 1.1em;
+}
 .mail-list-date {
-  display: inline;
-  font-size: 0.9em;
-  padding-left: 10px; }
-
+	display: inline;
+	font-size: 0.9em;
+	padding-left: 10px;
+}
 .mail-list-sender-name, .mail-list-date {
-  font-style: italic; }
-
+	font-style: italic;
+}
 .mail-list-subject {
-  font-size: 1.2em; }
-
+	font-size: 1.2em;
+}
 .mail-list-delete-wrapper {
-  float: right; }
-
+	float: right;
+}
 .mail-list-outside-wrapper-end {
-  clear: both;
-  border-bottom: 1px @main_colour dotted; }
-
+	clear: both;
+	border-bottom: 1px @main_colour dotted;
+}
 .mail-conv-sender {
-  float: left;
-  margin: 0px 5px 5px 0px; }
-
+	float: left;
+	margin: 0px 5px 5px 0px;
+}
 .mail-conv-sender-photo {
 	.box(32px, 32px)
 }
-
 .mail-conv-sender-name {
-	float: left; }
-
+	float: left;
+}
 .mail-conv-date {
-	float: right; }
-
+	float: right;
+}
 .mail-conv-subject {
-  clear: right;
-  font-weight: bold;
-  font-size: 1.2em; }
-
+	clear: right;
+	font-weight: bold;
+	font-size: 1.2em;
+}
 .mail-conv-body {
-  clear: both; }
-
+	clear: both;
+}
 .mail-conv-delete-wrapper {
-  margin-top: 5px; }
+	margin-top: 5px;
+}
+
 
 /**
  * contacts
  */
-
 .view-contact-wrapper, .contact-entry-wrapper {
 	float: left;
 	margin: 0 5px 40px 0;
 	.box(120px, 120px);
 	padding: 3px;
-	position: relative; }
-
+	position: relative;
+}
 .contact-direction-wrapper {
 	position: absolute;
-	top: 20px; }
-
+	top: 20px;
+}
 .contact-edit-links {
 	position: absolute;
-	top: 60px; }
-
+	top: 60px;
+}
 .contact-entry-photo-wrapper {}
 
 .contact-entry-photo {
-	margin-left: 20px; }
-
+	margin-left: 20px;
+}
 .contact-entry-name {
 	width: 120px;
 	font-weight: bold;
-	/*overflow: hidden;*/
 }
-
 .contact-entry-photo {
-  position: relative; }
-
+	position: relative;
+}
 .contact-entry-edit-links .icon {
-	border: 1px solid #babdb6;
+	.borders(1px, solid, #babdb6);
 	.rounded_corners(3px);
-	background-color: #fff;
+	background-color: white;
 }
-
 #contact-entry-url,
 [id^="contact-entry-url"],
 #contact-entry-network,
 [id^="contact-entry-network"] {
 	font-size: smaller;
 }
-
 #contact-entry-network,
 [id^="contact-entry-network"] {
 	font-style: italic;
 }
-
 #contact-edit-banner-name {
-  font-size: 1.5em; }
+	font-size: 1.5em;
+}
 
 #contact-edit-photo-wrapper {
-  position: relative;
-  float: left;
-  padding: 20px; }
-
+	position: relative;
+	float: left;
+	padding: 20px;
+}
 #contact-edit-direction-icon {
-  position: absolute;
-  top: 60px;
-  left: 0; }
-
+	position: absolute;
+	top: 60px;
+	left: 0;
+}
 #contact-edit-nav-wrapper {
-  margin-left: 0px; }
-
+	margin-left: 0px;
+}
 #contact-edit-links {
 	margin-top: 23px;
-	ul {
-		.list_reset;
-	}
 }
-
 #contact-drop-links {
 	margin-left: 5px;
 }
-
 #contact-edit-nav-wrapper .icon {
 	.borders(1px, solid, #babdb6);
 	.rounded_corners(3px);
 }
-
 #contact-edit-poll-wrapper {
-  margin-left: 0px; }
-
+	margin-left: 0px;
+}
 #contact-edit-last-update-text {
-  margin-bottom: 15px; }
-
+	margin-bottom: 15px;
+}
 #contact-edit-last-updated {
-  font-weight: bold; }
-
+	font-weight: bold;
+}
 #contact-edit-poll-text {
-  display: inline; }
-
-#contact-edit-info_tbl, #contact-edit-info_parent, .mceLayout {
-  width: 100%; }
-
+	display: inline;
+}
+#contact-edit-info_tbl,
+#contact-edit-info_parent,
+.mceLayout {
+	width: 100%; }
 #contact-edit-end {
-  clear: both;
-  margin-bottom: 65px; }
-
+	clear: both;
+	margin-bottom: 65px;
+}
 .contact-photo-menu-button {
 	position: absolute;
 	background: url("dark/photo-menu.jpg") top left no-repeat transparent;
@@ -1816,81 +1781,78 @@ div {
 	text-indent: 40px;
 	display: none;
 }
-
 .contact-photo-menu {
-  width: auto;
-  border: 2px solid #444;
-  background: @bg_colour;
-  color: @main_colour;
-  position: absolute;
-  left: 0px;
-  top: 90px;
-  display: none;
-  z-index: 10000;
-  ul {
-    margin: 0px;
-    padding: 0px;
-    list-style: none; }
-  li a {
-    display: block;
-    padding: 2px;
-    &:hover {
-      color: #fff;
-      background: #3465A4;
-      text-decoration: none; } } }
+	width: auto;
+	.borders(2px, solid, darken(@main_alt_colour, 66.5%));
+	background: @bg_colour;
+	color: @main_colour;
+	position: absolute;
+	left: 0px;
+	top: 90px;
+	display: none;
+	z-index: 10000;
+	li a {
+		display: block;
+		padding: 2px;
+		&:hover {
+			color: white;
+			background: #3465A4;
+			text-decoration: none;
+		}
+	}
+}
+
 
 /**
  * register, settings & profile forms
  */
-
 .openid {}
 
 #id_openid_url {
-  background: url(dark/login-bg.gif) no-repeat;
-  background-position: 0 50%;
-  padding-left: 18px; }
-
+	background: url(dark/login-bg.gif) no-repeat;
+	background-position: 0 50%;
+	padding-left: 18px;
+}
 #settings-nickname-desc {
 	background-color: @main_colour;
 	.rounded_corners;
 	padding: 5px;
-	color: #111;
+	color: @shadow_colour;
 }
-
 #settings-default-perms {
-  margin-bottom: 20px; }
-
+	margin-bottom: 20px;
+}
 #register-form div, #profile-edit-form div {
-  clear: both; }
-
+	clear: both;
+}
 .settings-block {
-  label {
-    clear: left; }
-  input {
-    margin: 10px 5px; } }
-
-/*#register-form label,     */
-/*#profile-edit-form label {*/
-/*    width: 300px;         */
-/*    float: left;          */
-/*}                         */
-
-/*#register-form span,     */
-/*#profile-edit-form span {*/
-/*    color: #555753;      */
-/*    display: block;      */
-/*    margin-bottom: 20px; */
-/*}                        */
-
+	label {
+		clear: left;
+	}
+	input {
+		margin: 10px 5px;
+	}
+}
+#register-form label,
+#profile-edit-form label {
+    width: 300px;
+    float: left;
+} 
+#register-form span,
+#profile-edit-form span {
+    color: @menu_bg_colour;
+    display: block;
+    margin-bottom: 20px;
+}
 #profile-edit-marital-label span {
-  margin: -4px; }
-
+	margin: -4px;
+}
 .settings-submit-wrapper, .profile-edit-submit-wrapper {
-  margin: 0 0 30px -3px; }
-
+	margin: 0 0 30px -3px;
+}
 .profile-edit-side-div {
-  display: none; }
-
+	display: none;
+}
 /*.profile-edit-side-div:hover {
     display: block;
 }
@@ -1899,12 +1861,12 @@ div {
 }*/
 
 #profiles-menu-trigger {
-  margin: 0px 0px 0px 25px; }
-
+	margin: 0px 0px 0px 25px;
+}
 .profile-listing {
-  float: left;
-  margin: 20px 20px 0px 0px; }
-
+	float: left;
+	margin: 20px 20px 0px 0px;
+}
 .icon-profile-edit {
 	background: url("dark/icons.png") -150px 0px no-repeat;
 	border: 0;
@@ -1938,39 +1900,36 @@ div {
 	margin: 10px 10px 10px 288px;
 }
 
+
 /**
  * contacts selector
  */
-
 .group-delete-wrapper {
 	margin: -31px 50px 0 0;
-	float: right; }
-
+	float: right;
+}
 /*.group-delete-icon {
     margin: 0 0 0 10px;
 }*/
-
 #group-edit-submit-wrapper {
 	margin: 0 0 10px 0;
-	display: inline; }
-
+	display: inline;
+}
 #group-edit-desc {
-	margin: 10px 0px; }
-
+	margin: 10px 0px;
+}
 #group-members, #prof-members {
 	height: 200px;
 	overflow: auto;
 	.borders(1px, solid, #555753);
 	.rounded_corners(5px 5px 0 0);
 }
-
 #group-all-contacts, #prof-all-contacts {
 	height: 200px;
 	overflow: auto;
 	.borders(1px, solid, #555753);
 	.rounded_corners(0 0 5px 5px);
 }
-
 #group-members h3,
 #group-all-contacts h3,
 #prof-members h3,
@@ -1978,215 +1937,227 @@ div {
 	color: @main_alt_colour;
 	background-color: #555753;
 	margin: 0;
-	padding: 5px; }
-
+	padding: 5px;
+}
 #group-separator, #prof-separator {
-	display: none; }
+	display: none;
+}
+
 
 /**
  * profile
  */
-
 #cropimage-wrapper {
-  float: left; }
-
+	float: left;
+}
 #crop-image-form {
-  clear: both; }
+	clear: both;
+}
+
 
 /**
  * intros
  */
-
 .intro-wrapper {
-  margin-top: 20px; }
-
+	margin-top: 20px;
+}
 .intro-fullname {
-  font-size: 1.1em;
-  font-weight: bold; }
-
+	font-size: 1.1em;
+	font-weight: bold;
+}
 .intro-desc {
-  margin-bottom: 20px;
-  font-weight: bold; }
-
+	margin-bottom: 20px;
+	font-weight: bold;
+}
 .intro-note {
-  padding: 10px; }
-
+	padding: 10px;
+}
 .intro-end {
-  padding: 30px; }
-
+	padding: 30px;
+}
 .intro-form {
-  float: left; }
-
-.intro-approve-form, .intro-approve-as-friend-end {
-  clear: both; }
-
+	float: left;
+}
+.intro-approve-form,
+.intro-approve-as-friend-end {
+	clear: both;
+}
 .intro-submit-approve, .intro-submit-ignore {
-  margin-right: 20px; }
-
+	margin-right: 20px;
+}
 .intro-submit-approve {
-  margin-top: 15px; }
-
-.intro-approve-as-friend-label, .intro-approve-as-fan-label, .intro-approve-as-friend, .intro-approve-as-fan {
-  float: left; }
-
+	margin-top: 15px;
+}
+.intro-approve-as-friend-label,
+.intro-approve-as-fan-label,
+.intro-approve-as-friend,
+.intro-approve-as-fan {
+	float: left;
+}
 .intro-form-end {
-  clear: both;
-  margin-bottom: 10px; }
-
+	clear: both;
+	margin-bottom: 10px;
+}
 .intro-approve-as-friend-desc {
-  margin-top: 10px; }
-
+	margin-top: 10px;
+}
 .intro-approve-as-end {
-  clear: both;
-  margin-bottom: 10px; }
-
+	clear: both;
+	margin-bottom: 10px;
+}
 .intro-end, .clear {
-  clear: both; }
+	clear: both;
+}
+
 
 /**
  * events
  */
-
 .eventcal {
-  float: left;
-  font-size: 20px; }
-
+	float: left;
+	font-size: 20px;
+}
 .event {
-  background: @bg_colour; }
-
+	background: @bg_colour;
+}
 .vevent {
-  border: 1px solid #ccc;
-  .event-description, .event-location, .event-start {
-    margin-left: 10px;
-    margin-right: 10px; } }
-
+	border: 1px solid darken(@main_alt_colour, 13.5%);
+	.event-description, .event-location, .event-start {
+		margin-left: 10px;
+		margin-right: 10px;
+	}
+}
 #new-event-link {
-  margin-bottom: 10px; }
-
+	margin-bottom: 10px;
+}
 .edit-event-link, .plink-event-link {
   /*float: left;      */
   /*margin-top: 4px;  */
   /*margin-right: 4px;*/
-  /*margin-bottom: 15px;*/ }
-
+  /*margin-bottom: 15px;*/
+}
 .event-description:before {
-  content: url('../../../images/calendar.png');
-  margin-right: 15px; }
-
-.event-start, .event-end {
-  margin-left: 10px;
-  width: 330px;
-  font-size: smaller; }
-
-.event-start .dtstart, .event-end .dtend {
-  float: right; }
-
+	content: url('../../../images/calendar.png');
+	margin-right: 15px;
+}
+.event-start,
+.event-end {
+	margin-left: 10px;
+	width: 330px;
+	font-size: smaller;
+}
+.event-start .dtstart,
+.event-end .dtend {
+	float: right;
+}
 .event-list-date {
-  margin-bottom: 10px; }
-
+	margin-bottom: 10px;
+}
 .prevcal, .nextcal {
-  float: left;
-  margin-left: 32px;
-  margin-right: 32px;
-  margin-top: 64px; }
-
-.event-calendar-end {
-  clear: both; }
-
+	float: left;
+	margin: 64px 32px auto 32px;
+}
 .calendar {
-  font-family: monospace; }
-
+	font-family: monospace;
+}
 .today {
-  font-weight: bold;
-  color: #F00; }
-
+	font-weight: bold;
+	color: red;
+}
 #event-start-text, #event-finish-text {
-  margin-top: 10px;
-  margin-bottom: 5px; }
-
-#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text, #event-share-checkbox {
-  float: left; }
-
+	margin-top: 10px;
+	margin-bottom: 5px;
+}
+#event-nofinish-checkbox,
+#event-nofinish-text,
+#event-adjust-checkbox,
+#event-adjust-text,
+#event-share-checkbox {
+	float: left;
+}
 #event-datetime-break {
-  margin-bottom: 10px; }
-
-#event-nofinish-break, #event-adjust-break, #event-share-break {
-  clear: both; }
-
+	margin-bottom: 10px;
+}
+#event-nofinish-break,
+#event-adjust-break,
+#event-share-break {
+	clear: both;
+}
 #event-desc-text, #event-location-text {
-  margin-top: 10px;
-  margin-bottom: 5px; }
-
+	margin-top: 10px;
+	margin-bottom: 5px;
+}
 #event-submit {
-  margin-top: 10px; }
-
+	margin-top: 10px;
+}
 .body-tag {
-  margin: 10px 0;
-  opacity: 0.5;
-  &:hover {
-    opacity: 1.0 !important; } }
-
+	margin: 10px 0;
+	opacity: 0.5;
+	&:hover {
+		opacity: 1.0 !important;
+	}
+}
 .filesavetags, .categorytags {
-  margin: 20px 0;
-  opacity: 0.5; }
-
+	margin: 20px 0;
+	opacity: 0.5;
+}
 .filesavetags:hover, .categorytags:hover {
-  margin: 20px 0;
-  opacity: 1.0 !important; }
-
+	margin: 20px 0;
+	opacity: 1.0 !important;
+}
 .item-select {
-  opacity: 0.1;
-  margin: 5px 0 0 6px !important;
-  &:hover {
-    opacity: 1; } }
-
+	opacity: 0.1;
+	margin: 5px 0 0 6px !important;
+	&:hover {
+		opacity: 1;
+	}
+}
 .checkeditem {
-  opacity: 1; }
-
+	opacity: 1;
+}
 #item-delete-selected {
-  margin-top: 30px; }
-
+	margin-top: 30px;
+}
 /* was tired of having no way of moving it around, so
 * here's a little 'hook' to do so */
-
 .delete-checked {
-  position: absolute;
-  left: 35px;
-  margin-top: 20px; }
-
-#item-delete-selected-end {
-  clear: both; }
-
+	position: absolute;
+	left: 35px;
+	margin-top: 20px;
+}
 #item-delete-selected-icon {
-  float: left;
-  margin-right: 5px; }
-
+	float: left;
+	margin-right: 5px;
+}
 #item-delete-selected-desc {
-  float: left;
-  margin-right: 5px;
-  &:hover {
-    text-decoration: underline; } }
-
+	float: left;
+	margin-right: 5px;
+	&:hover {
+		text-decoration: underline;
+	}
+}
 .fc-state-highlight {
-  background: @main_colour;
-  color: @bg_colour; }
+	background: @main_colour;
+	color: @bg_colour;
+}
+
 
 /**
  * directory
  */
-
 .directory-item {
-  float: left;
-  margin: 0 5px 4px 0;
-  padding: 3px;
-  width: 180px;
-  height: 250px;
-  position: relative; }
+	float: left;
+	margin: 0 5px 4px 0;
+	padding: 3px;
+	width: 180px;
+	height: 250px;
+	position: relative;
+}
+
 
 /**
  * sidebar
  */
-
 #group-sidebar {
 	margin-bottom: 10px;
 }
@@ -2232,7 +2203,7 @@ div {
 #sidebar-new-group {
 	margin: auto;
 	display: inline-block;
-	color: #efefef;
+	color: @main_alt_colour;
 	text-decoration: none;
 	text-align: center;
 }
@@ -2252,13 +2223,13 @@ div {
 #side-peoplefind-url {
 	background-color: @bg_colour;
 	color: @main_colour;
-	border: 1px #999 solid;
+	.borders(1px, solid, darken(@main_alt_colour, 33.5%));
 	margin-right: 3px;
 	width: 75%;
 	&:hover, &:focus {
-		background-color: #efefef;
-		color: #222;
-		border: 1px 333 solid;
+		background-color: @main_alt_colour;
+		color: darken(@main_alt_colour, 80%);
+		.borders(1px, solid, darken(@main_alt_colour, 73.5%));
 	}
 }
 .nets-ul {
@@ -2284,15 +2255,16 @@ div {
  */
 #pending-update {
 	float: right;
-	color: #fff;
+	color: white;
 	font-weight: bold;
-	background-color: #ff0000;
-	padding: 0 .3em;
+	background-color: red;
+	padding: 0 0.3em;
 }
 .admin {
 	&.linklist {
 		border: 0;
-		padding: 0; }
+		padding: 0;
+	}
 	&.link {
 		.list_reset;
 	}
@@ -2306,7 +2278,7 @@ div {
 	    clear: left;
 		margin-bottom: 2px;
 		padding-bottom: 2px;
-		border-bottom: 1px solid #000;
+		border-bottom: 1px solid @shadow_colour;
 	}
 	dt {
 		width: 250px;
@@ -2317,7 +2289,7 @@ div {
 		margin-left: 250px;
 	}
 	h3 {
-		border-bottom: 1px solid #ccc;
+		border-bottom: 1px solid darken(@main_alt_colour, 13.5%);
 	}
 	.submit {
 		clear: left;
@@ -2327,9 +2299,8 @@ div {
 		padding: 0;
 	}
 	.plugin {
-		list-style: none;
 		display: block;
-		border: 1px solid #888;
+		.borders(1px, solid, darken(@main_alt_colour, 40%));
 		padding: 1em;
 		margin-bottom: 5px;
 		clear: left;
@@ -2340,7 +2311,7 @@ div {
 	}
 	table {
 		width: 100%;
-		border-bottom: 1px solid #000;
+		border-bottom: 1px solid @shadow_colour;
 		margin: 5px 0;
 		th {
 			text-align: left;
@@ -2351,8 +2322,7 @@ div {
 	}
 	table {
 		&#users img {
-			width: 16px;
-			height: 16px;
+			.box(16px, 16px);
 		}
 	}
 	.selectall {
@@ -2363,15 +2333,14 @@ div {
 		text-decoration: underline;
 	}
 }
-
 #users .name {
 	color: @main_colour;
 }
 
+
 /**
  * form fields
  */
-
 .field {
 	overflow: auto;
 	label {
@@ -2382,15 +2351,16 @@ div {
 		border: 1px @bg_colour solid;
 		padding: 5px;
 		background: @main_colour;
-		color: #111; } }
-
+		color: #111;
+	}
+}
 .field .onoff {
 	float: right;
 	margin: 0 330px 0 auto;
 	width: 80px;
 	a {
 		display: block;
-		border: 1px solid #666;
+		.borders(1px, solid, darken(@main_alt_colour, 53.5%));
 		padding: 3px 6px 4px 10px;
 		height: 16px;
 		text-decoration: none;
@@ -2401,33 +2371,31 @@ div {
 	}
 	.on {
 		background-position: 42px 1px;
-		background-color: #999;
-		color: #111;
+		background-color: darken(@main_alt_colour, 33.5%);
+		color: darken(@main_alt_colour, 86.5%);
 		text-align: left;
 	}
 	.off {
 		background-position: 2px 1px;
-		background-color: #ccc;
-		color: #333;
+		background-color: darken(@main_alt_colour, 13.5%);
+		color: darken(@main_alt_colour, 73.5%);
 		text-align: right;
 	}
 }
-
 .hidden {
-	display: none !important; }
-
+	display: none !important;
+}
 .field textarea {
 	.box(80%, 100px);
 }
-
 .field_help {
-  display: block;
-  margin-left: 297px;
-  color: #aaa; }
-
+	display: block;
+	margin-left: 297px;
+	color: darken(@main_alt_colour, 24%);
+}
 .field.radio .field_help {
-  margin-left: 297px; }
-
+	margin-left: 297px;
+}
 label {
 	width: 38%;
 	display: inline-block;
@@ -2436,12 +2404,12 @@ label {
 	.borders(1px, solid, @bg_colour);
 	padding: 5px;
 	background: @main_colour;
-	color: #111;
+	color: darken(@main_alt_colour, 86.5%);
 	.box_shadow(3px, 3px, 5px);
 }
 input {
 	.box(250px, 25px);
-	.borders(1px, solid, #999);
+	.borders(1px, solid, darken(@main_alt_colour, 33.5%));
 	&[type="checkbox"],
 	&[type="radio"] {
 		margin: 0;
@@ -2449,11 +2417,11 @@ input {
 	}
 	&[type="submit"],
 	&[type="button"] {
-		background-color: #eee;
-		.borders(2px, outset, #aaa);
+		background-color: @main_alt_colour;
+		.borders(2px, outset, darken(@main_alt_colour, 24%));
 		.rounded_corners;
 		.box_shadow(1px, 3px, 4px, 0);
-		color: #2e302e;
+		color: @bg_alt_colour;
 		cursor: pointer;
 		font-weight: bold;
 		width: auto;
@@ -2476,35 +2444,35 @@ input {
 	position: absolute;
 	display: none;
 	.background {
-		background-color: #000;
+		background-color: darken(@main_alt_colour, 86.5%);
 		opacity: 0.5;
 		.box(100%, 100%);
 		position: absolute;
 		top: 0px;
-		left: 0px; }
+		left: 0px;
+	}
 	.panel {
 		top: 25%;
 		left: 25%;
 		.box(50%, 50%);
 		padding: 1em;
 		position: absolute;
-		border: 4px solid #000000;
-		background-color: #FFFFFF;
+		.borders(4px, solid, black);
+		background-color: white;
 	}
 }
-
 #panel {
-	z-index: 100; }
-
+	z-index: 100;
+}
 .grey, .gray {
-	color: gray; }
-
+	color: gray;
+}
 .orange {
-	color: orange; }
-
+	color: orange;
+}
 .red {
-	color: red; }
-
+	color: red;
+}
 .popup .panel {
 	.panel_text {
 		display: block;
@@ -2522,51 +2490,54 @@ input {
 		position: absolute;
 	}
 }
-
 .panel_text .progress {
-  width: 50%;
-  overflow: hidden;
-  height: auto;
-  border: 1px solid #cccccc;
-  margin-bottom: 5px;
-  span {
-    float: right;
-    display: block;
-    width: 25%;
-    background-color: #eeeeee;
-    text-align: right; } }
+	width: 50%;
+	overflow: hidden;
+	height: auto;
+	.borders(1px, solid, darken(@main_alt_colour, 13.5%));
+	margin-bottom: 5px;
+	span {
+		float: right;
+		display: block;
+		width: 25%;
+		background-color: @main_alt_colour;
+		text-align: right;
+	}
+}
+
 
 /**
  * OAuth
  */
-
 .oauthapp {
-  height: auto;
-  overflow: auto;
-  border-bottom: 2px solid #cccccc;
-  padding-bottom: 1em;
-  margin-bottom: 1em;
-  img {
-    float: left;
-    width: 48px;
-    height: 48px;
-    margin: 10px;
-    &.noicon {
-      background-image: url("../../../images/icons/48/plugin.png");
-      background-position: center center;
-      background-repeat: no-repeat; } }
-  a {
-    float: left; } }
+	height: auto;
+	overflow: auto;
+	border-bottom: 2px solid darken(@main_alt_colour, 13.5%);
+	padding-bottom: 1em;
+	margin-bottom: 1em;
+	img {
+		float: left;
+		.box(48px, 48px);
+		margin: 10px;
+		&.noicon {
+			background-image: url("../../../images/icons/48/plugin.png");
+			background-position: center center;
+			background-repeat: no-repeat;
+		}
+	}
+	a {
+		float: left;
+	}
+}
+
 
 /**
  * icons
  */
-
 .iconspacer {
 	display: block;
 	.box(16px, 16px);
 }
-
 .icon {
 	display: block;
 	.box;
@@ -2576,242 +2547,252 @@ input {
 	.rounded_corners;
 	&:hover {
 		border: 0;
-		text-decoration: none; } }
-
+		text-decoration: none;
+	}
+}
 .editicon {
-  display: inline-block;
-  width: 21px;
-  height: 21px;
-  background: url(dark/editicons.png) no-repeat;
-  border: 0;
-  text-decoration: none; }
-
+	display: inline-block;
+	.box(21px, 21px);
+	background: url(dark/editicons.png) no-repeat;
+	border: 0;
+	text-decoration: none;
+}
 .shadow {
 	.box_shadow(2px, 2px, 5px, 2px);
 	&:active, &:focus, &:hover {
-		box-shadow: 0 0 0 0;
+		.box_shadow(0, 0, 0, 0);
 	}
 }
 .editicon:hover {
-	border: 0; }
-
+	border: 0;
+}
 .boldbb {
 	background-position: 0px 0px;
 	&:hover {
-		background-position: -22px 0px; } }
-
+		background-position: -22px 0px; }
+}
 .italicbb {
 	background-position: 0px -22px;
 	&:hover {
-		background-position: -22px -22px; } }
-
+		background-position: -22px -22px; }
+}
 .underlinebb {
 	background-position: 0px -44px;
 	&:hover {
-		background-position: -22px -44px; } }
-
+		background-position: -22px -44px; }
+}
 .quotebb {
 	background-position: 0px -66px;
 	&:hover {
-		background-position: -22px -66px; } }
-
+		background-position: -22px -66px; }
+}
 .codebb {
 	background-position: 0px -88px;
 	&:hover {
-		background-position: -22px -88px; } }
-
+		background-position: -22px -88px; }
+}
 .imagebb {
 	background-position: -44px 0px;
 	&:hover {
-		background-position: -66px 0px; } }
-
+		background-position: -66px 0px; }
+}
 .urlbb {
 	background-position: -44px -22px;
 	&:hover {
-		background-position: -66px -22px; } }
-
+		background-position: -66px -22px; }
+}
 .videobb {
 	background-position: -44px -44px;
 	&:hover {
-		background-position: -66px -44px; } }
-
+		background-position: -66px -44px; }
+}
 .icon {
 	&.drop, &.drophide, &.delete {
 		float: left;
-		margin: 0 2px; }
+		margin: 0 2px;
+	}
 	&.s22 {
 		&.delete {
 			display: block;
-			background-position: -110px 0; }
+			background-position: -110px 0;
+		}
 		&.text {
 			padding: 10px 0px 0px 25px;
-			width: 200px; } }
+			width: 200px;
+		}
+	}
 	&.text {
-		text-indent: 0px; }
+		text-indent: 0px;
+	}
 	&.s16 {
 		min-width: 16px;
-		height: 16px; } }
-
+		height: 16px;
+	}
+}
+// special case for wall items
+.wall-item-delete-wrapper.icon.delete,
+.wall-item-delete-wrapper.icon.drophide {
+	margin: 0;
+}
 .s16 .add {
 	background: url("../../../images/icons/16/add.png") no-repeat;
 }
-
 .add {
-	margin: 0px 5px; }
-
+	margin: 0px 5px;
+}
 .article {
-	background-position: -50px 0; }
-
+	background-position: -50px 0;
+}
 .audio {
-	background-position: -70px 0; }
-
+	background-position: -70px 0;
+}
 .block {
-	background-position: -90px 0px; }
-
+	background-position: -90px 0px;
+}
 .drop, .delete {
-	background-position: -110px 0; }
-
+	background-position: -110px 0;
+}
 .drophide {
-	background-position: -130px 0; }
-
+	background-position: -130px 0;
+}
 .edit {
-	background-position: -150px 0; }
-
+	background-position: -150px 0;
+}
 .camera {
-	background-position: -170px 0; }
-
+	background-position: -170px 0;
+}
 .dislike {
-	background-position: -190px 0; }
-
+	background-position: -190px 0;
+}
 .file-as {
-	background-position: -230px -60px; }
-
+	background-position: -230px -60px;
+}
 .like {
-	background-position: -211px 0; }
-
+	background-position: -211px 0;
+}
 .link {
-	background-position: -230px 0; }
-
-.globe, .location {
-	background-position: -50px -20px; }
-
-.noglobe, .nolocation {
-	background-position: -70px -20px; }
-
+	background-position: -230px 0;
+}
+.globe,
+.location {
+	background-position: -50px -20px;
+}
+.noglobe,
+.nolocation {
+	background-position: -70px -20px;
+}
 .no {
-	background-position: -90px -20px; }
-
+	background-position: -90px -20px;
+}
 .pause {
-	background-position: -110px -20px; }
-
+	background-position: -110px -20px;
+}
 .play {
-	background-position: -130px -20px; }
-
+	background-position: -130px -20px;
+}
 .pencil {
-	background-position: -151px -18px; }
-
+	background-position: -151px -18px;
+}
 .small-pencil {
-	background-position: -170px -20px; }
-
+	background-position: -170px -20px;
+}
 .recycle {
-	background-position: -190px -20px; }
-
+	background-position: -190px -20px;
+}
 .remote-link {
-	background-position: -210px -20px; }
-
+	background-position: -210px -20px;
+}
 .share {
-	background-position: -230px -20px; }
-
+	background-position: -230px -20px;
+}
 .tools {
-	background-position: -50px -40px; }
-
+	background-position: -50px -40px;
+}
 .lock {
-	background-position: -70px -40px; }
-
+	background-position: -70px -40px;
+}
 .unlock {
-	background-position: -88px -40px; }
-
+	background-position: -88px -40px;
+}
 .video {
-	background-position: -110px -40px; }
-
+	background-position: -110px -40px;
+}
 .attach {
-	background-position: -190px -40px; }
-
+	background-position: -190px -40px;
+}
 .language {
-	background-position: -210px -40px; }
-
+	background-position: -210px -40px;
+}
 .starred {
-	background-position: -130px -60px; }
-
+	background-position: -130px -60px;
+}
 .unstarred {
-	background-position: -150px -60px; }
-
+	background-position: -150px -60px;
+}
 .tagged {
-	background-position: -170px -60px; }
-
+	background-position: -170px -60px;
+}
 .on {
-	background-position: -50px -60px; }
-
+	background-position: -50px -60px;
+}
 .off {
-	background-position: -70px -60px; }
-
+	background-position: -70px -60px;
+}
 .prev {
-	background-position: -90px -60px; }
-
+	background-position: -90px -60px;
+}
 .next {
-	background-position: -110px -60px; }
-
+	background-position: -110px -60px;
+}
 .icon.dim {
-	opacity: 0.3; }
-
+	opacity: 0.3;
+}
 #pause {
 	position: fixed;
 	bottom: 40px;
-	right: 30px; }
-
+	right: 30px;
+}
 .border {
-	.borders(1px, solid, #babdb6);
+	.borders(1px, solid, @border2);
 	.rounded_corners;
 	&:hover {
-		.borders(1px, solid, #babdb6);
+		.borders(1px, solid, @border2);
 		.rounded_corners;
 	}
 }
-
 .attachtype {
 	display: block;
-	width: 20px;
-	height: 23px;
-	background-image: url(../../../images/content-types.png); }
-
+	.box(20px, 23px);
+	background-image: url(../../../images/content-types.png);
+}
 .type-video {
-	background-position: 0px 0px; }
-
+	background-position: 0px 0px;
+}
 .type-image {
-	background-position: -20px 0; }
-
+	background-position: -20px 0;
+}
 .type-audio {
-	background-position: -40px 0; }
-
+	background-position: -40px 0;
+}
 .type-text {
-	background-position: -60px 0px; }
-
+	background-position: -60px 0px;
+}
 .type-unkn {
-	background-position: -80px 0; }
+	background-position: -80px 0;
+}
+
 
 /**
  * footer
  */
-
 .cc-license {
 	margin-top: 100px;
-	font-size: 0.7em; }
-
+	font-size: 0.7em;
+}
 footer {
 	display: block;
-	/*margin: 50px 20%;*/
-	clear: both; }
-
+	clear: both;
+}
 #profile-jot-text {
 	height: 20px;
 	color: @main_colour;
@@ -2820,85 +2801,87 @@ footer {
 	width: 99.5%;
 }
 
+
 /**
  * acl
  */
-
-#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper {
 	display: block !important;
 	background: @bg_colour;
-	color: @main_colour; }
-
+	color: @main_colour;
+}
 #acl-wrapper {
 	width: 660px;
-	margin: 0 auto; }
-
+	margin: 0 auto;
+}
 #acl-search {
 	float: right;
 	background: white url("../../../images/search_18.png") no-repeat right center;
 	padding-right: 20px;
 	margin: 6px;
-	color: #111; }
-
+	color: @shadow_colour;
+}
 #acl-showall {
 	float: left;
 	display: block;
-	width: auto;
-	height: 18px;
-	background: #eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;
+	.box(auto, 18px);
+	background: @main_colour url("../../../images/show_all_off.png") 8px 8px no-repeat;
 	padding: 7px 10px 7px 30px;
 	.rounded_corners;
-	color: #999;
+	color: darken(@main_alt_colour, 33.5%);
 	margin: 5px 0;
 	&.selected {
-		color: #000;
-		background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat; } }
-
+		color: black;
+		background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;
+	}
+}
 #acl-list {
-  height: 210px;
-  border: 1px solid #ccc;
-  clear: both;
-  margin-top: 30px;
-  overflow: auto; }
-
+	height: 210px;
+	.borders(1px, solid, darken(@main_alt_colour, 13.5%);
+	clear: both;
+	margin-top: 30px;
+	overflow: auto;
+}
 /*#acl-list-content {
 }*/
-
 .acl-list-item {
 	.borders;
+	.box(120px, 110px);
 	display: block;
 	float: left;
-	height: 110px;
 	margin: 3px 0 5px 5px;
-	width: 120px;
 	img {
 		.box(22px, 22px);
 		float: left;
-		margin: 5px 5px 20px; }
+		margin: 5px 5px 20px;
+	}
 	p {
 		height: 12px;
 		font-size: 10px;
 		margin: 0 0 22px;
-		padding: 2px 0 1px; }
+		padding: 2px 0 1px;
+	}
 	a {
-		background: #eeeecc 3px 3px no-repeat;
+		background: @main_colour 3px 3px no-repeat;
 		.rounded_corners;
+		.box(55px, 20px);
 		clear: both;
 		font-size: 10px;
 		display: block;
-		width: 55px;
-		height: 20px;
 		color: @bg_colour;
 		margin: 5px auto 0;
 		padding: 0 3px;
 		text-align: center;
-		vertical-align: middle; } }
-
+		vertical-align: middle;
+	}
+}
 #acl-wrapper a:hover {
 	text-decoration: none;
 	color: @bg_colour;
-	border: 0; }
-
+	border: 0;
+}
 //data URI:
 // data:[<MIME-type>][;charset=<encoding>][;base64],<data>
 .acl-button-show {
@@ -2923,24 +2906,27 @@ footer {
 }
 .acl-list-item {
 	&.groupshow {
-		border-color: #9ade00; }
+		border-color: @group_show;
+	}
 	&.grouphide {
-		border-color: #ff4141; } }
-
+		border-color: @group_hide;
+	}
+}
 /** /acl **/
 
+
 /* autocomplete popup */
 .acpopup {
 	max-height: 175px;
 	max-width: 42%;
-	background-color: #555753;
-	color: #fff;
+	background-color: @menu_bg_colour;
+	color: white;
 	overflow: auto;
 	z-index: 100000;
-	border: 1px solid #cccccc;
+	border: 1px solid darken(@main_alt_colour, 13.5%);
 }
 .acpopupitem {
-	background-color: #555753;
+	background-color: @menu_bg_colour;
 	padding: 4px;
 	clear: left;
 	img {
@@ -2948,7 +2934,7 @@ footer {
 		margin-right: 4px;
 	}
 	&.selected {
-		color: #2e302e;
+		color: @bg_alt_colour;
 		background-color: @main_alt_colour;
 	}
 }
@@ -2957,42 +2943,49 @@ footer {
 	margin: 5px 5px 5px 81%;
 }
 .qcomment {
-  opacity: 0.5;
-  &:hover {
-    opacity: 1.0; } }
-
+	opacity: 0.5;
+	&:hover {
+		opacity: 1.0;
+	}
+}
 #network-star-link {
-  margin-top: 10px; }
-
+	margin-top: 10px;
+}
 .network-star {
-  float: left;
-  margin-right: 5px;
-  &.icon.starred {
-    display: inline-block; } }
-
+	float: left;
+	margin-right: 5px;
+	&.icon.starred {
+		display: inline-block;
+	}
+}
 #fileas-sidebar {}
 
 .fileas-ul {
-  padding: 0; }
+	padding: 0;
+}
+
 
 /*
  * addons theming
  */
-
 #sidebar-page-list {
-  ul {
-    padding: 0;
-    margin: 5px 0; }
-  li {
-    list-style: none; } }
-
+	ul {
+		padding: 0;
+		margin: 5px 0;
+	}
+	li {
+		list-style: none;
+	}
+}
 #jappix_mini {
-  margin-left: 130px;
-  position: fixed;
-  bottom: 0;
-  right: 175px !important;
-  /* override the jappix css */
-  z-index: 999; }
+	margin-left: 130px;
+	position: fixed;
+	bottom: 0;
+	/* override the jappix css */
+	right: 175px !important;
+	z-index: 999;
+}
+
 
 //* media stuff */
 @media handheld {
@@ -3063,7 +3056,4 @@ footer {
 		font-size: 16px;
 	}
 }
-.test {
-	color: @link_colour;
-	background-color: darken(@main_alt_colour, 13%);
-}
+