diff --git a/include/text.php b/include/text.php
index e93c24ef4..d6a9ef5d3 100644
--- a/include/text.php
+++ b/include/text.php
@@ -646,7 +646,7 @@ function search($s,$id='search-box',$url='/search',$save = false) {
 	$a = get_app();
 	$o  = '<div id="' . $id . '">';
 	$o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >';
-	$o .= '<input type="text" name="search" id="search-text" value="' . $s .'" />';
+	$o .= '<input type="text" name="search" id="search-text" placeholder="' . t('Search') . '" value="' . $s .'" />';
 	$o .= '<input type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />'; 
 	if($save)
 		$o .= '<input type="submit" name="save" id="search-save" value="' . t('Save') . '" />'; 
diff --git a/view/theme/darkbubble/unsupported b/view/theme/darkbubble/unsupported
deleted file mode 100644
index e69de29bb..000000000
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 6f29ef1f4..612c24f5c 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -58,7 +58,7 @@ h6{font-size:xx-small;}
 #articlemain{width:100%;height:100%;margin:0 auto;}
 .button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;}
 #profile-listing-desc a{color:#eeeecc;font-weight:bold;}
-[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
+[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px ridge #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
 #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
 .intro-approve-as-friend-desc{margin-top:10px;}
 .intro-desc{margin-bottom:20px;font-weight:bold;}
@@ -121,7 +121,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #intro-update{background-position:-120px 0px;}
 #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
 #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
-.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;}
+.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.2;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;}
 .menu-popup .menu-sep{border-top:1px solid #4e4f4e;}
 .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}
 .menu-popup .empty{padding:5px;text-align:center;color:#9ea8ac;}
@@ -135,7 +135,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #asidemain{float:left;font-size:small;margin:20px 0 20px 35px;width:25%;display:inline;}
 #asideright,#asideleft{display:none;}
 .vcard .fn{font-size:1.5em;font-weight:bold;border-bottom:1px solid #638ec4;padding-bottom:3px;}
-.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;}
+.vcard #profile-photo-wrapper{margin:20px 0;background-color:#555753;padding:5px;width:175px;height:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;}
 #asidemain h4{font-size:1.2em;}
 #asidemain #viewcontacts{text-align:right;}
 #asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;}
@@ -389,21 +389,23 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
 .fc-state-highlight{background:#eeeecc;color:#2e2f2e;}
 .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
 #group-sidebar{margin-bottom:10px;}
-.group-selected,.nets-selected,.fileas-selected{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
-.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;}
+.categories-selected,.group-selected,.nets-selected,.fileas-selected{color:#2e2f2e;background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.categories-selected:hover,.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
+.categories-selected a,.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;}
 .groupsideedit{margin-right:10px;}
 #sidebar-group-ul{padding-left:0;}
 #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
 #sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
-.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
+.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#eeeecc;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
 .sidebar-group-element a{border:0;text-decoration:none;}
+.sidebar-group-element.group-selected{color:#2e2f2e;}
 #sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;}
 #peoplefind-sidebar form{margin-bottom:10px;}
 #sidebar-new-group:hover{}
 #sidebar-new-group:active{position:relative;top:1px;}
 #side-peoplefind-url{border:1px solid #999999;margin-right:3px;width:75%;}
-.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;}
-.nets-link,.nets-all{margin-left:0px;}
+.categories-ul,.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.categories-ul li,.nets-ul li{margin:10px 0 0;}
+.categories-link,.nets-link,.nets-all{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin-left:0px;}.categories-link:active,.nets-link:active,.nets-all:active,.categories-link:hover,.nets-link:hover,.nets-all:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
+.categories-link a,.nets-link a,.nets-all a{border:0;text-decoration:none;}
 #netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
 #pending-update{float:right;color:white;font-weight:bold;background-color:red;padding:0 0.3em;}
 .admin.linklist{border:0;padding:0;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index 000918a9b..51bf7ca30 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -312,7 +312,7 @@ h6 {
 [id$="-desc"] {
 	color: @main_colour;
 	background: @bg_colour;
-	.borders(3px, outset, @main_colour);
+	.borders(3px, ridge, @main_colour);
 	.rounded_corners;
 	// .box_shadow(3px, 3px, 5px);
     margin: 3px 10px 7px 0;
@@ -510,7 +510,8 @@ nav .nav-link {
 		background-position: -44px -190px;
 	}
 }
-#nav-login-link, #nav-logout-link {
+#nav-login-link,
+#nav-logout-link {
 	background-position: 0 -88px;
 	&:hover {
 		background-position: -22px -88px;
@@ -669,11 +670,10 @@ nav #nav-notifications-linkmenu {
 #mini-search-text {
 	background: white;
 	color: @bg_colour;
-	margin: 8px;
 }
 #search-text {
 	.borders(1px, solid, @main_alt_colour);
-	margin: 8px 0;
+	margin: 5px 0;
 }
 #mini-search-text {
 	font-size: 8pt;
@@ -771,7 +771,7 @@ nav #nav-notifications-linkmenu {
 	margin: 0px;
 	padding: 0px;
 	font-size: small;
-	line-height: 1.1;
+	line-height: 1.2;
 	.borders(3px, solid, @link_colour);
 	.rounded_corners;
 	z-index: 100000;
@@ -880,10 +880,12 @@ nav #nav-notifications-linkmenu {
 		padding-bottom: 3px;
 	}
 	#profile-photo-wrapper {
-		margin: 20px;
-		img {
-			.box_shadow(3px, 3px, 10px, 0);
-		}
+		margin: 20px 0;
+		background-color: @menu_bg_colour;
+		padding: 5px;
+		.box(175px, 175px);
+		.rounded_corners;
+		.box_shadow(3px, 3px, 10px, 0);
 	}
 }
 #asidemain {
@@ -2333,11 +2335,12 @@ div {
 #group-sidebar {
 	margin-bottom: 10px;
 }
+.categories-selected,
 .group-selected,
 .nets-selected,
 .fileas-selected {
 	// padding: 4px;
-	// color: @bg_colour;
+	color: @bg_colour;
 	// background: @main_colour;
 	// .borders(1px, solid, @link_colour);
 	.multibutton_active;
@@ -2369,6 +2372,10 @@ div {
 .sidebar-group-element {
 	.multibutton;
 	.rounded_corners;
+	color: @main_colour;
+	&.group-selected {
+		color: @bg_colour;
+	}
 }
 #sidebar-new-group {
 	margin: auto;
@@ -2396,14 +2403,18 @@ div {
 	margin-right: 3px;
 	width: 75%;
 }
+.categories-ul,
 .nets-ul {
 	.list_reset;
 	li {
 		margin: 10px 0 0;
 	}
 }
+.categories-link,
 .nets-link,
 .nets-all {
+	.multibutton;
+	.rounded_corners;
 	margin-left: 0px;
 }
 #netsearch-box {
diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl
index 10ecec2e8..be8e23de0 100644
--- a/view/theme/dispy/group_side.tpl
+++ b/view/theme/dispy/group_side.tpl
@@ -5,10 +5,9 @@
 	<ul id="sidebar-group-ul">
 		{{ for $groups as $group }}
 			<li class="sidebar-group-li">
-				<a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}">$group.text</a>
+				<a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ else }}group-other{{ endif }}">$group.text</a>
 				{{ if $group.edit }}
-					<a 
-                        class="groupsideedit"
+					<a class="groupsideedit"
                         href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a>
 				{{ endif }}
 				{{ if $group.cid }}
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index bd3da3189..3b02f3317 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -106,8 +106,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #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;}
 .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;margin:8px;}
-#search-text{border:1px solid #999999;margin:8px 0;}
+#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:75%;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;}
@@ -121,7 +121,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #intro-update{background-position:-120px 0px;}
 #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
 #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
-.menu-popup{position:absolute;display:none;background:white;color:#111111;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;}
+.menu-popup{position:absolute;display:none;background:white;color:#111111;margin:0px;padding:0px;font-size:small;line-height:1.2;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;}
 .menu-popup .menu-sep{border-top:1px solid #4e4f4e;}
 .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}
 .menu-popup .empty{padding:5px;text-align:center;color:#ffffff;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index d8bd922cc..ce7df59e9 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -313,7 +313,7 @@ h6 {
 [id$="-desc"] {
 	color: @bg_colour;
 	background: @dk_bg_colour;
-	.borders(3px, outset, @main_colour);
+	.borders(3px, ridge, @main_colour);
 	.rounded_corners;
 	// .box_shadow(3px, 3px, 5px);
     margin: 3px 10px 7px 0;
@@ -511,7 +511,8 @@ nav .nav-link {
 		background-position: -44px -190px;
 	}
 }
-#nav-login-link, #nav-logout-link {
+#nav-login-link,
+#nav-logout-link {
 	background-position: 0 -88px;
 	&:hover {
 		background-position: -22px -88px;
@@ -670,11 +671,10 @@ nav #nav-notifications-linkmenu {
 #mini-search-text {
 	background: white;
 	color: @main_colour;
-	margin: 8px;
 }
 #search-text {
 	.borders(1px, solid, @main_alt_colour);
-	margin: 8px 0;
+	margin: 5px 0;
 }
 #mini-search-text {
 	font-size: 8pt;
@@ -772,7 +772,7 @@ nav #nav-notifications-linkmenu {
 	margin: 0px;
 	padding: 0px;
 	font-size: small;
-	line-height: 1.1;
+	line-height: 1.2;
 	.borders(3px, solid, @link_colour);
 	.rounded_corners;
 	z-index: 100000;
@@ -881,10 +881,12 @@ nav #nav-notifications-linkmenu {
 		padding-bottom: 3px;
 	}
 	#profile-photo-wrapper {
-		margin: 20px;
-		img {
-			.box_shadow(3px, 3px, 10px, 0);
-		}
+		margin: 20px 0;
+		background-color: @menu_bg_colour;
+		padding: 5px;
+		.box(175px, 175px);
+		.rounded_corners;
+		.box_shadow(3px, 3px, 10px, 0);
 	}
 }
 #asidemain {
@@ -2334,11 +2336,12 @@ div {
 #group-sidebar {
 	margin-bottom: 10px;
 }
+.categories-selected,
 .group-selected,
 .nets-selected,
 .fileas-selected {
 	// padding: 4px;
-	// color: @bg_colour;
+	color: @bg_colour;
 	// background: @dk_bg_colour;
 	// .borders(1px, solid, @hover_colour);
 	.multibutton_active;
@@ -2370,6 +2373,10 @@ div {
 .sidebar-group-element {
 	.multibutton;
 	.rounded_corners;
+	color: @main_colour;
+	&.group-selected {
+		color: @bg_colour;
+	}
 }
 #sidebar-new-group {
 	margin: auto;
@@ -2397,14 +2404,18 @@ div {
 	margin-right: 3px;
 	width: 75%;
 }
+.categories-ul,
 .nets-ul {
 	.list_reset;
 	li {
 		margin: 10px 0 0;
 	}
 }
+.categories-link,
 .nets-link,
 .nets-all {
+	.multibutton;
+	.rounded_corners;
 	margin-left: 0px;
 }
 #netsearch-box {