Merge git://github.com/friendica/friendica

21 files changed, 4147 insertions, 4036 deletions

diff --git a/boot.php b/boot.php
index 97085c1e7..7369b4ece 100644
--- a/boot.php
+++ b/boot.php
@@ -10,7 +10,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1378' );
+define ( 'FRIENDICA_VERSION',      '3.0.1380' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1149      );
 
@@ -78,14 +78,6 @@ define ( 'CONTACT_IS_FRIEND',   3);
 
 
 /**
- * Hook array order
- */
-
-define ( 'HOOK_HOOK',      0);
-define ( 'HOOK_FILE',      1);
-define ( 'HOOK_FUNCTION',  2);
-
-/**
  * DB update return values
  */
 
@@ -1392,7 +1384,7 @@ if(! function_exists('proc_run')) {
 
 if(! function_exists('current_theme')) {
 	function current_theme(){
-		$app_base_themes = array('duepuntozero', 'loozah');
+		$app_base_themes = array('duepuntozero', 'dispy', 'quattro');
 	
 		$a = get_app();
 	
@@ -1410,7 +1402,7 @@ if(! function_exists('current_theme')) {
 				return($t);
 		}
 	
-		$fallback = glob('view/theme/*/style.[css|php]');
+		$fallback = array_merge(glob('view/theme/*/style.css'),glob('view/theme/*/style.php'));
 		if(count($fallback))
 			return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
 	
diff --git a/include/Scrape.php b/include/Scrape.php
index ca8f6e83a..4f53effe9 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -352,10 +352,11 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 	$email_conversant = false;
 
 	$twitter = ((strpos($url,'twitter.com') !== false) ? true : false);
+	$lastfm  = ((strpos($url,'last.fm/user') !== false) ? true : false);
 
 	$at_addr = ((strpos($url,'@') !== false) ? true : false);
 
-	if(! $twitter) {
+	if((! $twitter) && (! $lastfm)) {
 
 		if(strpos($url,'mailto:') !== false && $at_addr) {
 			$url = str_replace('mailto:','',$url);
@@ -564,6 +565,14 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 			$vcard['fn'] = $tid . '@twitter';
 		}
 
+		if($lastfm) {
+			$profile = $url;
+			$poll = str_replace(array('www.','last.fm/'),array('','ws.audioscrobbler.com/1.0/'),$url) . '/recenttracks.rss';
+			$vcard['nick'] = basename($url);
+			$vcard['fn'] = $vcard['nick'] . t(' on Last.fm');
+			$network = NETWORK_FEED;
+		}
+
 		if(! x($vcard,'fn'))
 			if(x($vcard,'nick'))
 				$vcard['fn'] = $vcard['nick'];
diff --git a/include/api.php b/include/api.php
index 855e4efa3..691543907 100644
--- a/include/api.php
+++ b/include/api.php
@@ -719,14 +719,18 @@
 		if ($page<0) $page=0;
 		$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
 		$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
+		$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
 		//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
 
 		$start = $page*$count;
 
 		//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
 
+		$sql_extra = '';
 		if ($max_id > 0)
-			$sql_extra = 'AND `item`.`id` <= '.intval($max_id);
+			$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
+		if ($exclude_replies > 0)
+			$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
 
 		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
 			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@@ -1061,11 +1065,14 @@
 		$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
 		if ($page<0) $page=0;
 		$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
 		//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
 		
 		$start = $page*$count;
 
-		if ($user_info['self']==1) $sql_extra = "AND `item`.`wall` = 1 ";
+		$sql_extra = '';
+		if ($user_info['self']==1) $sql_extra .= " AND `item`.`wall` = 1 ";
+		if ($exclude_replies > 0)  $sql_extra .= ' AND `item`.`parent` = `item`.`id`';
 
 		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
diff --git a/include/diaspora.php b/include/diaspora.php
index 2be266e8a..0ca9163a8 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2150,7 +2150,7 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
 
 	$a = get_app();
 	$myaddr = $owner['nickname'] . '@' .  substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
-	$theiraddr = $contact['addr'];
+//	$theiraddr = $contact['addr'];
 
 	// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
 	// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
@@ -2213,7 +2213,10 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 
 	$a = get_app();
 	$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
-	$theiraddr = $contact['addr'];
+//	$theiraddr = $contact['addr'];
+
+	$body = $item['body'];
+	$text = html_entity_decode(bb2diaspora($body));
 
 
 	// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
@@ -2232,26 +2235,30 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 	$relay_retract = false;
 	$sql_sign_id = 'iid';
 	if( $item['deleted']) {
-		$tpl = get_markup_template('diaspora_relayable_retraction.tpl');
 		$relay_retract = true;
-		$sql_sign_id = 'retract_iid';
+
 		$target_type = ( ($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
+		$sender_signed_text = $item['guid'] . ';' . $target_type ;
+
+		$sql_sign_id = 'retract_iid';
+		$tpl = get_markup_template('diaspora_relayable_retraction.tpl');
 	}
 	elseif($item['verb'] === ACTIVITY_LIKE) {
-		$tpl = get_markup_template('diaspora_like_relay.tpl');
 		$like = true;
+
 		$target_type = 'Post';
 //		$positive = (($item['deleted']) ? 'false' : 'true');
 		$positive = 'true';
+		$sender_signed_text = $item['guid'] . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $myaddr;
+
+		$tpl = get_markup_template('diaspora_like_relay.tpl');
 	}
-	else {
+	else { // item is a comment
+		$sender_signed_text = $item['guid'] . ';' . $parent_guid . ';' . $text . ';' . $myaddr;
+
 		$tpl = get_markup_template('diaspora_comment_relay.tpl');
 	}
 
-	$body = $item['body'];
-
-	$text = html_entity_decode(bb2diaspora($body));
-
 
 	// fetch the original signature	if the relayable was created by a Diaspora
 	// or DFRN user. Relayables for other networks are not supported.
@@ -2272,51 +2279,20 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 		// function is called
 		logger('diaspora_send_relay: original author signature not found, cannot send relayable');
 		return;
-/*
-		$itemcontact = q("select * from contact where `id` = %d limit 1",
-			intval($item['contact-id'])
-		);
-		if(count($itemcontact)) {
-			if(! $itemcontact[0]['self']) {
-				$prefix = sprintf( t('[Relayed] Comment authored by %s from network %s'),
-					'['. $item['author-name'] . ']' . '(' . $item['author-link'] . ')',  
-					network_to_name($itemcontact['network'])) . "\n";
-				// "$body" was assigned to "$text" above. It isn't used after that, so I don't think
-				// the following change will do anything
-				$body = $prefix . $body;
-
-				// I think this comment will fail upon reaching Diaspora, because "$signed_text" is not defined
-			}
-		}
-		else {
-		// I'm confused about this "else." Since it sets "$handle = $myaddr," it seems like it should be for the case
-		// where the top-level post owner commented on his own post, i.e. "$itemcontact[0]['self']" is true. But it's
-		// positioned to be for the case where "count($itemcontact)" is 0.
-
-			$handle = $myaddr;
-
-			if($like)
-				$signed_text = $item['guid'] . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $handle;
-			elseif($relay_retract)
-				$signed_text = $item['guid'] . ';' . $target_type;
-			else
-				$signed_text = $item['guid'] . ';' . $parent_guid . ';' . $text . ';' . $handle;
-
-			$authorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
-
-			q("insert into sign (`" . $sql_sign_id . "`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
-				intval($item['id']),
-				dbesc($signed_text),
-				dbesc($authorsig),
-				dbesc($handle)
-			);
-		}
-*/
 	}
 
-	// sign it with the top-level owner's signature
+	// Sign the relayable with the top-level owner's signature
+	//
+	// We'll use the $sender_signed_text that we just created, instead of the $signed_text
+	// stored in the database, because that provides the best chance that Diaspora will
+	// be able to reconstruct the signed text the same way we did. This is particularly a
+	// concern for the comment, whose signed text includes the text of the comment. The
+	// smallest change in the text of the comment, including removing whitespace, will
+	// make the signature verification fail. Since we translate from BB code to Diaspora's
+	// markup at the top of this function, which is AFTER we placed the original $signed_text
+	// in the database, it's hazardous to trust the original $signed_text.
 
-	$parentauthorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
+	$parentauthorsig = base64_encode(rsa_sign($sender_signed_text,$owner['uprvkey'],'sha256'));
 
 	$msg = replace_macros($tpl,array(
 		'$guid' => xmlify($item['guid']),
diff --git a/include/items.php b/include/items.php
index 05134ef8f..a0dd1c815 100755
--- a/include/items.php
+++ b/include/items.php
@@ -446,6 +446,8 @@ function get_atom_elements($feed,$item) {
 		$res['body'] = $purifier->purify($res['body']);
 
 		$res['body'] = @html2bbcode($res['body']);
+
+
 	}
 	elseif(! $have_real_body) {
 
@@ -1264,6 +1266,12 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 		return 3;
 	}
 
+	if($contact['term-date'] != '0000-00-00 00:00:00') {
+		logger("dfrn_deliver: $url back from the dead - removing mark for death");
+		require_once('include/Contact.php');
+		unmark_for_death($contact);
+	}
+
 	$res = parse_xml_string($xml);
 
 	return $res->status; 
diff --git a/include/plugin.php b/include/plugin.php
index ae8eee78a..c6b61ae6e 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -148,7 +148,9 @@ function load_hooks() {
 	$r = q("SELECT * FROM `hook` WHERE 1");
 	if(count($r)) {
 		foreach($r as $rr) {
-			$a->hooks[] = array($rr['hook'], $rr['file'], $rr['function']);
+			if(! array_key_exists($rr['hook'],$a->hooks))
+				$a->hooks[$rr['hook']] = array();
+			$a->hooks[$rr['hook']][] = array($rr['file'],$rr['function']);
 		}
 	}
 }}
@@ -158,25 +160,24 @@ if(! function_exists('call_hooks')) {
 function call_hooks($name, &$data = null) {
 	$a = get_app();
 
-	if(count($a->hooks)) {
-		foreach($a->hooks as $hook) {
-			if($hook[HOOK_HOOK] === $name) {
-				@include_once($hook[HOOK_FILE]);
-				if(function_exists($hook[HOOK_FUNCTION])) {
-					$func = $hook[HOOK_FUNCTION];
-					$func($a,$data);
-				}
-				else {
-					// remove orphan hooks
-					q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1",
-						dbesc($hook[HOOK_HOOK]),
-						dbesc($hook[HOOK_FILE]),
-						dbesc($hook[HOOK_FUNCTION])
-					);
-				}
+	if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) {
+		foreach($a->hooks[$name] as $hook) {
+			@include_once($hook[0]);
+			if(function_exists($hook[1])) {
+				$func = $hook[1];
+				$func($a,$data);
+			}
+			else {
+				// remove orphan hooks
+				q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1",
+					dbesc($name),
+					dbesc($hook[0]),
+					dbesc($hook[1])
+				);
 			}
 		}
 	}
+
 }}
 
 
diff --git a/library/simplepie/simplepie.inc b/library/simplepie/simplepie.inc
index 8a2739f52..96ad06678 100644
--- a/library/simplepie/simplepie.inc
+++ b/library/simplepie/simplepie.inc
@@ -709,7 +709,7 @@ class SimplePie
 	 * @see SimplePie::strip_htmltags()
 	 * @access private
 	 */
-	var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
+	var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
 
 	/**
 	 * The SimplePie class contains feed level data and options
@@ -14803,7 +14803,7 @@ class SimplePie_Sanitize
 	// Options
 	var $remove_div = true;
 	var $image_handler = '';
-	var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
+	var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
 	var $encode_instead_of_strip = false;
 	var $strip_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
 	var $strip_comments = false;
@@ -14892,7 +14892,7 @@ class SimplePie_Sanitize
 		}
 	}
 
-	function strip_htmltags($tags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'))
+	function strip_htmltags($tags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'))
 	{
 		if ($tags)
 		{
diff --git a/mod/contacts.php b/mod/contacts.php
index f84a988c8..fb4595739 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -479,12 +479,13 @@ function contacts_content(&$a) {
 
 
 
-
+	$searching = false;
 	if($search) {
 		$search_hdr = $search;
-		$search = dbesc($search.'*');
+		$search_txt = dbesc(protect_sprintf(preg_quote($search)));
+		$searching = true;
 	}
-	$sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : "");
+	$sql_extra .= (($searching) ? " AND `name` REGEXP '$search_txt' " : "");
 
 	if($nets)
 		$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
@@ -501,7 +502,6 @@ function contacts_content(&$a) {
 	}
 
 
-
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
 		intval($_SESSION['uid']),
 		intval($a->pager['start']),
@@ -568,7 +568,7 @@ function contacts_content(&$a) {
 		'$total' => $total,
 		'$search' => $search_hdr,
 		'$desc' => t('Search your contacts'),
-		'$finding' => (strlen($search) ? t('Finding: ') . "'" . $search . "'" : ""),
+		'$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""),
 		'$submit' => t('Find'),
 		'$cmd' => $a->cmd,
 		'$contacts' => $contacts,
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 436727a78..f3c145410 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -443,7 +443,7 @@ function dfrn_poll_content(&$a) {
 			$encrypted_id = '';
 			$id_str = $my_id . '.' . mt_rand(1000,9999);
 
-			if($r[0]['duplex'] && strlen($r[0]['pubkey'])) {
+			if(($r[0]['duplex'] && strlen($r[0]['pubkey'])) || (! strlen($r[0]['prvkey']))) {
 				openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']);
 				openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']);
 			}
diff --git a/mod/photos.php b/mod/photos.php
index 91adbb33b..d96bc135e 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -306,7 +306,8 @@ function photos_post(&$a) {
 			$albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
 
 
-		if((x($_POST,'rotate') !== false) && (intval($_POST['rotate']) == 1)) {
+		if((x($_POST,'rotate') !== false) && 
+		   ( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) {
 			logger('rotate');
 
 			$r = q("select * from photo where `resource-id` = '%s' and uid = %d and scale = 0 limit 1",
@@ -316,7 +317,8 @@ function photos_post(&$a) {
 			if(count($r)) {
 				$ph = new Photo($r[0]['data'], $r[0]['type']);
 				if($ph->is_valid()) {
-					$ph->rotate(270);
+					$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
+					$ph->rotate($rotate_deg);
 
 					$width  = $ph->getWidth();
 					$height = $ph->getHeight();
@@ -325,8 +327,8 @@ function photos_post(&$a) {
 						dbesc($ph->imageString()),
 						intval($height),
 						intval($width),
-				dbesc($resource_id),
-				intval($page_owner_uid)
+						dbesc($resource_id),
+						intval($page_owner_uid)
 					);
 
 					if($width > 640 || $height > 640) {
@@ -338,8 +340,8 @@ function photos_post(&$a) {
 							dbesc($ph->imageString()),
 							intval($height),
 							intval($width),
-				dbesc($resource_id),
-				intval($page_owner_uid)
+							dbesc($resource_id),
+							intval($page_owner_uid)
 						);
 					}
 
@@ -352,8 +354,8 @@ function photos_post(&$a) {
 							dbesc($ph->imageString()),
 							intval($height),
 							intval($width),
-				dbesc($resource_id),
-				intval($page_owner_uid)
+							dbesc($resource_id),
+							intval($page_owner_uid)
 						);
 					}	
 				}
@@ -1251,7 +1253,8 @@ function photos_content(&$a) {
 			$edit_tpl = get_markup_template('photo_edit.tpl');
 			$edit = replace_macros($edit_tpl, array(
 				'$id' => $ph[0]['id'],
-				'$rotate' => t('Rotate CW'),
+				'$rotatecw' => t('Rotate CW (right)'),
+				'$rotateccw' => t('Rotate CCW (left)'),
 				'$album' => template_escape($ph[0]['album']),
 				'$newalbum' => t('New album name'), 
 				'$nickname' => $a->data['user']['nickname'],
diff --git a/util/messages.po b/util/messages.po
index 1ff1bbf1b..21f5c6866 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1378\n"
+"Project-Id-Version: 3.0.1380\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-18 10:00-0700\n"
+"POT-Creation-Date: 2012-06-20 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,7 +36,7 @@ msgstr ""
 
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:928
+#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:929
 #: ../../mod/editpost.php:10 ../../mod/install.php:151
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:145
 #: ../../mod/settings.php:106 ../../mod/settings.php:537
@@ -55,8 +55,8 @@ msgstr ""
 #: ../../mod/profiles.php:385 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:507
-#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3387
-#: ../../index.php:299
+#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3400
+#: ../../index.php:309
 msgid "Permission denied."
 msgstr ""
 
@@ -123,20 +123,21 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:428 ../../mod/photos.php:963 ../../mod/photos.php:1021
-#: ../../mod/photos.php:1266 ../../mod/photos.php:1306
-#: ../../mod/photos.php:1346 ../../mod/photos.php:1377
+#: ../../mod/events.php:428 ../../mod/photos.php:964 ../../mod/photos.php:1022
+#: ../../mod/photos.php:1267 ../../mod/photos.php:1307
+#: ../../mod/photos.php:1347 ../../mod/photos.php:1378
 #: ../../mod/install.php:246 ../../mod/install.php:284
 #: ../../mod/localtime.php:45 ../../mod/contacts.php:343
 #: ../../mod/settings.php:555 ../../mod/settings.php:701
 #: ../../mod/settings.php:762 ../../mod/settings.php:969
-#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/admin.php:420
-#: ../../mod/admin.php:656 ../../mod/admin.php:792 ../../mod/admin.php:991
-#: ../../mod/admin.php:1078 ../../mod/profiles.php:554
+#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/message.php:410
+#: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792
+#: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:554
 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:609
 #: ../../addon/snautofollow/snautofollow.php:64
 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
-#: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158
+#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:164
+#: ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
@@ -226,7 +227,7 @@ msgid "link to source"
 msgstr ""
 
 #: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1529
+#: ../../include/nav.php:52 ../../boot.php:1546
 msgid "Events"
 msgstr ""
 
@@ -277,7 +278,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:423 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:265 ../../boot.php:1109
+#: ../../include/bb2diaspora.php:265 ../../boot.php:1126
 msgid "Location:"
 msgstr ""
 
@@ -354,19 +355,19 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:44 ../../boot.php:1523
+#: ../../mod/photos.php:44 ../../boot.php:1540
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:942
-#: ../../mod/photos.php:1013 ../../mod/photos.php:1028
-#: ../../mod/photos.php:1455 ../../mod/photos.php:1467
+#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:943
+#: ../../mod/photos.php:1014 ../../mod/photos.php:1029
+#: ../../mod/photos.php:1456 ../../mod/photos.php:1468
 #: ../../addon/communityhome/communityhome.php:110
 #: ../../view/theme/diabook/theme.php:598
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:59 ../../mod/photos.php:1038 ../../mod/photos.php:1505
+#: ../../mod/photos.php:59 ../../mod/photos.php:1039 ../../mod/photos.php:1506
 msgid "Upload New Photos"
 msgstr ""
 
@@ -378,8 +379,8 @@ msgstr ""
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/photos.php:154 ../../mod/photos.php:656 ../../mod/photos.php:1013
-#: ../../mod/photos.php:1028 ../../mod/profile_photo.php:60
+#: ../../mod/photos.php:154 ../../mod/photos.php:656 ../../mod/photos.php:1014
+#: ../../mod/photos.php:1029 ../../mod/profile_photo.php:60
 #: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74
 #: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254
 #: ../../mod/profile_photo.php:263
@@ -393,11 +394,11 @@ msgstr ""
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:182 ../../mod/photos.php:1022
+#: ../../mod/photos.php:182 ../../mod/photos.php:1023
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:245 ../../mod/photos.php:1267
+#: ../../mod/photos.php:245 ../../mod/photos.php:1268
 msgid "Delete Photo"
 msgstr ""
 
@@ -430,155 +431,155 @@ msgstr ""
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:734 ../../mod/profile_photo.php:259
+#: ../../mod/photos.php:735 ../../mod/profile_photo.php:259
 #: ../../mod/wall_upload.php:105
 msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/photos.php:820 ../../mod/community.php:16
+#: ../../mod/photos.php:821 ../../mod/community.php:16
 #: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/photos.php:830
+#: ../../mod/photos.php:831
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:909
+#: ../../mod/photos.php:910
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:970
+#: ../../mod/photos.php:971
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:973 ../../mod/photos.php:1017
+#: ../../mod/photos.php:974 ../../mod/photos.php:1018
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:974
+#: ../../mod/photos.php:975
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:975
+#: ../../mod/photos.php:976
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:977 ../../mod/photos.php:1262
+#: ../../mod/photos.php:978 ../../mod/photos.php:1263
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:1032
+#: ../../mod/photos.php:1033
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:1056 ../../mod/photos.php:1488
+#: ../../mod/photos.php:1057 ../../mod/photos.php:1489
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:1091
+#: ../../mod/photos.php:1092
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1093
+#: ../../mod/photos.php:1094
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:1143
+#: ../../mod/photos.php:1144
 msgid "View photo"
 msgstr ""
 
-#: ../../mod/photos.php:1143
+#: ../../mod/photos.php:1144
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1144
+#: ../../mod/photos.php:1145
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1150 ../../include/conversation.php:490
+#: ../../mod/photos.php:1151 ../../include/conversation.php:490
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:1172
+#: ../../mod/photos.php:1173
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1240
+#: ../../mod/photos.php:1241
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1243
+#: ../../mod/photos.php:1244
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1253
+#: ../../mod/photos.php:1254
 msgid "Rotate CW"
 msgstr ""
 
-#: ../../mod/photos.php:1255
+#: ../../mod/photos.php:1256
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1258
+#: ../../mod/photos.php:1259
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1260
+#: ../../mod/photos.php:1261
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1264
+#: ../../mod/photos.php:1265
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1284 ../../include/conversation.php:554
+#: ../../mod/photos.php:1285 ../../include/conversation.php:554
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1285 ../../include/conversation.php:555
+#: ../../mod/photos.php:1286 ../../include/conversation.php:555
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1286 ../../include/conversation.php:989
+#: ../../mod/photos.php:1287 ../../include/conversation.php:989
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1287 ../../mod/editpost.php:104
+#: ../../mod/photos.php:1288 ../../mod/editpost.php:104
 #: ../../mod/wallmessage.php:145 ../../mod/message.php:215
-#: ../../mod/message.php:410 ../../include/conversation.php:371
+#: ../../mod/message.php:411 ../../include/conversation.php:371
 #: ../../include/conversation.php:731 ../../include/conversation.php:1008
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1303 ../../mod/photos.php:1343
-#: ../../mod/photos.php:1374 ../../include/conversation.php:577
+#: ../../mod/photos.php:1304 ../../mod/photos.php:1344
+#: ../../mod/photos.php:1375 ../../include/conversation.php:577
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1305 ../../mod/photos.php:1345
-#: ../../mod/photos.php:1376 ../../include/conversation.php:579
-#: ../../boot.php:523
+#: ../../mod/photos.php:1306 ../../mod/photos.php:1346
+#: ../../mod/photos.php:1377 ../../include/conversation.php:579
+#: ../../boot.php:518
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1307 ../../mod/editpost.php:125
+#: ../../mod/photos.php:1308 ../../mod/editpost.php:125
 #: ../../include/conversation.php:589 ../../include/conversation.php:1026
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1404 ../../mod/settings.php:618
+#: ../../mod/photos.php:1405 ../../mod/settings.php:618
 #: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:663
 #: ../../include/conversation.php:328 ../../include/conversation.php:609
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1494
+#: ../../mod/photos.php:1495
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1503
+#: ../../mod/photos.php:1504
 msgid "Recent Photos"
 msgstr ""
 
@@ -821,7 +822,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:2783
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:2796
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -1193,7 +1194,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1053
+#: ../../include/contact_widgets.php:9 ../../boot.php:1070
 msgid "Connect"
 msgstr ""
 
@@ -1723,8 +1724,8 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:692
 #: ../../addon/facebook/facebook.php:1182
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2792
-#: ../../boot.php:703
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2805
+#: ../../boot.php:720
 msgid "Administrator"
 msgstr ""
 
@@ -1734,7 +1735,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:835
+#: ../../mod/lostpass.php:83 ../../boot.php:852
 msgid "Password Reset"
 msgstr ""
 
@@ -2409,7 +2410,7 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1535
+#: ../../mod/notes.php:44 ../../boot.php:1552
 msgid "Personal Notes"
 msgstr ""
 
@@ -2618,7 +2619,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:298
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308
 msgid "Permission denied"
 msgstr ""
 
@@ -2660,7 +2661,7 @@ msgstr ""
 
 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:79
-#: ../../include/nav.php:50 ../../boot.php:1514
+#: ../../include/nav.php:50 ../../boot.php:1531
 msgid "Profile"
 msgstr ""
 
@@ -2764,7 +2765,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:801
+#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:818
 msgid "Register"
 msgstr ""
 
@@ -2798,7 +2799,7 @@ msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
 #: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3234
+#: ../../mod/display.php:142 ../../include/items.php:3247
 msgid "Item not found."
 msgstr ""
 
@@ -2807,7 +2808,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1520
+#: ../../include/nav.php:51 ../../boot.php:1537
 msgid "Photos"
 msgstr ""
 
@@ -3610,7 +3611,7 @@ msgstr ""
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:966
+#: ../../mod/profile.php:21 ../../boot.php:983
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -3985,23 +3986,23 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:645 ../../boot.php:1075
+#: ../../mod/profiles.php:645 ../../boot.php:1092
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:646 ../../boot.php:1076
+#: ../../mod/profiles.php:646 ../../boot.php:1093
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:657 ../../boot.php:1086
+#: ../../mod/profiles.php:657 ../../boot.php:1103
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:659 ../../boot.php:1089
+#: ../../mod/profiles.php:659 ../../boot.php:1106
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:660 ../../boot.php:1090
+#: ../../mod/profiles.php:660 ../../boot.php:1107
 msgid "Edit visibility"
 msgstr ""
 
@@ -4615,16 +4616,32 @@ msgstr ""
 msgid "%s - Click to open/close"
 msgstr ""
 
-#: ../../addon/page/page.php:48
+#: ../../addon/page/page.php:58 ../../addon/page/page.php:88
 msgid "Forums"
 msgstr ""
 
-#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
-#: ../../include/contact_widgets.php:188 ../../include/conversation.php:476
-#: ../../boot.php:524
+#: ../../addon/page/page.php:73 ../../addon/page/page.php:107
+#: ../../addon/showmore/showmore.php:87 ../../include/contact_widgets.php:188
+#: ../../include/conversation.php:476 ../../boot.php:519
 msgid "show more"
 msgstr ""
 
+#: ../../addon/page/page.php:125
+msgid "Page settings updated."
+msgstr ""
+
+#: ../../addon/page/page.php:151
+msgid "Page Settings"
+msgstr ""
+
+#: ../../addon/page/page.php:153
+msgid "How many forums to display on sidebar without paging"
+msgstr ""
+
+#: ../../addon/page/page.php:156
+msgid "Randomise Page/Forum list"
+msgstr ""
+
 #: ../../addon/planets/planets.php:150
 msgid "Planets Settings"
 msgstr ""
@@ -4637,7 +4654,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:822
+#: ../../include/nav.php:64 ../../boot.php:839
 msgid "Login"
 msgstr ""
 
@@ -6051,7 +6068,7 @@ msgstr ""
 msgid "Set colour scheme"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:1111
+#: ../../include/profile_advanced.php:17 ../../boot.php:1128
 msgid "Gender:"
 msgstr ""
 
@@ -6064,7 +6081,7 @@ msgid "j F"
 msgstr ""
 
 #: ../../include/profile_advanced.php:30 ../../include/datetime.php:450
-#: ../../include/items.php:1446
+#: ../../include/items.php:1459
 msgid "Birthday:"
 msgstr ""
 
@@ -6072,7 +6089,7 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:1114
+#: ../../include/profile_advanced.php:37 ../../boot.php:1131
 msgid "Status:"
 msgstr ""
 
@@ -6081,7 +6098,7 @@ msgstr ""
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/profile_advanced.php:48 ../../boot.php:1116
+#: ../../include/profile_advanced.php:48 ../../boot.php:1133
 msgid "Homepage:"
 msgstr ""
 
@@ -6660,7 +6677,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:821
+#: ../../include/nav.php:46 ../../boot.php:838
 msgid "Logout"
 msgstr ""
 
@@ -6668,7 +6685,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1508
+#: ../../include/nav.php:49 ../../boot.php:1525
 msgid "Status"
 msgstr ""
 
@@ -6748,11 +6765,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1069
+#: ../../include/nav.php:138 ../../boot.php:1086
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1069
+#: ../../include/nav.php:138 ../../boot.php:1086
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -7039,7 +7056,7 @@ msgstr ""
 
 #: ../../include/enotify.php:126
 #, php-format
-msgid "%1$s [url=%2s]tagged you[/url]."
+msgid "%1$s [url=%2$s]tagged you[/url]."
 msgstr ""
 
 #: ../../include/enotify.php:137
@@ -7163,15 +7180,15 @@ msgstr ""
 msgid "following"
 msgstr ""
 
-#: ../../include/items.php:2790
+#: ../../include/items.php:2803
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2790
+#: ../../include/items.php:2803
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:3452
+#: ../../include/items.php:3465
 msgid "Archives"
 msgstr ""
 
@@ -7523,96 +7540,96 @@ msgstr ""
 msgid "permissions"
 msgstr ""
 
-#: ../../boot.php:522
+#: ../../boot.php:517
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:525
+#: ../../boot.php:520
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:698
+#: ../../boot.php:715
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:700
+#: ../../boot.php:717
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:800
+#: ../../boot.php:817
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:824
+#: ../../boot.php:841
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:825
+#: ../../boot.php:842
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:828
+#: ../../boot.php:845
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:834
+#: ../../boot.php:851
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1001
+#: ../../boot.php:1018
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1061
+#: ../../boot.php:1078
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1177 ../../boot.php:1253
+#: ../../boot.php:1194 ../../boot.php:1270
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1178 ../../boot.php:1254
+#: ../../boot.php:1195 ../../boot.php:1271
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1223 ../../boot.php:1294
+#: ../../boot.php:1240 ../../boot.php:1311
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1235
+#: ../../boot.php:1252
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1236
+#: ../../boot.php:1253
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1287
+#: ../../boot.php:1304
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1305
+#: ../../boot.php:1322
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1306
+#: ../../boot.php:1323
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1511
+#: ../../boot.php:1528
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1517
+#: ../../boot.php:1534
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1532
+#: ../../boot.php:1549
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1538
+#: ../../boot.php:1555
 msgid "Only You Can See This"
 msgstr ""
diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl
index f6059a7ec..85d5fb8e2 100644
--- a/view/photo_edit.tpl
+++ b/view/photo_edit.tpl
@@ -18,8 +18,12 @@
 
 	<div id="photo-edit-tags-end"></div>
 	<div id="photo-edit-rotate-wrapper">
-		<div id="photo-edit-rotate-label">$rotate</div>
-		<input type="checkbox" name="rotate" value="1" />
+		<div id="photo-edit-rotate-label">
+			$rotatecw<br>
+			$rotateccw
+		</div>
+		<input type="radio" name="rotate" value="1" /><br>
+		<input type="radio" name="rotate" value="2" />
 	</div>
 	<div id="photo-edit-rotate-end"></div>
 
diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css
index 6dc788f35..9c15329da 100644
--- a/view/theme/darkzero-NS/style.css
+++ b/view/theme/darkzero-NS/style.css
@@ -151,6 +151,10 @@ blockquote {
 	overflow: none;
 }
 
-.editicon:hover {
-	background-color: #ccc;
+.editicon {
+	background-color: #333;
+}
+
+#datebrowse-sidebar select {
+color:#99CCFF !important;
 }
\ No newline at end of file
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index 77650a91a..8a6099ee8 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -149,4 +149,8 @@ blockquote {
 /* This seems okay to me...we might not need a new iconset, lets see how people react */
 .editicon {
     	background-color: #333;
+}
+
+#datebrowse-sidebar select {
+color:#99CCFF !important;
 }
\ No newline at end of file
diff --git a/view/theme/dispy/dark/icons.png b/view/theme/dispy/dark/icons.png
index 2ee1a5ecb..67c8f3f0b 100644
--- a/view/theme/dispy/dark/icons.png
+++ b/view/theme/dispy/dark/icons.png
diff --git a/view/theme/dispy/dark/icons.svg b/view/theme/dispy/dark/icons.svg
index 2c4b3abd3..7cbbd3574 100644
--- a/view/theme/dispy/dark/icons.svg
+++ b/view/theme/dispy/dark/icons.svg
@@ -14,9 +14,9 @@
    height="200"
    id="svg3403"
    version="1.1"
-   inkscape:version="0.48+devel r"
+   inkscape:version="0.48.3.1 r9886"
    sodipodi:docname="icons.svg"
-   inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy-dark/icons.png"
+   inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/dark/icons.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -52,8 +52,8 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.9403009"
-     inkscape:cx="95.950174"
-     inkscape:cy="115.58345"
+     inkscape:cx="127.81563"
+     inkscape:cy="128.63003"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -1127,16 +1127,16 @@
        inkscape:connector-curvature="0"
        id="path4319"
        d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
-       style="fill:none;stroke:#999999;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836000000005;stroke-miterlimit:4;stroke-dasharray:none"
        transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
     <path
        inkscape:connector-curvature="0"
        id="path4321"
        d="m -44.467884,1124.9404 4.644661,0"
-       style="fill:none;stroke:#999999;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836000000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
     <path
-       style="fill:none;stroke:#999999;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836000000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        d="m -42.239747,1107.2336 0,17.6813"
        id="path4323"
        inkscape:connector-curvature="0"
@@ -1146,7 +1146,7 @@
        inkscape:connector-curvature="0"
        id="path4325"
        d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
-       style="fill:#999999;stroke:#999999;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       style="fill:#999999;stroke:#e6e6e6;stroke-width:0.66930836000000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
        transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
     <rect
        ry="0.42804927"
@@ -1156,7 +1156,7 @@
        height="1.8614606"
        width="5.1800866"
        id="rect4327"
-       style="fill:#999999;fill-opacity:1;stroke:#999999"
+       style="fill:#999999;fill-opacity:1;stroke:#e6e6e6"
        transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
     <path
        style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index b94e5ec34..327b053ab 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -78,16 +78,19 @@ h6{font-size:xx-small;}
 #login_openid label{width:180px !important;}
 nav{height:60px;background-color:#1d1f1d;color:#eeeeee;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeee;border:0px;}nav a:hover{text-decoration:none;color:#eeeeee;border:0px;}
 nav #banner{display:block;position:absolute;left:51px;top:25px;}nav #banner #logo-text a{font-size:40px;font-weight:bold;margin-left:3px;}
-ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeee;background-color:#555753;}ul#user-menu-popup li a:hover{color:#2e2f2e;background-color:#eeeeee;}
+#site-location{font-weight:bold;font-style:italic;font-size:small;width:30em;position:relative;left:-3.5em;top:3em;}
+ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:3px 0 0;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeee;background-color:#555753;}ul#user-menu-popup li a:hover{color:#2e2f2e;background-color:#eeeeee;}
 ul#user-menu-popup li a.nav-sep{border-top:1px solid #2e302e;}
 nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin:0px 5px 5px;text-indent:50px;background:transparent url(dark/icons.png) 0 0 no-repeat;}
+#nav-admin-link{background-position:0 -154px;}#nav-admin-link:hover{background-position:-22px -154px;}
 #nav-apps-link{background-position:0 -66px;}#nav-apps-link:hover{background-position:-22px -66px;}
 #nav-community-link,#nav-contacts-link{background-position:0 -22px;}#nav-community-link:hover,#nav-contacts-link:hover{background-position:-22px -22px;}
 #nav-directory-link{background-position:-44px -154px;}#nav-directory-link:hover{background-position:-66px -154px;}
 #nav-help-link{background-position:0 -110px;}#nav-help-link:hover{background-position:-22px -110px;}
 #nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;}
-#nav-intro-link{background-position:0px -190px;}#nav-intro-link:hover{background-position:-44px -190px;}
+#nav-intro-link{background-position:0px -88px;}#nav-intro-link:hover{background-position:-22px -88px;}
 #nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;}
+#nav-manage-link{background-position:0px -22px;}#nav-manage-link:hover{background-position:-22px -22px;}
 #nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;}
 #nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;}
 #nav-notify-link:hover{background-position:-66px -110px;}
@@ -105,14 +108,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;}
 #nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;}
 #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
+#nav-buttons-2{clear:both;list-style:none;padding:0px;margin:0px;left:136px;top:-20px;position:relative;width:6em;height:25px;}#nav-buttons-2>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
 .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;}
 .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 #search-text,#mini-search-text{background:white;color:#2e2f2e;}
 #search-text{border:1px solid #eeeeee;margin:5px 0;}
 #mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
 #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
-#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:80%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
-#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
+#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:35%;margin:5px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;top:4px;left:7px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
+#user-menu-label{font-size:small;padding:0px 20px 10px 5px;height:10px;display:block;}
 .nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(dark/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
 .nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
 #net-update{background-position:0px 0px;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index c15706c36..e3966683b 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -24,93 +24,93 @@ header,
 hgroup,
 nav,
 section {
-	display: block;
+    display: block;
 }
 audio,
 canvas,
 video,
 time {
-	display: inline-block;
-	*display: inline;
-	*zoom: 1;
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
 }
 audio:not([controls]),
 [hidden] {
-	display: none;
+    display: none;
 }
 ///*
 // * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
 // * 2. Force vertical scrollbar in non-IE
 // * 3. Prevent iOS text size adjust on device orientation change,
-// *		without disabling user zoom: h5bp.com/g
+// *        without disabling user zoom: h5bp.com/g
 // */
 html {
-	font-size: 100%;
-	overflow-y: scroll;
-	.font_size_adjust;
+    font-size: 100%;
+    overflow-y: scroll;
+    .font_size_adjust;
 }
 body {
-	margin: 0;
-	padding: 0;
-	.default_font;
-	color: @main_colour;
-	background-color: @bg_colour;
+    margin: 0;
+    padding: 0;
+    .default_font;
+    color: @main_colour;
+    background-color: @bg_colour;
 }
 button,
 input,
 select,
 textarea {
-	color: @main_colour;
-	background-color: @bg_colour;
+    color: @main_colour;
+    background-color: @bg_colour;
 }
 select {
-	.borders(1px, dotted, darken(@main_alt_colour, 60%));
-	padding: 1px;
-	margin: 3px;
-	color: @main_colour;
-	background: @bg_colour;
+    .borders(1px, dotted, darken(@main_alt_colour, 60%));
+    padding: 1px;
+    margin: 3px;
+    color: @main_colour;
+    background: @bg_colour;
     max-width: 85%;
     min-width: 85px;
 }
 option {
-	padding: 1px;
-	color: @main_colour;
-	background: @bg_colour;
-	&[selected="selected"] {
-		color: @bg_colour;
-		background: @main_colour;
-	}
+    padding: 1px;
+    color: @main_colour;
+    background: @bg_colour;
+    &[selected="selected"] {
+        color: @bg_colour;
+        background: @main_colour;
+    }
 }
 tr:nth-child(even) {
-	background-color: lighten(@bg_colour, 10%);
+    background-color: lighten(@bg_colour, 10%);
 }
 ///* remember to define focus styles! */
-//outline 	Sets all the outline properties in one declaration
-//outline-color 	Sets the color of an outline 	color_name,hex_number,rgb_number,invert,inherit
-//outline-style		Sets the style of an outline	dotted,dashed,solid,double,groove,ridge,inset,outset,inherit
-//outline-width		Sets the width of an outline 	thin,medium,thick,length,inherit
+//outline   Sets all the outline properties in one declaration
+//outline-color     Sets the color of an outline    color_name,hex_number,rgb_number,invert,inherit
+//outline-style     Sets the style of an outline    dotted,dashed,solid,double,groove,ridge,inset,outset,inherit
+//outline-width     Sets the width of an outline    thin,medium,thick,length,inherit
 :focus {
-	outline: none;
+    outline: none;
 }
 a:focus {
-	outline: invert, dashed, thin;
+    outline: invert, dashed, thin;
 }
 [disabled="disabled"] {
-	background: @med_bg_colour;
-	color: @disabled_colour;
+    background: @med_bg_colour;
+    color: @disabled_colour;
 }
 ///* remember to highlight inserts somehow! */
 ins,
 mark {
-	background-color: @bg_alt_colour;
-	color: @lt_main_colour;
+    background-color: @bg_alt_colour;
+    color: @lt_main_colour;
 }
 ins {
-	text-decoration: none;
+    text-decoration: none;
 }
 mark {
-	font-style: italic;
-	font-weight: bold;
+    font-style: italic;
+    font-weight: bold;
 }
 ///* Redeclare monospace font family: h5bp.com/j */
 pre,
@@ -118,157 +118,157 @@ code,
 kbd,
 samp,
 .wall-item-body code {
-	font-family: monospace, monospace;
-	_font-family: monospace;
-	font-size: 1em;
+    font-family: monospace, monospace;
+    _font-family: monospace;
+    font-size: 1em;
 }
 ///* Improve readability of pre-formatted text in all browsers */
 pre,
 .wall-item-body code {
-	.wrap;
+    .wrap;
 }
 q {
-	quotes: none;
-	&:before, &:after {
-		content: "";
-		content: none;
-	}
+    quotes: none;
+    &:before, &:after {
+        content: "";
+        content: none;
+    }
 }
 em {
-	font-style: italic;
+    font-style: italic;
 }
 strong {
-	font-weight: bold;
+    font-weight: bold;
 }
 strike {
-	text-decoration: line-through;
+    text-decoration: line-through;
 }
 small {
-	font-size: 85%;
+    font-size: 85%;
 }
 ///* Position subscript and superscript content without affecting
 // * line-height: h5bp.com/k */
 sub,
 sup {
-	font-size: 75%;
-	line-height: 0;
-	position: relative;
-	vertical-align: baseline;
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
 }
 sub {
-	bottom: -0.25em;
+    bottom: -0.25em;
 }
 sup {
-	top: -0.5em;
+    top: -0.5em;
 }
 img {
-	border: 0 none;
+    border: 0 none;
 }
 a {
-	color: @link_colour;
-	text-decoration: none;
-	margin-bottom: 1px;
-	&:hover {
-		color: @hover_colour;
-		border-bottom: 1px dotted @hover_colour;
-	}
-	&:hover img {
-		text-decoration: none;
-	}
+    color: @link_colour;
+    text-decoration: none;
+    margin-bottom: 1px;
+    &:hover {
+        color: @hover_colour;
+        border-bottom: 1px dotted @hover_colour;
+    }
+    &:hover img {
+        text-decoration: none;
+    }
 }
 blockquote {
-	background: darken(@main_alt_colour, 66.5%);
-	color: @main_colour;
-	text-indent: 5px;
-	padding: 5px;
-	.borders(1px, solid, darken(@main_alt_colour, 33%));
-	.rounded_corners;
+    background: darken(@main_alt_colour, 66.5%);
+    color: @main_colour;
+    text-indent: 5px;
+    padding: 5px;
+    .borders(1px, solid, darken(@main_alt_colour, 33%));
+    .rounded_corners;
 }
 .label () {
-	width: 38%;
-	display: inline-block;
-	font-size: small;
-	margin: 0 10px 1em 0;
-	.borders(1px, solid, @bg_colour);
-	padding: 3px 5px;
-	background: @main_colour;
-	color: darken(@main_alt_colour, 86.5%);
-	.box_shadow(3px, 3px, 5px);
+    width: 38%;
+    display: inline-block;
+    font-size: small;
+    margin: 0 10px 1em 0;
+    .borders(1px, solid, @bg_colour);
+    padding: 3px 5px;
+    background: @main_colour;
+    color: darken(@main_alt_colour, 86.5%);
+    .box_shadow(3px, 3px, 5px);
 }
 label {
-	.label;
+    .label;
 }
 input {
-	.box(250px, 25px);
-	.borders(1px, solid, darken(@main_alt_colour, 33.5%));
-	width: 17em;
-	&[type="checkbox"],
-	&[type="radio"] {
-		.box(15px, 15px);
-		margin: 0;
-	}
-	&[type="radio"] {
-		margin: 5px 0;
-	}
-	&[type="submit"],
-	&[type="button"] {
-		background-color: @main_alt_colour;
-		.borders(2px, outset, darken(@main_alt_colour, 24%));
-		.rounded_corners;
-		.box_shadow(1px, 3px, 4px, 0);
-		color: @bg_alt_colour;
-		cursor: pointer;
-		font-weight: bold;
-		width: auto;
-		.text_shadow;
-	}
-	&[type="submit"]:active,
-	&[type="button"]:active {
-		.box_shadow(0, 0, 0, 0);
-	}
+    .box(250px, 25px);
+    .borders(1px, solid, darken(@main_alt_colour, 33.5%));
+    width: 17em;
+    &[type="checkbox"],
+    &[type="radio"] {
+        .box(15px, 15px);
+        margin: 0;
+    }
+    &[type="radio"] {
+        margin: 5px 0;
+    }
+    &[type="submit"],
+    &[type="button"] {
+        background-color: @main_alt_colour;
+        .borders(2px, outset, darken(@main_alt_colour, 24%));
+        .rounded_corners;
+        .box_shadow(1px, 3px, 4px, 0);
+        color: @bg_alt_colour;
+        cursor: pointer;
+        font-weight: bold;
+        width: auto;
+        .text_shadow;
+    }
+    &[type="submit"]:active,
+    &[type="button"]:active {
+        .box_shadow(0, 0, 0, 0);
+    }
 }
 h1, h2, h3,
 h4, h5, h6 {
-	margin: 10px 0px;
-	font-weight: bold;
-	border-bottom: 1px solid @hover_colour;
+    margin: 10px 0px;
+    font-weight: bold;
+    border-bottom: 1px solid @hover_colour;
 }
 h1 {
-	font-size: x-large;
+    font-size: x-large;
 }
 h2 {
-	font-size: large;
+    font-size: large;
 }
 h3 {
-	font-size: medium;
+    font-size: medium;
 }
 h4 {
-	font-size: small;
+    font-size: small;
 }
 h5 {
-	font-size: x-small;
+    font-size: x-small;
 }
 h6 {
-	font-size: xx-small;
+    font-size: xx-small;
 }
 
 //
 .required {
-	display: inline;
-	color: red;
-	font-size: 16px;
-	font-weight: bold;
-	margin: 3px;
+    display: inline;
+    color: red;
+    font-size: 16px;
+    font-weight: bold;
+    margin: 3px;
 }
 .fakelink, .lockview {
-	color: @link_colour;
-	cursor: pointer;
+    color: @link_colour;
+    cursor: pointer;
 }
 .fakelink:hover {
-	color: @hover_colour;
+    color: @hover_colour;
 }
 .smalltext {
-	font-size: 0.7em;
+    font-size: 0.7em;
 }
 
 
@@ -277,89 +277,89 @@ h6 {
  */
 /* .tool .action */
 .action {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 .tool {
-	margin: 5px 0;
-	list-style: none;
+    margin: 5px 0;
+    list-style: none;
 }
 #articlemain {
-	.box(100%, 100%);
-	margin: 0 auto;
+    .box(100%, 100%);
+    margin: 0 auto;
 }
 .button {
-	// .box(25%, auto);
-	// background: @menu_bg_colour;
-	color: @main_colour;
-	// .borders(2px, outset, darken(@menu_bg_colour, 20%));
-	.rounded_corners;
-	padding: 5px;
-	// font-size: smaller;
-	cursor: pointer;
-	// &.active {
-		// .box_shadow(4px, 4px, 7px);
-	// }
-	a {
-		color: @main_colour;
-		// font-size: smaller;
-		font-weight: bold;
-	}
+    // .box(25%, auto);
+    // background: @menu_bg_colour;
+    color: @main_colour;
+    // .borders(2px, outset, darken(@menu_bg_colour, 20%));
+    .rounded_corners;
+    padding: 5px;
+    // font-size: smaller;
+    cursor: pointer;
+    // &.active {
+        // .box_shadow(4px, 4px, 7px);
+    // }
+    a {
+        color: @main_colour;
+        // font-size: smaller;
+        font-weight: bold;
+    }
 }
 #profile-listing-desc {
-	a {
-		color: @main_colour;
-		font-weight: bold;
-	}
+    a {
+        color: @main_colour;
+        font-weight: bold;
+    }
 }
 [class$="-desc"],
 [id$="-desc"] {
-	color: @main_colour;
-	background: @bg_colour;
-	.borders(2px, outset, @dk_main_colour);
-	.rounded_corners;
-	// .box_shadow(3px, 3px, 5px);
+    color: @main_colour;
+    background: @bg_colour;
+    .borders(2px, outset, @dk_main_colour);
+    .rounded_corners;
+    // .box_shadow(3px, 3px, 5px);
     margin: 3px 10px 7px 0;
     padding: 5px;
-	font-weight: bold;
-	font-size: smaller;
+    font-weight: bold;
+    font-size: smaller;
 }
 #item-delete-selected-desc {
-	float: left;
-	margin-right: 5px;
-	&:hover {
-		text-decoration: underline;
-	}
+    float: left;
+    margin-right: 5px;
+    &:hover {
+        text-decoration: underline;
+    }
 }
 .intro-approve-as-friend-desc {
-	margin-top: 10px;
+    margin-top: 10px;
 }
 .intro-desc {
-	margin-bottom: 20px;
-	font-weight: bold;
+    margin-bottom: 20px;
+    font-weight: bold;
 }
 #group-edit-desc {
-	margin: 10px 0px;
+    margin: 10px 0px;
 }
 #settings-nickname-desc {
-	background: @main_colour;
-	.rounded_corners;
-	.borders;
-	padding: 5px;
-	color: @bg_colour;
+    background: @main_colour;
+    .rounded_corners;
+    .borders;
+    padding: 5px;
+    color: @bg_colour;
 }
 .contactname,
 .contact-name {
-	font-weight: bold;
-	font-size: smaller;
+    font-weight: bold;
+    font-size: smaller;
 }
 .contact-details {
-	font-style: italic;
-	font-size: smaller;
+    font-style: italic;
+    font-size: smaller;
 }
 .like-rotator {
-	vertical-align: middle;
-	text-align: center;
-	margin: 1px;
+    vertical-align: middle;
+    text-align: center;
+    margin: 1px;
 }
 
 
@@ -367,54 +367,54 @@ h6 {
  * login
  */
 #asidemain .field {
-	overflow: hidden;
-	width: 200px;
+    overflow: hidden;
+    width: 200px;
 }
 #login-extra-links {
-	overflow: auto !important;
-	padding-top: 60px !important;
-	width: 100% !important;
-	a {
-		margin-right: 20px;
-	}
+    overflow: auto !important;
+    padding-top: 60px !important;
+    width: 100% !important;
+    a {
+        margin-right: 20px;
+    }
 }
 #login_standard {
-	display: block !important;
-	float: none !important;
-	height: 100% !important;
-	position: relative !important;
-	width: 100% !important;
-	.field label {
-		width: 200px !important;
-	}
-	input {
-		margin: 0 0 8px !important;
-		width: 210px !important;
-		&[type="text"] {
-			margin: 0 0 8px !important;
-			width: 210px !important; }
-	}
+    display: block !important;
+    float: none !important;
+    height: 100% !important;
+    position: relative !important;
+    width: 100% !important;
+    .field label {
+        width: 200px !important;
+    }
+    input {
+        margin: 0 0 8px !important;
+        width: 210px !important;
+        &[type="text"] {
+            margin: 0 0 8px !important;
+            width: 210px !important; }
+    }
 }
 #login-submit-wrapper {
-	margin: 0 !important;
+    margin: 0 !important;
 }
 #login-submit-button {
-	margin-left: 0px !important;
+    margin-left: 0px !important;
 }
 #asidemain #login_openid {
-	position: relative !important;
-	float: none !important;
-	margin-left: 0px !important;
-	height: auto !important;
-	width: 200px !important;
+    position: relative !important;
+    float: none !important;
+    margin-left: 0px !important;
+    height: auto !important;
+    width: 200px !important;
 }
 #login_openid {
-	#id_openid_url {
-		width: 180px !important;
-		overflow: hidden !important; }
-	label {
-		width: 180px !important;
-	}
+    #id_openid_url {
+        width: 180px !important;
+        overflow: hidden !important; }
+    label {
+        width: 180px !important;
+    }
 }
 
 
@@ -422,133 +422,154 @@ h6 {
  * nav
  */
 nav {
-	height: 60px;
-	background-color: @dk_bg_colour;
-	color: @main_alt_colour;
-	position: relative;
-	padding: 20px 20px 10px 95px;
-	a {
-		text-decoration: none;
-		color: @main_alt_colour;
-		border: 0px;
-		&:hover {
-			text-decoration: none;
-			color: @main_alt_colour;
-			border: 0px; } }
-	#banner {
-		display: block;
-		position: absolute;
-		left: 51px;
-		top: 25px;
-		#logo-text a {
-			font-size: 40px;
-			font-weight: bold;
-			margin-left: 3px; } }
+    height: 60px;
+    background-color: @dk_bg_colour;
+    color: @main_alt_colour;
+    position: relative;
+    padding: 20px 20px 10px 95px;
+    a {
+        text-decoration: none;
+        color: @main_alt_colour;
+        border: 0px;
+        &:hover {
+            text-decoration: none;
+            color: @main_alt_colour;
+            border: 0px; } }
+    #banner {
+        display: block;
+        position: absolute;
+        left: 51px;
+        top: 25px;
+        #logo-text a {
+            font-size: 40px;
+            font-weight: bold;
+            margin-left: 3px; } }
+}
+#site-location {
+    font-weight: bold;
+    font-style: italic;
+    font-size: small;
+    width: 30em;
+    position: relative;
+    left: -3.5em;
+    top: 3em;
 }
 ul#user-menu-popup {
-	display: none;
-	position: absolute;
-	background-color: @menu_bg_colour;
-	width: 100%;
-	padding: 10px 0px;
-	margin: 0px;
-	top: 20px;
-	left: 0;
-	font-size: small;
-	line-height: 1;
-	.rounded_corners(0 0 5px 5px);
-	.box_shadow(5px, 5px, 10px, 0px);
-	z-index: 10000;
-	li {
-		display: block;
-		a {
-			display: block;
-			padding: 5px;
-			color: @main_alt_colour;
-			background-color: @menu_bg_colour;
-			&:hover {
-				color: @bg_colour;
-				background-color: @main_alt_colour;
-			}
-			&.nav-sep {
-				border-top: 1px solid @bg_alt_colour; } } }
+    display: none;
+    position: absolute;
+    background-color: @menu_bg_colour;
+    width: 100%;
+    padding: 10px 0px;
+    margin: 3px 0 0;
+    top: 20px;
+    left: 0;
+    font-size: small;
+    line-height: 1;
+    .rounded_corners(0 0 5px 5px);
+    .box_shadow(5px, 5px, 10px, 0px);
+    z-index: 10000;
+    li {
+        display: block;
+        a {
+            display: block;
+            padding: 5px;
+            color: @main_alt_colour;
+            background-color: @menu_bg_colour;
+            &:hover {
+                color: @bg_colour;
+                background-color: @main_alt_colour;
+            }
+            &.nav-sep {
+                border-top: 1px solid @bg_alt_colour; } } }
 }
 nav .nav-link {
-	display: inline-block;
-	.box(22px, 22px);
-	overflow: hidden;
-	margin: 0px 5px 5px;
-	text-indent: 50px;
-	background: transparent url(dark/icons.png) 0 0 no-repeat;
+    display: inline-block;
+    .box(22px, 22px);
+    overflow: hidden;
+    margin: 0px 5px 5px;
+    text-indent: 50px;
+    background: transparent url(dark/icons.png) 0 0 no-repeat;
+}
+#nav-admin-link {
+    background-position: 0 -154px;
+    &:hover {
+        background-position: -22px -154px;
+    }
 }
 #nav-apps-link {
-	background-position: 0 -66px;
-	&:hover {
-		background-position: -22px -66px;
-	}
+    background-position: 0 -66px;
+    &:hover {
+        background-position: -22px -66px;
+    }
 }
 #nav-community-link,
 #nav-contacts-link {
-	background-position: 0 -22px;
-	&:hover {
-		background-position: -22px -22px;
-	}
+    background-position: 0 -22px;
+    &:hover {
+        background-position: -22px -22px;
+    }
 }
 #nav-directory-link {
-	background-position: -44px -154px;
-	&:hover {
-		background-position: -66px -154px;
-	}
+    background-position: -44px -154px;
+    &:hover {
+        background-position: -66px -154px;
+    }
 }
 #nav-help-link {
-	background-position: 0 -110px;
-	&:hover {
-		background-position: -22px -110px;
-	}
+    background-position: 0 -110px;
+    &:hover {
+        background-position: -22px -110px;
+    }
 }
 #nav-home-link {
-	background-position: -44px -132px;
-	&:hover {
-		background-position: -66px -132px;
-	}
+    background-position: -44px -132px;
+    &:hover {
+        background-position: -66px -132px;
+    }
 }
 #nav-intro-link {
-	background-position: 0px -190px;
-	&:hover {
-		background-position: -44px -190px;
-	}
+    background-position: 0px -88px;
+    &:hover {
+        background-position: -22px -88px;
+    }
 }
 #nav-login-link,
 #nav-logout-link {
-	background-position: 0 -88px;
-	&:hover {
-		background-position: -22px -88px;
-	}
+    background-position: 0 -88px;
+    &:hover {
+        background-position: -22px -88px;
+    }
+}
+#nav-manage-link {
+    background-position: 0px -22px;
+    &:hover {
+        background-position: -22px -22px;
+    }
 }
 #nav-messages-link {
-	background-position: -44px -88px;
-	&:hover {
-		background-position: -66px -88px;
-	}
+    background-position: -44px -88px;
+    &:hover {
+        background-position: -66px -88px;
+    }
 }
 #nav-notify-link,
 #nav-notifications-linkmenu {
-	background-position: -44px -110px;
+    background-position: -44px -110px;
 }
 #nav-notify-link:hover {
-	background-position: -66px -110px;
+    background-position: -66px -110px;
 }
 #nav-network-link {
-	background-position: 0px -177px;
-	&:hover {
-		background-position: -22px -177px;
-	}
+    background-position: 0px -177px;
+    &:hover {
+        background-position: -22px -177px;
+    }
 }
 #nav-search-link {
-	background-position: 0 -44px;
-	&:hover {
-		background-position: -22px -44px;
-	}
+    background-position: 0 -44px;
+    &:hover {
+        background-position: -22px -44px;
+    }
 }
 #jot-title,
 #profile-link,
@@ -570,266 +591,282 @@ nav .nav-link {
 .hover,
 .focus,
 .pointer {
-	cursor: pointer;
+    cursor: pointer;
 }
 //* popup notifications */
 div.jGrowl div {
-	&.notice {
-		background: @notice url("../../../images/icons/48/notice.png") no-repeat 5px center;
-		color: white;
-		padding-left: 58px;
-		margin-top: 50px;
-	}
-	&.info {
-		background: @info url("../../../images/icons/48/info.png") no-repeat 5px center;
-		color: white;
-		padding-left: 58px;
-		margin-top: 50px;
-	}
-	// &.jGrowl-message {
-
-	// }
+    &.notice {
+        background: @notice url("../../../images/icons/48/notice.png") no-repeat 5px center;
+        color: white;
+        padding-left: 58px;
+        margin-top: 50px;
+    }
+    &.info {
+        background: @info url("../../../images/icons/48/info.png") no-repeat 5px center;
+        color: white;
+        padding-left: 58px;
+        margin-top: 50px;
+    }
+    // &.jGrowl-message {
+
+    // }
 }
 #nav-notifications-menu {
-	margin: 30px 0 0 -20px;
-	width: 275px;
-	max-height: 300px;
-	overflow-y: auto;
-	font-size: 9pt;
-	img {
-		float: left;
-		margin-right: 5px; }
-	.notif-when {
-		font-size: 0.8em;
-		display: block; }
-	li {
-		word-wrap: normal;
-		border-bottom: 1px solid black;
-		&:hover {
-			color: black; }
-	}
-	a:hover {
-		color: black;
-		text-decoration: underline;
-	}
+    margin: 30px 0 0 -20px;
+    width: 275px;
+    max-height: 300px;
+    overflow-y: auto;
+    font-size: 9pt;
+    img {
+        float: left;
+        margin-right: 5px; }
+    .notif-when {
+        font-size: 0.8em;
+        display: block; }
+    li {
+        word-wrap: normal;
+        border-bottom: 1px solid black;
+        &:hover {
+            color: black; }
+    }
+    a:hover {
+        color: black;
+        text-decoration: underline;
+    }
 }
 nav #nav-notifications-linkmenu {
-	&.on .icon.s22.notify,
-	&.selected .icon.s22.notify {
-		// background-image: url("../../../images/icons/22/notify_on.png");
-		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg==");
-	}
+    &.on .icon.s22.notify,
+    &.selected .icon.s22.notify {
+        // background-image: url("../../../images/icons/22/notify_on.png");
+        background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg==");
+    }
 }
 .show {
-	display: block;
+    display: block;
 }
 #notifications {
-	.box(170px, 20px);
-	font-size: small;
-	top: -19px;
-	left: 4px;
-	position: absolute;
+    .box(170px, 20px);
+    font-size: small;
+    top: -19px;
+    left: 4px;
+    position: absolute;
 }
 #nav-floater {
-	position: fixed;
-	top: 20px;
-	right: 1%;
-	padding: 5px;
-	background: @dk_bg_colour;
-	color: transparent;
-	.rounded_corners;
-	z-index: 100;
-	.box(270px, 60px);
+    position: fixed;
+    top: 20px;
+    right: 1%;
+    padding: 5px;
+    background: @dk_bg_colour;
+    color: transparent;
+    .rounded_corners;
+    z-index: 100;
+    .box(270px, 60px);
 }
 #nav-buttons {
-	clear: both;
-	list-style: none;
-	padding: 0px;
-	margin: 0px;
-	height: 25px;
-	> li {
-		padding: 0;
-		display: inline-block;
-		margin: 0px -4px 0px 0px;
-	}
+    clear: both;
+    list-style: none;
+    padding: 0px;
+    margin: 0px;
+    height: 25px;
+    > li {
+        padding: 0;
+        display: inline-block;
+        margin: 0px -4px 0px 0px;
+    }
+}
+#nav-buttons-2 {
+    clear: both;
+    list-style: none;
+    padding: 0px;
+    margin: 0px;
+    left: 136px;
+    top: -20px;
+    position: relative;
+    .box(6em, 25px);
+    > li {
+        padding: 0;
+        display: inline-block;
+        margin: 0px -4px 0px 0px;
+    }
 }
 .floaterflip {
-	display: block;
-	position: fixed;
-	z-index: 110;
-	top: 56px;
-	right: 19px;
-	.box(22px, 22px);
-	overflow: hidden;
-	margin: 0px;
-	background: transparent url(dark/icons.png) -190px -60px no-repeat;
+    display: block;
+    position: fixed;
+    z-index: 110;
+    top: 56px;
+    right: 19px;
+    .box(22px, 22px);
+    overflow: hidden;
+    margin: 0px;
+    background: transparent url(dark/icons.png) -190px -60px no-repeat;
 }
 .search-box {
-	display: inline-block;
-	margin: 5px;
-	position: fixed;
-	right: 0px;
-	bottom: 0px;
-	z-index: 100;
-	background: @dk_bg_colour;
-	.rounded_corners;
+    display: inline-block;
+    margin: 5px;
+    position: fixed;
+    right: 0px;
+    bottom: 0px;
+    z-index: 100;
+    background: @dk_bg_colour;
+    .rounded_corners;
 }
 #search-text,
 #mini-search-text {
-	background: white;
-	color: @bg_colour;
+    background: white;
+    color: @bg_colour;
 }
 #search-text {
-	.borders(1px, solid, @main_alt_colour);
-	margin: 5px 0;
+    .borders(1px, solid, @main_alt_colour);
+    margin: 5px 0;
 }
 #mini-search-text {
-	font-size: 8pt;
-	height: 14px;
-	width: 10em;
-	margin: 5px;
+    font-size: 8pt;
+    height: 14px;
+    width: 10em;
+    margin: 5px;
 }
 #scrollup {
-	position: fixed;
-	right: 5px;
-	bottom: 40px;
-	z-index: 100;
-	a:hover {
-		text-decoration: none;
-		border: 0;
-	}
+    position: fixed;
+    right: 5px;
+    bottom: 40px;
+    z-index: 100;
+    a:hover {
+        text-decoration: none;
+        border: 0;
+    }
 }
 #user-menu {
-	.box_shadow(5px, 0, 10px, 0);
-	display: block;
-	width: 80%;
-	margin: 3px 0 0 0;
-	position: relative;
-	.rounded_corners;
-	background-color: @menu_bg_colour;
-	background-image: url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");
-	background-position: 98% center;
-	background-repeat: no-repeat;
-	clear: both;
-	top: 4px;
-	left: 10px;
-	padding: 2px;
-	> a {
-		vertical-align: top;
-		outline: 0 none;
-	}
+    .box_shadow(5px, 0, 10px, 0);
+    display: block;
+    width: 35%;
+    margin: 5px 0 0 0;
+    position: relative;
+    .rounded_corners;
+    background-color: @menu_bg_colour;
+    background-image: url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");
+    background-position: 98% center;
+    background-repeat: no-repeat;
+/*  clear: both;*/
+    top: 4px;
+    left: 7px;
+    padding: 2px;
+    > a {
+        vertical-align: top;
+        outline: 0 none;
+    }
 }
 #user-menu-label {
-	font-size: small;
-	padding: 3px 20px 9px 5px;
-	height: 10px;
+    font-size: small;
+    padding: 0px 20px 10px 5px;
+    height: 10px;
+    display: block;
 }
 .nav-ajax-update,
 .nav-ajax-left {
-	.box(30px, 19px);
-	background: transparent url(dark/notifications.png) 0 0 no-repeat;
-	color: @shadow_colour;
-	font-weight: bold;
-	font-size: 0.8em;
-	padding-top: 0.2em;
-	text-align: center;
-	float: left;
-	margin: 0 -1px 0 3px;
-	display: block;
-	visibility: hidden;
+    .box(30px, 19px);
+    background: transparent url(dark/notifications.png) 0 0 no-repeat;
+    color: @shadow_colour;
+    font-weight: bold;
+    font-size: 0.8em;
+    padding-top: 0.2em;
+    text-align: center;
+    float: left;
+    margin: 0 -1px 0 3px;
+    display: block;
+    visibility: hidden;
 }
 .nav-ajax-update.show,
 .nav-ajax-left.show {
-	visibility: visible;
+    visibility: visible;
 }
 #net-update {
-	background-position: 0px 0px;
+    background-position: 0px 0px;
 }
 #mail-update {
-	background-position: -30px 0;
+    background-position: -30px 0;
 }
 #notify-update {
-	background-position: -60px 0px;
+    background-position: -60px 0px;
 }
 #home-update {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 #intro-update {
-	background-position: -120px 0px;
+    background-position: -120px 0px;
 }
 #lang-select-icon {
-	cursor: pointer;
-	position: fixed;
-	left: 28px;
-	bottom: 6px;
-	z-index: 10;
+    cursor: pointer;
+    position: fixed;
+    left: 28px;
+    bottom: 6px;
+    z-index: 10;
 }
 #language-selector {
-	position: fixed;
-	bottom: 2px;
-	left: 52px;
-	z-index: 10;
+    position: fixed;
+    bottom: 2px;
+    left: 52px;
+    z-index: 10;
 }
 .menu-popup {
-	position: absolute;
-	display: none;
-	// width: 11em;
-	background: white;
-	color: @bg_colour;
-	margin: 0px;
-	padding: 0px;
-	font-size: small;
-	line-height: 1.2;
-	.borders(3px, solid, @link_colour);
-	.rounded_corners;
-	z-index: 100000;
-	.box_shadow;
-	a {
-		display: block;
-		color: @bg_colour;
-		padding: 5px 10px;
-		text-decoration: none;
-		&:hover {
-			color: @main_colour;
-			background-color: @link_colour;
-		}
-	}
-	.menu-sep {
-	    border-top: 1px solid @med_bg_colour;
-	}
-	li {
-		float: none;
-		overflow: auto;
-		height: auto;
-		display: block;
-		img {
-			float: left;
-			.box(16px, 16px);
-			padding-right: 5px;
-		}
-	}
-	.empty {
-		padding: 5px;
-		text-align: center;
-		color: lighten(@shiny_colour, 45%);
-	}
+    position: absolute;
+    display: none;
+    // width: 11em;
+    background: white;
+    color: @bg_colour;
+    margin: 0px;
+    padding: 0px;
+    font-size: small;
+    line-height: 1.2;
+    .borders(3px, solid, @link_colour);
+    .rounded_corners;
+    z-index: 100000;
+    .box_shadow;
+    a {
+        display: block;
+        color: @bg_colour;
+        padding: 5px 10px;
+        text-decoration: none;
+        &:hover {
+            color: @main_colour;
+            background-color: @link_colour;
+        }
+    }
+    .menu-sep {
+        border-top: 1px solid @med_bg_colour;
+    }
+    li {
+        float: none;
+        overflow: auto;
+        height: auto;
+        display: block;
+        img {
+            float: left;
+            .box(16px, 16px);
+            padding-right: 5px;
+        }
+    }
+    .empty {
+        padding: 5px;
+        text-align: center;
+        color: lighten(@shiny_colour, 45%);
+    }
 }
 .notif-item {
-	font-size: small;
-	a {
-		vertical-align: middle;
-	}
+    font-size: small;
+    a {
+        vertical-align: middle;
+    }
 }
 .notif-image {
-	.box(32px, 32px);
-	padding: 7px 7px 0px 0px;
+    .box(32px, 32px);
+    padding: 7px 7px 0px 0px;
 }
 .notify-seen {
-	background: @disabled_colour;
-	color: @main_colour;
+    background: @disabled_colour;
+    color: @main_colour;
 }
 .notify-unseen {
-	color: @main_colour;
+    color: @main_colour;
 }
 
 
@@ -837,32 +874,32 @@ nav #nav-notifications-linkmenu {
  * sysmsg
  */
 #sysmsg_info {
-	position: fixed;
-	bottom: 0;
-	.box_shadow(@main_shadow);
-	padding: 10px;
-	background-color: @lt_orange;
-	.borders(2px, solid, @orange);
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    position: fixed;
+    bottom: 0;
+    .box_shadow(@main_shadow);
+    padding: 10px;
+    background-color: @lt_orange;
+    .borders(2px, solid, @orange);
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg {
-	position: fixed;
-	bottom: 0;
-	.box_shadow(@main_shadow);
-	padding: 10px;
-	background-color: @lt_orange;
-	.borders(2px, solid, @orange);
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    position: fixed;
+    bottom: 0;
+    .box_shadow(@main_shadow);
+    padding: 10px;
+    background-color: @lt_orange;
+    .borders(2px, solid, @orange);
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg_info br,
 #sysmsg br {
-	display: block;
-	margin: 2px 0px;
-	border-top: 1px solid @main_colour;
+    display: block;
+    margin: 2px 0px;
+    border-top: 1px solid @main_colour;
 }
 
 
@@ -870,85 +907,85 @@ nav #nav-notifications-linkmenu {
  * aside
  */
 #asidemain {
-	float: left;
-	font-size: small;
-	margin: 1em;
-	width: 25%;
-	display: inline;
+    float: left;
+    font-size: small;
+    margin: 1em;
+    width: 25%;
+    display: inline;
 }
 /* for now, disappear these */
 #asideright, #asideleft {
-	display: none;
+    display: none;
 }
 .vcard {
-	.fn {
-		font-size: 1.5em;
-		font-weight: bold;
-		border-bottom: 1px solid @hover_colour;
-		padding-bottom: 3px;
-	}
-	#profile-photo-wrapper {
-		margin: 20px 0;
-		background-color: @menu_bg_colour;
-		padding: 5px;
-		.box(175px, 175px);
-		.rounded_corners;
-		.box_shadow(3px, 3px, 10px, 0);
-	}
+    .fn {
+        font-size: 1.5em;
+        font-weight: bold;
+        border-bottom: 1px solid @hover_colour;
+        padding-bottom: 3px;
+    }
+    #profile-photo-wrapper {
+        margin: 20px 0;
+        background-color: @menu_bg_colour;
+        padding: 5px;
+        .box(175px, 175px);
+        .rounded_corners;
+        .box_shadow(3px, 3px, 10px, 0);
+    }
 }
 #asidemain {
-	h4 {
-		font-size: 1.2em; }
-	#viewcontacts {
-		text-align: right;
-	}
-	#contact-block {
-		width: 99%;
-		.contact-block-content {
-			width: 99%;
-			.contact-block-div {
-				float: left;
-				margin: 0 5px 5px 0;
-				.box(50px, 50px);
-				padding: 3px;
-				position: relative; } } }
+    h4 {
+        font-size: 1.2em; }
+    #viewcontacts {
+        text-align: right;
+    }
+    #contact-block {
+        width: 99%;
+        .contact-block-content {
+            width: 99%;
+            .contact-block-div {
+                float: left;
+                margin: 0 5px 5px 0;
+                .box(50px, 50px);
+                padding: 3px;
+                position: relative; } } }
 }
 .aprofile dt {
-	background: @main_colour;
-	color: @bg_colour;
-	font-weight: bold;
-	.box_shadow(3px, 3px, 5px);
-	.rounded_corners;
-	margin: 15px 0 5px;
-	padding-left: 5px;
+    background: @main_colour;
+    color: @bg_colour;
+    font-weight: bold;
+    .box_shadow(3px, 3px, 5px);
+    .rounded_corners;
+    margin: 15px 0 5px;
+    padding-left: 5px;
 }
 #profile-extra-links ul {
-	margin-left: 0px;
-	padding-left: 0px;
-	list-style: none;
+    margin-left: 0px;
+    padding-left: 0px;
+    list-style: none;
 }
 #dfrn-request-link {
-	.rounded_corners;
-	color: @main_colour;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
-	background-color: @friendica_blue;
-	// background-image: url(icons/connect.png);
-	background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");
-	background-repeat: no-repeat;
-	background-position: 95% center;
+    .rounded_corners;
+    color: @main_colour;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
+    background-color: @friendica_blue;
+    // background-image: url(icons/connect.png);
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");
+    background-repeat: no-repeat;
+    background-position: 95% center;
 }
 #wallmessage-link {
-	///*background: #3465A4 url(dark/connect.png) no-repeat 95% center;*/
-	///*border-radius: 5px 5px 5px 5px;*/
-	color: @main_alt_colour;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
+    ///*background: #3465A4 url(dark/connect.png) no-repeat 95% center;*/
+    ///*border-radius: 5px 5px 5px 5px;*/
+    color: @main_alt_colour;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 .ttright {
-	margin: 0px;
+    margin: 0px;
 }
 
 
@@ -956,12 +993,12 @@ nav #nav-notifications-linkmenu {
  * contacts block
  */
 .contact-block-div {
-	.box(50px, 50px);
-	float: left;
+    .box(50px, 50px);
+    float: left;
 }
 .contact-block-textdiv {
-	.box(150px, 34px);
-	float: left;
+    .box(150px, 34px);
+    float: left;
 }
 
 
@@ -969,96 +1006,96 @@ nav #nav-notifications-linkmenu {
  * jot
  */
 #jot {
-	margin: 10px 0 20px 0px;
-	width: 100%;
-	#jot-tools {
-		margin: 0px;
-		padding: 0px;
-		.box(100%, 35px);
-		overflow: none;
-		span {
-			float: left;
-			margin: 10px 20px 2px 0px;
-			a {
-				display: block;
-			}
-		}
-		.perms {
-			float: right;
-			width: 40px;
-		}
-		li.loading {
-			float: right;
-			background-color: white;
-			.box(20px, 38px);
-			vertical-align: center;
-			text-align: center;
-			border-top: 2px solid #9eabb0;
-			img {
-				margin-top: 10px;
-			}
-		}
-	}
-	#jot-title {
-	    .borders(1px, solid, darken(@main_alt_colour, 13%));
-		margin: 0 0 5px;
-		.box(90%, 20px);
-		font-weight: bold;
-		.rounded_corners;
-		vertical-align: middle;
-	}
+    margin: 10px 0 20px 0px;
+    width: 100%;
+    #jot-tools {
+        margin: 0px;
+        padding: 0px;
+        .box(100%, 35px);
+        overflow: none;
+        span {
+            float: left;
+            margin: 10px 20px 2px 0px;
+            a {
+                display: block;
+            }
+        }
+        .perms {
+            float: right;
+            width: 40px;
+        }
+        li.loading {
+            float: right;
+            background-color: white;
+            .box(20px, 38px);
+            vertical-align: center;
+            text-align: center;
+            border-top: 2px solid #9eabb0;
+            img {
+                margin-top: 10px;
+            }
+        }
+    }
+    #jot-title {
+        .borders(1px, solid, darken(@main_alt_colour, 13%));
+        margin: 0 0 5px;
+        .box(90%, 20px);
+        font-weight: bold;
+        .rounded_corners;
+        vertical-align: middle;
+    }
 }
 #jot-category {
-	margin: 5px 0;
-	.rounded_corners;
-	.borders(1px, solid, darken(@main_alt_colour, 33%));
-	color: darken(@main_alt_colour, 27%);
-	font-size: smaller;
-	&:focus {
-		color: @main_alt_colour;
-	}
+    margin: 5px 0;
+    .rounded_corners;
+    .borders(1px, solid, darken(@main_alt_colour, 33%));
+    color: darken(@main_alt_colour, 27%);
+    font-size: smaller;
+    &:focus {
+        color: @main_alt_colour;
+    }
 }
 #jot #character-counter {
-	.box(6%, 15px);
-	float: right;
-	text-align: right;
-	line-height: 20px;
-	padding: 2px 20px 5px 0;
+    .box(6%, 15px);
+    float: right;
+    text-align: right;
+    line-height: 20px;
+    padding: 2px 20px 5px 0;
 }
 #profile-jot-text_parent {
-	.box_shadow(5px, 0, 10px, 0);
+    .box_shadow(5px, 0, 10px, 0);
 }
 #profile-jot-text_tbl {
-	margin-bottom: 10px;
-	background: darken(@main_alt_colour, 46.8%);
+    margin-bottom: 10px;
+    background: darken(@main_alt_colour, 46.8%);
 }
 #profile-jot-text_ifr {
-	width: 99.900002% !important;
+    width: 99.900002% !important;
 }
 #profile-jot-text_toolbargroup, .mceCenter tr {
-	background: darken(@main_alt_colour, 46.8%);
+    background: darken(@main_alt_colour, 46.8%);
 }
 [id$="jot-text_ifr"] {
-	// width: 99.900002% !important;
-	color: @bg_colour;
-	background: @main_colour;
-	.mceContentBody {
-		color: @bg_colour;
-		background: @main_colour;
-	}
+    // width: 99.900002% !important;
+    color: @bg_colour;
+    background: @main_colour;
+    .mceContentBody {
+        color: @bg_colour;
+        background: @main_colour;
+    }
 }
 .defaultSkin {
-	tr.mceFirst {
-		background: darken(@main_alt_colour, 46.8%);
-	}
-	td {
-		&.mceFirst, &.mceLast {
-			background-color: @main_colour;
-		}
-	}
-	span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon {
-		background-color: @main_colour;
-	}
+    tr.mceFirst {
+        background: darken(@main_alt_colour, 46.8%);
+    }
+    td {
+        &.mceFirst, &.mceLast {
+            background-color: @main_colour;
+        }
+    }
+    span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon {
+        background-color: @main_colour;
+    }
 }
 #profile-attach-wrapper,
 #profile-audio-wrapper,
@@ -1068,92 +1105,92 @@ nav #nav-notifications-linkmenu {
 #profile-title-wrapper,
 #profile-upload-wrapper,
 #profile-video-wrapper {
-	float: left;
-	margin: 0 20px 0 0;
+    float: left;
+    margin: 0 20px 0 0;
 }
 #profile-rotator-wrapper {
-	float: right;
+    float: right;
 }
 #profile-jot-email-wrapper {
-	margin: 10px 10% 0;
-	.borders(1px, solid, @menu_bg_colour);
-	border-bottom: 0;
+    margin: 10px 10% 0;
+    .borders(1px, solid, @menu_bg_colour);
+    border-bottom: 0;
 }
 #profile-jot-email-label {
-	background-color: @menu_bg_colour;
-	color: @main_colour;
-	padding: 5px;
+    background-color: @menu_bg_colour;
+    color: @main_colour;
+    padding: 5px;
 }
 #profile-jot-email {
-	width: 90%;
-	margin: 5px;
+    width: 90%;
+    margin: 5px;
 }
 #profile-jot-networks {
-	margin: 0 10%;
-	border: 1px solid @menu_bg_colour;
-	border-top: 0;
-	border-bottom: 0;
-	padding: 5px;
+    margin: 0 10%;
+    border: 1px solid @menu_bg_colour;
+    border-top: 0;
+    border-bottom: 0;
+    padding: 5px;
 }
 #profile-jot-net {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #jot-preview-link {
-	margin: 0 0 0 10px;
-	border: 0;
-	text-decoration: none;
-	float: right;
+    margin: 0 0 0 10px;
+    border: 0;
+    text-decoration: none;
+    float: right;
 }
 .icon-text-preview {
-	margin: 0 0 -18px 0;
-	display: block;
-	.box(20px, 20px);
-	background: url(dark/icons.png) no-repeat -128px -40px;
-	border: 0;
-	text-decoration: none;
-	float: right;
-	cursor: pointer;
+    margin: 0 0 -18px 0;
+    display: block;
+    .box(20px, 20px);
+    background: url(dark/icons.png) no-repeat -128px -40px;
+    border: 0;
+    text-decoration: none;
+    float: right;
+    cursor: pointer;
 }
 #profile-jot-perms {
-	float: right;
-	color: @menu_bg_colour;
-	.box(20px, 20px);
-	.rounded_corners;
-	.box_shadow(3px, 3px, 5px, 0);
-	.borders(2px, outset, @menu_bg_colour);
-	overflow: hidden;
-	margin: 0 10px 0 10px;
+    float: right;
+    color: @menu_bg_colour;
+    .box(20px, 20px);
+    .rounded_corners;
+    .box_shadow(3px, 3px, 5px, 0);
+    .borders(2px, outset, @menu_bg_colour);
+    overflow: hidden;
+    margin: 0 10px 0 10px;
 }
 #profile-jot-plugin-wrapper {
-	width: 1px;
-	margin: 10px 0 0 0;
-	float: right;
+    width: 1px;
+    margin: 10px 0 0 0;
+    float: right;
 }
 #profile-jot-submit-wrapper {
-	float: right;
-	width: 100%;
-	margin: 10px 0 0 0;
-	padding: 0;
+    float: right;
+    width: 100%;
+    margin: 10px 0 0 0;
+    padding: 0;
 }
 #profile-jot-submit {
-	height: auto;
-	background-color: @menu_bg_colour;
-	color: @main_alt_colour;
-	.rounded_corners;
-	.borders(2px, outset, @shiny_colour);
-	margin: 0;
-	float: right;
-	.text_shadow;
-	width: auto;
-	&:active {
-		.box_shadow(0, 0, 0, 0);
-	}
+    height: auto;
+    background-color: @menu_bg_colour;
+    color: @main_alt_colour;
+    .rounded_corners;
+    .borders(2px, outset, @shiny_colour);
+    margin: 0;
+    float: right;
+    .text_shadow;
+    width: auto;
+    &:active {
+        .box_shadow(0, 0, 0, 0);
+    }
 }
 #jot-perms-icon {
-	.box(22px, 22px);
-	.rounded_corners;
-	overflow: hidden;
-	background: @menu_bg_colour url("dark/icons.png") -88px -40px;
+    .box(22px, 22px);
+    .rounded_corners;
+    overflow: hidden;
+    background: @menu_bg_colour url("dark/icons.png") -88px -40px;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
@@ -1161,67 +1198,67 @@ nav #nav-notifications-linkmenu {
 #contact_allow_wrapper,
 #contact_deny_wrapper,
 #acl-deny-outer-wrapper {
-	width: 47%;
+    width: 47%;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
 #acl-permit-outer-wrapper {
-	float: left;
+    float: left;
 }
 #contact_allow_wrapper,
 #contact_deny_wrapper,
 #acl-deny-outer-wrapper {
-	float: right;
+    float: right;
 }
 #acl-permit-text {
-	background-color: darken(@main_alt_colour, 60%);
-	color: @main_colour;
-	padding: 5px;
-	float: left;
+    background-color: darken(@main_alt_colour, 60%);
+    color: @main_colour;
+    padding: 5px;
+    float: left;
 }
 #jot-public {
-	background-color: darken(@main_alt_colour, 60%);
-	color: @alert;
-	padding: 5px;
-	float: left;
+    background-color: darken(@main_alt_colour, 60%);
+    color: @alert;
+    padding: 5px;
+    float: left;
 }
 #acl-deny-text {
-	background-color: darken(@main_alt_colour, 60%);
-	color: @main_colour;
-	padding: 5px;
-	float: left;
+    background-color: darken(@main_alt_colour, 60%);
+    color: @main_colour;
+    padding: 5px;
+    float: left;
 }
 #jot-title-desc {
-	color: darken(@main_alt_colour, 13%);
+    color: darken(@main_alt_colour, 13%);
 }
 #profile-jot-desc {
-	background: @bg_colour;
-	.borders;
-	.rounded_corners;
-	color: @red_orange;
-	margin: 5px 0;
+    background: @bg_colour;
+    .borders;
+    .rounded_corners;
+    color: @red_orange;
+    margin: 5px 0;
 }
 #jot-title-wrapper {
-	margin-bottom: 5px;
+    margin-bottom: 5px;
 }
 #jot-title-display {
-	font-weight: bold;
+    font-weight: bold;
 }
 .jothidden {
-	display: none;
+    display: none;
 }
 #jot-preview-content {
-	background-color: @shiny_colour;
-	color: @main_colour;
-	.borders(1px, solid, @bg_colour);
-	.rounded_corners;
-	.box_shadow(5px, 0, 10px);
-	padding: 3px 3px 6px 10px;
-	.wall-item-outside-wrapper {
-	    border: 0;
-		.rounded_corners(0px 0px 0px 0px);
-		.box_shadow(0, 0, 0, 0);
-	}
+    background-color: @shiny_colour;
+    color: @main_colour;
+    .borders(1px, solid, @bg_colour);
+    .rounded_corners;
+    .box_shadow(5px, 0, 10px);
+    padding: 3px 3px 6px 10px;
+    .wall-item-outside-wrapper {
+        border: 0;
+        .rounded_corners(0px 0px 0px 0px);
+        .box_shadow(0, 0, 0, 0);
+    }
 }
 
 
@@ -1229,12 +1266,12 @@ nav #nav-notifications-linkmenu {
  * section
  */
 #sectionmain {
-	margin: 1em;
-	font-size: 0.8em;
-	min-width: 475px;
-	width: 69%;
-	float: left;
-	display: inline;
+    margin: 1em;
+    font-size: 0.8em;
+    min-width: 475px;
+    width: 69%;
+    float: left;
+    display: inline;
 }
 
 
@@ -1242,51 +1279,51 @@ nav #nav-notifications-linkmenu {
  * tabs
  */
 .tabs {
-	.list_reset;
-	margin: 10px 0;
-	li {
-		display: inline;
-		font-size: smaller;
-	}
+    .list_reset;
+    margin: 10px 0;
+    li {
+        display: inline;
+        font-size: smaller;
+    }
 }
 .multibutton () {
-	.borders(1px, solid, @hover_colour);
-	padding: 4px;
-	.rounded_corners;
-	&:active,
-	&:hover {
-		background: @shiny_colour;
-		color: @main_colour;
-		.borders(1px, solid, @hover_colour);
-	}
-	a {
-		border: 0;
-		text-decoration: none;
-	}
+    .borders(1px, solid, @hover_colour);
+    padding: 4px;
+    .rounded_corners;
+    &:active,
+    &:hover {
+        background: @shiny_colour;
+        color: @main_colour;
+        .borders(1px, solid, @hover_colour);
+    }
+    a {
+        border: 0;
+        text-decoration: none;
+    }
 }
 .multibutton_active () {
-	background: @main_colour;
-	color: @bg_colour;
-	.borders(1px, solid, @hover_colour);
-	padding: 4px;
-	.rounded_corners;
-	&:hover {
-		background: @shiny_colour;
-		color: @main_colour;
-		.borders(1px, solid, @hover_colour);
-	}
-	a {
-		color: @bg_colour;
-		text-decoration: none;
-	}
+    background: @main_colour;
+    color: @bg_colour;
+    .borders(1px, solid, @hover_colour);
+    padding: 4px;
+    .rounded_corners;
+    &:hover {
+        background: @shiny_colour;
+        color: @main_colour;
+        .borders(1px, solid, @hover_colour);
+    }
+    a {
+        color: @bg_colour;
+        text-decoration: none;
+    }
 }
 .tab {
-	.multibutton;
+    .multibutton;
 }
 .tab {
-	&.active {
-		.multibutton_active;
-	}
+    &.active {
+        .multibutton_active;
+    }
 }
 
 
@@ -1294,223 +1331,223 @@ nav #nav-notifications-linkmenu {
  * items
  */
 .wall-item-outside-wrapper {
-	.borders(1px, solid, darken(@main_alt_colour, 27%));
-	.rounded_corners;
-	.box_shadow(6px, 1px, 10px, -2px);//@lt_shadow_colour
-	&.comment {
-		margin-top: 5px;
-	}
+    .borders(1px, solid, darken(@main_alt_colour, 27%));
+    .rounded_corners;
+    .box_shadow(6px, 1px, 10px, -2px);//@lt_shadow_colour
+    &.comment {
+        margin-top: 5px;
+    }
 }
 .wall-item-content-wrapper {
-	position: relative;
-	padding: 0.75em;
-	width: auto;
+    position: relative;
+    padding: 0.75em;
+    width: auto;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
-	/*margin-left: 90px;*/
-	.preview {
-		border: 0;
-		.rounded_corners(0px);
-	}
+    /*margin-left: 90px;*/
+    .preview {
+        border: 0;
+        .rounded_corners(0px);
+    }
 }
 .shiny {
-	background: @shiny_colour;
-	.rounded_corners;
+    background: @shiny_colour;
+    .rounded_corners;
 }
 .wall-outside-wrapper .shiny {
-	.rounded_corners;
+    .rounded_corners;
 }
 .heart {
-	color: red;
+    color: red;
 }
 .wall-item-content {
-	overflow-x: auto;
-	margin: 0px 4em 1em 5px;
+    overflow-x: auto;
+    margin: 0px 4em 1em 5px;
 }
 [id^="tread-wrapper"],
 [class^="tread-wrapper"] {
-	margin: 1.2em 0 0 0;
-	padding: 0px;
+    margin: 1.2em 0 0 0;
+    padding: 0px;
 }
 .wall-item-photo-menu {
-	display: none;
+    display: none;
 }
 .wall-item-photo-menu-button {
-	display: none;
-	text-indent: -99999px;
-	background: @menu_bg_colour url(dark/menu-user-pin.jpg) no-repeat 75px center;
-	position: absolute;
-	overflow: hidden;
-	.box(90px, 20px);
-	top: 85px;
-	left: 0;
-	.rounded_corners(0 0 5px 5px);
+    display: none;
+    text-indent: -99999px;
+    background: @menu_bg_colour url(dark/menu-user-pin.jpg) no-repeat 75px center;
+    position: absolute;
+    overflow: hidden;
+    .box(90px, 20px);
+    top: 85px;
+    left: 0;
+    .rounded_corners(0 0 5px 5px);
 }
 .wall-item-info {
-	float: left;
-	width: 7em;
-	position: relative;
+    float: left;
+    width: 7em;
+    position: relative;
 }
 .wall-item-photo-wrapper {
-	.box(80px, 80px);
-	position: relative;
-	padding: 5px;
-	background-color: @menu_bg_colour;
-	.rounded_corners;
+    .box(80px, 80px);
+    position: relative;
+    padding: 5px;
+    background-color: @menu_bg_colour;
+    .rounded_corners;
 }
 [class^="wall-item-tools"] * {
-	/*margin: 0 0 5px 0;*/
-	> * {
-		/*margin: 0 0 5px 0;*/
-	}
+    /*margin: 0 0 5px 0;*/
+    > * {
+        /*margin: 0 0 5px 0;*/
+    }
 }
 .wall-item-tools {
-	float: right;
-	opacity: 0.4;
-	.transition;
-	&:hover {
-		opacity: 1;
-		.transition;
-	}
+    float: right;
+    opacity: 0.4;
+    .transition;
+    &:hover {
+        opacity: 1;
+        .transition;
+    }
 }
 .wall-item-subtools1 {
-	.box(30px, 30px);
-	list-style: none outside none;
-	margin: 18px 0 30px -20px;
-	padding: 0;
+    .box(30px, 30px);
+    list-style: none outside none;
+    margin: 18px 0 30px -20px;
+    padding: 0;
 }
 .wall-item-subtools2 {
-	.box(25px, 25px);
-	list-style: none outside none;
-	margin: -78px 0 0 5px;
-	padding: 0;
+    .box(25px, 25px);
+    list-style: none outside none;
+    margin: -78px 0 0 5px;
+    padding: 0;
 }
 .wall-item-title {
-	font-size: 1.2em;
-	font-weight: bold;
-	margin-bottom: 1.4em;
+    font-size: 1.2em;
+    font-weight: bold;
+    margin-bottom: 1.4em;
 }
 .wall-item-body {
-	margin: 15px 10px 10px 0px;
-	text-align: left;
-	overflow-x: auto;
+    margin: 15px 10px 10px 0px;
+    text-align: left;
+    overflow-x: auto;
 }
 .wall-item-lock-wrapper {
-	float: right;
-	.box(22px, 22px);
-	margin: 0 -5px 0 0;
-	opacity: 1;
+    float: right;
+    .box(22px, 22px);
+    margin: 0 -5px 0 0;
+    opacity: 1;
 }
 .wall-item-dislike,
 .wall-item-like {
-	clear: left;
-	font-size: 0.8em;
-	color: lighten(@menu_bg_colour, 20%);
-	margin: 5px 0 5px 10.2em;
-	.transition;
-	opacity: 0.5;
-	&:hover {
-		opacity: 1;
-	}
+    clear: left;
+    font-size: 0.8em;
+    color: lighten(@menu_bg_colour, 20%);
+    margin: 5px 0 5px 10.2em;
+    .transition;
+    opacity: 0.5;
+    &:hover {
+        opacity: 1;
+    }
 }
 .wall-item-author,
 .wall-item-actions-author,
 .wall-item-ago {
-	color: @main_colour;
-	line-height: 1;
-	display: inline-block;
-	font-size: x-small;
-	margin: 0.5em auto;
-	font-weight: bold;
+    color: @main_colour;
+    line-height: 1;
+    display: inline-block;
+    font-size: x-small;
+    margin: 0.5em auto;
+    font-weight: bold;
 }
 .comment-edit-preview {
-	width: auto;
-	margin: auto auto auto -2em;
-	&.wall-item-author,
-	&.wall-item-actions-author,
-	&.wall-item-ago {
-		font-size: smaller;
-	}
+    width: auto;
+    margin: auto auto auto -2em;
+    &.wall-item-author,
+    &.wall-item-actions-author,
+    &.wall-item-ago {
+        font-size: smaller;
+    }
 }
 .wall-item-location {
-	margin-top: 2em;
-	width: 6em;
-	overflow: hidden;
-	.text_overflow;
-	.icon {
-		float: left;
-	}
-	> a,
-	.smalltext {
-		margin-left: 25px;
-		font-size: 0.7em;
-		display: block;
-	}
-	> br {
-		display: none;
-	}
+    margin-top: 2em;
+    width: 6em;
+    overflow: hidden;
+    .text_overflow;
+    .icon {
+        float: left;
+    }
+    > a,
+    .smalltext {
+        margin-left: 25px;
+        font-size: 0.7em;
+        display: block;
+    }
+    > br {
+        display: none;
+    }
 }
 .wallwall {
-	.wwto {
-		left: 5px;
-		margin: 0;
-		position: absolute;
-		top: 75px;
-		z-index: 10001;
-		.box(30px, 30px);
-		img {
-			width: 30px !important;
-			height: 30px !important;
-		}
-	}
-	.wall-item-photo-end {
-		clear: both;
-	}
+    .wwto {
+        left: 5px;
+        margin: 0;
+        position: absolute;
+        top: 75px;
+        z-index: 10001;
+        .box(30px, 30px);
+        img {
+            width: 30px !important;
+            height: 30px !important;
+        }
+    }
+    .wall-item-photo-end {
+        clear: both;
+    }
 }
 .wall-item-arrowphoto-wrapper {
-	position: absolute;
-	left: 35px;
-	top: 80px;
-	z-index: 10002;
+    position: absolute;
+    left: 35px;
+    top: 80px;
+    z-index: 10002;
 }
 .wall-item-photo-menu {
-	min-width: 92px;
-	font-size: 0.75em;
-	.borders(2px, solid, @menu_bg_colour);
-	border-top: 0px;
-	background: @menu_bg_colour;
-	position: absolute;
-	left: -2px;
-	top: 101px;
-	display: none;
-	z-index: 10003;
-	.rounded_corners(0 5px 5px 5px);
-	li a {
-		white-space: nowrap;
-		display: block;
-		padding: 5px 6px;
-		color: @main_alt_colour;
-		&:hover {
-			color: @menu_bg_colour;
-			background: @main_alt_colour;
-		}
-	}
+    min-width: 92px;
+    font-size: 0.75em;
+    .borders(2px, solid, @menu_bg_colour);
+    border-top: 0px;
+    background: @menu_bg_colour;
+    position: absolute;
+    left: -2px;
+    top: 101px;
+    display: none;
+    z-index: 10003;
+    .rounded_corners(0 5px 5px 5px);
+    li a {
+        white-space: nowrap;
+        display: block;
+        padding: 5px 6px;
+        color: @main_alt_colour;
+        &:hover {
+            color: @menu_bg_colour;
+            background: @main_alt_colour;
+        }
+    }
 }
 #item-delete-selected {
-	overflow: auto;
-	width: 100%;
+    overflow: auto;
+    width: 100%;
 }
 #connect-services-header,
 #extra-help-header {
-	margin: 1.5em 0 0 0;
+    margin: 1.5em 0 0 0;
 }
 #connect-services,
 #extra-help {
-	.list_reset;
-	margin: 1em 0 0 0;
-	li {
-		display: inline;
-	}
+    .list_reset;
+    margin: 1em 0 0 0;
+    li {
+        display: inline;
+    }
 }
 
 
@@ -1518,36 +1555,36 @@ nav #nav-notifications-linkmenu {
  * comment
  */
 .ccollapse-wrapper {
-	font-size: 0.9em;
-	margin-left: 5em;
+    font-size: 0.9em;
+    margin-left: 5em;
 }
 .hide-comments-outer {
-	font-size: small;
+    font-size: small;
 }
 .wall-item-outside-wrapper.comment {
-	margin-left: 5em;
-	.wall-item-info {
-		width: 5em;
-	}
-	.wall-item-photo {
-		width: 40px !important;
-		height: 40px !important;
-	}
-	.wall-item-photo-wrapper {
-		.box(40px, 40px);
-	}
-	.wall-item-photo-menu-button {
-		width: 3.35em;
-		top: 3.2em;
-		background-position: 35px center;
-	}
-	.wall-item-author {
-		margin-left: 0.2em;
-	}
-	.wall-item-photo-menu {
-		min-width: 4.5em;
-		top: 5.5em;
-	}
+    margin-left: 5em;
+    .wall-item-info {
+        width: 5em;
+    }
+    .wall-item-photo {
+        width: 40px !important;
+        height: 40px !important;
+    }
+    .wall-item-photo-wrapper {
+        .box(40px, 40px);
+    }
+    .wall-item-photo-menu-button {
+        width: 3.35em;
+        top: 3.2em;
+        background-position: 35px center;
+    }
+    .wall-item-author {
+        margin-left: 0.2em;
+    }
+    .wall-item-photo-menu {
+        min-width: 4.5em;
+        top: 5.5em;
+    }
 }
 .comment-wwedit-wrapper {
     .borders(1px, solid, @main_colour);
@@ -1555,61 +1592,61 @@ nav #nav-notifications-linkmenu {
     margin: 5px;
 }
 .comment-edit-wrapper {
-	border-top: 1px #aaa solid;
+    border-top: 1px #aaa solid;
 }
 [class^="comment-edit-bb"] {
-	.list_reset;
-	display: none;
-	margin: -40px 0 5px 60px;
-	width: 75%;
-	> li {
-		display: inline-block;
-		margin: 0 10px 0 0;
-		visibility: none;
-	}
+    .list_reset;
+    display: none;
+    margin: -40px 0 5px 60px;
+    width: 75%;
+    > li {
+        display: inline-block;
+        margin: 0 10px 0 0;
+        visibility: none;
+    }
 }
 .comment-wwedit-wrapper img,
 .comment-edit-wrapper img {
-	.box;
+    .box;
 }
 .comment-edit-photo-link,
 .comment-edit-photo {
-	margin-left: 10px;
+    margin-left: 10px;
 }
 .my-comment-photo {
-	.box(40px, 40px);
-	padding: 5px;
+    .box(40px, 40px);
+    padding: 5px;
 }
 [class^="comment-edit-text"] {
-	margin: 5px 0 10px 20px;
-	width: 94%;
+    margin: 5px 0 10px 20px;
+    width: 94%;
 }
 .comment-edit-text-empty {
-	height: 20px;
-	.med_borders;
-	.rounded_corners;
-	color: @med_border_colour;
-	.transition;
-	&:hover {
-		color: darken(@main_alt_colour, 33.5%);
-	}
+    height: 20px;
+    .med_borders;
+    .rounded_corners;
+    color: @med_border_colour;
+    .transition;
+    &:hover {
+        color: darken(@main_alt_colour, 33.5%);
+    }
 }
 .comment-edit-text-full {
-	height: 10em;
-	.rounded_corners;
-	.transition;
+    height: 10em;
+    .rounded_corners;
+    .transition;
 }
 .comment-edit-submit-wrapper {
-	width: 90%;
-	margin: 5px 5px 10px 50px;
-	text-align: right;
+    width: 90%;
+    margin: 5px 5px 10px 50px;
+    text-align: right;
 }
 .comment-edit-submit {
-	height: 22px;
-	background-color: @menu_bg_colour;
-	color: @main_alt_colour;
-	.rounded_corners;
-	border: 0;
+    height: 22px;
+    background-color: @menu_bg_colour;
+    color: @main_alt_colour;
+    .rounded_corners;
+    border: 0;
 }
 
 
@@ -1621,14 +1658,14 @@ nav #nav-notifications-linkmenu {
     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%);
-	color: @main_colour;
+    color: @main_colour;
     display: block;
     overflow-x: auto;
     padding: 5px 0 15px 10px;
     width: 95%;
-	a {
-		color: @lt_link_colour;
-	}
+    a {
+        color: @lt_link_colour;
+    }
 }
 
 
@@ -1636,47 +1673,47 @@ nav #nav-notifications-linkmenu {
  * profile
  */
 div {
-	&[id$="text"] {
-		font-weight: bold;
-		border-bottom: 1px solid darken(@main_alt_colour, 13.5%);
-	}
-	&[id$="wrapper"] {
-		height: 100%;
-		br {
-			clear: left;
-		}
-	}
+    &[id$="text"] {
+        font-weight: bold;
+        border-bottom: 1px solid darken(@main_alt_colour, 13.5%);
+    }
+    &[id$="wrapper"] {
+        height: 100%;
+        br {
+            clear: left;
+        }
+    }
 }
 .profile-match-wrapper {
-	float: left;
-	margin: 0 5px 40px 0;
-	.box(120px, 120px);
-	padding: 3px;
-	position: relative;
+    float: left;
+    margin: 0 5px 40px 0;
+    .box(120px, 120px);
+    padding: 3px;
+    position: relative;
 }
 .icon.drophide.profile-match-ignore {
-	margin: 0 6px 0 -3px;
+    margin: 0 6px 0 -3px;
 }
 .profile-match-photo {
-	
+    
 }
 [id$="-end"], [class$="-end"] {
-	clear: both;
-	margin: 0 0 10px 0;
+    clear: both;
+    margin: 0 0 10px 0;
 }
 .profile-match-end {
-	margin: 0 0 5px 0;
+    margin: 0 0 5px 0;
 }
 .profile-match-name {
-	font-weight: bold;
-	margin: auto auto auto 23px;
+    font-weight: bold;
+    margin: auto auto auto 23px;
 }
 .profile-match-connect {
-	font-style: italic;
-	margin: auto auto auto 23px;
+    font-style: italic;
+    margin: auto auto auto 23px;
 }
 #advanced-profile-with {
-	margin-left: 200px;
+    margin-left: 200px;
 }
 
 
@@ -1684,98 +1721,98 @@ div {
  * photos
  */
 .photos {
-	height: auto;
-	overflow: auto;
+    height: auto;
+    overflow: auto;
 }
 #photo-top-links {
-	margin-bottom: 30px;
+    margin-bottom: 30px;
 }
 .photo-album-image-wrapper,
 .photo-top-image-wrapper {
-	float: left;
-	.box_shadow(3px, 3px, 10px, 0);
-	background-color: darken(@main_alt_colour, 80%);
-	color: @bg_colour;
-	.rounded_corners;
-	padding-bottom: 30px;
-	position: relative;
-	margin: 0 10px 10px 0;
+    float: left;
+    .box_shadow(3px, 3px, 10px, 0);
+    background-color: darken(@main_alt_colour, 80%);
+    color: @bg_colour;
+    .rounded_corners;
+    padding-bottom: 30px;
+    position: relative;
+    margin: 0 10px 10px 0;
 }
 #photo-photo {
-	margin: auto auto 5em 20%;
-	img {
-		max-width: 50%;
-	}
+    margin: auto auto 5em 20%;
+    img {
+        max-width: 50%;
+    }
 }
 .photo-top-image-wrapper a:hover,
 #photo-photo a:hover,
 .photo-album-image-wrapper a:hover {
-	border-bottom: 0;
+    border-bottom: 0;
 }
 .photo-top-photo,
 .photo-album-photo {
-	.rounded_corners(5px 5px 0 0);
+    .rounded_corners(5px 5px 0 0);
 }
 .photo-top-album-name,
 .caption {
-	position: absolute;
-	bottom: 0;
-	padding: 0 5px;
+    position: absolute;
+    bottom: 0;
+    padding: 0 5px;
 }
 #photo-prev-link,
 #photo-next-link {
-	position: absolute;
-	// .box(30%, 100%);
-	.box(50px, 200px);
-	background: white center center no-repeat;
-	opacity: 0;
-	.transition(all, 0.5s);
-	z-index: 10;
-	top: 15em;
-	.rounded_corners;
-	&:hover {
-		opacity: 0.6;
-		.transition(all, 0.5s);
-	}
-	.icon {
-		display: none;
-	}
+    position: absolute;
+    // .box(30%, 100%);
+    .box(50px, 200px);
+    background: white center center no-repeat;
+    opacity: 0;
+    .transition(all, 0.5s);
+    z-index: 10;
+    top: 15em;
+    .rounded_corners;
+    &:hover {
+        opacity: 0.6;
+        .transition(all, 0.5s);
+    }
+    .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=");
+    // 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: 5%;
 }
 #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=");
+    // 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: 50%;
 }
 #photo-prev-link a,
 #photo-next-link a {
-	display: block;
-	.box(100%, 100%);
-	.rounded_corners;
-	overflow: hidden;
-	text-indent: -900000px;
+    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: @menu_bg_colour;
-	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,
@@ -1783,45 +1820,45 @@ div {
 
 }
 #photo-edit-link-wrap {
-	margin-bottom: 15px;
+    margin-bottom: 15px;
 }
 #photo-edit-caption,
 #photo-edit-newtag {
 
 }
 #photo-edit-perms {
-	width: auto;
+    width: auto;
 }
 #photo-edit-rotate-label {
-	.label;
+    .label;
 }
 #photo-like-div {
-	float: left;
-	margin: auto 0 0;
-	width: 2em;
-	.rounded_corners;
-	.borders;
+    float: left;
+    margin: auto 0 0;
+    width: 2em;
+    .rounded_corners;
+    .borders;
 }
 .wall-item-like-buttons {
-	> * {
-		display: inline;
-	}
+    > * {
+        display: inline;
+    }
 }
 #photo-edit-delete-button {
-	margin: auto auto auto 1em;
+    margin: auto auto auto 1em;
 }
 #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;
 }
 #wall-photo-container {
-	margin: 0 auto 1em 4em;
-	width: 90%;
+    margin: 0 auto 1em 4em;
+    width: 90%;
 }
 
 
@@ -1829,79 +1866,79 @@ div {
  * message
  */
 .prvmail-text {
-	width: 100%;
+    width: 100%;
 }
 #prvmail-subject {
-	width: 100%;
-	color: @bg_colour;
-	background: @main_colour;
+    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)
+    .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;
 }
 
 
@@ -1910,129 +1947,129 @@ div {
  */
 .view-contact-wrapper,
 .contact-entry-wrapper {
-	float: left;
-	margin: 0 5px 40px 0;
-	.box(120px, 135px);
-	padding: 3px;
-	position: relative;
+    float: left;
+    margin: 0 5px 40px 0;
+    .box(120px, 135px);
+    padding: 3px;
+    position: relative;
 }
 .contact-direction-wrapper {
-	position: absolute;
-	top: 20px;
+    position: absolute;
+    top: 20px;
 }
 .contact-edit-links {
-	position: absolute;
-	top: 60px;
+    position: absolute;
+    top: 60px;
 }
 .contact-entry-photo-wrapper {}
 .contact-entry-photo {
-	margin-left: 20px;
+    margin-left: 20px;
 }
 .contact-entry-name {
-	width: 120px;
-	font-weight: bold;
-	font-size: small;
+    width: 120px;
+    font-weight: bold;
+    font-size: small;
 }
 .contact-entry-details {
-	font-size: x-small;
+    font-size: x-small;
 }
 .contact-entry-photo {
-	position: relative;
+    position: relative;
 }
 .contact-entry-edit-links .icon {
-	.borders(1px, solid, #babdb6);
-	.rounded_corners(3px);
-	background-color: white;
+    .borders(1px, solid, #babdb6);
+    .rounded_corners(3px);
+    background-color: white;
 }
 #contact-entry-url,
 [id^="contact-entry-url"],
 #contact-entry-network,
 [id^="contact-entry-network"] {
-	font-size: smaller;
+    font-size: smaller;
 }
 #contact-entry-network,
 [id^="contact-entry-network"] {
-	font-style: italic;
+    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;
+    margin-top: 23px;
 }
 #contact-drop-links {
-	margin-left: 5px;
+    margin-left: 5px;
 }
 #contact-edit-nav-wrapper .icon {
-	.borders(1px, solid, #babdb6);
-	.rounded_corners(3px);
+    .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;
+    display: inline;
 }
 #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;
-	margin: 0px;
-	padding: 0px;
-	.box(16px, 16px);
-	top: 64px;
-	left: 0px;
-	overflow: hidden;
-	text-indent: 40px;
-	display: none;
+    position: absolute;
+    background: url("dark/photo-menu.jpg") top left no-repeat transparent;
+    margin: 0px;
+    padding: 0px;
+    .box(16px, 16px);
+    top: 64px;
+    left: 0px;
+    overflow: hidden;
+    text-indent: 40px;
+    display: none;
 }
 .contact-photo-menu {
-	width: auto;
-	.borders(2px, solid, @link_colour);
-	background: @bg_colour;
-	color: @main_colour;
-	position: absolute;
-	font-size: smaller;
-	.rounded_corners;
-	left: 0px;
-	top: 90px;
-	display: none;
-	z-index: 10000;
-	li a {
-		display: block;
-		padding: 4px;
-		color: @link_colour;
-		background: @main_colour;
-		line-height: 1;
-		&:hover {
-			background: @link_colour;
-			color: @main_colour;
-			text-decoration: none;
-		}
-	}
+    width: auto;
+    .borders(2px, solid, @link_colour);
+    background: @bg_colour;
+    color: @main_colour;
+    position: absolute;
+    font-size: smaller;
+    .rounded_corners;
+    left: 0px;
+    top: 90px;
+    display: none;
+    z-index: 10000;
+    li a {
+        display: block;
+        padding: 4px;
+        color: @link_colour;
+        background: @main_colour;
+        line-height: 1;
+        &:hover {
+            background: @link_colour;
+            color: @main_colour;
+            text-decoration: none;
+        }
+    }
 }
 
 
@@ -2041,23 +2078,23 @@ div {
  */
 .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-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;
-	}
+    label {
+        clear: left;
+    }
+    input {
+        margin: 10px 5px;
+    }
 }
 #register-form label,
 #profile-edit-form label {
@@ -2070,53 +2107,53 @@ div {
     margin-bottom: 20px;
 }
 #profile-edit-marital-label span {
-	margin: -4px;
+    margin: -4px;
 }
 .settings-submit-wrapper,
 .profile-edit-submit-wrapper {
-	margin: 0 0 30px;
+    margin: 0 0 30px;
 }
 .profile-edit-side-div {
-	display: none;
+    display: none;
 }
 #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;
-	cursor: pointer;
-	display: block;
-	.box(20px, 20px);
-	margin: 0 0 -18px;
-	text-decoration: none;
-	top: 113px;
-	right: 260px;
+    background: url("dark/icons.png") -150px 0px no-repeat;
+    border: 0;
+    cursor: pointer;
+    display: block;
+    .box(20px, 20px);
+    margin: 0 0 -18px;
+    text-decoration: none;
+    top: 113px;
+    right: 260px;
 }
 #profile-edit-links ul {
-	.list_reset;
-	margin: 20px 0;
+    .list_reset;
+    margin: 20px 0;
 }
 .marital {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 #register-sitename {
-	display: inline;
-	font-weight: bold;
+    display: inline;
+    font-weight: bold;
 }
 #advanced-expire-popup {
-	background: @bg_colour;
-	color: @main_colour;
+    background: @bg_colour;
+    color: @main_colour;
 }
 #id_ssl_policy {
-	width: 374px;
+    width: 374px;
 }
 #theme-preview img {
-	margin: 10px 10px 10px 288px;
+    margin: 10px 10px 10px 288px;
 }
 
 
@@ -2124,39 +2161,39 @@ div {
  * contacts selector
  */
 .group-delete-wrapper {
-	margin: -31px 50px 0 0;
-	float: right;
+    margin: -31px 50px 0 0;
+    float: right;
 }
 /*.group-delete-icon {
     margin: 0 0 0 10px;
 }*/
 #group-edit-submit-wrapper {
-	margin: 0 0 10px 0;
-	display: inline;
+    margin: 0 0 10px 0;
+    display: inline;
 }
 #group-members, #prof-members {
-	height: 200px;
-	overflow: auto;
-	.borders(1px, solid, @menu_bg_colour);
-	.rounded_corners(5px 5px 0 0);
+    height: 200px;
+    overflow: auto;
+    .borders(1px, solid, @menu_bg_colour);
+    .rounded_corners(5px 5px 0 0);
 }
 #group-all-contacts, #prof-all-contacts {
-	height: 200px;
-	overflow: auto;
-	.borders(1px, solid, @menu_bg_colour);
-	.rounded_corners(0 0 5px 5px);
+    height: 200px;
+    overflow: auto;
+    .borders(1px, solid, @menu_bg_colour);
+    .rounded_corners(0 0 5px 5px);
 }
 #group-members h3,
 #group-all-contacts h3,
 #prof-members h3,
 #prof-all-contacts h3 {
-	color: @main_alt_colour;
-	background-color: @menu_bg_colour;
-	margin: 0;
-	padding: 5px;
+    color: @main_alt_colour;
+    background-color: @menu_bg_colour;
+    margin: 0;
+    padding: 5px;
 }
 #group-separator, #prof-separator {
-	display: none;
+    display: none;
 }
 
 
@@ -2164,10 +2201,10 @@ div {
  * profile
  */
 #cropimage-wrapper {
-	float: left;
+    float: left;
 }
 #crop-image-form {
-	clear: both;
+    clear: both;
 }
 
 
@@ -2175,47 +2212,47 @@ div {
  * 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-note {
-	padding: 10px;
+    padding: 10px;
 }
 .intro-end {
-	padding: 30px;
+    padding: 30px;
 }
 .intro-form {
-	float: left;
+    float: left;
 }
 .intro-approve-form {
-	clear: both;
+    clear: both;
 }
 .intro-submit-approve,
 .intro-submit-ignore {
-	margin-right: 20px;
+    margin-right: 20px;
 }
 .intro-submit-approve {
-	margin-top: 15px;
+    margin-top: 15px;
 }
 .intro-approve-as-friend-label,
 .intro-approve-as-fan-label,
 .intro-approve-as-friend,
 .intro-approve-as-fan {
-	float: left;
+    float: left;
 }
 .intro-form-end {
-	clear: both;
-	margin-bottom: 10px;
+    clear: both;
+    margin-bottom: 10px;
 }
 .intro-approve-as-end {
-	clear: both;
-	margin-bottom: 10px;
+    clear: both;
+    margin-bottom: 10px;
 }
 .clear {
-	clear: both;
+    clear: both;
 }
 
 
@@ -2223,23 +2260,23 @@ div {
  * events
  */
 .eventcal {
-	float: left;
-	font-size: 20px;
+    float: left;
+    font-size: 20px;
 }
 .event {
-	background: @bg_colour;
+    background: @bg_colour;
 }
 .vevent {
-	border: 1px solid darken(@main_alt_colour, 13.5%);
-	.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 {
@@ -2249,105 +2286,105 @@ div {
   /*margin-bottom: 15px;*/
 }
 .event-description:before {
-	content: url('../../../images/calendar.png');
-	margin-right: 15px;
+    content: url('../../../images/calendar.png');
+    margin-right: 15px;
 }
 .event-start,
 .event-end {
-	margin-left: 10px;
-	width: 330px;
-	font-size: smaller;
+    margin-left: 10px;
+    width: 330px;
+    font-size: smaller;
 }
 .event-start .dtstart,
 .event-end .dtend {
-	float: right;
+    float: right;
 }
 .event-list-date {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .prevcal, .nextcal {
-	float: left;
-	margin: 64px 32px auto 32px;
+    float: left;
+    margin: 64px 32px auto 32px;
 }
 .calendar {
-	font-family: monospace;
+    font-family: monospace;
 }
 .today {
-	font-weight: bold;
-	color: red;
+    font-weight: bold;
+    color: red;
 }
 #event-start-text,
 #event-finish-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-nofinish-checkbox,
 #event-nofinish-text,
 #event-adjust-checkbox,
 #event-adjust-text,
 #event-share-checkbox {
-	float: left;
+    float: left;
 }
 #event-datetime-break {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #event-nofinish-break,
 #event-adjust-break,
 #event-share-break {
-	clear: both;
+    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;
+    position: absolute;
+    left: 35px;
+    margin-top: 20px;
 }
 #item-delete-selected-icon {
-	float: left;
-	margin-right: 5px;
+    float: left;
+    margin-right: 5px;
 }
 .fc-state-highlight {
-	background: @main_colour;
-	color: @bg_colour;
+    background: @main_colour;
+    color: @bg_colour;
 }
 
 
@@ -2355,12 +2392,12 @@ div {
  * 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;
 }
 
 
@@ -2368,93 +2405,93 @@ div {
  * sidebar
  */
 #group-sidebar {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .categories-selected,
 .group-selected,
 .nets-selected,
 .fileas-selected {
-	// padding: 4px;
-	color: @bg_colour;
-	// background: @main_colour;
-	// .borders(1px, solid, @link_colour);
-	.multibutton_active;
+    // padding: 4px;
+    color: @bg_colour;
+    // background: @main_colour;
+    // .borders(1px, solid, @link_colour);
+    .multibutton_active;
 }
 .categories-selected:hover,
 .group-selected:hover,
 .nets-selected:hover,
 .fileas-selected:hover {
 //     padding: 4px;
-	// color: @bg_colour;
+    // color: @bg_colour;
 //     background: @bg_colour;
 //     .borders(1px, solid, @link_colour);
 }
 .groupsideedit {
-	margin-right: 10px;
+    margin-right: 10px;
 }
 #sidebar-group-ul {
-	padding-left: 0;
+    padding-left: 0;
 }
 #sidebar-group-list {
-	margin: 0 0 5px 0;
-	li {
-		margin-top: 10px;
-	}
-	.icon {
-		display: inline-block;
-		.box(12px, 12px);
-	}
+    margin: 0 0 5px 0;
+    li {
+        margin-top: 10px;
+    }
+    .icon {
+        display: inline-block;
+        .box(12px, 12px);
+    }
 }
 .sidebar-group-element {
-	.multibutton;
-	.rounded_corners;
+    .multibutton;
+    .rounded_corners;
 }
 #sidebar-new-group {
-	margin: auto;
-	display: inline-block;
-	color: @main_alt_colour;
-	text-decoration: none;
-	text-align: center;
+    margin: auto;
+    display: inline-block;
+    color: @main_alt_colour;
+    text-decoration: none;
+    text-align: center;
 }
 #peoplefind-sidebar form {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #sidebar-new-group {
-	&:hover {
-		/*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
-		/*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
-		/*background-color: #b20202;*/
-	}
-	&:active {
-		position: relative;
-		top: 1px;
-	}
+    &:hover {
+        /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
+        /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
+        /*background-color: #b20202;*/
+    }
+    &:active {
+        position: relative;
+        top: 1px;
+    }
 }
 #side-peoplefind-url {
-	.borders(1px, solid, darken(@main_alt_colour, 33.5%));
-	margin-right: 3px;
-	width: 75%;
+    .borders(1px, solid, darken(@main_alt_colour, 33.5%));
+    margin-right: 3px;
+    width: 75%;
 }
 .categories-ul,
 .nets-ul {
-	.list_reset;
-	li {
-		margin: 10px 0 0;
-	}
+    .list_reset;
+    li {
+        margin: 10px 0 0;
+    }
 }
 .categories-link,
 .nets-link,
 .nets-all {
-	.multibutton;
-	.rounded_corners;
-	margin-left: 0px;
+    .multibutton;
+    .rounded_corners;
+    margin-left: 0px;
 }
 #netsearch-box {
-	margin: 20px 0px 30px;
-	width: 135px;
-	#search-submit {
-		margin: 5px 5px 0px 0px;
-	}
+    margin: 20px 0px 30px;
+    width: 135px;
+    #search-submit {
+        margin: 5px 5px 0px 0px;
+    }
 }
 
 
@@ -2462,98 +2499,98 @@ div {
  * admin
  */
 #pending-update {
-	float: right;
-	color: white;
-	font-weight: bold;
-	background-color: red;
-	padding: 0 0.3em;
+    float: right;
+    color: white;
+    font-weight: bold;
+    background-color: red;
+    padding: 0 0.3em;
 }
 .admin {
-	&.linklist {
-		border: 0;
-		padding: 0;
-	}
-	&.link {
-		.list_reset;
-	}
+    &.linklist {
+        border: 0;
+        padding: 0;
+    }
+    &.link {
+        .list_reset;
+    }
 }
 #adminpage {
-	color: @main_colour;
-	background: @bg_colour;
-	margin: 5px;
-	padding: 10px;
-	font-size: smaller;
-	dl {
-	    clear: left;
-		margin-bottom: 2px;
-		padding-bottom: 2px;
-		border-bottom: 1px solid @shadow_colour;
-	}
-	dt {
-		width: 250px;
-		float: left;
-		font-weight: bold;
-	}
-	dd {
-		margin-left: 250px;
-	}
-	h3 {
-		border-bottom: 1px solid darken(@main_alt_colour, 13.5%);
-	}
-	.submit {
-		clear: left;
-	}
-	#pluginslist {
-		margin: 0;
-		padding: 0;
-	}
-	.plugin {
-		display: block;
-		.borders(1px, solid, darken(@main_alt_colour, 40%));
-		padding: 1em;
-		margin-bottom: 5px;
-		clear: left;
-	}
-	.toggleplugin {
-		float: left;
-		margin-right: 1em;
-	}
-	table {
-		width: 100%;
-		border-bottom: 1px solid @shadow_colour;
-		margin: 5px 0;
-		th {
-			font-weight: bold;
-			text-align: left;
-		}
-		td {
-			padding: 5px;
-			vertical-align: middle;
-		}
-		&#users {
-			padding: 5px;
-		    img {
-			    .box(16px, 16px);
-    		}
+    color: @main_colour;
+    background: @bg_colour;
+    margin: 5px;
+    padding: 10px;
+    font-size: smaller;
+    dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid @shadow_colour;
+    }
+    dt {
+        width: 250px;
+        float: left;
+        font-weight: bold;
+    }
+    dd {
+        margin-left: 250px;
+    }
+    h3 {
+        border-bottom: 1px solid darken(@main_alt_colour, 13.5%);
+    }
+    .submit {
+        clear: left;
+    }
+    #pluginslist {
+        margin: 0;
+        padding: 0;
+    }
+    .plugin {
+        display: block;
+        .borders(1px, solid, darken(@main_alt_colour, 40%));
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+    }
+    .toggleplugin {
+        float: left;
+        margin-right: 1em;
+    }
+    table {
+        width: 100%;
+        border-bottom: 1px solid @shadow_colour;
+        margin: 5px 0;
+        th {
+            font-weight: bold;
+            text-align: left;
+        }
+        td {
+            padding: 5px;
+            vertical-align: middle;
+        }
+        &#users {
+            padding: 5px;
+            img {
+                .box(16px, 16px);
+            }
             a {
-			    color: @main_colour;
-			    text-decoration: underline;
+                color: @main_colour;
+                text-decoration: underline;
             }
-		}
-	}
-	td .icon {
-		float: left;
-	}
-	.selectall {
-		text-align: right;
-	}
+        }
+    }
+    td .icon {
+        float: left;
+    }
+    .selectall {
+        text-align: right;
+    }
 }
 #users .name {
-	color: @main_colour;
+    color: @main_colour;
 }
 #users .tools {
-	padding: 5px 0;
-	vertical-align: middle;
+    padding: 5px 0;
+    vertical-align: middle;
 }
 
 
@@ -2561,50 +2598,50 @@ div {
  * form fields
  */
 .field {
-	overflow: auto;
+    overflow: auto;
 }
 .field .onoff {
-	float: right;
-	margin: 0 330px 0 auto;
-	width: 80px;
-	a {
-		display: block;
-		.borders(1px, solid, darken(@main_alt_colour, 53.5%));
-		padding: 3px 6px 4px 10px;
-		height: 16px;
-		text-decoration: none;
-	}
-	.on, .off {
-		background-image: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAUACIDASIAAhEBAxEB/8QAGgABAQACAwAAAAAAAAAAAAAAAAQDBQEGCf/EACgQAAIBAwIFAwUAAAAAAAAAAAECAAMEERIUBRMxUpEhIoEjM1Nxkv/EABcBAAMBAAAAAAAAAAAAAAAAAAABAgT/xAAaEQEAAgMBAAAAAAAAAAAAAAAAAQIRMVES/9oADAMBAAIRAxEAPwD1ERKFNFVaNNVUYACgACcNVt1dEKUwzZwNI9cSDczDVdnuKDjomrPyJOQ2SXNq/L0rTPMzp9vXHWZfo/jT+RNFQV6e2yPt6s/Ms3EWQofhnDqjszWFqzMcljRUknxEn3ES/dup8xxPZ0hXtKFViQzorEDpkiZtqvc3mIkzs40bVe5vMbVe5vMREbrN3xy4t7utSVaZVHZQSDnAP7iIm+K1xpkm09f/2Q==');
-		background-repeat: no-repeat;
-	}
-	.on {
-		background-position: 42px 1px;
-		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: darken(@main_alt_colour, 13.5%);
-		color: darken(@main_alt_colour, 73.5%);
-		text-align: right;
-	}
+    float: right;
+    margin: 0 330px 0 auto;
+    width: 80px;
+    a {
+        display: block;
+        .borders(1px, solid, darken(@main_alt_colour, 53.5%));
+        padding: 3px 6px 4px 10px;
+        height: 16px;
+        text-decoration: none;
+    }
+    .on, .off {
+        background-image: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAUACIDASIAAhEBAxEB/8QAGgABAQACAwAAAAAAAAAAAAAAAAQDBQEGCf/EACgQAAIBAwIFAwUAAAAAAAAAAAECAAMEERIUBRMxUpEhIoEjM1Nxkv/EABcBAAMBAAAAAAAAAAAAAAAAAAABAgT/xAAaEQEAAgMBAAAAAAAAAAAAAAAAAQIRMVES/9oADAMBAAIRAxEAPwD1ERKFNFVaNNVUYACgACcNVt1dEKUwzZwNI9cSDczDVdnuKDjomrPyJOQ2SXNq/L0rTPMzp9vXHWZfo/jT+RNFQV6e2yPt6s/Ms3EWQofhnDqjszWFqzMcljRUknxEn3ES/dup8xxPZ0hXtKFViQzorEDpkiZtqvc3mIkzs40bVe5vMbVe5vMREbrN3xy4t7utSVaZVHZQSDnAP7iIm+K1xpkm09f/2Q==');
+        background-repeat: no-repeat;
+    }
+    .on {
+        background-position: 42px 1px;
+        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: 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);
+    .box(80%, 100px);
 }
 .field_help {
-	display: block;
-	margin-left: 297px;
-	color: darken(@main_alt_colour, 24%);
-	font-size: small;
+    display: block;
+    margin-left: 297px;
+    color: darken(@main_alt_colour, 24%);
+    font-size: small;
 }
 .field.radio .field_help {
-	margin-left: 297px;
+    margin-left: 297px;
 }
 
 
@@ -2612,95 +2649,95 @@ div {
  * update
  */
 .popup {
-	.box(100%, 100%);
-	top: 0px;
-	left: 0px;
-	position: absolute;
-	display: none;
-	.background {
-		background-color: darken(@main_alt_colour, 86.5%);
-		opacity: 0.5;
-		.box(100%, 100%);
-		position: absolute;
-		top: 0px;
-		left: 0px;
-	}
-	.panel {
-		top: 25%;
-		left: 25%;
-		.box(50%, 50%);
-		padding: 1em;
-		position: absolute;
-		.borders(4px, solid, black);
-		background-color: white;
-	}
+    .box(100%, 100%);
+    top: 0px;
+    left: 0px;
+    position: absolute;
+    display: none;
+    .background {
+        background-color: darken(@main_alt_colour, 86.5%);
+        opacity: 0.5;
+        .box(100%, 100%);
+        position: absolute;
+        top: 0px;
+        left: 0px;
+    }
+    .panel {
+        top: 25%;
+        left: 25%;
+        .box(50%, 50%);
+        padding: 1em;
+        position: absolute;
+        .borders(4px, solid, black);
+        background-color: white;
+    }
 }
 #panel {
-	position: absolute;
-	font-size: small;
-	.rounded_corners;
-	.borders(1px, solid, @main_alt_colour);
-	background-color: @bg_alt_colour;
-	color: @main_colour;
-	padding: 1em;
-	z-index: 100;
+    position: absolute;
+    font-size: small;
+    .rounded_corners;
+    .borders(1px, solid, @main_alt_colour);
+    background-color: @bg_alt_colour;
+    color: @main_colour;
+    padding: 1em;
+    z-index: 100;
 }
 .pager {
-	margin-top: 60px;
-	display: block;
-	clear: both;
-	text-align: center;
-	font-size: small;
-	font-weight: bold;
-	span {
-		padding: 4px;
-		margin: 4px;
-	}
+    margin-top: 60px;
+    display: block;
+    clear: both;
+    text-align: center;
+    font-size: small;
+    font-weight: bold;
+    span {
+        padding: 4px;
+        margin: 4px;
+    }
 }
 .pager_current {
-	background-color: @link_colour;
-	color: @bg_colour;
+    background-color: @link_colour;
+    color: @bg_colour;
 }
 .grey,
 .gray {
-	color: gray;
+    color: gray;
 }
 .orange {
-	color: orange;
+    color: orange;
 }
 .red {
-	color: red;
+    color: red;
 }
 .popup .panel {
-	.panel_text {
-		display: block;
-		overflow: auto;
-		height: 80%;
-	}
-	.panel_in {
-		.box(100%, 100%);
-		position: relative;
-	}
-	.panel_actions {
-		width: 100%;
-		bottom: 4px;
-		left: 0px;
-		position: absolute;
-	}
+    .panel_text {
+        display: block;
+        overflow: auto;
+        height: 80%;
+    }
+    .panel_in {
+        .box(100%, 100%);
+        position: relative;
+    }
+    .panel_actions {
+        width: 100%;
+        bottom: 4px;
+        left: 0px;
+        position: absolute;
+    }
 }
 .panel_text .progress {
-	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;
-	}
+    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;
+    }
 }
 
 
@@ -2708,24 +2745,24 @@ div {
  * OAuth
  */
 .oauthapp {
-	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;
-	}
+    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;
+    }
 }
 
 
@@ -2733,251 +2770,251 @@ div {
  * icons
  */
 .iconspacer {
-	display: block;
-	.box(16px, 16px);
+    display: block;
+    .box(16px, 16px);
 }
 .icon {
-	display: block;
-	.box;
-	background: transparent url("dark/icons.png") no-repeat;
-	border: 0;
-	text-decoration: none;
-	.rounded_corners;
-	&:hover {
-		border: 0;
-		text-decoration: none;
-	}
+    display: block;
+    .box;
+    background: transparent url("dark/icons.png") no-repeat;
+    border: 0;
+    text-decoration: none;
+    .rounded_corners;
+    &:hover {
+        border: 0;
+        text-decoration: none;
+    }
 }
 .editicon {
-	display: inline-block;
-	.box(21px, 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(2px, 2px, 5px, 2px);
+    &:active, &:focus, &:hover {
+        .box_shadow(0, 0, 0, 0);
+    }
 }
 .editicon:hover {
-	border: 0;
+    border: 0;
 }
 .boldbb {
-	background-position: 0px 0px;
-	&:hover {
-		background-position: -22px 0px; }
+    background-position: 0px 0px;
+    &:hover {
+        background-position: -22px 0px; }
 }
 .italicbb {
-	background-position: 0px -22px;
-	&:hover {
-		background-position: -22px -22px; }
+    background-position: 0px -22px;
+    &:hover {
+        background-position: -22px -22px; }
 }
 .underlinebb {
-	background-position: 0px -44px;
-	&:hover {
-		background-position: -22px -44px; }
+    background-position: 0px -44px;
+    &:hover {
+        background-position: -22px -44px; }
 }
 .quotebb {
-	background-position: 0px -66px;
-	&:hover {
-		background-position: -22px -66px; }
+    background-position: 0px -66px;
+    &:hover {
+        background-position: -22px -66px; }
 }
 .codebb {
-	background-position: 0px -88px;
-	&:hover {
-		background-position: -22px -88px; }
+    background-position: 0px -88px;
+    &:hover {
+        background-position: -22px -88px; }
 }
 .imagebb {
-	background-position: -44px 0px;
-	&:hover {
-		background-position: -66px 0px; }
+    background-position: -44px 0px;
+    &:hover {
+        background-position: -66px 0px; }
 }
 .urlbb {
-	background-position: -44px -22px;
-	&:hover {
-		background-position: -66px -22px; }
+    background-position: -44px -22px;
+    &:hover {
+        background-position: -66px -22px; }
 }
 .videobb {
-	background-position: -44px -44px;
-	&:hover {
-		background-position: -66px -44px; }
+    background-position: -44px -44px;
+    &:hover {
+        background-position: -66px -44px; }
 }
 .icon {
-	&.drop, &.drophide, &.delete {
-		float: left;
-		margin: 0 2px;
-	}
-	&.s22 {
-		&.delete {
-			display: block;
-			background-position: -110px 0;
-		}
-		&.text {
-			padding: 10px 0px 0px 25px;
-			width: 200px;
-		}
-	}
-	&.text {
-		text-indent: 0px;
-	}
-	&.s16 {
-		min-width: 16px;
-		height: 16px;
-	}
+    &.drop, &.drophide, &.delete {
+        float: left;
+        margin: 0 2px;
+    }
+    &.s22 {
+        &.delete {
+            display: block;
+            background-position: -110px 0;
+        }
+        &.text {
+            padding: 10px 0px 0px 25px;
+            width: 200px;
+        }
+    }
+    &.text {
+        text-indent: 0px;
+    }
+    &.s16 {
+        min-width: 16px;
+        height: 16px;
+    }
 }
 // special case for wall items
 .wall-item-delete-wrapper.icon.delete,
 .wall-item-delete-wrapper.icon.drophide {
-	margin: 0;
+    margin: 0;
 }
 .s16 .add {
-	background: url("../../../images/icons/16/add.png") no-repeat;
+    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;
+    background-position: -230px 0;
 }
 .globe,
 .location {
-	background-position: -50px -20px;
+    background-position: -50px -20px;
 }
 .noglobe,
 .nolocation {
-	background-position: -70px -20px;
+    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: -191px -40px;
+    background-position: -191px -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;
-	z-index: 10;
+    position: fixed;
+    bottom: 40px;
+    right: 30px;
+    z-index: 10;
 }
 .border {
-	.borders(1px, solid, @border2);
-	.rounded_corners;
-	&:hover {
-		.borders(1px, solid, @border2);
-		.rounded_corners;
-	}
+    .borders(1px, solid, @border2);
+    .rounded_corners;
+    &:hover {
+        .borders(1px, solid, @border2);
+        .rounded_corners;
+    }
 }
 .attachtype {
-	display: block;
-	.box(20px, 23px);
-	background-image: url(../../../images/content-types.png);
+    display: block;
+    .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;
 }
 
 
@@ -2985,23 +3022,23 @@ div {
  * footer
  */
 .cc-license {
-	margin-top: 100px;
-	font-size: 0.7em;
+    margin-top: 100px;
+    font-size: 0.7em;
 }
 footer {
-	display: block;
-	clear: both;
+    display: block;
+    clear: both;
 }
 #sectionfooter {
-	margin: 1em 0 1em 0;
+    margin: 1em 0 1em 0;
 }
 #profile-jot-text {
-	height: 20px;
-	color: @main_colour;
-	background: @bg_colour;
-	.borders;
-	.rounded_corners;
-	width: 99.5%;
+    height: 20px;
+    color: @main_colour;
+    background: @bg_colour;
+    .borders;
+    .rounded_corners;
+    width: 99.5%;
 }
 
 
@@ -3011,167 +3048,167 @@ footer {
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper {
-	display: block !important;
-	background: @bg_colour;
-	color: @main_colour;
+    display: block !important;
+    background: @bg_colour;
+    color: @main_colour;
 }
 #profile-jot-acl-wrapper {
-	margin: 0 10px;
-	.borders(1px, solid, @menu_bg_colour);
-	border-top: 0;
-	font-size: small;
-	// .box_shadow;
+    margin: 0 10px;
+    .borders(1px, solid, @menu_bg_colour);
+    border-top: 0;
+    font-size: small;
+    // .box_shadow;
 }
 #acl-wrapper {
-	width: 660px;
-	margin: 0 auto;
+    width: 660px;
+    margin: 0 auto;
 }
 #acl-search {
-	float: right;
-	background: white url("../../../images/search_18.png") no-repeat right center;
-	padding-right: 20px;
-	margin: 6px;
-	color: @shadow_colour;
+    float: right;
+    background: white url("../../../images/search_18.png") no-repeat right center;
+    padding-right: 20px;
+    margin: 6px;
+    color: @shadow_colour;
 }
 #acl-showall {
-	float: left;
-	display: block;
-	.box(auto, 18px);
-	background: @main_colour url("../../../images/show_all_off.png") 8px 8px no-repeat;
-	padding: 7px 10px 7px 30px;
-	.rounded_corners;
-	color: darken(@main_alt_colour, 33.5%);
-	margin: 5px 0;
-	&.selected {
-		color: black;
-		background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;
-	}
+    float: left;
+    display: block;
+    .box(auto, 18px);
+    background: @main_colour url("../../../images/show_all_off.png") 8px 8px no-repeat;
+    padding: 7px 10px 7px 30px;
+    .rounded_corners;
+    color: darken(@main_alt_colour, 33.5%);
+    margin: 5px 0;
+    &.selected {
+        color: black;
+        background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;
+    }
 }
 #acl-list {
-	height: 210px;
-	.borders(1px, solid, darken(@main_alt_colour, 13.5%);
-	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;
-	margin: 3px 0 5px 5px;
-	img {
-		.box(22px, 22px);
-		float: left;
-		margin: 5px 5px 20px;
-	}
-	p {
-		height: 12px;
-		font-size: 10px;
-		margin: 0 0 22px;
-		padding: 2px 0 1px;
-	}
-	a {
-		background: @main_colour 3px 3px no-repeat;
-		.rounded_corners;
-		.box(55px, 20px);
-		clear: both;
-		font-size: 10px;
-		display: block;
-		color: @bg_colour;
-		margin: 5px auto 0;
-		padding: 0 3px;
-		text-align: center;
-		vertical-align: middle;
-	}
+    .borders;
+    .box(120px, 110px);
+    display: block;
+    float: left;
+    margin: 3px 0 5px 5px;
+    img {
+        .box(22px, 22px);
+        float: left;
+        margin: 5px 5px 20px;
+    }
+    p {
+        height: 12px;
+        font-size: 10px;
+        margin: 0 0 22px;
+        padding: 2px 0 1px;
+    }
+    a {
+        background: @main_colour 3px 3px no-repeat;
+        .rounded_corners;
+        .box(55px, 20px);
+        clear: both;
+        font-size: 10px;
+        display: block;
+        color: @bg_colour;
+        margin: 5px auto 0;
+        padding: 0 3px;
+        text-align: center;
+        vertical-align: middle;
+    }
 }
 #acl-wrapper a:hover {
-	text-decoration: none;
-	color: @bg_colour;
-	border: 0;
+    text-decoration: none;
+    color: @bg_colour;
+    border: 0;
 }
 //data URI:
 // data:[<MIME-type>][;charset=<encoding>][;base64],<data>
 .acl-button-show {
-	// background-image: url('../../../images/show_off.png');
-	background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABxSURBVAiZY/z//z8DDMyaNUuEgYEhk4GBwZ8JJrhv3z5DZmbmMwwMDOoMDAxpLKtWraqTl5d3fPv2rcn///9XpKWlpTIwMDCwfPr0SePWrVtmP378YPn//385zASmf//+Rf/8+XMpIyPj2bS0tHcwCQBWkiq6M5HGDgAAAABJRU5ErkJggg==');
-	margin: 0 auto;
+    // background-image: url('../../../images/show_off.png');
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABxSURBVAiZY/z//z8DDMyaNUuEgYEhk4GBwZ8JJrhv3z5DZmbmMwwMDOoMDAxpLKtWraqTl5d3fPv2rcn///9XpKWlpTIwMDCwfPr0SePWrVtmP378YPn//385zASmf//+Rf/8+XMpIyPj2bS0tHcwCQBWkiq6M5HGDgAAAABJRU5ErkJggg==');
+    margin: 0 auto;
 }
 .acl-button-hide {
-	// background-image: url('../../../images/hide_off.png');
-	background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACWSURBVAiZBcEhDsIwFAbg/72+VXQ7wPSCIlj8JMlmcKQGgdgRCCfpEz0HjgSDw3IA1AQC1QqSpXwfqeoZwHOaphsAqGpfVVVHIYQNM1+J6MLMOwA9gAOVUhBC6Ky1r7quv03TrMZxzAwAIjKIyCel9JvneQ8ApKprY8zdObfNOXMp5bEsyyDGmJaITt77NwDEGI/W2vYP0nYuQ/Tw9H4AAAAASUVORK5CYII=');
-	margin: 0 auto;
+    // background-image: url('../../../images/hide_off.png');
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACWSURBVAiZBcEhDsIwFAbg/72+VXQ7wPSCIlj8JMlmcKQGgdgRCCfpEz0HjgSDw3IA1AQC1QqSpXwfqeoZwHOaphsAqGpfVVVHIYQNM1+J6MLMOwA9gAOVUhBC6Ky1r7quv03TrMZxzAwAIjKIyCel9JvneQ8ApKprY8zdObfNOXMp5bEsyyDGmJaITt77NwDEGI/W2vYP0nYuQ/Tw9H4AAAAASUVORK5CYII=');
+    margin: 0 auto;
 }
 .acl-button-show.selected {
-	// background: #9ade00 url(../../../images/show_on.png);
-	background: #9ade00 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABXSURBVAiZTcyhDYNQGADh7xEGwGDxhD2qUWxAwIBgE9BdoxO03YaEEX7USzh5l1yKCJl0pBoT+uIhK3zRYk52Az5444w1FijxwoYOTT4UGPHHL9a4crgBhcYSpxKVgzIAAAAASUVORK5CYII=');
-	color: @bg_colour;
+    // background: #9ade00 url(../../../images/show_on.png);
+    background: #9ade00 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABXSURBVAiZTcyhDYNQGADh7xEGwGDxhD2qUWxAwIBgE9BdoxO03YaEEX7USzh5l1yKCJl0pBoT+uIhK3zRYk52Az5444w1FijxwoYOTT4UGPHHL9a4crgBhcYSpxKVgzIAAAAASUVORK5CYII=');
+    color: @bg_colour;
 }
 .acl-button-hide.selected {
-	// background: #ff4141 url(../../../images/hide_on.png);
-	background: #ff4141 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACSSURBVAiZBcGhDoJQFAbg/z/3cGliJDOTszmLichGstkMPoTzvfA2N4vN6gMYCGhwMifMTY7fxyCy4zBcCrMjAFRk7p3LWAEzRwYT2StQgMwBrGlmOJCZV72Ok+QpcTyZ1/VHAEBEyiiKHq+2/d6bZgUADMCUIqeR94t338tAns2sVKea/sy2y667AUAgN+pc+gcI6S733PoZRAAAAABJRU5ErkJggg==');
-	color: @bg_colour;
+    // background: #ff4141 url(../../../images/hide_on.png);
+    background: #ff4141 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACSSURBVAiZBcGhDoJQFAbg/z/3cGliJDOTszmLichGstkMPoTzvfA2N4vN6gMYCGhwMifMTY7fxyCy4zBcCrMjAFRk7p3LWAEzRwYT2StQgMwBrGlmOJCZV72Ok+QpcTyZ1/VHAEBEyiiKHq+2/d6bZgUADMCUIqeR94t338tAns2sVKea/sy2y667AUAgN+pc+gcI6S733PoZRAAAAABJRU5ErkJggg==');
+    color: @bg_colour;
 }
 .acl-list-item {
-	&.groupshow {
-		border-color: @group_show;
-	}
-	&.grouphide {
-		border-color: @group_hide;
-	}
+    &.groupshow {
+        border-color: @group_show;
+    }
+    &.grouphide {
+        border-color: @group_hide;
+    }
 }
 /** /acl **/
 
 
 /* autocomplete popup */
 .acpopup {
-	max-height: 175px;
-	max-width: 42%;
-	background-color: @menu_bg_colour;
-	color: white;
-	overflow: auto;
-	z-index: 100000;
-	border: 1px solid darken(@main_alt_colour, 13.5%);
+    max-height: 175px;
+    max-width: 42%;
+    background-color: @menu_bg_colour;
+    color: white;
+    overflow: auto;
+    z-index: 100000;
+    border: 1px solid darken(@main_alt_colour, 13.5%);
 }
 .acpopupitem {
-	background-color: @menu_bg_colour;
-	padding: 4px;
-	clear: left;
-	img {
-		float: left;
-		margin-right: 4px;
-	}
-	&.selected {
-		color: @bg_alt_colour;
-		background-color: @main_alt_colour;
-	}
+    background-color: @menu_bg_colour;
+    padding: 4px;
+    clear: left;
+    img {
+        float: left;
+        margin-right: 4px;
+    }
+    &.selected {
+        color: @bg_alt_colour;
+        background-color: @main_alt_colour;
+    }
 }
 .qcomment-wrapper {
-	padding: 0px;
-	margin: 5px 5px 5px 81%;
+    padding: 0px;
+    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;
 }
 
 
@@ -3179,21 +3216,21 @@ footer {
  * 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;
-	/* override the jappix css */
-	right: 175px !important;
-	z-index: 999;
+    margin-left: 130px;
+    position: fixed;
+    bottom: 0;
+    /* override the jappix css */
+    right: 175px !important;
+    z-index: 999;
 }
 
 @import "../css/media";
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index 0e7fc1f8d..194609428 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -78,16 +78,19 @@ h6{font-size:xx-small;}
 #login_openid label{width:180px !important;}
 nav{height:60px;background-color:#2e3436;color:#eeeeec;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeec;border:0px;}nav a:hover{text-decoration:none;color:#eeeeec;border:0px;}
 nav #banner{display:block;position:absolute;left:51px;top:25px;}nav #banner #logo-text a{font-size:40px;font-weight:bold;margin-left:3px;}
-ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeec;background-color:#555753;}ul#user-menu-popup li a:hover{color:#eeeeec;background-color:#111111;}
+#site-location{font-weight:bold;font-style:italic;font-size:small;width:30em;position:relative;left:-3.5em;top:3em;}
+ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:3px 0 0;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeec;background-color:#555753;}ul#user-menu-popup li a:hover{color:#eeeeec;background-color:#111111;}
 ul#user-menu-popup li a.nav-sep{border-top:1px solid #2e302e;}
 nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin:0px 5px 5px;text-indent:50px;background:transparent url(light/icons.png) 0 0 no-repeat;}
+#nav-admin-link{background-position:0 -154px;}#nav-admin-link:hover{background-position:-22px -154px;}
 #nav-apps-link{background-position:0 -66px;}#nav-apps-link:hover{background-position:-22px -66px;}
 #nav-community-link,#nav-contacts-link{background-position:0 -22px;}#nav-community-link:hover,#nav-contacts-link:hover{background-position:-22px -22px;}
 #nav-directory-link{background-position:-44px -154px;}#nav-directory-link:hover{background-position:-66px -154px;}
 #nav-help-link{background-position:0 -110px;}#nav-help-link:hover{background-position:-22px -110px;}
 #nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;}
-#nav-intro-link{background-position:0px -190px;}#nav-intro-link:hover{background-position:-44px -190px;}
+#nav-intro-link{background-position:0px -88px;}#nav-intro-link:hover{background-position:-22px -88px;}
 #nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;}
+#nav-manage-link{background-position:0px -22px;}#nav-manage-link:hover{background-position:-22px -22px;}
 #nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;}
 #nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;}
 #nav-notify-link:hover{background-position:-66px -110px;}
@@ -105,14 +108,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;}
 #nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#2e3436;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;}
 #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
+#nav-buttons-2{clear:both;list-style:none;padding:0px;margin:0px;left:136px;top:-20px;position:relative;width:6em;height:25px;}#nav-buttons-2>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
 .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;}
 .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 #search-text,#mini-search-text{background:white;color:#111111;}
 #search-text{border:1px solid #999999;margin:5px 0;}
 #mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
 #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
-#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:80%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
-#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
+#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:35%;margin:5px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;top:4px;left:7px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
+#user-menu-label{font-size:small;padding:0px 20px 10px 5px;height:10px;display:block;}
 .nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(light/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
 .nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
 #net-update{background-position:0px 0px;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index ba8e0093b..b0fab994c 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -25,93 +25,93 @@ header,
 hgroup,
 nav,
 section {
-	display: block;
+    display: block;
 }
 audio,
 canvas,
 video,
 time {
-	display: inline-block;
-	*display: inline;
-	*zoom: 1;
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
 }
 audio:not([controls]),
 [hidden] {
-	display: none;
+    display: none;
 }
 ///*
 // * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
 // * 2. Force vertical scrollbar in non-IE
 // * 3. Prevent iOS text size adjust on device orientation change,
-// *		without disabling user zoom: h5bp.com/g
+// *        without disabling user zoom: h5bp.com/g
 // */
 html {
-	font-size: 100%;
-	overflow-y: scroll;
-	.font_size_adjust;
+    font-size: 100%;
+    overflow-y: scroll;
+    .font_size_adjust;
 }
 body {
-	margin: 0;
-	padding: 0;
-	.default_font;
-	color: @main_colour;
-	background-color: @bg_colour;
+    margin: 0;
+    padding: 0;
+    .default_font;
+    color: @main_colour;
+    background-color: @bg_colour;
 }
 button,
 input,
 select,
 textarea {
-	color: @main_colour;
-	background-color: white;
+    color: @main_colour;
+    background-color: white;
 }
 select {
-	.borders(1px, dotted, darken(@main_alt_colour, 26.8%));
-	padding: 1px;
-	margin: 3px;
-	color: @main_colour;
-	background: @bg_colour;
+    .borders(1px, dotted, darken(@main_alt_colour, 26.8%));
+    padding: 1px;
+    margin: 3px;
+    color: @main_colour;
+    background: @bg_colour;
     max-width: 85%;
     min-width: 85px;
 }
 option {
-	padding: 1px;
-	color: @main_colour;
-	background: @bg_colour;
-	&[selected="selected"] {
-		color: @bg_colour;
-		background: @dk_bg_colour;
-	}
+    padding: 1px;
+    color: @main_colour;
+    background: @bg_colour;
+    &[selected="selected"] {
+        color: @bg_colour;
+        background: @dk_bg_colour;
+    }
 }
 tr:nth-child(even) {
-	background-color: darken(@bg_colour, 10%);
+    background-color: darken(@bg_colour, 10%);
 }
 ///* remember to define focus styles! */
-//outline 	Sets all the outline properties in one declaration
-//outline-color 	Sets the color of an outline 	color_name,hex_number,rgb_number,invert,inherit
-//outline-style		Sets the style of an outline	dotted,dashed,solid,double,groove,ridge,inset,outset,inherit
-//outline-width		Sets the width of an outline 	thin,medium,thick,length,inherit
+//outline   Sets all the outline properties in one declaration
+//outline-color     Sets the color of an outline    color_name,hex_number,rgb_number,invert,inherit
+//outline-style     Sets the style of an outline    dotted,dashed,solid,double,groove,ridge,inset,outset,inherit
+//outline-width     Sets the width of an outline    thin,medium,thick,length,inherit
 :focus {
-	outline: none;
+    outline: none;
 }
 a:focus {
-	outline: invert, dashed, thin;
+    outline: invert, dashed, thin;
 }
 [disabled="disabled"] {
-	background: @dk_bg_colour;
-	color: @disabled_colour;
+    background: @dk_bg_colour;
+    color: @disabled_colour;
 }
 ///* remember to highlight inserts somehow! */
 ins,
 mark {
-	background-color: @bg_colour;
-	color: @main_colour;
+    background-color: @bg_colour;
+    color: @main_colour;
 }
 ins {
-	text-decoration: none;
+    text-decoration: none;
 }
 mark {
-	font-style: italic;
-	font-weight: bold;
+    font-style: italic;
+    font-weight: bold;
 }
 ///* Redeclare monospace font family: h5bp.com/j */
 pre,
@@ -119,157 +119,157 @@ code,
 kbd,
 samp,
 .wall-item-body code {
-	font-family: monospace, monospace;
-	_font-family: monospace;
-	font-size: 1em;
+    font-family: monospace, monospace;
+    _font-family: monospace;
+    font-size: 1em;
 }
 ///* Improve readability of pre-formatted text in all browsers */
 pre,
 .wall-item-body code {
-	.wrap;
+    .wrap;
 }
 q {
-	quotes: none;
-	&:before, &:after {
-		content: "";
-		content: none;
-	}
+    quotes: none;
+    &:before, &:after {
+        content: "";
+        content: none;
+    }
 }
 em {
-	font-style: italic;
+    font-style: italic;
 }
 strong {
-	font-weight: bold;
+    font-weight: bold;
 }
 strike {
-	text-decoration: line-through;
+    text-decoration: line-through;
 }
 small {
-	font-size: 85%;
+    font-size: 85%;
 }
 ///* Position subscript and superscript content without affecting
 // * line-height: h5bp.com/k */
 sub,
 sup {
-	font-size: 75%;
-	line-height: 0;
-	position: relative;
-	vertical-align: baseline;
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
 }
 sub {
-	bottom: -0.25em;
+    bottom: -0.25em;
 }
 sup {
-	top: -0.5em;
+    top: -0.5em;
 }
 img {
-	border: 0 none;
+    border: 0 none;
 }
 a {
-	color: @link_colour;
-	text-decoration: none;
-	margin-bottom: 1px;
-	&:hover {
-		color: @hover_colour;
-		border-bottom: 1px dotted @hover_colour;
-	}
-	&:hover img {
-		text-decoration: none;
-	}
+    color: @link_colour;
+    text-decoration: none;
+    margin-bottom: 1px;
+    &:hover {
+        color: @hover_colour;
+        border-bottom: 1px dotted @hover_colour;
+    }
+    &:hover img {
+        text-decoration: none;
+    }
 }
 blockquote {
-	background: lighten(@main_alt_colour, 6.5%);
-	color: @main_colour;
-	text-indent: 5px;
-	padding: 5px;
-	.borders(1px, solid, @main_colour);
-	.rounded_corners;
+    background: lighten(@main_alt_colour, 6.5%);
+    color: @main_colour;
+    text-indent: 5px;
+    padding: 5px;
+    .borders(1px, solid, @main_colour);
+    .rounded_corners;
 }
 .label () {
-	width: 38%;
-	display: inline-block;
-	font-size: small;
-	margin: 0 10px 1em 0;
-	.borders(1px, solid, @bg_colour);
-	padding: 3px 5px;
-	background: lighten(@main_alt_colour, 20%);
-	color: @main_colour;
-	.box_shadow(3px, 3px, 5px);
+    width: 38%;
+    display: inline-block;
+    font-size: small;
+    margin: 0 10px 1em 0;
+    .borders(1px, solid, @bg_colour);
+    padding: 3px 5px;
+    background: lighten(@main_alt_colour, 20%);
+    color: @main_colour;
+    .box_shadow(3px, 3px, 5px);
 }
 label {
-	.label;
+    .label;
 }
 input {
-	.box(250px, 25px);
-	.borders(1px, solid, darken(@main_alt_colour, 33.5%));
-	width: 17em;
-	&[type="checkbox"],
-	&[type="radio"] {
-		.box(15px, 15px);
-		margin: 0;
-	}
-	&[type="radio"] {
-		margin: 5px 0;
-	}
-	&[type="submit"],
-	&[type="button"] {
-		background-color: @menu_bg_colour;
-		.borders(2px, outset, darken(@main_alt_colour, 33.5%));
-		.rounded_corners;
-		.box_shadow(1px, 3px, 4px, 0);
-		color: @bg_colour;
-		cursor: pointer;
-		font-weight: bold;
-		width: auto;
-		.text_shadow;
-	}
-	&[type="submit"]:active,
-	&[type="button"]:active {
-		.box_shadow(0, 0, 0, 0);
-	}
+    .box(250px, 25px);
+    .borders(1px, solid, darken(@main_alt_colour, 33.5%));
+    width: 17em;
+    &[type="checkbox"],
+    &[type="radio"] {
+        .box(15px, 15px);
+        margin: 0;
+    }
+    &[type="radio"] {
+        margin: 5px 0;
+    }
+    &[type="submit"],
+    &[type="button"] {
+        background-color: @menu_bg_colour;
+        .borders(2px, outset, darken(@main_alt_colour, 33.5%));
+        .rounded_corners;
+        .box_shadow(1px, 3px, 4px, 0);
+        color: @bg_colour;
+        cursor: pointer;
+        font-weight: bold;
+        width: auto;
+        .text_shadow;
+    }
+    &[type="submit"]:active,
+    &[type="button"]:active {
+        .box_shadow(0, 0, 0, 0);
+    }
 }
 h1, h2, h3,
 h4, h5, h6 {
-	margin: 10px 0px;
-	font-weight: bold;
-	border-bottom: 1px solid @hover_colour;
+    margin: 10px 0px;
+    font-weight: bold;
+    border-bottom: 1px solid @hover_colour;
 }
 h1 {
-	font-size: x-large;
+    font-size: x-large;
 }
 h2 {
-	font-size: large;
+    font-size: large;
 }
 h3 {
-	font-size: medium;
+    font-size: medium;
 }
 h4 {
-	font-size: small;
+    font-size: small;
 }
 h5 {
-	font-size: x-small;
+    font-size: x-small;
 }
 h6 {
-	font-size: xx-small;
+    font-size: xx-small;
 }
 
 //
 .required {
-	display: inline;
-	color: red;
-	font-size: 16px;
-	font-weight: bold;
-	margin: 3px;
+    display: inline;
+    color: red;
+    font-size: 16px;
+    font-weight: bold;
+    margin: 3px;
 }
 .fakelink, .lockview {
-	color: @link_colour;
-	cursor: pointer;
+    color: @link_colour;
+    cursor: pointer;
 }
 .fakelink:hover {
-	color: @hover_colour;
+    color: @hover_colour;
 }
 .smalltext {
-	font-size: 0.7em;
+    font-size: 0.7em;
 }
 
 
@@ -278,89 +278,89 @@ h6 {
  */
 /* .tool .action */
 .action {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 .tool {
-	margin: 5px 0;
-	list-style: none;
+    margin: 5px 0;
+    list-style: none;
 }
 #articlemain {
-	.box(100%, 100%);
-	margin: 0 auto;
+    .box(100%, 100%);
+    margin: 0 auto;
 }
 .button {
-	// .box(25%, auto);
-	// background: @menu_bg_colour;
-	color: @main_colour;
-	// .borders(2px, outset, darken(@menu_bg_colour, 20%));
-	.rounded_corners;
-	padding: 5px;
-	// font-size: smaller;
-	cursor: pointer;
-	// &.active {
-		// .box_shadow(4px, 4px, 7px);
-	// }
-	a {
-		color: @main_colour;
-		// font-size: smaller;
-		font-weight: bold;
-	}
+    // .box(25%, auto);
+    // background: @menu_bg_colour;
+    color: @main_colour;
+    // .borders(2px, outset, darken(@menu_bg_colour, 20%));
+    .rounded_corners;
+    padding: 5px;
+    // font-size: smaller;
+    cursor: pointer;
+    // &.active {
+        // .box_shadow(4px, 4px, 7px);
+    // }
+    a {
+        color: @main_colour;
+        // font-size: smaller;
+        font-weight: bold;
+    }
 }
 #profile-listing-desc {
-	a {
-		color: @bg_colour;
-		font-weight: bold;
-	}
+    a {
+        color: @bg_colour;
+        font-weight: bold;
+    }
 }
 [class$="-desc"],
 [id$="-desc"] {
-	color: @bg_colour;
-	background: @dk_bg_colour;
-	.borders(2px, outset, @main_colour);
-	.rounded_corners;
-	// .box_shadow(3px, 3px, 5px);
+    color: @bg_colour;
+    background: @dk_bg_colour;
+    .borders(2px, outset, @main_colour);
+    .rounded_corners;
+    // .box_shadow(3px, 3px, 5px);
     margin: 3px 10px 7px 0;
     padding: 5px;
-	font-weight: bold;
-	font-size: smaller;
+    font-weight: bold;
+    font-size: smaller;
 }
 #item-delete-selected-desc {
-	float: left;
-	margin-right: 5px;
-	&:hover {
-		text-decoration: underline;
-	}
+    float: left;
+    margin-right: 5px;
+    &:hover {
+        text-decoration: underline;
+    }
 }
 .intro-approve-as-friend-desc {
-	margin-top: 10px;
+    margin-top: 10px;
 }
 .intro-desc {
-	margin-bottom: 20px;
-	font-weight: bold;
+    margin-bottom: 20px;
+    font-weight: bold;
 }
 #group-edit-desc {
-	margin: 10px 0px;
+    margin: 10px 0px;
 }
 #settings-nickname-desc {
-	background: @dk_bg_colour;
-	.rounded_corners;
-	.borders;
-	padding: 5px;
-	color: @bg_colour;
+    background: @dk_bg_colour;
+    .rounded_corners;
+    .borders;
+    padding: 5px;
+    color: @bg_colour;
 }
 .contactname,
 .contact-name {
-	font-weight: bold;
-	font-size: smaller;
+    font-weight: bold;
+    font-size: smaller;
 }
 .contact-details {
-	font-style: italic;
-	font-size: smaller;
+    font-style: italic;
+    font-size: smaller;
 }
 .like-rotator {
-	vertical-align: middle;
-	text-align: center;
-	margin: 1px;
+    vertical-align: middle;
+    text-align: center;
+    margin: 1px;
 }
 
 
@@ -368,54 +368,54 @@ h6 {
  * login
  */
 #asidemain .field {
-	overflow: hidden;
-	width: 200px;
+    overflow: hidden;
+    width: 200px;
 }
 #login-extra-links {
-	overflow: auto !important;
-	padding-top: 60px !important;
-	width: 100% !important;
-	a {
-		margin-right: 20px;
-	}
+    overflow: auto !important;
+    padding-top: 60px !important;
+    width: 100% !important;
+    a {
+        margin-right: 20px;
+    }
 }
 #login_standard {
-	display: block !important;
-	float: none !important;
-	height: 100% !important;
-	position: relative !important;
-	width: 100% !important;
-	.field label {
-		width: 200px !important;
-	}
-	input {
-		margin: 0 0 8px !important;
-		width: 210px !important;
-		&[type="text"] {
-			margin: 0 0 8px !important;
-			width: 210px !important; }
-	}
+    display: block !important;
+    float: none !important;
+    height: 100% !important;
+    position: relative !important;
+    width: 100% !important;
+    .field label {
+        width: 200px !important;
+    }
+    input {
+        margin: 0 0 8px !important;
+        width: 210px !important;
+        &[type="text"] {
+            margin: 0 0 8px !important;
+            width: 210px !important; }
+    }
 }
 #login-submit-wrapper {
-	margin: 0 !important;
+    margin: 0 !important;
 }
 #login-submit-button {
-	margin-left: 0px !important;
+    margin-left: 0px !important;
 }
 #asidemain #login_openid {
-	position: relative !important;
-	float: none !important;
-	margin-left: 0px !important;
-	height: auto !important;
-	width: 200px !important;
+    position: relative !important;
+    float: none !important;
+    margin-left: 0px !important;
+    height: auto !important;
+    width: 200px !important;
 }
 #login_openid {
-	#id_openid_url {
-		width: 180px !important;
-		overflow: hidden !important; }
-	label {
-		width: 180px !important;
-	}
+    #id_openid_url {
+        width: 180px !important;
+        overflow: hidden !important; }
+    label {
+        width: 180px !important;
+    }
 }
 
 
@@ -423,133 +423,154 @@ h6 {
  * nav
  */
 nav {
-	height: 60px;
-	background-color: @dk_bg_colour;
-	color: @bg_colour;
-	position: relative;
-	padding: 20px 20px 10px 95px;
-	a {
-		text-decoration: none;
-		color: @bg_colour;
-		border: 0px;
-		&:hover {
-			text-decoration: none;
-			color: @bg_colour;
-			border: 0px; } }
-	#banner {
-		display: block;
-		position: absolute;
-		left: 51px;
-		top: 25px;
-		#logo-text a {
-			font-size: 40px;
-			font-weight: bold;
-			margin-left: 3px; } }
+    height: 60px;
+    background-color: @dk_bg_colour;
+    color: @bg_colour;
+    position: relative;
+    padding: 20px 20px 10px 95px;
+    a {
+        text-decoration: none;
+        color: @bg_colour;
+        border: 0px;
+        &:hover {
+            text-decoration: none;
+            color: @bg_colour;
+            border: 0px; } }
+    #banner {
+        display: block;
+        position: absolute;
+        left: 51px;
+        top: 25px;
+        #logo-text a {
+            font-size: 40px;
+            font-weight: bold;
+            margin-left: 3px; } }
+}
+#site-location {
+    font-weight: bold;
+    font-style: italic;
+    font-size: small;
+    width: 30em;
+    position: relative;
+    left: -3.5em;
+    top: 3em;
 }
 ul#user-menu-popup {
-	display: none;
-	position: absolute;
-	background-color: @menu_bg_colour;
-	width: 100%;
-	padding: 10px 0px;
-	margin: 0px;
-	top: 20px;
-	left: 0;
-	font-size: small;
-	line-height: 1;
-	.rounded_corners(0 0 5px 5px);
-	.box_shadow(5px, 5px, 10px, 0px);
-	z-index: 10000;
-	li {
-		display: block;
-		a {
-			display: block;
-			padding: 5px;
-			color: @bg_colour;
-			background-color: @menu_bg_colour;
-			&:hover {
-				color: @bg_colour;
-				background-color: @main_colour;
-			}
-			&.nav-sep {
-				border-top: 1px solid @bg_alt_colour; } } }
+    display: none;
+    position: absolute;
+    background-color: @menu_bg_colour;
+    width: 100%;
+    padding: 10px 0px;
+    margin: 3px 0 0;
+    top: 20px;
+    left: 0;
+    font-size: small;
+    line-height: 1;
+    .rounded_corners(0 0 5px 5px);
+    .box_shadow(5px, 5px, 10px, 0px);
+    z-index: 10000;
+    li {
+        display: block;
+        a {
+            display: block;
+            padding: 5px;
+            color: @bg_colour;
+            background-color: @menu_bg_colour;
+            &:hover {
+                color: @bg_colour;
+                background-color: @main_colour;
+            }
+            &.nav-sep {
+                border-top: 1px solid @bg_alt_colour; } } }
 }
 nav .nav-link {
-	display: inline-block;
-	.box(22px, 22px);
-	overflow: hidden;
-	margin: 0px 5px 5px;
-	text-indent: 50px;
-	background: transparent url(light/icons.png) 0 0 no-repeat;
+    display: inline-block;
+    .box(22px, 22px);
+    overflow: hidden;
+    margin: 0px 5px 5px;
+    text-indent: 50px;
+    background: transparent url(light/icons.png) 0 0 no-repeat;
+}
+#nav-admin-link {
+    background-position: 0 -154px;
+    &:hover {
+        background-position: -22px -154px;
+    }
 }
 #nav-apps-link {
-	background-position: 0 -66px;
-	&:hover {
-		background-position: -22px -66px;
-	}
+    background-position: 0 -66px;
+    &:hover {
+        background-position: -22px -66px;
+    }
 }
 #nav-community-link,
 #nav-contacts-link {
-	background-position: 0 -22px;
-	&:hover {
-		background-position: -22px -22px;
-	}
+    background-position: 0 -22px;
+    &:hover {
+        background-position: -22px -22px;
+    }
 }
 #nav-directory-link {
-	background-position: -44px -154px;
-	&:hover {
-		background-position: -66px -154px;
-	}
+    background-position: -44px -154px;
+    &:hover {
+        background-position: -66px -154px;
+    }
 }
 #nav-help-link {
-	background-position: 0 -110px;
-	&:hover {
-		background-position: -22px -110px;
-	}
+    background-position: 0 -110px;
+    &:hover {
+        background-position: -22px -110px;
+    }
 }
 #nav-home-link {
-	background-position: -44px -132px;
-	&:hover {
-		background-position: -66px -132px;
-	}
+    background-position: -44px -132px;
+    &:hover {
+        background-position: -66px -132px;
+    }
 }
 #nav-intro-link {
-	background-position: 0px -190px;
-	&:hover {
-		background-position: -44px -190px;
-	}
+    background-position: 0px -88px;
+    &:hover {
+        background-position: -22px -88px;
+    }
 }
 #nav-login-link,
 #nav-logout-link {
-	background-position: 0 -88px;
-	&:hover {
-		background-position: -22px -88px;
-	}
+    background-position: 0 -88px;
+    &:hover {
+        background-position: -22px -88px;
+    }
+}
+#nav-manage-link {
+    background-position: 0px -22px;
+    &:hover {
+        background-position: -22px -22px;
+    }
 }
 #nav-messages-link {
-	background-position: -44px -88px;
-	&:hover {
-		background-position: -66px -88px;
-	}
+    background-position: -44px -88px;
+    &:hover {
+        background-position: -66px -88px;
+    }
 }
 #nav-notify-link,
 #nav-notifications-linkmenu {
-	background-position: -44px -110px;
+    background-position: -44px -110px;
 }
 #nav-notify-link:hover {
-	background-position: -66px -110px;
+    background-position: -66px -110px;
 }
 #nav-network-link {
-	background-position: 0px -177px;
-	&:hover {
-		background-position: -22px -177px;
-	}
+    background-position: 0px -177px;
+    &:hover {
+        background-position: -22px -177px;
+    }
 }
 #nav-search-link {
-	background-position: 0 -44px;
-	&:hover {
-		background-position: -22px -44px;
-	}
+    background-position: 0 -44px;
+    &:hover {
+        background-position: -22px -44px;
+    }
 }
 #jot-title,
 #profile-link,
@@ -571,266 +592,282 @@ nav .nav-link {
 .hover,
 .focus,
 .pointer {
-	cursor: pointer;
+    cursor: pointer;
 }
 //* popup notifications */
 div.jGrowl div {
-	&.notice {
-		background: @notice url("../../../images/icons/48/notice.png") no-repeat 5px center;
-		color: white;
-		padding-left: 58px;
-		margin-top: 50px;
-	}
-	&.info {
-		background: @info url("../../../images/icons/48/info.png") no-repeat 5px center;
-		color: white;
-		padding-left: 58px;
-		margin-top: 50px;
-	}
-	// &.jGrowl-message {
-
-	// }
+    &.notice {
+        background: @notice url("../../../images/icons/48/notice.png") no-repeat 5px center;
+        color: white;
+        padding-left: 58px;
+        margin-top: 50px;
+    }
+    &.info {
+        background: @info url("../../../images/icons/48/info.png") no-repeat 5px center;
+        color: white;
+        padding-left: 58px;
+        margin-top: 50px;
+    }
+    // &.jGrowl-message {
+
+    // }
 }
 #nav-notifications-menu {
-	margin: 30px 0 0 -20px;
-	width: 275px;
-	max-height: 300px;
-	overflow-y: auto;
-	font-size: 9pt;
-	img {
-		float: left;
-		margin-right: 5px; }
-	.notif-when {
-		font-size: 0.8em;
-		display: block; }
-	li {
-		word-wrap: normal;
-		border-bottom: 1px solid black;
-		&:hover {
-			color: black; }
-	}
-	a:hover {
-		color: black;
-		text-decoration: underline;
-	}
+    margin: 30px 0 0 -20px;
+    width: 275px;
+    max-height: 300px;
+    overflow-y: auto;
+    font-size: 9pt;
+    img {
+        float: left;
+        margin-right: 5px; }
+    .notif-when {
+        font-size: 0.8em;
+        display: block; }
+    li {
+        word-wrap: normal;
+        border-bottom: 1px solid black;
+        &:hover {
+            color: black; }
+    }
+    a:hover {
+        color: black;
+        text-decoration: underline;
+    }
 }
 nav #nav-notifications-linkmenu {
-	&.on .icon.s22.notify,
-	&.selected .icon.s22.notify {
-		// background-image: url("../../../images/icons/22/notify_on.png");
-		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg==");
-	}
+    &.on .icon.s22.notify,
+    &.selected .icon.s22.notify {
+        // background-image: url("../../../images/icons/22/notify_on.png");
+        background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg==");
+    }
 }
 .show {
-	display: block;
+    display: block;
 }
 #notifications {
-	.box(170px, 20px);
-	font-size: small;
-	top: -19px;
-	left: 4px;
-	position: absolute;
+    .box(170px, 20px);
+    font-size: small;
+    top: -19px;
+    left: 4px;
+    position: absolute;
 }
 #nav-floater {
-	position: fixed;
-	top: 20px;
-	right: 1%;
-	padding: 5px;
-	background: @dk_bg_colour;
-	color: transparent;
-	.rounded_corners;
-	z-index: 100;
-	.box(270px, 60px);
+    position: fixed;
+    top: 20px;
+    right: 1%;
+    padding: 5px;
+    background: @dk_bg_colour;
+    color: transparent;
+    .rounded_corners;
+    z-index: 100;
+    .box(270px, 60px);
 }
 #nav-buttons {
-	clear: both;
-	list-style: none;
-	padding: 0px;
-	margin: 0px;
-	height: 25px;
-	> li {
-		padding: 0;
-		display: inline-block;
-		margin: 0px -4px 0px 0px;
-	}
+    clear: both;
+    list-style: none;
+    padding: 0px;
+    margin: 0px;
+    height: 25px;
+    > li {
+        padding: 0;
+        display: inline-block;
+        margin: 0px -4px 0px 0px;
+    }
+}
+#nav-buttons-2 {
+    clear: both;
+    list-style: none;
+    padding: 0px;
+    margin: 0px;
+    left: 136px;
+    top: -20px;
+    position: relative;
+    .box(6em, 25px);
+    > li {
+        padding: 0;
+        display: inline-block;
+        margin: 0px -4px 0px 0px;
+    }
 }
 .floaterflip {
-	display: block;
-	position: fixed;
-	z-index: 110;
-	top: 56px;
-	right: 19px;
-	.box(22px, 22px);
-	overflow: hidden;
-	margin: 0px;
-	background: transparent url(light/icons.png) -190px -60px no-repeat;
+    display: block;
+    position: fixed;
+    z-index: 110;
+    top: 56px;
+    right: 19px;
+    .box(22px, 22px);
+    overflow: hidden;
+    margin: 0px;
+    background: transparent url(light/icons.png) -190px -60px no-repeat;
 }
 .search-box {
-	display: inline-block;
-	margin: 5px;
-	position: fixed;
-	right: 0px;
-	bottom: 0px;
-	z-index: 100;
-	background: @dk_bg_colour;
-	.rounded_corners;
+    display: inline-block;
+    margin: 5px;
+    position: fixed;
+    right: 0px;
+    bottom: 0px;
+    z-index: 100;
+    background: @dk_bg_colour;
+    .rounded_corners;
 }
 #search-text,
 #mini-search-text {
-	background: white;
-	color: @main_colour;
+    background: white;
+    color: @main_colour;
 }
 #search-text {
-	.borders(1px, solid, @main_alt_colour);
-	margin: 5px 0;
+    .borders(1px, solid, @main_alt_colour);
+    margin: 5px 0;
 }
 #mini-search-text {
-	font-size: 8pt;
-	height: 14px;
-	width: 10em;
-	margin: 5px;
+    font-size: 8pt;
+    height: 14px;
+    width: 10em;
+    margin: 5px;
 }
 #scrollup {
-	position: fixed;
-	right: 5px;
-	bottom: 40px;
-	z-index: 100;
-	a:hover {
-		text-decoration: none;
-		border: 0;
-	}
+    position: fixed;
+    right: 5px;
+    bottom: 40px;
+    z-index: 100;
+    a:hover {
+        text-decoration: none;
+        border: 0;
+    }
 }
 #user-menu {
-	.box_shadow(5px, 0, 10px, 0);
-	display: block;
-	width: 80%;
-	margin: 3px 0 0 0;
-	position: relative;
-	.rounded_corners;
-	background-color: @menu_bg_colour;
-	background-image: url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");
-	background-position: 98% center;
-	background-repeat: no-repeat;
-	clear: both;
-	top: 4px;
-	left: 10px;
-	padding: 2px;
-	> a {
-		vertical-align: top;
-		outline: 0 none;
-	}
+    .box_shadow(5px, 0, 10px, 0);
+    display: block;
+    width: 35%;
+    margin: 5px 0 0 0;
+    position: relative;
+    .rounded_corners;
+    background-color: @menu_bg_colour;
+    background-image: url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");
+    background-position: 98% center;
+    background-repeat: no-repeat;
+/*  clear: both;*/
+    top: 4px;
+    left: 7px;
+    padding: 2px;
+    > a {
+        vertical-align: top;
+        outline: 0 none;
+    }
 }
 #user-menu-label {
-	font-size: small;
-	padding: 3px 20px 9px 5px;
-	height: 10px;
+    font-size: small;
+    padding: 0px 20px 10px 5px;
+    height: 10px;
+    display: block;
 }
 .nav-ajax-update,
 .nav-ajax-left {
-	.box(30px, 19px);
-	background: transparent url(light/notifications.png) 0 0 no-repeat;
-	color: @main_colour;
-	font-weight: bold;
-	font-size: 0.8em;
-	padding-top: 0.2em;
-	text-align: center;
-	float: left;
-	margin: 0 -1px 0 3px;
-	display: block;
-	visibility: hidden;
+    .box(30px, 19px);
+    background: transparent url(light/notifications.png) 0 0 no-repeat;
+    color: @main_colour;
+    font-weight: bold;
+    font-size: 0.8em;
+    padding-top: 0.2em;
+    text-align: center;
+    float: left;
+    margin: 0 -1px 0 3px;
+    display: block;
+    visibility: hidden;
 }
 .nav-ajax-update.show,
 .nav-ajax-left.show {
-	visibility: visible;
+    visibility: visible;
 }
 #net-update {
-	background-position: 0px 0px;
+    background-position: 0px 0px;
 }
 #mail-update {
-	background-position: -30px 0;
+    background-position: -30px 0;
 }
 #notify-update {
-	background-position: -60px 0px;
+    background-position: -60px 0px;
 }
 #home-update {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 #intro-update {
-	background-position: -120px 0px;
+    background-position: -120px 0px;
 }
 #lang-select-icon {
-	cursor: pointer;
-	position: fixed;
-	left: 28px;
-	bottom: 6px;
-	z-index: 10;
+    cursor: pointer;
+    position: fixed;
+    left: 28px;
+    bottom: 6px;
+    z-index: 10;
 }
 #language-selector {
-	position: fixed;
-	bottom: 2px;
-	left: 52px;
-	z-index: 10;
+    position: fixed;
+    bottom: 2px;
+    left: 52px;
+    z-index: 10;
 }
 .menu-popup {
-	position: absolute;
-	display: none;
-	// width: 11em;
-	background: white;
-	color: @main_colour;
-	margin: 0px;
-	padding: 0px;
-	font-size: small;
-	line-height: 1.2;
-	.borders(3px, solid, @link_colour);
-	.rounded_corners;
-	z-index: 100000;
-	.box_shadow;
-	a {
-		display: block;
-		color: @main_colour;
-		padding: 5px 10px;
-		text-decoration: none;
-		&:hover {
-			color: @bg_colour;
-			background-color: @link_colour;
-		}
-	}
-	.menu-sep {
-	    border-top: 1px solid @med_bg_colour;
-	}
-	li {
-		float: none;
-		overflow: auto;
-		height: auto;
-		display: block;
-		img {
-			float: left;
-			.box(16px, 16px);
-			padding-right: 5px;
-		}
-	}
-	.empty {
-		padding: 5px;
-		text-align: center;
-		color: lighten(@shiny_colour, 45%);
-	}
+    position: absolute;
+    display: none;
+    // width: 11em;
+    background: white;
+    color: @main_colour;
+    margin: 0px;
+    padding: 0px;
+    font-size: small;
+    line-height: 1.2;
+    .borders(3px, solid, @link_colour);
+    .rounded_corners;
+    z-index: 100000;
+    .box_shadow;
+    a {
+        display: block;
+        color: @main_colour;
+        padding: 5px 10px;
+        text-decoration: none;
+        &:hover {
+            color: @bg_colour;
+            background-color: @link_colour;
+        }
+    }
+    .menu-sep {
+        border-top: 1px solid @med_bg_colour;
+    }
+    li {
+        float: none;
+        overflow: auto;
+        height: auto;
+        display: block;
+        img {
+            float: left;
+            .box(16px, 16px);
+            padding-right: 5px;
+        }
+    }
+    .empty {
+        padding: 5px;
+        text-align: center;
+        color: lighten(@shiny_colour, 45%);
+    }
 }
 .notif-item {
-	font-size: small;
-	a {
-		vertical-align: middle;
-	}
+    font-size: small;
+    a {
+        vertical-align: middle;
+    }
 }
 .notif-image {
-	.box(32px, 32px);
-	padding: 7px 7px 0px 0px;
+    .box(32px, 32px);
+    padding: 7px 7px 0px 0px;
 }
 .notify-seen {
-	background: @disabled_colour;
-	color: @main_colour;
+    background: @disabled_colour;
+    color: @main_colour;
 }
 .notify-unseen {
-	color: @main_colour;
+    color: @main_colour;
 }
 
 
@@ -838,32 +875,32 @@ nav #nav-notifications-linkmenu {
  * sysmsg
  */
 #sysmsg_info {
-	position: fixed;
-	bottom: 0;
-	.box_shadow(@main_shadow);
-	padding: 10px;
-	background-color: @lt_orange;
-	.borders(2px, solid, @orange);
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    position: fixed;
+    bottom: 0;
+    .box_shadow(@main_shadow);
+    padding: 10px;
+    background-color: @lt_orange;
+    .borders(2px, solid, @orange);
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg {
-	position: fixed;
-	bottom: 0;
-	.box_shadow(@main_shadow);
-	padding: 10px;
-	background-color: @lt_orange;
-	.borders(2px, solid, @orange);
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    position: fixed;
+    bottom: 0;
+    .box_shadow(@main_shadow);
+    padding: 10px;
+    background-color: @lt_orange;
+    .borders(2px, solid, @orange);
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg_info br,
 #sysmsg br {
-	display: block;
-	margin: 2px 0px;
-	border-top: 1px solid @bg_colour;
+    display: block;
+    margin: 2px 0px;
+    border-top: 1px solid @bg_colour;
 }
 
 
@@ -871,85 +908,85 @@ nav #nav-notifications-linkmenu {
  * aside
  */
 #asidemain {
-	float: left;
-	font-size: small;
-	margin: 1em;
-	width: 25%;
-	display: inline;
+    float: left;
+    font-size: small;
+    margin: 1em;
+    width: 25%;
+    display: inline;
 }
 /* for now, disappear these */
 #asideright, #asideleft {
-	display: none;
+    display: none;
 }
 .vcard {
-	.fn {
-		font-size: 1.5em;
-		font-weight: bold;
-		border-bottom: 1px solid @hover_colour;
-		padding-bottom: 3px;
-	}
-	#profile-photo-wrapper {
-		margin: 20px 0;
-		background-color: @menu_bg_colour;
-		padding: 5px;
-		.box(175px, 175px);
-		.rounded_corners;
-		.box_shadow(3px, 3px, 10px, 0);
-	}
+    .fn {
+        font-size: 1.5em;
+        font-weight: bold;
+        border-bottom: 1px solid @hover_colour;
+        padding-bottom: 3px;
+    }
+    #profile-photo-wrapper {
+        margin: 20px 0;
+        background-color: @menu_bg_colour;
+        padding: 5px;
+        .box(175px, 175px);
+        .rounded_corners;
+        .box_shadow(3px, 3px, 10px, 0);
+    }
 }
 #asidemain {
-	h4 {
-		font-size: 1.2em; }
-	#viewcontacts {
-		text-align: right;
-	}
-	#contact-block {
-		width: 99%;
-		.contact-block-content {
-			width: 99%;
-			.contact-block-div {
-				float: left;
-				margin: 0 5px 5px 0;
-				.box(50px, 50px);
-				padding: 3px;
-				position: relative; } } }
+    h4 {
+        font-size: 1.2em; }
+    #viewcontacts {
+        text-align: right;
+    }
+    #contact-block {
+        width: 99%;
+        .contact-block-content {
+            width: 99%;
+            .contact-block-div {
+                float: left;
+                margin: 0 5px 5px 0;
+                .box(50px, 50px);
+                padding: 3px;
+                position: relative; } } }
 }
 .aprofile dt {
-	background: transparent;
-	color: darken(@main_alt_colour, 20%);
-	font-weight: bold;
-	.box_shadow(3px, 3px, 5px);
-	.rounded_corners;
-	margin: 15px 0 5px;
-	padding-left: 5px;
+    background: transparent;
+    color: darken(@main_alt_colour, 20%);
+    font-weight: bold;
+    .box_shadow(3px, 3px, 5px);
+    .rounded_corners;
+    margin: 15px 0 5px;
+    padding-left: 5px;
 }
 #profile-extra-links ul {
-	margin-left: 0px;
-	padding-left: 0px;
-	list-style: none;
+    margin-left: 0px;
+    padding-left: 0px;
+    list-style: none;
 }
 #dfrn-request-link {
-	.rounded_corners;
-	color: @bg_colour;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
-	background-color: @link_colour;
-	// background-image: url(icons/connect.png);
-	background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");
-	background-repeat: no-repeat;
-	background-position: 95% center;
+    .rounded_corners;
+    color: @bg_colour;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
+    background-color: @link_colour;
+    // background-image: url(icons/connect.png);
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");
+    background-repeat: no-repeat;
+    background-position: 95% center;
 }
 #wallmessage-link {
-	///*background: #3465A4 url(dark/connect.png) no-repeat 95% center;*/
-	///*border-radius: 5px 5px 5px 5px;*/
-	color: @bg_colour;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
+    ///*background: #3465A4 url(dark/connect.png) no-repeat 95% center;*/
+    ///*border-radius: 5px 5px 5px 5px;*/
+    color: @bg_colour;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 .ttright {
-	margin: 0px;
+    margin: 0px;
 }
 
 
@@ -957,12 +994,12 @@ nav #nav-notifications-linkmenu {
  * contacts block
  */
 .contact-block-div {
-	.box(50px, 50px);
-	float: left;
+    .box(50px, 50px);
+    float: left;
 }
 .contact-block-textdiv {
-	.box(150px, 34px);
-	float: left;
+    .box(150px, 34px);
+    float: left;
 }
 
 
@@ -970,96 +1007,96 @@ nav #nav-notifications-linkmenu {
  * jot
  */
 #jot {
-	margin: 10px 0 20px 0px;
-	width: 100%;
-	#jot-tools {
-		margin: 0px;
-		padding: 0px;
-		.box(100%, 35px);
-		overflow: none;
-		span {
-			float: left;
-			margin: 10px 20px 2px 0px;
-			a {
-				display: block;
-			}
-		}
-		.perms {
-			float: right;
-			width: 40px;
-		}
-		li.loading {
-			float: right;
-			background-color: white;
-			.box(20px, 38px);
-			vertical-align: center;
-			text-align: center;
-			border-top: 2px solid #9eabb0;
-			img {
-				margin-top: 10px;
-			}
-		}
-	}
-	#jot-title {
-	    .borders(1px, solid, lighten(@main_alt_colour, 20%));
-		margin: 0 0 5px;
-		.box(90%, 20px);
-		font-weight: bold;
-		.rounded_corners;
-		vertical-align: middle;
-	}
+    margin: 10px 0 20px 0px;
+    width: 100%;
+    #jot-tools {
+        margin: 0px;
+        padding: 0px;
+        .box(100%, 35px);
+        overflow: none;
+        span {
+            float: left;
+            margin: 10px 20px 2px 0px;
+            a {
+                display: block;
+            }
+        }
+        .perms {
+            float: right;
+            width: 40px;
+        }
+        li.loading {
+            float: right;
+            background-color: white;
+            .box(20px, 38px);
+            vertical-align: center;
+            text-align: center;
+            border-top: 2px solid #9eabb0;
+            img {
+                margin-top: 10px;
+            }
+        }
+    }
+    #jot-title {
+        .borders(1px, solid, lighten(@main_alt_colour, 20%));
+        margin: 0 0 5px;
+        .box(90%, 20px);
+        font-weight: bold;
+        .rounded_corners;
+        vertical-align: middle;
+    }
 }
 #jot-category {
-	margin: 5px 0;
-	.rounded_corners;
-	.borders(1px, solid, lighten(@main_alt_colour, 20%));
-	color: darken(@main_alt_colour, 20%);
-	font-size: smaller;
-	&:focus {
-		color: @main_colour;
-	}
+    margin: 5px 0;
+    .rounded_corners;
+    .borders(1px, solid, lighten(@main_alt_colour, 20%));
+    color: darken(@main_alt_colour, 20%);
+    font-size: smaller;
+    &:focus {
+        color: @main_colour;
+    }
 }
 #jot #character-counter {
-	.box(6%, 15px);
-	float: right;
-	text-align: right;
-	line-height: 20px;
-	padding: 2px 20px 5px 0;
+    .box(6%, 15px);
+    float: right;
+    text-align: right;
+    line-height: 20px;
+    padding: 2px 20px 5px 0;
 }
 #profile-jot-text_parent {
-	.box_shadow(5px, 0, 10px, 0);
+    .box_shadow(5px, 0, 10px, 0);
 }
 #profile-jot-text_tbl {
-	margin-bottom: 10px;
-	background: darken(@main_alt_colour, 10%);
+    margin-bottom: 10px;
+    background: darken(@main_alt_colour, 10%);
 }
 #profile-jot-text_ifr {
-	width: 99.900002% !important;
+    width: 99.900002% !important;
 }
 #profile-jot-text_toolbargroup, .mceCenter tr {
-	background: darken(@main_alt_colour, 10%);
+    background: darken(@main_alt_colour, 10%);
 }
 [id$="jot-text_ifr"] {
-	// width: 99.900002% !important;
-	color: @main_colour;
-	background: @bg_colour;
-	.mceContentBody {
-		color: @main_colour;
-		background: @bg_colour;
-	}
+    // width: 99.900002% !important;
+    color: @main_colour;
+    background: @bg_colour;
+    .mceContentBody {
+        color: @main_colour;
+        background: @bg_colour;
+    }
 }
 .defaultSkin {
-	tr.mceFirst {
-		background: darken(@main_alt_colour, 10%);
-	}
-	td {
-		&.mceFirst, &.mceLast {
-			background-color: @bg_colour;
-		}
-	}
-	span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon {
-		background-color: @bg_colour;
-	}
+    tr.mceFirst {
+        background: darken(@main_alt_colour, 10%);
+    }
+    td {
+        &.mceFirst, &.mceLast {
+            background-color: @bg_colour;
+        }
+    }
+    span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon {
+        background-color: @bg_colour;
+    }
 }
 #profile-attach-wrapper,
 #profile-audio-wrapper,
@@ -1069,92 +1106,92 @@ nav #nav-notifications-linkmenu {
 #profile-title-wrapper,
 #profile-upload-wrapper,
 #profile-video-wrapper {
-	float: left;
-	margin: 0 20px 0 0;
+    float: left;
+    margin: 0 20px 0 0;
 }
 #profile-rotator-wrapper {
-	float: right;
+    float: right;
 }
 #profile-jot-email-wrapper {
-	margin: 10px 10% 0;
-	.borders(1px, solid, @menu_bg_colour);
-	border-bottom: 0;
+    margin: 10px 10% 0;
+    .borders(1px, solid, @menu_bg_colour);
+    border-bottom: 0;
 }
 #profile-jot-email-label {
-	background-color: @menu_bg_colour;
-	color: @bg_colour;
-	padding: 5px;
+    background-color: @menu_bg_colour;
+    color: @bg_colour;
+    padding: 5px;
 }
 #profile-jot-email {
-	width: 90%;
-	margin: 5px;
+    width: 90%;
+    margin: 5px;
 }
 #profile-jot-networks {
-	margin: 0 10%;
-	border: 1px solid @menu_bg_colour;
-	border-top: 0;
-	border-bottom: 0;
-	padding: 5px;
+    margin: 0 10%;
+    border: 1px solid @menu_bg_colour;
+    border-top: 0;
+    border-bottom: 0;
+    padding: 5px;
 }
 #profile-jot-net {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #jot-preview-link {
-	margin: 0 0 0 10px;
-	border: 0;
-	text-decoration: none;
-	float: right;
+    margin: 0 0 0 10px;
+    border: 0;
+    text-decoration: none;
+    float: right;
 }
 .icon-text-preview {
-	margin: 0 0 -18px 0;
-	display: block;
-	.box(20px, 20px);
-	background: url(light/icons.png) no-repeat -128px -40px;
-	border: 0;
-	text-decoration: none;
-	float: right;
-	cursor: pointer;
+    margin: 0 0 -18px 0;
+    display: block;
+    .box(20px, 20px);
+    background: url(light/icons.png) no-repeat -128px -40px;
+    border: 0;
+    text-decoration: none;
+    float: right;
+    cursor: pointer;
 }
 #profile-jot-perms {
-	float: right;
-	color: @menu_bg_colour;
-	.box(20px, 20px);
-	.rounded_corners;
-	.box_shadow(3px, 3px, 5px, 0);
-	.borders(2px, outset, @menu_bg_colour);
-	overflow: hidden;
-	margin: 0 10px 0 10px;
+    float: right;
+    color: @menu_bg_colour;
+    .box(20px, 20px);
+    .rounded_corners;
+    .box_shadow(3px, 3px, 5px, 0);
+    .borders(2px, outset, @menu_bg_colour);
+    overflow: hidden;
+    margin: 0 10px 0 10px;
 }
 #profile-jot-plugin-wrapper {
-	width: 1px;
-	margin: 10px 0 0 0;
-	float: right;
+    width: 1px;
+    margin: 10px 0 0 0;
+    float: right;
 }
 #profile-jot-submit-wrapper {
-	float: right;
-	width: 100%;
-	margin: 10px 0 0 0;
-	padding: 0;
+    float: right;
+    width: 100%;
+    margin: 10px 0 0 0;
+    padding: 0;
 }
 #profile-jot-submit {
-	height: auto;
-	background-color: @menu_bg_colour;
-	color: @bg_colour;
-	.rounded_corners;
-	.borders(2px, outset, @menu_bg_colour);
-	margin: 0;
-	float: right;
-	.text_shadow;
-	width: auto;
-	&:active {
-		.box_shadow(0, 0, 0, 0);
-	}
+    height: auto;
+    background-color: @menu_bg_colour;
+    color: @bg_colour;
+    .rounded_corners;
+    .borders(2px, outset, @menu_bg_colour);
+    margin: 0;
+    float: right;
+    .text_shadow;
+    width: auto;
+    &:active {
+        .box_shadow(0, 0, 0, 0);
+    }
 }
 #jot-perms-icon {
-	.box(22px, 22px);
-	.rounded_corners;
-	overflow: hidden;
-	background: @menu_bg_colour url("dark/icons.png") -88px -40px;
+    .box(22px, 22px);
+    .rounded_corners;
+    overflow: hidden;
+    background: @menu_bg_colour url("dark/icons.png") -88px -40px;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
@@ -1162,67 +1199,67 @@ nav #nav-notifications-linkmenu {
 #contact_allow_wrapper,
 #contact_deny_wrapper,
 #acl-deny-outer-wrapper {
-	width: 47%;
+    width: 47%;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
 #acl-permit-outer-wrapper {
-	float: left;
+    float: left;
 }
 #contact_allow_wrapper,
 #contact_deny_wrapper,
 #acl-deny-outer-wrapper {
-	float: right;
+    float: right;
 }
 #acl-permit-text {
-	background-color: @menu_bg_colour;
-	color: @main_colour;
-	padding: 5px;
-	float: left;
+    background-color: @menu_bg_colour;
+    color: @main_colour;
+    padding: 5px;
+    float: left;
 }
 #jot-public {
-	background-color: @menu_bg_colour;
-	color: @alert;
-	padding: 5px;
-	float: left;
+    background-color: @menu_bg_colour;
+    color: @alert;
+    padding: 5px;
+    float: left;
 }
 #acl-deny-text {
-	background-color: @menu_bg_colour;
-	color: @bg_colour;
-	padding: 5px;
-	float: left;
+    background-color: @menu_bg_colour;
+    color: @bg_colour;
+    padding: 5px;
+    float: left;
 }
 #jot-title-desc {
-	color: lighten(@main_alt_colour, 20%);
+    color: lighten(@main_alt_colour, 20%);
 }
 #profile-jot-desc {
-	background: @bg_colour;
-	.borders;
-	.rounded_corners;
-	color: @red_orange;
-	margin: 5px 0;
+    background: @bg_colour;
+    .borders;
+    .rounded_corners;
+    color: @red_orange;
+    margin: 5px 0;
 }
 #jot-title-wrapper {
-	margin-bottom: 5px;
+    margin-bottom: 5px;
 }
 #jot-title-display {
-	font-weight: bold;
+    font-weight: bold;
 }
 .jothidden {
-	display: none;
+    display: none;
 }
 #jot-preview-content {
-	background-color: @shiny_colour;
-	color: @main_colour;
-	.borders(1px, solid, @main_colour);
-	.rounded_corners;
-	.box_shadow(5px, 0, 10px);
-	padding: 3px 3px 6px 10px;
-	.wall-item-outside-wrapper {
-	    border: 0;
-		.rounded_corners(0px 0px 0px 0px);
-		.box_shadow(0, 0, 0, 0);
-	}
+    background-color: @shiny_colour;
+    color: @main_colour;
+    .borders(1px, solid, @main_colour);
+    .rounded_corners;
+    .box_shadow(5px, 0, 10px);
+    padding: 3px 3px 6px 10px;
+    .wall-item-outside-wrapper {
+        border: 0;
+        .rounded_corners(0px 0px 0px 0px);
+        .box_shadow(0, 0, 0, 0);
+    }
 }
 
 
@@ -1230,12 +1267,12 @@ nav #nav-notifications-linkmenu {
  * section
  */
 #sectionmain {
-	margin: 1em;
-	font-size: 0.8em;
-	min-width: 475px;
-	width: 69%;
-	float: left;
-	display: inline;
+    margin: 1em;
+    font-size: 0.8em;
+    min-width: 475px;
+    width: 69%;
+    float: left;
+    display: inline;
 }
 
 
@@ -1243,51 +1280,51 @@ nav #nav-notifications-linkmenu {
  * tabs
  */
 .tabs {
-	.list_reset;
-	margin: 10px 0;
-	li {
-		display: inline;
-		font-size: smaller;
-	}
+    .list_reset;
+    margin: 10px 0;
+    li {
+        display: inline;
+        font-size: smaller;
+    }
 }
 .multibutton () {
-	.borders(1px, solid, @hover_colour);
-	padding: 4px;
-	.rounded_corners;
-	&:active,
-	&:hover {
-		background: @shiny_colour;
-		color: @main_colour;
-		.borders(1px, solid, @hover_colour);
-	}
-	a {
-		border: 0;
-		text-decoration: none;
-	}
+    .borders(1px, solid, @hover_colour);
+    padding: 4px;
+    .rounded_corners;
+    &:active,
+    &:hover {
+        background: @shiny_colour;
+        color: @main_colour;
+        .borders(1px, solid, @hover_colour);
+    }
+    a {
+        border: 0;
+        text-decoration: none;
+    }
 }
 .multibutton_active () {
-	background: @dk_bg_colour;
-	color: @bg_colour;
-	.borders(1px, solid, @hover_colour);
-	padding: 4px;
-	.rounded_corners;
-	&:hover {
-		background: @shiny_colour;
-		color: @main_colour;
-		.borders(1px, solid, @hover_colour);
-	}
-	a {
-		color: @bg_colour;
-		text-decoration: none;
-	}
+    background: @dk_bg_colour;
+    color: @bg_colour;
+    .borders(1px, solid, @hover_colour);
+    padding: 4px;
+    .rounded_corners;
+    &:hover {
+        background: @shiny_colour;
+        color: @main_colour;
+        .borders(1px, solid, @hover_colour);
+    }
+    a {
+        color: @bg_colour;
+        text-decoration: none;
+    }
 }
 .tab {
-	.multibutton;
+    .multibutton;
 }
 .tab {
-	&.active {
-		.multibutton_active;
-	}
+    &.active {
+        .multibutton_active;
+    }
 }
 
 
@@ -1295,223 +1332,223 @@ nav #nav-notifications-linkmenu {
  * items
  */
 .wall-item-outside-wrapper {
-	.borders(1px, solid, darken(@main_alt_colour, 27%));
-	.rounded_corners;
-	.box_shadow(6px, 1px, 10px, -2px);//@lt_shadow_colour
-	&.comment {
-		margin-top: 5px;
-	}
+    .borders(1px, solid, darken(@main_alt_colour, 27%));
+    .rounded_corners;
+    .box_shadow(6px, 1px, 10px, -2px);//@lt_shadow_colour
+    &.comment {
+        margin-top: 5px;
+    }
 }
 .wall-item-content-wrapper {
-	position: relative;
-	padding: 0.75em;
-	width: auto;
+    position: relative;
+    padding: 0.75em;
+    width: auto;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
-	/*margin-left: 90px;*/
-	.preview {
-		border: 0;
-		.rounded_corners(0px);
-	}
+    /*margin-left: 90px;*/
+    .preview {
+        border: 0;
+        .rounded_corners(0px);
+    }
 }
 .shiny {
-	background: @shiny_colour;
-	.rounded_corners;
+    background: @shiny_colour;
+    .rounded_corners;
 }
 .wall-outside-wrapper .shiny {
-	.rounded_corners;
+    .rounded_corners;
 }
 .heart {
-	color: red;
+    color: red;
 }
 .wall-item-content {
-	overflow-x: auto;
-	margin: 0px 4em 1em 5px;
+    overflow-x: auto;
+    margin: 0px 4em 1em 5px;
 }
 [id^="tread-wrapper"],
 [class^="tread-wrapper"] {
-	margin: 1.2em 0 0 0;
-	padding: 0px;
+    margin: 1.2em 0 0 0;
+    padding: 0px;
 }
 .wall-item-photo-menu {
-	display: none;
+    display: none;
 }
 .wall-item-photo-menu-button {
-	display: none;
-	text-indent: -99999px;
-	background: @menu_bg_colour url(light/menu-user-pin.jpg) no-repeat 75px center;
-	position: absolute;
-	overflow: hidden;
-	.box(90px, 20px);
-	top: 85px;
-	left: 0;
-	.rounded_corners(0 0 5px 5px);
+    display: none;
+    text-indent: -99999px;
+    background: @menu_bg_colour url(light/menu-user-pin.jpg) no-repeat 75px center;
+    position: absolute;
+    overflow: hidden;
+    .box(90px, 20px);
+    top: 85px;
+    left: 0;
+    .rounded_corners(0 0 5px 5px);
 }
 .wall-item-info {
-	float: left;
-	width: 7em;
-	position: relative;
+    float: left;
+    width: 7em;
+    position: relative;
 }
 .wall-item-photo-wrapper {
-	.box(80px, 80px);
-	position: relative;
-	padding: 5px;
-	background-color: @menu_bg_colour;
-	.rounded_corners;
+    .box(80px, 80px);
+    position: relative;
+    padding: 5px;
+    background-color: @menu_bg_colour;
+    .rounded_corners;
 }
 [class^="wall-item-tools"] * {
-	/*margin: 0 0 5px 0;*/
-	> * {
-		/*margin: 0 0 5px 0;*/
-	}
+    /*margin: 0 0 5px 0;*/
+    > * {
+        /*margin: 0 0 5px 0;*/
+    }
 }
 .wall-item-tools {
-	float: right;
-	opacity: 0.4;
-	.transition;
-	&:hover {
-		opacity: 1;
-		.transition;
-	}
+    float: right;
+    opacity: 0.4;
+    .transition;
+    &:hover {
+        opacity: 1;
+        .transition;
+    }
 }
 .wall-item-subtools1 {
-	.box(30px, 30px);
-	list-style: none outside none;
-	margin: 18px 0 30px -20px;
-	padding: 0;
+    .box(30px, 30px);
+    list-style: none outside none;
+    margin: 18px 0 30px -20px;
+    padding: 0;
 }
 .wall-item-subtools2 {
-	.box(25px, 25px);
-	list-style: none outside none;
-	margin: -78px 0 0 5px;
-	padding: 0;
+    .box(25px, 25px);
+    list-style: none outside none;
+    margin: -78px 0 0 5px;
+    padding: 0;
 }
 .wall-item-title {
-	font-size: 1.2em;
-	font-weight: bold;
-	margin-bottom: 1.4em;
+    font-size: 1.2em;
+    font-weight: bold;
+    margin-bottom: 1.4em;
 }
 .wall-item-body {
-	margin: 15px 10px 10px 0px;
-	text-align: left;
-	overflow-x: auto;
+    margin: 15px 10px 10px 0px;
+    text-align: left;
+    overflow-x: auto;
 }
 .wall-item-lock-wrapper {
-	float: right;
-	.box(22px, 22px);
-	margin: 0 -5px 0 0;
-	opacity: 1;
+    float: right;
+    .box(22px, 22px);
+    margin: 0 -5px 0 0;
+    opacity: 1;
 }
 .wall-item-dislike,
 .wall-item-like {
-	clear: left;
-	font-size: 0.8em;
-	color: @main_colour;
-	margin: 5px 0 5px 10.2em;
-	.transition;
-	opacity: 0.5;
-	&:hover {
-		opacity: 1;
-	}
+    clear: left;
+    font-size: 0.8em;
+    color: @main_colour;
+    margin: 5px 0 5px 10.2em;
+    .transition;
+    opacity: 0.5;
+    &:hover {
+        opacity: 1;
+    }
 }
 .wall-item-author,
 .wall-item-actions-author,
 .wall-item-ago {
-	color: @main_colour;
-	line-height: 1;
-	display: inline-block;
-	font-size: x-small;
-	margin: 0.5em auto;
-	font-weight: bold;
+    color: @main_colour;
+    line-height: 1;
+    display: inline-block;
+    font-size: x-small;
+    margin: 0.5em auto;
+    font-weight: bold;
 }
 .comment-edit-preview {
-	width: auto;
-	margin: auto auto auto -2em;
-	&.wall-item-author,
-	&.wall-item-actions-author,
-	&.wall-item-ago {
-		font-size: smaller;
-	}
+    width: auto;
+    margin: auto auto auto -2em;
+    &.wall-item-author,
+    &.wall-item-actions-author,
+    &.wall-item-ago {
+        font-size: smaller;
+    }
 }
 .wall-item-location {
-	margin-top: 2em;
-	width: 6em;
-	overflow: hidden;
-	.text_overflow;
-	.icon {
-		float: left;
-	}
-	> a,
-	.smalltext {
-		margin-left: 25px;
-		font-size: 0.7em;
-		display: block;
-	}
-	> br {
-		display: none;
-	}
+    margin-top: 2em;
+    width: 6em;
+    overflow: hidden;
+    .text_overflow;
+    .icon {
+        float: left;
+    }
+    > a,
+    .smalltext {
+        margin-left: 25px;
+        font-size: 0.7em;
+        display: block;
+    }
+    > br {
+        display: none;
+    }
 }
 .wallwall {
-	.wwto {
-		left: 5px;
-		margin: 0;
-		position: absolute;
-		top: 75px;
-		z-index: 10001;
-		.box(30px, 30px);
-		img {
-			width: 30px !important;
-			height: 30px !important;
-		}
-	}
-	.wall-item-photo-end {
-		clear: both;
-	}
+    .wwto {
+        left: 5px;
+        margin: 0;
+        position: absolute;
+        top: 75px;
+        z-index: 10001;
+        .box(30px, 30px);
+        img {
+            width: 30px !important;
+            height: 30px !important;
+        }
+    }
+    .wall-item-photo-end {
+        clear: both;
+    }
 }
 .wall-item-arrowphoto-wrapper {
-	position: absolute;
-	left: 35px;
-	top: 80px;
-	z-index: 10002;
+    position: absolute;
+    left: 35px;
+    top: 80px;
+    z-index: 10002;
 }
 .wall-item-photo-menu {
-	min-width: 92px;
-	font-size: 0.75em;
-	.borders(2px, solid, @menu_bg_colour);
-	border-top: 0px;
-	background: @menu_bg_colour;
-	position: absolute;
-	left: -2px;
-	top: 101px;
-	display: none;
-	z-index: 10003;
-	.rounded_corners(0 5px 5px 5px);
-	li a {
-		white-space: nowrap;
-		display: block;
-		padding: 5px 6px;
-		color: @bg_colour;
-		&:hover {
-			color: @menu_bg_colour;
-			background: @bg_colour;
-		}
-	}
+    min-width: 92px;
+    font-size: 0.75em;
+    .borders(2px, solid, @menu_bg_colour);
+    border-top: 0px;
+    background: @menu_bg_colour;
+    position: absolute;
+    left: -2px;
+    top: 101px;
+    display: none;
+    z-index: 10003;
+    .rounded_corners(0 5px 5px 5px);
+    li a {
+        white-space: nowrap;
+        display: block;
+        padding: 5px 6px;
+        color: @bg_colour;
+        &:hover {
+            color: @menu_bg_colour;
+            background: @bg_colour;
+        }
+    }
 }
 #item-delete-selected {
-	overflow: auto;
-	width: 100%;
+    overflow: auto;
+    width: 100%;
 }
 #connect-services-header,
 #extra-help-header {
-	margin: 1.5em 0 0 0;
+    margin: 1.5em 0 0 0;
 }
 #connect-services,
 #extra-help {
-	.list_reset;
-	margin: 1em 0 0 0;
-	li {
-		display: inline;
-	}
+    .list_reset;
+    margin: 1em 0 0 0;
+    li {
+        display: inline;
+    }
 }
 
 
@@ -1519,36 +1556,36 @@ nav #nav-notifications-linkmenu {
  * comment
  */
 .ccollapse-wrapper {
-	font-size: 0.9em;
-	margin-left: 5em;
+    font-size: 0.9em;
+    margin-left: 5em;
 }
 .hide-comments-outer {
-	font-size: small;
+    font-size: small;
 }
 .wall-item-outside-wrapper.comment {
-	margin-left: 5em;
-	.wall-item-info {
-		width: 5em;
-	}
-	.wall-item-photo {
-		width: 40px !important;
-		height: 40px !important;
-	}
-	.wall-item-photo-wrapper {
-		.box(40px, 40px);
-	}
-	.wall-item-photo-menu-button {
-		width: 3.35em;
-		top: 3.2em;
-		background-position: 35px center;
-	}
-	.wall-item-author {
-		margin-left: 0.2em;
-	}
-	.wall-item-photo-menu {
-		min-width: 4.5em;
-		top: 5.5em;
-	}
+    margin-left: 5em;
+    .wall-item-info {
+        width: 5em;
+    }
+    .wall-item-photo {
+        width: 40px !important;
+        height: 40px !important;
+    }
+    .wall-item-photo-wrapper {
+        .box(40px, 40px);
+    }
+    .wall-item-photo-menu-button {
+        width: 3.35em;
+        top: 3.2em;
+        background-position: 35px center;
+    }
+    .wall-item-author {
+        margin-left: 0.2em;
+    }
+    .wall-item-photo-menu {
+        min-width: 4.5em;
+        top: 5.5em;
+    }
 }
 .comment-wwedit-wrapper {
     .borders(1px, solid, @main_colour);
@@ -1556,61 +1593,61 @@ nav #nav-notifications-linkmenu {
     margin: 5px;
 }
 .comment-edit-wrapper {
-	border-top: 1px #aaa solid;
+    border-top: 1px #aaa solid;
 }
 [class^="comment-edit-bb"] {
-	.list_reset;
-	display: none;
-	margin: -40px 0 5px 60px;
-	width: 75%;
-	> li {
-		display: inline-block;
-		margin: 0 10px 0 0;
-		visibility: none;
-	}
+    .list_reset;
+    display: none;
+    margin: -40px 0 5px 60px;
+    width: 75%;
+    > li {
+        display: inline-block;
+        margin: 0 10px 0 0;
+        visibility: none;
+    }
 }
 .comment-wwedit-wrapper img,
 .comment-edit-wrapper img {
-	.box;
+    .box;
 }
 .comment-edit-photo-link,
 .comment-edit-photo {
-	margin-left: 10px;
+    margin-left: 10px;
 }
 .my-comment-photo {
-	.box(40px, 40px);
-	padding: 5px;
+    .box(40px, 40px);
+    padding: 5px;
 }
 [class^="comment-edit-text"] {
-	margin: 5px 0 10px 20px;
-	width: 94%;
+    margin: 5px 0 10px 20px;
+    width: 94%;
 }
 .comment-edit-text-empty {
-	height: 20px;
-	.med_borders;
-	.rounded_corners;
-	color: @med_border_colour;
-	.transition;
-	&:hover {
-		color: darken(@main_alt_colour, 33.5%);
-	}
+    height: 20px;
+    .med_borders;
+    .rounded_corners;
+    color: @med_border_colour;
+    .transition;
+    &:hover {
+        color: darken(@main_alt_colour, 33.5%);
+    }
 }
 .comment-edit-text-full {
-	height: 10em;
-	.rounded_corners;
-	.transition;
+    height: 10em;
+    .rounded_corners;
+    .transition;
 }
 .comment-edit-submit-wrapper {
-	width: 90%;
-	margin: 5px 5px 10px 50px;
-	text-align: right;
+    width: 90%;
+    margin: 5px 5px 10px 50px;
+    text-align: right;
 }
 .comment-edit-submit {
-	height: 22px;
-	background-color: @menu_bg_colour;
-	color: @bg_colour;
-	.rounded_corners;
-	border: 0;
+    height: 22px;
+    background-color: @menu_bg_colour;
+    color: @bg_colour;
+    .rounded_corners;
+    border: 0;
 }
 
 
@@ -1622,14 +1659,14 @@ nav #nav-notifications-linkmenu {
     border-bottom: 1px dashed darken(@main_alt_colour, 6.5%);
     border-left: 5px solid darken(@main_alt_colour, 6.5%);
     border-top: 1px dashed darken(@main_alt_colour, 6.5%);
-	color: darken(@main_alt_colour, 50%);
+    color: darken(@main_alt_colour, 50%);
     display: block;
     overflow-x: auto;
     padding: 5px 0 15px 10px;
     width: 95%;
-	a {
-		color: @lt_link_colour;
-	}
+    a {
+        color: @lt_link_colour;
+    }
 }
 
 
@@ -1637,47 +1674,47 @@ nav #nav-notifications-linkmenu {
  * profile
  */
 div {
-	&[id$="text"] {
-		font-weight: bold;
-		border-bottom: 1px solid @bg_colour;
-	}
-	&[id$="wrapper"] {
-		height: 100%;
-		br {
-			clear: left;
-		}
-	}
+    &[id$="text"] {
+        font-weight: bold;
+        border-bottom: 1px solid @bg_colour;
+    }
+    &[id$="wrapper"] {
+        height: 100%;
+        br {
+            clear: left;
+        }
+    }
 }
 .profile-match-wrapper {
-	float: left;
-	margin: 0 5px 40px 0;
-	.box(120px, 120px);
-	padding: 3px;
-	position: relative;
+    float: left;
+    margin: 0 5px 40px 0;
+    .box(120px, 120px);
+    padding: 3px;
+    position: relative;
 }
 .icon.drophide.profile-match-ignore {
-	margin: 0 6px 0 -3px;
+    margin: 0 6px 0 -3px;
 }
 .profile-match-photo {
-	
+    
 }
 [id$="-end"], [class$="-end"] {
-	clear: both;
-	margin: 0 0 10px 0;
+    clear: both;
+    margin: 0 0 10px 0;
 }
 .profile-match-end {
-	margin: 0 0 5px 0;
+    margin: 0 0 5px 0;
 }
 .profile-match-name {
-	font-weight: bold;
-	margin: auto auto auto 23px;
+    font-weight: bold;
+    margin: auto auto auto 23px;
 }
 .profile-match-connect {
-	font-style: italic;
-	margin: auto auto auto 23px;
+    font-style: italic;
+    margin: auto auto auto 23px;
 }
 #advanced-profile-with {
-	margin-left: 200px;
+    margin-left: 200px;
 }
 
 
@@ -1685,98 +1722,98 @@ div {
  * photos
  */
 .photos {
-	height: auto;
-	overflow: auto;
+    height: auto;
+    overflow: auto;
 }
 #photo-top-links {
-	margin-bottom: 30px;
+    margin-bottom: 30px;
 }
 .photo-album-image-wrapper,
 .photo-top-image-wrapper {
-	float: left;
-	.box_shadow(3px, 3px, 10px, 0);
-	background-color: @bg_colour;
-	color: @main_colour;
-	.rounded_corners;
-	padding-bottom: 30px;
-	position: relative;
-	margin: 0 10px 10px 0;
+    float: left;
+    .box_shadow(3px, 3px, 10px, 0);
+    background-color: @bg_colour;
+    color: @main_colour;
+    .rounded_corners;
+    padding-bottom: 30px;
+    position: relative;
+    margin: 0 10px 10px 0;
 }
 #photo-photo {
-	margin: auto auto 5em 20%;
-	img {
-		max-width: 50%;
-	}
+    margin: auto auto 5em 20%;
+    img {
+        max-width: 50%;
+    }
 }
 .photo-top-image-wrapper a:hover,
 #photo-photo a:hover,
 .photo-album-image-wrapper a:hover {
-	border-bottom: 0;
+    border-bottom: 0;
 }
 .photo-top-photo,
 .photo-album-photo {
-	.rounded_corners(5px 5px 0 0);
+    .rounded_corners(5px 5px 0 0);
 }
 .photo-top-album-name,
 .caption {
-	position: absolute;
-	bottom: 0;
-	padding: 0 5px;
+    position: absolute;
+    bottom: 0;
+    padding: 0 5px;
 }
 #photo-prev-link,
 #photo-next-link {
-	position: absolute;
-	// .box(30%, 100%);
-	.box(50px, 200px);
-	background: white center center no-repeat;
-	opacity: 0;
-	.transition(all, 0.5s);
-	z-index: 10;
-	top: 15em;
-	.rounded_corners;
-	&:hover {
-		opacity: 0.6;
-		.transition(all, 0.5s);
-	}
-	.icon {
-		display: none;
-	}
+    position: absolute;
+    // .box(30%, 100%);
+    .box(50px, 200px);
+    background: white center center no-repeat;
+    opacity: 0;
+    .transition(all, 0.5s);
+    z-index: 10;
+    top: 15em;
+    .rounded_corners;
+    &:hover {
+        opacity: 0.6;
+        .transition(all, 0.5s);
+    }
+    .icon {
+        display: none;
+    }
 }
 #photo-prev-link {
-	// background-image: url(light/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=");
+    // background-image: url(light/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: 5%;
 }
 #photo-next-link {
-	// background-image: url(light/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=");
+    // background-image: url(light/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: 50%;
 }
 #photo-prev-link a,
 #photo-next-link a {
-	display: block;
-	.box(100%, 100%);
-	.rounded_corners;
-	overflow: hidden;
-	text-indent: -900000px;
+    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: @menu_bg_colour;
-	color: @bg_colour;
-	padding: 1px;
+    background-color: @menu_bg_colour;
+    color: @bg_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,
@@ -1784,45 +1821,45 @@ div {
 
 }
 #photo-edit-link-wrap {
-	margin-bottom: 15px;
+    margin-bottom: 15px;
 }
 #photo-edit-caption,
 #photo-edit-newtag {
 
 }
 #photo-edit-perms {
-	width: auto;
+    width: auto;
 }
 #photo-edit-rotate-label {
-	.label;
+    .label;
 }
 #photo-like-div {
-	float: left;
-	margin: auto 0 0;
-	width: 2em;
-	.rounded_corners;
-	.borders;
+    float: left;
+    margin: auto 0 0;
+    width: 2em;
+    .rounded_corners;
+    .borders;
 }
 .wall-item-like-buttons {
-	> * {
-		display: inline;
-	}
+    > * {
+        display: inline;
+    }
 }
 #photo-edit-delete-button {
-	margin: auto auto auto 1em;
+    margin: auto auto auto 1em;
 }
 #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;
 }
 #wall-photo-container {
-	margin: 0 auto 1em 4em;
-	width: 90%;
+    margin: 0 auto 1em 4em;
+    width: 90%;
 }
 
 
@@ -1830,79 +1867,79 @@ div {
  * message
  */
 .prvmail-text {
-	width: 100%;
+    width: 100%;
 }
 #prvmail-subject {
-	width: 100%;
-	color: @bg_colour;
-	background: @main_colour;
+    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)
+    .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;
 }
 
 
@@ -1911,129 +1948,129 @@ div {
  */
 .view-contact-wrapper,
 .contact-entry-wrapper {
-	float: left;
-	margin: 0 5px 40px 0;
-	.box(120px, 135px);
-	padding: 3px;
-	position: relative;
+    float: left;
+    margin: 0 5px 40px 0;
+    .box(120px, 135px);
+    padding: 3px;
+    position: relative;
 }
 .contact-direction-wrapper {
-	position: absolute;
-	top: 20px;
+    position: absolute;
+    top: 20px;
 }
 .contact-edit-links {
-	position: absolute;
-	top: 60px;
+    position: absolute;
+    top: 60px;
 }
 .contact-entry-photo-wrapper {}
 .contact-entry-photo {
-	margin-left: 20px;
+    margin-left: 20px;
 }
 .contact-entry-name {
-	width: 120px;
-	font-weight: bold;
-	font-size: small;
+    width: 120px;
+    font-weight: bold;
+    font-size: small;
 }
 .contact-entry-details {
-	font-size: x-small;
+    font-size: x-small;
 }
 .contact-entry-photo {
-	position: relative;
+    position: relative;
 }
 .contact-entry-edit-links .icon {
-	.borders(1px, solid, #babdb6);
-	.rounded_corners(3px);
-	background-color: white;
+    .borders(1px, solid, #babdb6);
+    .rounded_corners(3px);
+    background-color: white;
 }
 #contact-entry-url,
 [id^="contact-entry-url"],
 #contact-entry-network,
 [id^="contact-entry-network"] {
-	font-size: smaller;
+    font-size: smaller;
 }
 #contact-entry-network,
 [id^="contact-entry-network"] {
-	font-style: italic;
+    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;
+    margin-top: 23px;
 }
 #contact-drop-links {
-	margin-left: 5px;
+    margin-left: 5px;
 }
 #contact-edit-nav-wrapper .icon {
-	.borders(1px, solid, #babdb6);
-	.rounded_corners(3px);
+    .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;
+    display: inline;
 }
 #contact-edit-end {
-	clear: both;
-	margin-bottom: 65px;
+    clear: both;
+    margin-bottom: 65px;
 }
 .contact-photo-menu-button {
-	position: absolute;
-	background: url("light/photo-menu.jpg") top left no-repeat transparent;
-	margin: 0px;
-	padding: 0px;
-	.box(16px, 16px);
-	top: 64px;
-	left: 0px;
-	overflow: hidden;
-	text-indent: 40px;
-	display: none;
+    position: absolute;
+    background: url("light/photo-menu.jpg") top left no-repeat transparent;
+    margin: 0px;
+    padding: 0px;
+    .box(16px, 16px);
+    top: 64px;
+    left: 0px;
+    overflow: hidden;
+    text-indent: 40px;
+    display: none;
 }
 .contact-photo-menu {
-	width: auto;
-	.borders(2px, solid, @link_colour);
-	background: @bg_colour;
-	color: @main_colour;
-	position: absolute;
-	font-size: smaller;
-	.rounded_corners;
-	left: 0px;
-	top: 90px;
-	display: none;
-	z-index: 10000;
-	li a {
-		display: block;
-		padding: 4px;
-		color: @link_colour;
-		background: @bg_colour;
-		line-height: 1;
-		&:hover {
-			background: @link_colour;
-			color: @bg_colour;
-			text-decoration: none;
-		}
-	}
+    width: auto;
+    .borders(2px, solid, @link_colour);
+    background: @bg_colour;
+    color: @main_colour;
+    position: absolute;
+    font-size: smaller;
+    .rounded_corners;
+    left: 0px;
+    top: 90px;
+    display: none;
+    z-index: 10000;
+    li a {
+        display: block;
+        padding: 4px;
+        color: @link_colour;
+        background: @bg_colour;
+        line-height: 1;
+        &:hover {
+            background: @link_colour;
+            color: @bg_colour;
+            text-decoration: none;
+        }
+    }
 }
 
 
@@ -2042,23 +2079,23 @@ div {
  */
 .openid {}
 #id_openid_url {
-	background: url(light/login-bg.gif) no-repeat;
-	background-position: 0 50%;
-	padding-left: 18px;
+    background: url(light/login-bg.gif) no-repeat;
+    background-position: 0 50%;
+    padding-left: 18px;
 }
 #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;
-	}
+    label {
+        clear: left;
+    }
+    input {
+        margin: 10px 5px;
+    }
 }
 #register-form label,
 #profile-edit-form label {
@@ -2071,53 +2108,53 @@ div {
     margin-bottom: 20px;
 }
 #profile-edit-marital-label span {
-	margin: -4px;
+    margin: -4px;
 }
 .settings-submit-wrapper,
 .profile-edit-submit-wrapper {
-	margin: 0 0 30px;
+    margin: 0 0 30px;
 }
 .profile-edit-side-div {
-	display: none;
+    display: none;
 }
 #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("light/icons.png") -150px 0px no-repeat;
-	border: 0;
-	cursor: pointer;
-	display: block;
-	.box(20px, 20px);
-	margin: 0 0 -18px;
-	text-decoration: none;
-	top: 113px;
-	right: 260px;
+    background: url("light/icons.png") -150px 0px no-repeat;
+    border: 0;
+    cursor: pointer;
+    display: block;
+    .box(20px, 20px);
+    margin: 0 0 -18px;
+    text-decoration: none;
+    top: 113px;
+    right: 260px;
 }
 #profile-edit-links ul {
-	.list_reset;
-	margin: 20px 0;
+    .list_reset;
+    margin: 20px 0;
 }
 .marital {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 #register-sitename {
-	display: inline;
-	font-weight: bold;
+    display: inline;
+    font-weight: bold;
 }
 #advanced-expire-popup {
-	background: @main_colour;
-	color: @bg_colour;
+    background: @main_colour;
+    color: @bg_colour;
 }
 #id_ssl_policy {
-	width: 374px;
+    width: 374px;
 }
 #theme-preview img {
-	margin: 10px 10px 10px 288px;
+    margin: 10px 10px 10px 288px;
 }
 
 
@@ -2125,39 +2162,39 @@ div {
  * contacts selector
  */
 .group-delete-wrapper {
-	margin: -31px 50px 0 0;
-	float: right;
+    margin: -31px 50px 0 0;
+    float: right;
 }
 /*.group-delete-icon {
     margin: 0 0 0 10px;
 }*/
 #group-edit-submit-wrapper {
-	margin: 0 0 10px 0;
-	display: inline;
+    margin: 0 0 10px 0;
+    display: inline;
 }
 #group-members, #prof-members {
-	height: 200px;
-	overflow: auto;
-	.borders(1px, solid, @menu_bg_colour);
-	.rounded_corners(5px 5px 0 0);
+    height: 200px;
+    overflow: auto;
+    .borders(1px, solid, @menu_bg_colour);
+    .rounded_corners(5px 5px 0 0);
 }
 #group-all-contacts, #prof-all-contacts {
-	height: 200px;
-	overflow: auto;
-	.borders(1px, solid, @menu_bg_colour);
-	.rounded_corners(0 0 5px 5px);
+    height: 200px;
+    overflow: auto;
+    .borders(1px, solid, @menu_bg_colour);
+    .rounded_corners(0 0 5px 5px);
 }
 #group-members h3,
 #group-all-contacts h3,
 #prof-members h3,
 #prof-all-contacts h3 {
-	color: @bg_colour;
-	background-color: @menu_bg_colour;
-	margin: 0;
-	padding: 5px;
+    color: @bg_colour;
+    background-color: @menu_bg_colour;
+    margin: 0;
+    padding: 5px;
 }
 #group-separator, #prof-separator {
-	display: none;
+    display: none;
 }
 
 
@@ -2165,10 +2202,10 @@ div {
  * profile
  */
 #cropimage-wrapper {
-	float: left;
+    float: left;
 }
 #crop-image-form {
-	clear: both;
+    clear: both;
 }
 
 
@@ -2176,47 +2213,47 @@ div {
  * 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-note {
-	padding: 10px;
+    padding: 10px;
 }
 .intro-end {
-	padding: 30px;
+    padding: 30px;
 }
 .intro-form {
-	float: left;
+    float: left;
 }
 .intro-approve-form {
-	clear: both;
+    clear: both;
 }
 .intro-submit-approve,
 .intro-submit-ignore {
-	margin-right: 20px;
+    margin-right: 20px;
 }
 .intro-submit-approve {
-	margin-top: 15px;
+    margin-top: 15px;
 }
 .intro-approve-as-friend-label,
 .intro-approve-as-fan-label,
 .intro-approve-as-friend,
 .intro-approve-as-fan {
-	float: left;
+    float: left;
 }
 .intro-form-end {
-	clear: both;
-	margin-bottom: 10px;
+    clear: both;
+    margin-bottom: 10px;
 }
 .intro-approve-as-end {
-	clear: both;
-	margin-bottom: 10px;
+    clear: both;
+    margin-bottom: 10px;
 }
 .clear {
-	clear: both;
+    clear: both;
 }
 
 
@@ -2224,23 +2261,23 @@ div {
  * events
  */
 .eventcal {
-	float: left;
-	font-size: 20px;
+    float: left;
+    font-size: 20px;
 }
 .event {
-	background: @bg_colour;
+    background: @bg_colour;
 }
 .vevent {
-	border: 1px solid @bg_colour;
-	.event-description,
-	.event-location,
-	.event-start {
-		margin-left: 10px;
-		margin-right: 10px;
-	}
+    border: 1px solid @bg_colour;
+    .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 {
@@ -2250,105 +2287,105 @@ div {
   /*margin-bottom: 15px;*/
 }
 .event-description:before {
-	content: url('../../../images/calendar.png');
-	margin-right: 15px;
+    content: url('../../../images/calendar.png');
+    margin-right: 15px;
 }
 .event-start,
 .event-end {
-	margin-left: 10px;
-	width: 330px;
-	font-size: smaller;
+    margin-left: 10px;
+    width: 330px;
+    font-size: smaller;
 }
 .event-start .dtstart,
 .event-end .dtend {
-	float: right;
+    float: right;
 }
 .event-list-date {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .prevcal, .nextcal {
-	float: left;
-	margin: 64px 32px auto 32px;
+    float: left;
+    margin: 64px 32px auto 32px;
 }
 .calendar {
-	font-family: monospace;
+    font-family: monospace;
 }
 .today {
-	font-weight: bold;
-	color: red;
+    font-weight: bold;
+    color: red;
 }
 #event-start-text,
 #event-finish-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-nofinish-checkbox,
 #event-nofinish-text,
 #event-adjust-checkbox,
 #event-adjust-text,
 #event-share-checkbox {
-	float: left;
+    float: left;
 }
 #event-datetime-break {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #event-nofinish-break,
 #event-adjust-break,
 #event-share-break {
-	clear: both;
+    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;
+    position: absolute;
+    left: 35px;
+    margin-top: 20px;
 }
 #item-delete-selected-icon {
-	float: left;
-	margin-right: 5px;
+    float: left;
+    margin-right: 5px;
 }
 .fc-state-highlight {
-	background: @bg_colour;
-	color: @main_colour;
+    background: @bg_colour;
+    color: @main_colour;
 }
 
 
@@ -2356,12 +2393,12 @@ div {
  * 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;
 }
 
 
@@ -2369,93 +2406,93 @@ div {
  * sidebar
  */
 #group-sidebar {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .categories-selected,
 .group-selected,
 .nets-selected,
 .fileas-selected {
-	// padding: 4px;
-	color: @main_colour;
-	// background: @dk_bg_colour;
-	// .borders(1px, solid, @hover_colour);
-	.multibutton_active;
+    // padding: 4px;
+    color: @main_colour;
+    // background: @dk_bg_colour;
+    // .borders(1px, solid, @hover_colour);
+    .multibutton_active;
 }
 .categories-selected:hover,
 .group-selected:hover,
 .nets-selected:hover,
 .fileas-selected:hover {
 //     padding: 4px;
-	// color: @link_colour;
+    // color: @link_colour;
 //     background: @bg_colour;
 //     .borders(1px, solid, @link_colour);
 }
 .groupsideedit {
-	margin-right: 10px;
+    margin-right: 10px;
 }
 #sidebar-group-ul {
-	padding-left: 0;
+    padding-left: 0;
 }
 #sidebar-group-list {
-	margin: 0 0 5px 0;
-	li {
-		margin-top: 10px;
-	}
-	.icon {
-		display: inline-block;
-		.box(12px, 12px);
-	}
+    margin: 0 0 5px 0;
+    li {
+        margin-top: 10px;
+    }
+    .icon {
+        display: inline-block;
+        .box(12px, 12px);
+    }
 }
 .sidebar-group-element {
-	.multibutton;
-	.rounded_corners;
+    .multibutton;
+    .rounded_corners;
 }
 #sidebar-new-group {
-	margin: auto;
-	display: inline-block;
-	color: @bg_colour;
-	text-decoration: none;
-	text-align: center;
+    margin: auto;
+    display: inline-block;
+    color: @bg_colour;
+    text-decoration: none;
+    text-align: center;
 }
 #peoplefind-sidebar form {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #sidebar-new-group {
-	&:hover {
-		/*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
-		/*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
-		/*background-color: #b20202;*/
-	}
-	&:active {
-		position: relative;
-		top: 1px;
-	}
+    &:hover {
+        /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
+        /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
+        /*background-color: #b20202;*/
+    }
+    &:active {
+        position: relative;
+        top: 1px;
+    }
 }
 #side-peoplefind-url {
-	.borders(1px, solid, darken(@main_alt_colour, 20%));
-	margin-right: 3px;
-	width: 75%;
+    .borders(1px, solid, darken(@main_alt_colour, 20%));
+    margin-right: 3px;
+    width: 75%;
 }
 .categories-ul,
 .nets-ul {
-	.list_reset;
-	li {
-		margin: 10px 0 0;
-	}
+    .list_reset;
+    li {
+        margin: 10px 0 0;
+    }
 }
 .categories-link,
 .nets-link,
 .nets-all {
-	.multibutton;
-	.rounded_corners;
-	margin-left: 0px;
+    .multibutton;
+    .rounded_corners;
+    margin-left: 0px;
 }
 #netsearch-box {
-	margin: 20px 0px 30px;
-	width: 135px;
-	#search-submit {
-		margin: 5px 5px 0px 0px;
-	}
+    margin: 20px 0px 30px;
+    width: 135px;
+    #search-submit {
+        margin: 5px 5px 0px 0px;
+    }
 }
 
 
@@ -2463,98 +2500,98 @@ div {
  * admin
  */
 #pending-update {
-	float: right;
-	color: white;
-	font-weight: bold;
-	background-color: red;
-	padding: 0 0.3em;
+    float: right;
+    color: white;
+    font-weight: bold;
+    background-color: red;
+    padding: 0 0.3em;
 }
 .admin {
-	&.linklist {
-		border: 0;
-		padding: 0;
-	}
-	&.link {
-		.list_reset;
-	}
+    &.linklist {
+        border: 0;
+        padding: 0;
+    }
+    &.link {
+        .list_reset;
+    }
 }
 #adminpage {
-	color: @main_colour;
-	background: @bg_colour;
-	margin: 5px;
-	padding: 10px;
-	font-size: smaller;
-	dl {
-	    clear: left;
-		margin-bottom: 2px;
-		padding-bottom: 2px;
-		border-bottom: 1px solid @shadow_colour;
-	}
-	dt {
-		width: 250px;
-		float: left;
-		font-weight: bold;
-	}
-	dd {
-		margin-left: 250px;
-	}
-	h3 {
-		border-bottom: 1px solid lighten(@main_alt_colour, 20%);
-	}
-	.submit {
-		clear: left;
-	}
-	#pluginslist {
-		margin: 0;
-		padding: 0;
-	}
-	.plugin {
-		display: block;
-		.borders(1px, solid, darken(@main_alt_colour, 6.5%));
-		padding: 1em;
-		margin-bottom: 5px;
-		clear: left;
-	}
-	.toggleplugin {
-		float: left;
-		margin-right: 1em;
-	}
-	table {
-		width: 100%;
-		border-bottom: 1px solid @shadow_colour;
-		margin: 5px 0;
-		th {
-			font-weight: bold;
-			text-align: left;
-		}
-		td {
-			padding: 5px;
-			vertical-align: middle;
-		}
-		&#users {
-			padding: 5px;
-		    img {
-			    .box(16px, 16px);
-    		}
+    color: @main_colour;
+    background: @bg_colour;
+    margin: 5px;
+    padding: 10px;
+    font-size: smaller;
+    dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid @shadow_colour;
+    }
+    dt {
+        width: 250px;
+        float: left;
+        font-weight: bold;
+    }
+    dd {
+        margin-left: 250px;
+    }
+    h3 {
+        border-bottom: 1px solid lighten(@main_alt_colour, 20%);
+    }
+    .submit {
+        clear: left;
+    }
+    #pluginslist {
+        margin: 0;
+        padding: 0;
+    }
+    .plugin {
+        display: block;
+        .borders(1px, solid, darken(@main_alt_colour, 6.5%));
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+    }
+    .toggleplugin {
+        float: left;
+        margin-right: 1em;
+    }
+    table {
+        width: 100%;
+        border-bottom: 1px solid @shadow_colour;
+        margin: 5px 0;
+        th {
+            font-weight: bold;
+            text-align: left;
+        }
+        td {
+            padding: 5px;
+            vertical-align: middle;
+        }
+        &#users {
+            padding: 5px;
+            img {
+                .box(16px, 16px);
+            }
             a {
-			    color: @main_colour;
-			    text-decoration: underline;
+                color: @main_colour;
+                text-decoration: underline;
             }
-		}
-	}
-	td .icon {
-		float: left;
-	}
-	.selectall {
-		text-align: right;
-	}
+        }
+    }
+    td .icon {
+        float: left;
+    }
+    .selectall {
+        text-align: right;
+    }
 }
 #users .name {
-	color: @main_colour;
+    color: @main_colour;
 }
 #users .tools {
-	padding: 5px 0;
-	vertical-align: middle;
+    padding: 5px 0;
+    vertical-align: middle;
 }
 
 
@@ -2562,50 +2599,50 @@ div {
  * form fields
  */
 .field {
-	overflow: auto;
+    overflow: auto;
 }
 .field .onoff {
-	float: right;
-	margin: 0 330px 0 auto;
-	width: 80px;
-	a {
-		display: block;
-		.borders(1px, solid, darken(@main_alt_colour, 20%));
-		padding: 3px 6px 4px 10px;
-		height: 16px;
-		text-decoration: none;
-	}
-	.on, .off {
-		background-image: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAUACIDASIAAhEBAxEB/8QAGgABAQACAwAAAAAAAAAAAAAAAAQDBQEGCf/EACgQAAIBAwIFAwUAAAAAAAAAAAECAAMEERIUBRMxUpEhIoEjM1Nxkv/EABcBAAMBAAAAAAAAAAAAAAAAAAABAgT/xAAaEQEAAgMBAAAAAAAAAAAAAAAAAQIRMVES/9oADAMBAAIRAxEAPwD1ERKFNFVaNNVUYACgACcNVt1dEKUwzZwNI9cSDczDVdnuKDjomrPyJOQ2SXNq/L0rTPMzp9vXHWZfo/jT+RNFQV6e2yPt6s/Ms3EWQofhnDqjszWFqzMcljRUknxEn3ES/dup8xxPZ0hXtKFViQzorEDpkiZtqvc3mIkzs40bVe5vMbVe5vMREbrN3xy4t7utSVaZVHZQSDnAP7iIm+K1xpkm09f/2Q==');
-		background-repeat: no-repeat;
-	}
-	.on {
-		background-position: 42px 1px;
-		background-color: darken(@main_alt_colour, 40%);
-		color: lighten(@main_alt_colour, 20%);
-		text-align: left;
-	}
-	.off {
-		background-position: 2px 1px;
-		background-color: lighten(@main_alt_colour, 20%);
-		color: darken(@main_alt_colour, 40%);
-		text-align: right;
-	}
+    float: right;
+    margin: 0 330px 0 auto;
+    width: 80px;
+    a {
+        display: block;
+        .borders(1px, solid, darken(@main_alt_colour, 20%));
+        padding: 3px 6px 4px 10px;
+        height: 16px;
+        text-decoration: none;
+    }
+    .on, .off {
+        background-image: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAUACIDASIAAhEBAxEB/8QAGgABAQACAwAAAAAAAAAAAAAAAAQDBQEGCf/EACgQAAIBAwIFAwUAAAAAAAAAAAECAAMEERIUBRMxUpEhIoEjM1Nxkv/EABcBAAMBAAAAAAAAAAAAAAAAAAABAgT/xAAaEQEAAgMBAAAAAAAAAAAAAAAAAQIRMVES/9oADAMBAAIRAxEAPwD1ERKFNFVaNNVUYACgACcNVt1dEKUwzZwNI9cSDczDVdnuKDjomrPyJOQ2SXNq/L0rTPMzp9vXHWZfo/jT+RNFQV6e2yPt6s/Ms3EWQofhnDqjszWFqzMcljRUknxEn3ES/dup8xxPZ0hXtKFViQzorEDpkiZtqvc3mIkzs40bVe5vMbVe5vMREbrN3xy4t7utSVaZVHZQSDnAP7iIm+K1xpkm09f/2Q==');
+        background-repeat: no-repeat;
+    }
+    .on {
+        background-position: 42px 1px;
+        background-color: darken(@main_alt_colour, 40%);
+        color: lighten(@main_alt_colour, 20%);
+        text-align: left;
+    }
+    .off {
+        background-position: 2px 1px;
+        background-color: lighten(@main_alt_colour, 20%);
+        color: darken(@main_alt_colour, 40%);
+        text-align: right;
+    }
 }
 .hidden {
-	display: none !important;
+    display: none !important;
 }
 .field textarea {
-	.box(80%, 100px);
+    .box(80%, 100px);
 }
 .field_help {
-	display: block;
-	margin-left: 297px;
-	color: darken(@main_alt_colour, 20%);
-	font-size: small;
+    display: block;
+    margin-left: 297px;
+    color: darken(@main_alt_colour, 20%);
+    font-size: small;
 }
 .field.radio .field_help {
-	margin-left: 297px;
+    margin-left: 297px;
 }
 
 
@@ -2613,95 +2650,95 @@ div {
  * update
  */
 .popup {
-	.box(100%, 100%);
-	top: 0px;
-	left: 0px;
-	position: absolute;
-	display: none;
-	.background {
-		background-color: @main_colour;
-		opacity: 0.5;
-		.box(100%, 100%);
-		position: absolute;
-		top: 0px;
-		left: 0px;
-	}
-	.panel {
-		top: 25%;
-		left: 25%;
-		.box(50%, 50%);
-		padding: 1em;
-		position: absolute;
-		.borders(4px, solid, black);
-		background-color: white;
-	}
+    .box(100%, 100%);
+    top: 0px;
+    left: 0px;
+    position: absolute;
+    display: none;
+    .background {
+        background-color: @main_colour;
+        opacity: 0.5;
+        .box(100%, 100%);
+        position: absolute;
+        top: 0px;
+        left: 0px;
+    }
+    .panel {
+        top: 25%;
+        left: 25%;
+        .box(50%, 50%);
+        padding: 1em;
+        position: absolute;
+        .borders(4px, solid, black);
+        background-color: white;
+    }
 }
 #panel {
-	position: absolute;
-	font-size: small;
-	.rounded_corners;
-	.borders(1px, solid, @bg_colour);
-	background-color: @dk_bg_colour;
-	color: @bg_colour;
-	padding: 1em;
-	z-index: 100;
+    position: absolute;
+    font-size: small;
+    .rounded_corners;
+    .borders(1px, solid, @bg_colour);
+    background-color: @dk_bg_colour;
+    color: @bg_colour;
+    padding: 1em;
+    z-index: 100;
 }
 .pager {
-	margin-top: 60px;
-	display: block;
-	clear: both;
-	text-align: center;
-	font-size: small;
-	font-weight: bold;
-	span {
-		padding: 4px;
-		margin: 4px;
-	}
+    margin-top: 60px;
+    display: block;
+    clear: both;
+    text-align: center;
+    font-size: small;
+    font-weight: bold;
+    span {
+        padding: 4px;
+        margin: 4px;
+    }
 }
 .pager_current {
-	background-color: @link_colour;
-	color: @bg_colour;
+    background-color: @link_colour;
+    color: @bg_colour;
 }
 .grey,
 .gray {
-	color: gray;
+    color: gray;
 }
 .orange {
-	color: orange;
+    color: orange;
 }
 .red {
-	color: red;
+    color: red;
 }
 .popup .panel {
-	.panel_text {
-		display: block;
-		overflow: auto;
-		height: 80%;
-	}
-	.panel_in {
-		.box(100%, 100%);
-		position: relative;
-	}
-	.panel_actions {
-		width: 100%;
-		bottom: 4px;
-		left: 0px;
-		position: absolute;
-	}
+    .panel_text {
+        display: block;
+        overflow: auto;
+        height: 80%;
+    }
+    .panel_in {
+        .box(100%, 100%);
+        position: relative;
+    }
+    .panel_actions {
+        width: 100%;
+        bottom: 4px;
+        left: 0px;
+        position: absolute;
+    }
 }
 .panel_text .progress {
-	width: 50%;
-	overflow: hidden;
-	height: auto;
-	.borders(1px, solid, lighten(@main_alt_colour, 20%));
-	margin-bottom: 5px;
-	span {
-		float: right;
-		display: block;
-		width: 25%;
-		background-color: @bg_colour;
-		text-align: right;
-	}
+    width: 50%;
+    overflow: hidden;
+    height: auto;
+    .borders(1px, solid, lighten(@main_alt_colour, 20%));
+    margin-bottom: 5px;
+    span {
+        float: right;
+        display: block;
+        width: 25%;
+        background-color: @bg_colour;
+        text-align: right;
+    }
 }
 
 
@@ -2709,24 +2746,24 @@ div {
  * OAuth
  */
 .oauthapp {
-	height: auto;
-	overflow: auto;
-	border-bottom: 2px solid lighten(@main_alt_colour, 20%);
-	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;
-	}
+    height: auto;
+    overflow: auto;
+    border-bottom: 2px solid lighten(@main_alt_colour, 20%);
+    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;
+    }
 }
 
 
@@ -2734,251 +2771,251 @@ div {
  * icons
  */
 .iconspacer {
-	display: block;
-	.box(16px, 16px);
+    display: block;
+    .box(16px, 16px);
 }
 .icon {
-	display: block;
-	.box;
-	background: transparent url("light/icons.png") no-repeat;
-	border: 0;
-	text-decoration: none;
-	.rounded_corners;
-	&:hover {
-		border: 0;
-		text-decoration: none;
-	}
+    display: block;
+    .box;
+    background: transparent url("light/icons.png") no-repeat;
+    border: 0;
+    text-decoration: none;
+    .rounded_corners;
+    &:hover {
+        border: 0;
+        text-decoration: none;
+    }
 }
 .editicon {
-	display: inline-block;
-	.box(21px, 21px);
-	background: url("light/editicons.png") no-repeat;
-	border: 0;
-	text-decoration: none;
+    display: inline-block;
+    .box(21px, 21px);
+    background: url("light/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(2px, 2px, 5px, 2px);
+    &:active, &:focus, &:hover {
+        .box_shadow(0, 0, 0, 0);
+    }
 }
 .editicon:hover {
-	border: 0;
+    border: 0;
 }
 .boldbb {
-	background-position: 0px 0px;
-	&:hover {
-		background-position: -22px 0px; }
+    background-position: 0px 0px;
+    &:hover {
+        background-position: -22px 0px; }
 }
 .italicbb {
-	background-position: 0px -22px;
-	&:hover {
-		background-position: -22px -22px; }
+    background-position: 0px -22px;
+    &:hover {
+        background-position: -22px -22px; }
 }
 .underlinebb {
-	background-position: 0px -44px;
-	&:hover {
-		background-position: -22px -44px; }
+    background-position: 0px -44px;
+    &:hover {
+        background-position: -22px -44px; }
 }
 .quotebb {
-	background-position: 0px -66px;
-	&:hover {
-		background-position: -22px -66px; }
+    background-position: 0px -66px;
+    &:hover {
+        background-position: -22px -66px; }
 }
 .codebb {
-	background-position: 0px -88px;
-	&:hover {
-		background-position: -22px -88px; }
+    background-position: 0px -88px;
+    &:hover {
+        background-position: -22px -88px; }
 }
 .imagebb {
-	background-position: -44px 0px;
-	&:hover {
-		background-position: -66px 0px; }
+    background-position: -44px 0px;
+    &:hover {
+        background-position: -66px 0px; }
 }
 .urlbb {
-	background-position: -44px -22px;
-	&:hover {
-		background-position: -66px -22px; }
+    background-position: -44px -22px;
+    &:hover {
+        background-position: -66px -22px; }
 }
 .videobb {
-	background-position: -44px -44px;
-	&:hover {
-		background-position: -66px -44px; }
+    background-position: -44px -44px;
+    &:hover {
+        background-position: -66px -44px; }
 }
 .icon {
-	&.drop, &.drophide, &.delete {
-		float: left;
-		margin: 0 2px;
-	}
-	&.s22 {
-		&.delete {
-			display: block;
-			background-position: -110px 0;
-		}
-		&.text {
-			padding: 10px 0px 0px 25px;
-			width: 200px;
-		}
-	}
-	&.text {
-		text-indent: 0px;
-	}
-	&.s16 {
-		min-width: 16px;
-		height: 16px;
-	}
+    &.drop, &.drophide, &.delete {
+        float: left;
+        margin: 0 2px;
+    }
+    &.s22 {
+        &.delete {
+            display: block;
+            background-position: -110px 0;
+        }
+        &.text {
+            padding: 10px 0px 0px 25px;
+            width: 200px;
+        }
+    }
+    &.text {
+        text-indent: 0px;
+    }
+    &.s16 {
+        min-width: 16px;
+        height: 16px;
+    }
 }
 // special case for wall items
 .wall-item-delete-wrapper.icon.delete,
 .wall-item-delete-wrapper.icon.drophide {
-	margin: 0;
+    margin: 0;
 }
 .s16 .add {
-	background: url("../../../images/icons/16/add.png") no-repeat;
+    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;
+    background-position: -230px 0;
 }
 .globe,
 .location {
-	background-position: -50px -20px;
+    background-position: -50px -20px;
 }
 .noglobe,
 .nolocation {
-	background-position: -70px -20px;
+    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: -191px -40px;
+    background-position: -191px -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;
-	z-index: 10;
+    position: fixed;
+    bottom: 40px;
+    right: 30px;
+    z-index: 10;
 }
 .border {
-	.borders(1px, solid, @border2);
-	.rounded_corners;
-	&:hover {
-		.borders(1px, solid, @border2);
-		.rounded_corners;
-	}
+    .borders(1px, solid, @border2);
+    .rounded_corners;
+    &:hover {
+        .borders(1px, solid, @border2);
+        .rounded_corners;
+    }
 }
 .attachtype {
-	display: block;
-	.box(20px, 23px);
-	background-image: url(../../../images/content-types.png);
+    display: block;
+    .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;
 }
 
 
@@ -2986,23 +3023,23 @@ div {
  * footer
  */
 .cc-license {
-	margin-top: 100px;
-	font-size: 0.7em;
+    margin-top: 100px;
+    font-size: 0.7em;
 }
 footer {
-	display: block;
-	clear: both;
+    display: block;
+    clear: both;
 }
 #sectionfooter {
-	margin: 1em 0 1em 0;
+    margin: 1em 0 1em 0;
 }
 #profile-jot-text {
-	height: 20px;
-	color: darken(@main_alt_colour, 20%);
-	background: lighten(@main_alt_colour, 20%);
-	.borders;
-	.rounded_corners;
-	width: 99.5%;
+    height: 20px;
+    color: darken(@main_alt_colour, 20%);
+    background: lighten(@main_alt_colour, 20%);
+    .borders;
+    .rounded_corners;
+    width: 99.5%;
 }
 
 
@@ -3012,167 +3049,167 @@ footer {
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper {
-	display: block !important;
-	background: @bg_colour;
-	color: @main_colour;
+    display: block !important;
+    background: @bg_colour;
+    color: @main_colour;
 }
 #profile-jot-acl-wrapper {
-	margin: 0 10px;
-	.borders(1px, solid, @menu_bg_colour);
-	border-top: 0;
-	font-size: small;
-	// .box_shadow;
+    margin: 0 10px;
+    .borders(1px, solid, @menu_bg_colour);
+    border-top: 0;
+    font-size: small;
+    // .box_shadow;
 }
 #acl-wrapper {
-	width: 660px;
-	margin: 0 auto;
+    width: 660px;
+    margin: 0 auto;
 }
 #acl-search {
-	float: right;
-	background: white url("../../../images/search_18.png") no-repeat right center;
-	padding-right: 20px;
-	margin: 6px;
-	color: @main_colour;
+    float: right;
+    background: white url("../../../images/search_18.png") no-repeat right center;
+    padding-right: 20px;
+    margin: 6px;
+    color: @main_colour;
 }
 #acl-showall {
-	float: left;
-	display: block;
-	.box(auto, 18px);
-	background: @bg_colour url("../../../images/show_all_off.png") 8px 8px no-repeat;
-	padding: 7px 10px 7px 30px;
-	.rounded_corners;
-	color: @main_alt_colour;
-	margin: 5px 0;
-	&.selected {
-		color: black;
-		background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;
-	}
+    float: left;
+    display: block;
+    .box(auto, 18px);
+    background: @bg_colour url("../../../images/show_all_off.png") 8px 8px no-repeat;
+    padding: 7px 10px 7px 30px;
+    .rounded_corners;
+    color: @main_alt_colour;
+    margin: 5px 0;
+    &.selected {
+        color: black;
+        background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;
+    }
 }
 #acl-list {
-	height: 210px;
-	.borders(1px, solid, lighten(@main_alt_colour, 20%);
-	clear: both;
-	margin-top: 30px;
-	overflow: auto;
+    height: 210px;
+    .borders(1px, solid, lighten(@main_alt_colour, 20%);
+    clear: both;
+    margin-top: 30px;
+    overflow: auto;
 }
 /*#acl-list-content {
 }*/
 .acl-list-item {
-	.borders(1px, solid, lighten(@main_alt_colour, 20%));
-	.box(120px, 110px);
-	display: block;
-	float: left;
-	margin: 3px 0 5px 5px;
-	img {
-		.box(22px, 22px);
-		float: left;
-		margin: 5px 5px 20px;
-	}
-	p {
-		height: 12px;
-		font-size: 10px;
-		margin: 0 0 22px;
-		padding: 2px 0 1px;
-	}
-	a {
-		background: lighten(@main_alt_colour, 20%) 3px 3px no-repeat;
-		.rounded_corners;
-		.box(55px, 20px);
-		clear: both;
-		font-size: 10px;
-		display: block;
-		color: @main_alt_colour;
-		margin: 5px auto 0;
-		padding: 0 3px;
-		text-align: center;
-		vertical-align: middle;
-	}
+    .borders(1px, solid, lighten(@main_alt_colour, 20%));
+    .box(120px, 110px);
+    display: block;
+    float: left;
+    margin: 3px 0 5px 5px;
+    img {
+        .box(22px, 22px);
+        float: left;
+        margin: 5px 5px 20px;
+    }
+    p {
+        height: 12px;
+        font-size: 10px;
+        margin: 0 0 22px;
+        padding: 2px 0 1px;
+    }
+    a {
+        background: lighten(@main_alt_colour, 20%) 3px 3px no-repeat;
+        .rounded_corners;
+        .box(55px, 20px);
+        clear: both;
+        font-size: 10px;
+        display: block;
+        color: @main_alt_colour;
+        margin: 5px auto 0;
+        padding: 0 3px;
+        text-align: center;
+        vertical-align: middle;
+    }
 }
 #acl-wrapper a:hover {
-	text-decoration: none;
-	color: @main_colour;
-	border: 0;
+    text-decoration: none;
+    color: @main_colour;
+    border: 0;
 }
 //data URI:
 // data:[<MIME-type>][;charset=<encoding>][;base64],<data>
 .acl-button-show {
-	// background-image: url('../../../images/show_off.png');
-	background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABxSURBVAiZY/z//z8DDMyaNUuEgYEhk4GBwZ8JJrhv3z5DZmbmMwwMDOoMDAxpLKtWraqTl5d3fPv2rcn///9XpKWlpTIwMDCwfPr0SePWrVtmP378YPn//385zASmf//+Rf/8+XMpIyPj2bS0tHcwCQBWkiq6M5HGDgAAAABJRU5ErkJggg==');
-	margin: 0 auto;
+    // background-image: url('../../../images/show_off.png');
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABxSURBVAiZY/z//z8DDMyaNUuEgYEhk4GBwZ8JJrhv3z5DZmbmMwwMDOoMDAxpLKtWraqTl5d3fPv2rcn///9XpKWlpTIwMDCwfPr0SePWrVtmP378YPn//385zASmf//+Rf/8+XMpIyPj2bS0tHcwCQBWkiq6M5HGDgAAAABJRU5ErkJggg==');
+    margin: 0 auto;
 }
 .acl-button-hide {
-	// background-image: url('../../../images/hide_off.png');
-	background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACWSURBVAiZBcEhDsIwFAbg/72+VXQ7wPSCIlj8JMlmcKQGgdgRCCfpEz0HjgSDw3IA1AQC1QqSpXwfqeoZwHOaphsAqGpfVVVHIYQNM1+J6MLMOwA9gAOVUhBC6Ky1r7quv03TrMZxzAwAIjKIyCel9JvneQ8ApKprY8zdObfNOXMp5bEsyyDGmJaITt77NwDEGI/W2vYP0nYuQ/Tw9H4AAAAASUVORK5CYII=');
-	margin: 0 auto;
+    // background-image: url('../../../images/hide_off.png');
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACWSURBVAiZBcEhDsIwFAbg/72+VXQ7wPSCIlj8JMlmcKQGgdgRCCfpEz0HjgSDw3IA1AQC1QqSpXwfqeoZwHOaphsAqGpfVVVHIYQNM1+J6MLMOwA9gAOVUhBC6Ky1r7quv03TrMZxzAwAIjKIyCel9JvneQ8ApKprY8zdObfNOXMp5bEsyyDGmJaITt77NwDEGI/W2vYP0nYuQ/Tw9H4AAAAASUVORK5CYII=');
+    margin: 0 auto;
 }
 .acl-button-show.selected {
-	// background: #9ade00 url(../../../images/show_on.png);
-	background: #9ade00 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABXSURBVAiZTcyhDYNQGADh7xEGwGDxhD2qUWxAwIBgE9BdoxO03YaEEX7USzh5l1yKCJl0pBoT+uIhK3zRYk52Az5444w1FijxwoYOTT4UGPHHL9a4crgBhcYSpxKVgzIAAAAASUVORK5CYII=');
-	color: black;
+    // background: #9ade00 url(../../../images/show_on.png);
+    background: #9ade00 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABXSURBVAiZTcyhDYNQGADh7xEGwGDxhD2qUWxAwIBgE9BdoxO03YaEEX7USzh5l1yKCJl0pBoT+uIhK3zRYk52Az5444w1FijxwoYOTT4UGPHHL9a4crgBhcYSpxKVgzIAAAAASUVORK5CYII=');
+    color: black;
 }
 .acl-button-hide.selected {
-	// background: #ff4141 url(../../../images/hide_on.png);
-	background: #ff4141 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACSSURBVAiZBcGhDoJQFAbg/z/3cGliJDOTszmLichGstkMPoTzvfA2N4vN6gMYCGhwMifMTY7fxyCy4zBcCrMjAFRk7p3LWAEzRwYT2StQgMwBrGlmOJCZV72Ok+QpcTyZ1/VHAEBEyiiKHq+2/d6bZgUADMCUIqeR94t338tAns2sVKea/sy2y667AUAgN+pc+gcI6S733PoZRAAAAABJRU5ErkJggg==');
-	color: black;
+    // background: #ff4141 url(../../../images/hide_on.png);
+    background: #ff4141 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACSSURBVAiZBcGhDoJQFAbg/z/3cGliJDOTszmLichGstkMPoTzvfA2N4vN6gMYCGhwMifMTY7fxyCy4zBcCrMjAFRk7p3LWAEzRwYT2StQgMwBrGlmOJCZV72Ok+QpcTyZ1/VHAEBEyiiKHq+2/d6bZgUADMCUIqeR94t338tAns2sVKea/sy2y667AUAgN+pc+gcI6S733PoZRAAAAABJRU5ErkJggg==');
+    color: black;
 }
 .acl-list-item {
-	&.groupshow {
-		border-color: @group_show;
-	}
-	&.grouphide {
-		border-color: @group_hide;
-	}
+    &.groupshow {
+        border-color: @group_show;
+    }
+    &.grouphide {
+        border-color: @group_hide;
+    }
 }
 /** /acl **/
 
 
 /* autocomplete popup */
 .acpopup {
-	max-height: 175px;
-	max-width: 42%;
-	background-color: @menu_bg_colour;
-	color: white;
-	overflow: auto;
-	z-index: 100000;
-	border: 1px solid lighten(@main_alt_colour, 20%);
+    max-height: 175px;
+    max-width: 42%;
+    background-color: @menu_bg_colour;
+    color: white;
+    overflow: auto;
+    z-index: 100000;
+    border: 1px solid lighten(@main_alt_colour, 20%);
 }
 .acpopupitem {
-	background-color: @menu_bg_colour;
-	padding: 4px;
-	clear: left;
-	img {
-		float: left;
-		margin-right: 4px;
-	}
-	&.selected {
-		color: @dk_bg_colour;
-		background-color: @bg_colour;
-	}
+    background-color: @menu_bg_colour;
+    padding: 4px;
+    clear: left;
+    img {
+        float: left;
+        margin-right: 4px;
+    }
+    &.selected {
+        color: @dk_bg_colour;
+        background-color: @bg_colour;
+    }
 }
 .qcomment-wrapper {
-	padding: 0px;
-	margin: 5px 5px 5px 81%;
+    padding: 0px;
+    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;
 }
 
 
@@ -3180,21 +3217,21 @@ footer {
  * 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;
-	/* override the jappix css */
-	right: 175px !important;
-	z-index: 999;
+    margin-left: 130px;
+    position: fixed;
+    bottom: 0;
+    /* override the jappix css */
+    right: 175px !important;
+    z-index: 999;
 }
 
 @import "../css/media";
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index 21343aea5..bb6754dae 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -1,56 +1,57 @@
 <nav id="pagenav">
 
-<span id="banner">$banner</span>
+<div id="banner">$banner</div>
+<div id="site-location">$sitelocation</div>
 
 <a name="top" id="top"></a>
 <div id="nav-floater">
     <ul id="nav-buttons">
     {{ if $nav.login }}
     <li><a id="nav-login-link" class="nav-login-link $nav.login.2"
-			href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a></li>
+            href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a></li>
     {{ endif }}
     {{ if $nav.home }}
     <li><a id="nav-home-link" class="nav-link $nav.home.2"
-			href="$nav.home.0" title="$nav.home.1">$nav.home.1</a></li>
+            href="$nav.home.0" title="$nav.home.1">$nav.home.1</a></li>
     {{ endif }}
     {{ if $nav.network }}
     <li><a id="nav-network-link" class="nav-link $nav.network.2"
-			href="$nav.network.0" title="$nav.network.1">$nav.network.1</a></li>
+            href="$nav.network.0" title="$nav.network.1">$nav.network.1</a></li>
     {{ endif }}
     {{ if $nav.notifications }}
     <li><a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2"
-			href="$nav.notifications.0"
-			rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a></li>
-		<ul id="nav-notifications-menu" class="menu-popup">
-			<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-			<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-			<li class="empty">$emptynotifications</li>
-		</ul>
+            href="$nav.notifications.0"
+            rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a></li>
+        <ul id="nav-notifications-menu" class="menu-popup">
+            <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+            <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+            <li class="empty">$emptynotifications</li>
+        </ul>
     {{ endif }}
     {{ if $nav.messages }}
     <li><a id="nav-messages-link" class="nav-link $nav.messages.2"
-			href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a></li>
+            href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a></li>
     {{ endif }}
     {{ if $nav.community }}
     <li><a id="nav-community-link" class="nav-link $nav.community.2"
-			href="$nav.community.0" title="$nav.community.1">$nav.community.1</a></li>
+            href="$nav.community.0" title="$nav.community.1">$nav.community.1</a></li>
     {{ endif }}
     <li><a id="nav-directory-link" class="nav-link $nav.directory.2"
-			href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
+            href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
     <li><a id="nav-search-link" class="nav-link $nav.search.2"
-			href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
+            href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
     {{ if $nav.apps }}
     <li><a id="nav-apps-link" class="nav-link $nav.apps.2"
-		href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li>
+        href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li>
     {{ endif }}
     {{ if $nav.help }}
     <li><a id="nav-help-link" class="nav-link $nav.help.2"
-			href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
+            href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
     {{ endif }}
-	</ul>
+    </ul>
 
-	<div id="user-menu">
-        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false;" href="$nav.home.0">$sitelocation</a>
+    <div id="user-menu">
+        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false;" href="$nav.home.0"><span class="">User Menu</span></a>
         <ul id="user-menu-popup"
             onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
             onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
@@ -63,21 +64,12 @@
         {{ if $nav.contacts }}
         <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
         {{ endif }}
-		{{ if $nav.introductions }}
-	    <li><a id="nav-intro-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a></li>
-		{{ endif }}
         {{ if $nav.profiles }}
         <li><a id="nav-profiles-link" class="nav-commlink $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.1">$nav.profiles.1</a></li>
         {{ endif }}
         {{ if $nav.settings }}
         <li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0" title="$nav.settings.1">$nav.settings.1</a></li>
         {{ endif }}
-        {{ if $nav.manage }}
-        <li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li>
-        {{ endif }}
-        {{ if $nav.admin }}
-        <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
-        {{ endif }}
         {{ if $nav.login }}
         <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
         {{ endif }}
@@ -87,12 +79,24 @@
         </ul>
     </div>
 
+    <ul id="nav-buttons-2">
+    {{ if $nav.introductions }}
+    <li><a id="nav-intro-link" class="nav-link $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a></li>
+    {{ endif }}
+    {{ if $nav.admin }}
+    <li><a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
+    {{ endif }}
+    {{ if $nav.manage }}
+    <li><a id="nav-manage-link" class="nav-link $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li>
+    {{ endif }}
+    </ul>
+
 {{ if $userinfo }}
         <ul id="nav-user-menu" class="menu-popup">
             {{ for $nav.usermenu as $usermenu }}
                 <li>
-					<a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a>
-				</li>
+                    <a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a>
+                </li>
             {{ endfor }}
         </ul>
 {{ endif }}
@@ -110,9 +114,9 @@
         {{ if $nav.messages }}
         <a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a>
         {{ endif }}
-		{{if $nav.introductions }}
-		<a id="intro-update" class="nav-ajax-left" href="$nav.introductions.0"></a>
-		{{ endif }}
+        {{if $nav.introductions }}
+        <a id="intro-update" class="nav-ajax-left" href="$nav.introductions.0"></a>
+        {{ endif }}
     </div>
 </div>
     <a href="#" class="floaterflip"></a>
@@ -124,18 +128,18 @@ $langselector
 
 <div id="scrollup">
 <a href="#top"><img src="view/theme/dispy/icons/scroll_top.png"
-	alt="back to top" title="Back to top" /></a>
+    alt="back to top" title="Back to top" /></a>
 </div>
 
 <div class="search-box">
-	<form method="get" action="$nav.search.0">
-		<input id="mini-search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
-	</form>
+    <form method="get" action="$nav.search.0">
+        <input id="mini-search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
+    </form>
 </div>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}">
-	<a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a>
-	</li>
+    <li class="{4}">
+    <a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a>
+    </li>
 </ul>