21 files changed, 2363 insertions, 1286 deletions

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 07403e893..c435621b2 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -25,34 +25,35 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 	margin: 0;
 	padding: 0;
 	border: 0;
-	outline: 0;
 	font-weight: inherit;
 	font-style: inherit;
 	font-size: 100%;
 	font-family: inherit;
 	vertical-align: baseline;
 }
-img {
-	border-width:0;
-	border-color:transparent;
+<?php // force vertical scroll bar ?>
+html, body {
+	height: 100%;
+	margin-bottom: 1px;
 }
-:focus {
-	outline:0 none;
+img {
+	border-width: 0;
+	border-color: transparent;
 }
 ol, ul {
 	list-style: none;
 }
 em, i {
-	font-style:italic;
+	font-style: italic;
 }
 ins {
-	text-decoration:none;
+	text-decoration: none;
 }
 del {
 	text-decoration:line-through;
 }
 strong, b {
-	font-weight:bold;
+	font-weight: bold;
 }
 table {
 	border-collapse: collapse;
@@ -74,7 +75,6 @@ blockquote, q {
 /* ***************************************
 	BASICS
 *************************************** */
-
 body {
 	background-color: #eee;
 	font-size: 80%;
@@ -95,13 +95,21 @@ h6 { font-size: 0.8em; }
 
 a {
 	color: #333;
+	text-decoration: none;
 }
 a:hover {
 	color: black;
 	text-decoration: underline;
 }
 pre, code {
-	background: #EBF5FF;
+	background-color: #EEE;
+	border: 1px solid #DDD;
+	color: #444;
+	font-family: Monaco, "Courier New", Courier, monospace;
+	font-size: 13px;
+	overflow: auto;
+	margin: 15px 0;
+	padding: 5px;
 }
 blockquote {
 	background: #EBF5FF;
@@ -110,23 +118,28 @@ p {
 	margin-bottom: 15px;
 }
 
-table.mceLayout {
-	width:100% !important;
-}
-
 .clearfloat {
-	clear:both;
+	clear: both;
 }
 
 /* Clearfix! */
+.clearfix:after,
 .elgg-grid:after,
-.clearfix:after {
+.elgg-layout:after,
+.elgg-inner:after,
+.elgg-page-header:after,
+.elgg-page-footer:after,
+.elgg-head:after,
+.elgg-foot:after,
+.elgg-col:after,
+.elgg-image-block:after {
 	content: ".";
 	display: block;
 	height: 0;
 	clear: both;
 	visibility: hidden;
 }
+
 .elgg-body {
 	width: auto;
 	word-wrap: break-word;
@@ -137,18 +150,11 @@ table.mceLayout {
 	visibility: hidden;
 	height: 0 !important;
 	line-height: 0;
+	overflow: hidden;
 	font-size: xx-large;
 	content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
 }
-.hidden {
-	display:none;
-}
-.centered {
-	margin:0 auto;
-}
-.center {
-	text-align: center;
-}
+
 /* ***************************************
 	PAGE WRAPPER
 *************************************** */
@@ -195,7 +201,7 @@ table.mceLayout {
 .elgg-menu-user li {
 	display: inline;
 }
-.elgg-menu-user li:after{
+.elgg-menu-user li:after {
 	content: "|";
 	display: inline-block;
 	font-weight: normal;
@@ -206,6 +212,9 @@ table.mceLayout {
 	content: "";
 }
 
+/* ***************************************
+	MESSAGES
+*************************************** */
 .elgg-page-messages {
 	padding: 20px 0 0;
 	width: 500px;
@@ -218,6 +227,45 @@ table.mceLayout {
 	padding: 10px;
 	margin-bottom: 10px;
 	border: 2px solid #ddd;
+	cursor: pointer;
+}
+.elgg-message.elgg-state-error {
+	background: #fbe3e4;
+	color: #8a1f11;
+	border-color: #fbc2c4;
+	font-weight: bold;
+}
+.elgg-message.elgg-state-success {
+	background: #e6efc2;
+	color: #264409;
+	border-color: #c6d880;
+}
+
+.elgg-admin-notices {
+	padding-bottom: 15px;
+}
+.elgg-admin-notices p {
+	background-color: #BDE5F8;
+	color: black;
+	border: 1px solid blue;
+	font-weight: bold;
+	padding: 3px 0px 3px 10px;
+
+	-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+	-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.elgg-admin-notices a.elgg-admin-notice {
+	float: right;
+	text-decoration: none;
+}
+
+.elgg-admin-notices a {
+	text-decoration: underline;
 }
 
 /* ***************************************
@@ -226,7 +274,7 @@ table.mceLayout {
 .elgg-page-body {
 	padding: 20px 0;
 }
-.elgg-main  {
+.elgg-main {
 	background-color: #fff;
 	border: 1px solid #ccc;
 	padding: 20px;
@@ -252,6 +300,7 @@ table.mceLayout {
 	background-color: #111;
 	border: 1px solid #999;
 	padding: 10px 20px;
+	margin-bottom: 10px;
 }
 .elgg-page-footer a {
 	color: #ddd;
@@ -262,66 +311,12 @@ table.mceLayout {
 	text-decoration: underline;
 }
 
-
-/* ***************************************
-	SIDEBAR MENU
-*************************************** */
-.elgg-admin-sidebar-menu a {
-	border: 1px solid red;
-	display: block;
-	padding: 5px;
-	color: #333;
-	cursor: pointer;
-	text-decoration: none;
-	margin-bottom: 2px;
-	border: 1px solid #CCC;
-
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-
-.elgg-admin-sidebar-menu a:hover {
-	text-decoration: none;
-	background: black;
-	color: white;
-	border: 1px solid black;
-}
-.elgg-admin-sidebar-menu li.elgg-state-selected > a {
-	background-color: #BBB;
-}
-
-.elgg-admin-sidebar-menu .elgg-menu-closed:before {
-	content: "\25B8";
-	padding-right: 4px;
-}
-
-.elgg-admin-sidebar-menu .elgg-menu-opened:before {
-	content: "\25BE";
-	padding-right: 4px;
-}
-
-.elgg-admin-sidebar-menu .elgg-child-menu {
-	display: none;
-	padding-left: 30px;
-}
-.elgg-admin-sidebar-menu li.elgg-state-selected > ul {
-	display: block;
-}
-
-.elgg-admin-sidebar-menu h2 {
-	padding-bottom: 5px;
-}
-
-.elgg-admin-sidebar-menu ul.elgg-menu-page {
-	padding-bottom: 15px;
-}
-
-
 /* ***************************************
 	MODULES
 *************************************** */
-
+.elgg-module {
+	overflow: hidden;
+}
 .elgg-module-main {
 	background-color: #fff;
 	border: 1px solid #ccc;
@@ -330,6 +325,9 @@ table.mceLayout {
 .elgg-module-main > .elgg-head {
 	margin-bottom: 5px;
 }
+.elgg-module-info > .elgg-head {
+	margin-bottom: 10px;
+}
 .elgg-module-inline {
 	margin: 20px 0;
 }
@@ -357,6 +355,8 @@ table.mceLayout {
 .elgg-table td, .elgg-table th {
 	background: white;
 	border: 1px solid #ccc;
+	padding: 4px 8px;
+	vertical-align: middle;
 }
 .elgg-table th {
 	background-color: #ddd;
@@ -364,15 +364,19 @@ table.mceLayout {
 .elgg-table .alt td {
 	background: #eee;
 }
-.elgg-table td {
-	padding: 4px 8px;
-	border-bottom: 1px solid #ccc;
+.elgg-table input[type=checkbox] {
+	margin-top: 3px;
 }
+
 .elgg-table-alt {
 	width: 100%;
 	border-top: 1px solid #ccc;
 }
-.elgg-table-alt td {
+.elgg-table-alt th {
+	background-color: #eee;
+	font-weight: bold;
+}
+.elgg-table-alt td, th {
 	padding: 2px 4px;
 	border-bottom: 1px solid #ccc;
 }
@@ -397,31 +401,27 @@ table.mceLayout {
 	float: right;
 	margin-left: 5px;
 }
-
-.elgg-list-item {
+.elgg-item {
 	margin: 3px;
 }
-.elgg-menu-metadata {
-	float: right;
-	margin-left: 15px;
-	font-size: 90%;
-}
-.elgg-menu-metadata > li {
-	float: left;
-	margin-left: 15px;
+.elgg-list-simple li {
+	margin-bottom: 5px;
 }
-.elgg-menu-metadata, .elgg-menu-metadata a {
-	color: #aaa;
+.elgg-list-distinct {
+	border-top: 1px dotted #CCCCCC;
+	margin: 5px 0;
+	clear: both;
 }
-.elgg-simple-list li {
-	margin-bottom: 5px;
+.elgg-list-distinct > li {
+	border-bottom: 1px dotted #CCCCCC;
 }
+
 /* ***************************************
 	FORMS AND INPUT
 *************************************** */
 label {
 	font-weight: bold;
-	color:#333333;
+	color: #333333;
 	font-size: 110%;
 }
 fieldset > div {
@@ -434,38 +434,365 @@ input {
 	font: 120% Arial, Helvetica, sans-serif;
 	padding: 5px;
 	border: 1px solid #ccc;
-	color:#666;
+	color: #666;
 	
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
+	margin: 0;
+}
+
+/* default elgg core input field classes */
+.elgg-input-text,
+.elgg-input-tags,
+.elgg-input-url,
+.elgg-input-plaintext,
+.elgg-input-longtext {
+	width: 98%;
+}
+textarea {
+	height: 100px;
+}
+.elgg-input-thin {
+	width: 400px;
+}
+.elgg-input-natural {
+	width: auto;
 }
-input[type="submit"], .elgg-button-submit, .elgg-button-action {
+
+.elgg-button {
 	font-size: 14px;
 	font-weight: bold;
-	color: white;
 	text-decoration: none;
-	background-color: #333;
-	border-color: #333;
-	
+
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
-	
+
 	width: auto;
 	padding: 2px 4px;
-	margin: 10px 5px 10px 0;
 	cursor: pointer;
-	outline: none;
 }
-input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover {
+a.elgg-button {
+	padding: 3px 6px;
+}
+
+.elgg-button + .elgg-button {
+	margin-left: 5px;
+}
+
+.elgg-button-submit,
+.elgg-button-action {
+	color: white;
+	border: 1px solid #333;
+	background-color: #333;
+	text-shadow: 1px 1px 0px black;
+}
+.elgg-button-submit:hover,
+.elgg-button-action:hover {
 	color: white;
 	background-color: #000;
 	text-decoration: none;
 }
-.elgg-button-submit, .elgg-button-action {
-	padding: 4px 8px;
+.elgg-button-submit.elgg-state-disabled,
+.elgg-button-action.elgg-state-disabled {
+	color: #999;
+	cursor: default;
+}
+
+.elgg-button-cancel {
+	color: #333;
+	background-color: #999;
+	border: 1px solid #999;
+}
+.elgg-button-cancel:hover {
+	color: #222;
+	background-color: #666;
+	text-decoration: none;
+}
+
+.elgg-form-useradd input[type=text],
+.elgg-form-useradd input[type=password] {
+	width: 300px;
+}
+
+.elgg-form-settings {
+	max-width: 800px;
+}
+
+/* **************************************
+     DATE PICKER
+*************************************** */
+.ui-datepicker {
+	margin-top: 3px;
+	padding: 3px 3px 0;
+	border: 1px solid #ccc;
+	background-color: white;
+}
+.ui-datepicker-header {
+	padding: 2px 0;
+	border: 1px solid #ccc;
+	background-color: #eee;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+}
+.ui-datepicker-prev, .ui-datepicker-next {
+	position: absolute;
+	top: 9px;
+	cursor: pointer;
+}
+.ui-datepicker-prev {
+	left: 6px;
+}
+.ui-datepicker-next {
+	right: 6px;
+}
+.ui-datepicker-title {
+	line-height: 1.8em;
+	margin: 0 30px;
+	text-align: center;
+	font-weight: bold;
+}
+.ui-datepicker-calendar {
+	margin-bottom: 2px;
+}
+.ui-datepicker th {
+	border: none;
+	font-weight: bold;
+	padding: 5px 6px;
+	text-align: center;
+}
+.ui-datepicker td {
+	padding: 1px;
+}
+.ui-datepicker td span, .ui-datepicker td a {
+	display: block;
+	padding: 2px;
+	line-height: 1.2em;
+	text-align: right;
+	text-decoration: none;
+}
+.ui-datepicker-calendar .ui-state-default {
+	border: 1px solid #ccc;
+	color: #555;
+	background: #fafafa;
+}
+.ui-datepicker-calendar .ui-state-hover {
+	border: 1px solid #aaa;
+	color: #333;
+	background: #ccc;
+}
+.ui-datepicker-calendar .ui-state-active,
+.ui-datepicker-calendar .ui-state-active.ui-state-hover {
+	font-weight: bold;
+	border: 1px solid #999;
+	color: #333;
+	background: #ddd;
+}
+
+/* ***************************************
+	AUTOCOMPLETE
+*************************************** */
+<?php //autocomplete will expand to fullscreen without max-width ?>
+.ui-autocomplete {
+	position: absolute;
+	cursor: default;
+}
+.elgg-autocomplete-item .elgg-body {
+	max-width: 600px;
+}
+.ui-autocomplete {
+	background-color: white;
+	border: 1px solid #ccc;
+	overflow: hidden;
+
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.ui-autocomplete .ui-menu-item {
+	padding: 0px 4px;
+
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.ui-autocomplete .ui-menu-item:hover {
+	background-color: #eee;
+}
+.ui-autocomplete a:hover {
+	text-decoration: none;
+	color: #4690D6;
+}
+.ui-autocomplete a.ui-state-hover {
+	background-color: #eee;
+	display: block;
+}
+
+/* ***************************************
+	USER PICKER
+*************************************** */
+.elgg-user-picker-list li:first-child {
+	border-top: 1px dotted #ccc;
+	margin-top: 5px;
+}
+.elgg-user-picker-list > li {
+	border-bottom: 1px dotted #ccc;
+}
+
+/* ***************************************
+	FRIENDS PICKER
+*************************************** */
+.friends-picker-main-wrapper {
+	margin-bottom: 15px;
+}
+.friends-picker-container h3 {
+	font-size:4em !important;
+	text-align: left;
+	margin:10px 0 20px !important;
+	color:#999 !important;
+	background: none !important;
+	padding:0 !important;
+}
+.friends-picker .friends-picker-container .panel ul {
+	text-align: left;
+	margin: 0;
+	padding:0;
+}
+.friends-picker-wrapper {
+	margin: 0;
+	padding:0;
+	position: relative;
+	width: 730px;
+}
+.friends-picker {
+	position: relative;
+	overflow: hidden;
+	margin: 0;
+	padding:0;
+	width: 730px;
+	height: auto;
+	background-color: #dedede;
+
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+}
+.friendspicker-savebuttons {
+	background: white;
+
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+
+	margin:0 10px 10px;
+}
+.friends-picker .friends-picker-container { /* long container used to house end-to-end panels. Width is calculated in JS  */
+	position: relative;
+	left: 0;
+	top: 0;
+	width: 100%;
+	list-style-type: none;
+}
+.friends-picker .friends-picker-container .panel {
+	float:left;
+	height: 100%;
+	position: relative;
+	width: 730px;
+	margin: 0;
+	padding:0;
+}
+.friends-picker .friends-picker-container .panel .wrapper {
+	margin: 0;
+	padding:4px 10px 10px 10px;
+	min-height: 230px;
+}
+.friends-picker-navigation {
+	margin: 0 0 10px;
+	padding:0 0 10px;
+	border-bottom:1px solid #ccc;
+}
+.friends-picker-navigation ul {
+	list-style: none;
+	padding-left: 0;
+}
+.friends-picker-navigation ul li {
+	float: left;
+	margin:0;
+	background:white;
+}
+.friends-picker-navigation a {
+	font-weight: bold;
+	text-align: center;
+	background: white;
+	color: #999;
+	text-decoration: none;
+	display: block;
+	padding: 0;
+	width:20px;
+
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.tabHasContent {
+	background: white;
+	color:#333 !important;
+}
+.friends-picker-navigation li a:hover {
+	background: #333;
+	color:white !important;
+}
+.friends-picker-navigation li a.current {
+	background: #4690D6;
+	color:white !important;
+}
+.friends-picker-navigation-l, .friends-picker-navigation-r {
+	position: absolute;
+	top: 46px;
+	text-indent: -9000em;
 }
+.friends-picker-navigation-l a, .friends-picker-navigation-r a {
+	display: block;
+	height: 40px;
+	width: 40px;
+}
+.friends-picker-navigation-l {
+	right: 48px;
+	z-index:1;
+}
+.friends-picker-navigation-r {
+	right: 0;
+	z-index:1;
+}
+.friends-picker-navigation-l {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat left top;
+}
+.friends-picker-navigation-r {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat -60px top;
+}
+.friends-picker-navigation-l:hover {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat left -44px;
+}
+.friends-picker-navigation-r:hover {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat -60px -44px;
+}
+.friendspicker-savebuttons .elgg-button-submit,
+.friendspicker-savebuttons .elgg-button-cancel {
+	margin:5px 20px 5px 5px;
+}
+.friendspicker-members-table {
+	background: #dedede;
+
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+
+	margin:10px 0 0;
+	padding:10px 10px 0;
+}
+
 /* ***************************************
 	PAGINATION
 *************************************** */
@@ -491,14 +818,13 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 	color: white;
 	text-decoration: none;
 }
-
-.elgg-pagination .elgg-state-disabled {
+.elgg-pagination .elgg-state-disabled span {
 	color: #CCC;
 	border-color: #CCC;
 }
-.elgg-pagination .elgg-state-selected {
-	color: #555;
-	border-color: #555;
+.elgg-pagination .elgg-state-selected span {
+	color: #000;
+	border-color: #ccc;
 }
 
 /* ***************************************
@@ -540,176 +866,100 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 }
 
 /* ***************************************
-	WIDGETS
+	SIDEBAR MENU
 *************************************** */
-.elgg-widgets {
-	float: right;
-	min-height: 30px;
-}
-.elgg-widget-add-control {
-	text-align: right;
-	margin: 5px 5px 15px;
-}
-.elgg-widgets-add-panel {
-	padding: 10px;
-	margin: 0 5px 15px;
-	background: #eee;
-	border: 1px solid #ccc;
-}
-
-<?php //@todo location-dependent style: make an extension of elgg-gallery ?>
-.elgg-widgets-add-panel ul {
-	padding: 0;
-	margin: 0;
-}
-.elgg-widgets-add-panel li {
-	float: left;
-	margin: 2px 10px;
-	list-style: none;
-	width: 200px;
-	padding: 4px;
-	background-color: #eee;
-	border: 1px solid #ccc;
-	font-weight: bold;
-}
-.elgg-widgets-add-panel li a {
+.elgg-admin-sidebar-menu a {
+	border: 1px solid red;
 	display: block;
-}
-
-.elgg-module-widget {
-	background-color: #dedede;
-	padding: 1px;
-	margin: 0 5px 15px;
-	position: relative;
-}
-.elgg-module-widget:hover {
-	background-color: #ccc;
-}
-.elgg-module-widget > .elgg-head {
-	background-color: #f5f5f5;
-	height: 30px;
-	line-height: 30px;
-	overflow: hidden;
-}
-.elgg-module-widget > .elgg-head h3 {
-	float: left;
-	padding: 0 45px 0 20px;
+	padding: 5px;
 	color: #333;
-}
-.elgg-module-widget > .elgg-head a {
-	position: absolute;
-	top: 5px;
-	display: inline-block;
-	width: 18px;
-	height: 18px;
-	padding: 2px 2px 0 0;
-	border: 1px solid transparent;
-}
+	cursor: pointer;
+	text-decoration: none;
+	margin-bottom: 2px;
+	border: 1px solid #CCC;
 
-.elgg-widget-collapse-button {
-	left: 5px;
-	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 0px -385px;
-}
-.elgg-widget-collapsed {
-	background-position: 0px -365px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
 }
-.elgg-widget-delete-button {
-	right: 5px;
+.elgg-admin-sidebar-menu a:hover {
+	text-decoration: none;
+	background: black;
+	color: white;
+	border: 1px solid black;
 }
-.elgg-widget-edit-button {
-	right: 25px;
+.elgg-admin-sidebar-menu li.elgg-state-selected > a {
+	background-color: #BBB;
 }
-.elgg-module-widget .elgg-widget-edit-button:hover, 
-.elgg-module-widget .elgg-widget-delete-button:hover {
-	border: 1px solid #ccc;
+.elgg-admin-sidebar-menu .elgg-menu-closed:before {
+	content: "\25B8";
+	padding-right: 4px;
 }
-.elgg-module-widget > .elgg-body {
-	border-top: 1px solid #dedede;
-	background-color: white;
-	width: 100%;
-	overflow: hidden;
+.elgg-admin-sidebar-menu .elgg-menu-opened:before {
+	content: "\25BE";
+	padding-right: 4px;
 }
-.elgg-widget-edit {
+.elgg-admin-sidebar-menu .elgg-child-menu {
 	display: none;
-	width: 96%;
-	padding: 2%;
-	border-bottom: 1px solid #dedede;
+	padding-left: 30px;
 }
-.elgg-widget-content {
-	padding: 10px;
+.elgg-admin-sidebar-menu li.elgg-state-selected > ul {
+	display: block;
 }
-.elgg-widget-placeholder {
-	border: 2px dashed #dedede;
-	margin-bottom: 15px;
+.elgg-admin-sidebar-menu h2 {
+	padding-bottom: 5px;
 }
-
-
-
-
-.elgg-subtext {
-	color: #666;
-	font-size: 85%;
-	line-height: 1.2em;
-	font-style: italic;
-	margin-bottom: 5px;
+.elgg-admin-sidebar-menu ul.elgg-menu-page {
+	padding-bottom: 15px;
 }
 
-.avatar_menu_button {
-	display: none;
+/* ***************************************
+	TITLE MENU
+*************************************** */
+.elgg-menu-title {
+	float: right;
+}
+.elgg-menu-title > li {
+	display: inline-block;
+	margin-left: 4px;
 }
 
-<?php // @todo clean up and figure out what admin css needs ?>
-.elgg-avatar {
-	position: relative;
+/* ***************************************
+	FOOTER MENU
+*************************************** */
+.elgg-menu-footer {
+	color: gray;
 }
-.elgg-avatar > a > img {
-	display: block;
+.elgg-menu-footer li {
+	float: left;
 }
-.elgg-avatar-tiny > a > img {
-	width: 25px;
-	height: 25px;
-	
-	/* remove the border-radius if you don't want rounded avatars in supported browsers */
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;
-	
-	-moz-background-clip:  border;
-	background-clip:  border;
-
-	-webkit-background-size: 25px;
-	-khtml-background-size: 25px;
-	-moz-background-size: 25px;
-	-o-background-size: 25px;
-	background-size: 25px;
+.elgg-menu-footer li:after {
+	content: "\007C";
+	display: inline-block;
+	padding: 0 4px 0 4px;
+	font-weight: normal;
 }
-.elgg-avatar-small > a > img {
-	width: 40px;
-	height: 40px;
-	
-	/* remove the border-radius if you don't want rounded avatars in supported browsers */
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	
-	-moz-background-clip:  border;
-	background-clip:  border;
-
-	-webkit-background-size: 40px;
-	-khtml-background-size: 40px;
-	-moz-background-size: 40px;
-	-o-background-size: 40px;
-	background-size: 40px;
+.elgg-menu-footer li:last-child:after {
+	content: "";
 }
-.elgg-avatar-medium > a > img {
-	width: 100px;
-	height: 100px;
+
+/* ***************************************
+	GENERAL MENU
+*************************************** */
+.elgg-menu-general > li,
+.elgg-menu-general > li > a {
+	display: inline-block;
+	color: #999;
 }
-.elgg-avatar-large > a > img {
-	width: 200px;
-	height: 200px;
+
+.elgg-menu-general > li:after {
+	content: "\007C";
+	padding: 0 4px;
 }
 
+/* ***************************************
+	HOVER MENU
+*************************************** */
 .elgg-menu-hover {
 	display: none;
 	position: absolute;
@@ -719,7 +969,7 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 	border: solid 1px #E5E5E5;
 	border-color: #E5E5E5 #999 #999 #E5E5E5;
 	background-color: #FFF;
-	
+
 	-webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
 	-moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
 	box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
@@ -751,405 +1001,194 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 }
 
 /* ***************************************
-	GENERAL FORM ELEMENTS
+	ENTITY MENU
 *************************************** */
-
-
-/* default elgg core input field classes */
-.input-text,
-.input-tags,
-.input-url,
-.input-textarea {
-	width:98%;
-}
-.admin_area .input-access {
-	margin:5px 0 0 0;
-}
-.admin_area .input-password {
-	width:200px;
-}
-.admin_area .input-textarea {
-	height: 200px;
-	width:718px;
-}
-.admin_area input[type="checkbox"],
-.admin_area input.input-radio {
-	margin:0 3px 0 0;
-	padding:0;
-	border:none;
-}
-.admin_area input {
-	font: 120% Arial, Helvetica, sans-serif;
-	padding: 5px;
-	border: 1px solid #ccc;
-	color:#666;
-	
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-.admin_area textarea {
-	font: 120% Arial, Helvetica, sans-serif;
-	border: solid 1px #ccc;
-	padding: 5px;
-	color:#666;
-	
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
+<?php // height depends on line height/font size ?>
+.elgg-menu-entity, .elgg-menu-annotation {
+	float: right;
+	margin-left: 15px;
+	font-size: 90%;
+	color: #666;
+	line-height: 16px;
+	height: 16px;
 }
-.admin_area textarea:focus,
-.admin_area input[type="text"]:focus {
-	border: solid 1px #666;
-	background: #f5f5f5;
-	color:#333;
+.elgg-menu-entity > li, .elgg-menu-annotation > li {
+	margin-left: 15px;
 }
-.admin_area .input-textarea.monospace {
-	font-family:Monaco,"Courier New",Courier,monospace;
-	font-size:13px;
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
+	color: #aaa;
 }
-a.elgg-longtext-control {
-	float: right;
-	margin-left: 14px;
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
+	display: block;
 }
-.admin_area .elgg-button-submit {
-	font-size: 14px;
-	font-weight: bold;
-	color: white;
-	text-shadow:1px 1px 0px black;
-	text-decoration:none;
-	border: 1px solid #0054A7;
-	background: #0054A7 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
-	
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	
-	width: auto;
-	padding: 2px 4px;
-	margin:0 10px 10px 0;
-	cursor: pointer;
-	
-	-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
-	-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
-	box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
+.elgg-menu-entity > li > span, .elgg-menu-annotation > li > span {
+	vertical-align: baseline;
 }
-.admin_area .elgg-button-submit:hover {
-	color: white;
-	border-color: #333;
-	text-decoration:none;
-	background: #333 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
+
+/* ***************************************
+	WIDGET MENU
+*************************************** */
+.elgg-menu-widget > li {
+	position: absolute;
+	top: 4px;
+	display: inline-block;
+	width: 18px;
+	height: 18px;
+	padding: 2px 2px 0 0;
 }
-.admin_area input[type="password"]:focus {
-	border: solid 1px #666;
-	background-color: #f5f5f5;
-	color: #333;
+.elgg-menu-widget > .elgg-menu-item-collapse {
+	left: 5px;
 }
-.admin_area input[type="submit"] {
-	font-size: 14px;
-	font-weight: bold;
-	color: white;
-	text-shadow:1px 1px 0px black;
-	text-decoration:none;
-	border: 1px solid #0054A7;
-	background: #0054A7 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
-	
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	
-	width: auto;
-	padding: 2px 4px;
-	margin:10px 0 10px 0;
-	cursor: pointer;
-	outline: none;
-	
-	-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
-	-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
-	box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
+.elgg-menu-widget > .elgg-menu-item-delete {
+	right: 5px;
 }
-.admin_area input[type="submit"]:hover {
-	border-color: #333;
-	text-decoration:none;
-	background: #333 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
+.elgg-menu-widget > .elgg-menu-item-settings {
+	right: 25px;
 }
-.admin_area .elgg-button-cancel {
-	font-size: 14px;
-	font-weight: bold;
-	text-decoration:none;
-	color: #333;
-	background: #ddd url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
-	border: 1px solid #999;
-	
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	
-	width: auto;
-	padding: 2px 4px;
-	margin:10px 0 10px 10px;
-	cursor: pointer;
+
+/* ***************************************
+	MORE MENUS
+*************************************** */
+/* Horizontal menus w/ separator support */
+.elgg-menu-hz > li,
+.elgg-menu-hz > li:after,
+.elgg-menu-hz > li > a {
+	display: inline-block;
+	vertical-align: middle;
 }
-.admin_area .elgg-button-cancel:hover {
-	background-color: #999;
-	background-position:  left 10px;
-	text-decoration:none;
-	color:white;
+/* Allow inline image blocks in horizontal menus */
+.elgg-menu-hz .elgg-body:after {
+	content: '.';
 }
-.admin_area .content-header-options .elgg-button-action {
-	margin-top:0;
-	margin-left:10px;
+.elgg-menu > li:last-child::after {
+	display: none;
 }
-.admin_area input.elgg-button-action,
-.admin_area a.elgg-button-action {
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	
-	background: #ccc url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif) repeat-x 0 0;
-	border:1px solid #999;
-	color:#333;
-	padding:2px 15px;
-	text-align:center;
-	font-weight:bold;
-	text-decoration:none;
-	text-shadow:0 1px 0 white;
-	cursor:pointer;
-	
-	-webkit-box-shadow: none;
-	-moz-box-shadow: none;
-	box-shadow: none;
-}
-.admin_area input.elgg-button-action:hover,
-.admin_area a.elgg-button-action:hover,
-.admin_area input.elgg-button-action:focus,
-.admin_area a.elgg-button-action:focus {
-	background-position:0 -15px;
-	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
-	background-repeat:  repeat-x;
-	color:#111;
-	text-decoration: none;
-	background-color:#ccc;
-	border:1px solid #999;
+.elgg-menu-admin-footer a {
+	color: #eee;
 }
-.admin_area .elgg-button-action:active {
-	background-image:none;
+.elgg-menu-admin-footer > li {
+	padding-right: 25px;
 }
-.admin_area .elgg-button-action.elgg-state-disabled {
-	color:#999;
-	padding:2px 7px;
+.elgg-menu-longtext {
+	float: right;
 }
-.admin_area .elgg-button-action.elgg-state-disabled:hover {
-	background-position:0 -15px;
-	color:#111;
-	border:1px solid #999;
+.elgg-menu-metadata {
+	list-style-type: none;
+	float: right;
+	margin-left: 15px;
+	font-size: 90%;
 }
-.admin_area .elgg-button-action.elgg-state-disabled:active {
-	background-image:none;
+.elgg-menu-metadata > li {
+	float: left;
+	margin-left: 15px;
 }
-.admin_area .elgg-button-action.download {
-	padding: 5px 9px 5px 6px;
+.elgg-menu-metadata, .elgg-menu-metadata a {
+	color: #aaa;
 }
-.admin_area .elgg-button-action.download:hover {
 
+/* ***************************************
+	WIDGETS
+*************************************** */
+.elgg-widgets {
+	float: right;
+	min-height: 30px;
 }
-.admin_area .elgg-button-action.download img {
-	margin-right:6px;
-	position:relative;
-	top:5px;
-}
-.admin_area .elgg-button-action.small {
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;
-	
-	width: auto;
-	height:8px;
-	padding: 4px;
-	font-size: 0.9em;
-	line-height: 0.6em;
+.elgg-widget-add-control {
+	text-align: right;
+	margin: 5px 5px 15px;
 }
-.admin_area .elgg-button-action.small:hover {
-	background-color: #0054A7;
-	background-image: none;
-	border-color: #0054A7;
-	color:white;
-	text-shadow:0 -1px 0 #999;
+.elgg-widgets-add-panel {
+	padding: 10px;
+	margin: 0 5px 15px;
+	background: #eee;
+	border: 1px solid #ccc;
 }
-
-
-.manifest_file {
-	background-color:#eee;
-	
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	border-radius: 8px;
-	
-	padding:5px 10px;
-	margin:4px 0;
+.elgg-widgets-add-panel ul {
+	padding: 0;
+	margin: 0;
 }
-
-
-.plugin_controls {
-	padding: 3px 3px 3px 0;
-	font-weight: bold;
+.elgg-widgets-add-panel li {
 	float: left;
-	width: 150px;
-}
-form.admin_plugins_simpleview .elgg-button-submit {
-	margin-right:20px;
+	margin: 2px 10px;
+	list-style: none;
+	width: 200px;
+	padding: 4px;
+	background-color: #eee;
+	border: 1px solid #ccc;
+	font-weight: bold;
 }
-.plugin_info {
-	margin: 3px;
-	padding-left: 150px;
+.elgg-widgets-add-panel li a {
 	display: block;
 }
-.plugin_metadata {
-	display:block;
-	color:#999;
-}
-.plugin_name input[type="checkbox"] {
-	margin-right: 10px;
+.elgg-widget-single.elgg-state-available {
+	color: #333;
+	cursor: pointer;
 }
-ul.admin_plugins {
-	margin-bottom:0;
-	padding-left:0;
-	list-style: none;
+.elgg-widget-single.elgg-state-available:hover {
+	border-color: #aaa;
 }
-.elgg-plugin {
-	border:1px solid #999;
-	margin:0 0 5px;
-	padding:0 7px 4px 10px;
-	
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
+.elgg-widget-single.elgg-state-unavailable {
+	color: #888;
 }
 
-.elgg-plugin p {
-	margin:0;
-	padding:0;
+.elgg-module-widget {
+	background-color: #dedede;
+	padding: 1px;
+	margin: 0 5px 15px;
+	position: relative;
 }
-.elgg-plugin h3 {
-	color:black;
-	padding-bottom: 10px;
+.elgg-module-widget:hover {
+	background-color: #ccc;
 }
-.plugin_settings {
-	font-weight: normal;
+.elgg-module-widget > .elgg-head {
+	background-color: #f5f5f5;
+	height: 26px;
+	overflow: hidden;
 }
-
-.elgg-plugin-screenshot {
-	display: inline;
+.elgg-module-widget.elgg-state-draggable .elgg-widget-handle {
+	cursor: move;
 }
-.elgg-plugin-screenshot img {
-	border: 1px solid #999;
+.elgg-module-widget > .elgg-head h3 {
+	float: left;
+	padding: 4px 45px 0 20px;
+	color: #333;
 }
-.elgg-plugin-screenshot-lightbox {
-	display: block;
-	position: absolute;
-	width: 99%;
-	text-align: center;
-	background-color: white;
-	border: 1px solid #999;
-	
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	border-radius: 8px;
+
+.elgg-widget-collapse-button {
+	color: #c5c5c5;
+	text-decoration: none;
 }
-.elgg-plugin-screenshot-lightbox h2 {
-	color:black;
+a.elgg-widget-collapse-button:hover,
+a.elgg-widget-collapsed:hover {
+	color: #9d9d9d;
+	text-decoration: none;
 }
-
-.elgg-plugin.elgg-state-active {
-	background: white;
+a.elgg-widget-collapse-button:before {
+	content: "\25BC";
 }
-
-.admin_notices {
-	padding-bottom: 15px;
+a.elgg-widget-collapsed:before {
+	content: "\25BA";
 }
-.admin_notices p {
-	background-color:#BDE5F8;
-	color: black;
-	border: 1px solid blue;
-	font-weight: bold;
-	padding: 3px 0px 3px 10px;
-	
-	-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
-	-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
-	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
-	
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
+.elgg-module-widget > .elgg-body {
+	border-top: 1px solid #dedede;
+	background-color: white;
+	width: 100%;
+	overflow: hidden;
 }
-
-.admin_notices a {
-	float: right;
+.elgg-widget-edit {
+	display: none;
+	width: 96%;
+	padding: 2%;
+	border-bottom: 1px solid #dedede;
 }
-
-.add-user form {
-	width:300px;
+.elgg-widget-content {
+	padding: 10px;
+}
+.elgg-widget-placeholder {
+	border: 2px dashed #dedede;
+	margin-bottom: 15px;
 }
-
-/* ***************************************
-	Spacing (from OOCSS)
-*************************************** */
-.pan{padding:0}
-.pas{padding:5px}
-.pam{padding:10px}
-.pal{padding:20px}
-.ptn{padding-top:0}
-.pts{padding-top:5px}
-.ptm{padding-top:10px}
-.ptl{padding-top:20px}
-.prn{padding-right:0}
-.prs{padding-right:5px}
-.prm{padding-right:10px}
-.prl{padding-right:20px}
-.pbn{padding-bottom:0}
-.pbs{padding-bottom:5px}
-.pbm{padding-bottom:10px}
-.pbl{padding-bottom:20px}
-.pln{padding-left:0}
-.pls{padding-left:5px}
-.plm{padding-left:10px}
-.pll{padding-left:20px}
-.phn{padding-left:0;padding-right:0}
-.phs{padding-left:5px;padding-right:5px}
-.phm{padding-left:10px;padding-right:10px}
-.phl{padding-left:20px;padding-right:20px}
-.pvn{padding-top:0;padding-bottom:0}
-.pvs{padding-top:5px;padding-bottom:5px}
-.pvm{padding-top:10px;padding-bottom:10px}
-.pvl{padding-top:20px;padding-bottom:20px}
-.man{margin:0}
-.mas{margin:5px}
-.mam{margin:10px}
-.mal{margin:20px}
-.mtn{margin-top:0}
-.mts{margin-top:5px}
-.mtm{margin-top:10px}
-.mtl{margin-top:20px}
-.mrn{margin-right:0}
-.mrs{margin-right:5px}
-.mrm{margin-right:10px}
-.mrl{margin-right:20px}
-.mbn{margin-bottom:0}
-.mbs{margin-bottom:5px}
-.mbm{margin-bottom:10px}
-.mbl{margin-bottom:20px}
-.mln{margin-left:0}
-.mls{margin-left:5px}
-.mlm{margin-left:10px}
-.mll{margin-left:20px}
-.mhn{margin-left:0;margin-right:0}
-.mhs{margin-left:5px;margin-right:5px}
-.mhm{margin-left:10px;margin-right:10px}
-.mhl{margin-left:20px;margin-right:20px}
-.mvn{margin-top:0;margin-bottom:0}
-.mvs{margin-top:5px;margin-bottom:5px}
-.mvm{margin-top:10px;margin-bottom:10px}
-.mvl{margin-top:20px;margin-bottom:20px}
 
 /* ***************************************
 	GRID
@@ -1198,83 +1237,42 @@ ul.admin_plugins {
 /* ***************************************
 	ICONS
 *************************************** */
-
 .elgg-icon {
-	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left;
+	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/admin_sprites.png) no-repeat left;
 	width: 16px;
 	height: 16px;
-	display: block;
-	float: left;
+	display: inline-block;
 	margin: 0 2px;
+	vertical-align: text-bottom;
 }
-.elgg-icon-settings {
-	background-position: -302px -44px;
-}
-.elgg-icon-friends {
-	background-position: 0 -300px;
-	width: 36px;
-}
-.elgg-icon-friends:hover {
-	background-position: 0 -340px;
-}
-.elgg-icon-help {
-	background-position: -302px -136px;
-}
-.elgg-icon-delete {
-	background-position: -199px 1px;
-}
-.elgg-icon-delete:hover {
-	background-position: -199px -15px;
-}
-.elgg-icon-thumbs-up {
-	background-position: 0px -101px;
-	width: 20px;
-	height: 20px;
-}
-.elgg-icon-thumbs-up:hover {
-	background-position: 0px -131px;
-}
-.elgg-icon-thumbs-up-alt {
-	background-position: 0px -131px;
-	width: 20px;
-	height: 20px;
-}
-.elgg-icon-arrow-s {
-	background-position: -146px -56px;
+.elgg-module .elgg-head .elgg-icon {
+	vertical-align: baseline;
 }
-.elgg-icon-arrow-s:hover {
-	background-position: -146px -76px;
+.elgg-icon-delete:hover,
+.elgg-icon-delete-alt:hover {
+	background-position: 0 -0px;
 }
-.elgg-icon-following {
-	background-position: -35px -100px;
-	width: 22px;
-	height: 20px;
+.elgg-icon-delete,
+.elgg-icon-delete-alt {
+	background-position: 0 -18px;
 }
-.elgg-icon-rss {
-	background-position: -249px 1px;
+.elgg-icon-drag-arrow:hover {
+	background-position: 0 -36px;
 }
-.elgg-icon-hover-menu {
-	background-position: -150px 0;
+.elgg-icon-drag-arrow {
+	background-position: 0 -54px;
 }
 .elgg-icon-hover-menu:hover {
-	background-position: -150px -32px;
+	background-position: 0 -72px;
 }
-.elgg-icon-dragger {
-	background-position: -302px -186px;
-	width: 21px;
-	height: 21px;
+.elgg-icon-hover-menu {
+	background-position: 0 -90px;
 }
-.elgg-icon-gear {
-	background-position: -300px -2px;
+.elgg-icon-settings-alt:hover {
+	background-position: 0 -108px;
 }
-
-.elgg-avatar > .elgg-icon-hover-menu {
-	display: none;
-	position: absolute;
-	right: 0;
-	bottom: 0;
-	margin: 0;
-	cursor: pointer;
+.elgg-icon-settings-alt {
+	background-position: 0 -126px;
 }
 
 .elgg-ajax-loader {
@@ -1288,6 +1286,7 @@ ul.admin_plugins {
 *************************************** */
 .elgg-avatar {
 	position: relative;
+	display: inline-block;
 }
 .elgg-avatar > a > img {
 	display: block;
@@ -1336,112 +1335,343 @@ ul.admin_plugins {
 	width: 200px;
 	height: 200px;
 }
+.elgg-avatar > .elgg-icon-hover-menu {
+	display: none;
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	margin: 0;
+	cursor: pointer;
+}
+.elgg-avatar {
+	position: relative;
+}
+.elgg-avatar > a > img {
+	display: block;
+}
+.elgg-avatar-tiny > a > img {
+	width: 25px;
+	height: 25px;
 
+	/* remove the border-radius if you don't want rounded avatars in supported browsers */
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
 
-.elgg-menu-metadata {
-	list-style-type: none;
-	float: right;
-	margin-left: 15px;
-	font-size: 90%;
-}
-.elgg-menu-metadata > li {
-	float: left;
-	margin-left: 15px;
+	-moz-background-clip:  border;
+	background-clip:  border;
+
+	-webkit-background-size: 25px;
+	-khtml-background-size: 25px;
+	-moz-background-size: 25px;
+	-o-background-size: 25px;
+	background-size: 25px;
 }
+.elgg-avatar-small > a > img {
+	width: 40px;
+	height: 40px;
 
-.right {float:right}
-.elgg-toggle {cursor:pointer}
+	/* remove the border-radius if you don't want rounded avatars in supported browsers */
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
 
-/* ***************************************
-	FOOTER
-*************************************** */
-.elgg-menu-footer {color:gray}
+	-moz-background-clip:  border;
+	background-clip:  border;
 
-.elgg-menu-footer li {
-	float: left;
+	-webkit-background-size: 40px;
+	-khtml-background-size: 40px;
+	-moz-background-size: 40px;
+	-o-background-size: 40px;
+	background-size: 40px;
 }
-.elgg-menu-footer li:after{
-	content: "\007C";
-	display: inline-block;
-	padding: 0 4px 0 4px;
-	font-weight: normal;
+.elgg-avatar-medium > a > img {
+	width: 100px;
+	height: 100px;
 }
-.elgg-menu-footer li:last-child:after {
-	content: "";
+.elgg-avatar-large > a > img {
+	width: 200px;
+	height: 200px;
 }
 
 /* ***************************************
-	STATES
-*************************************** */
+	PLUGINS
+**************************************** */
+.elgg-plugin {
+	border: 1px solid #999;
+	margin: 0 0 5px;
+	padding: 0 7px 4px 10px;
 
-.elgg-state-active {
-	background:#ccc;
-	color: #333;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.elgg-plugin.elgg-state-draggable > .elgg-image-block .elgg-head {
+	cursor: move;
+}
+.elgg-plugin p {
+	margin: 0;
+}
+.elgg-plugin h3 {
+	color: black;
+	padding-bottom: 10px;
 }
+.elgg-plugin-settings {
+	font-weight: normal;
+	font-size: 0.9em;
+}
+.elgg-plugin-screenshot {
+	display: inline;
+}
+.elgg-plugin-screenshot img {
+	border: 1px solid #999;
+}
+.elgg-plugin-screenshot-lightbox {
+	display: block;
+	position: absolute;
+	width: 99%;
+	text-align: center;
+	background-color: white;
+	border: 1px solid #999;
 
-.elgg-state-inactive {
-	background:#dedede;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+}
+.elgg-plugin-screenshot-lightbox h2 {
+	color: black;
 }
+.elgg-plugin.elgg-state-active {
+	background: white;
+}
+.elgg-plugin.elgg-state-inactive {
+	background: #dedede;
+}
+.elgg-plugin .elgg-state-error {
+	background: #fbe3e4;
+	color: #8a1f11;
+	border-color: #fbc2c4;
+	font-weight: bold;
+}
+.elgg-plugin .elgg-state-warning {
+	background: #fbedb5;
+	color: #000000;
+	border-color: #fbe58b;
+	font-weight: bold;
+}
+.elgg-plugin-more {
+	background-color: #eee;
 
-.elgg-state-available {
-	color: #333;
-	cursor: pointer;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+
+	padding: 5px 10px;
+	margin: 4px 0;
+}
+ul.elgg-plugin-categories, ul.elgg-plugin-categories > li,
+ul.elgg-plugin-resources, ul.elgg-plugin-resources > li {
+	display: inline;
+}
+.elgg-plugin-category-bundled {
+	border-width: 2px;
+	border-color: #0054A7;
 }
 
-.elgg-state-available:hover {
-	border-color: #aaa;
+/****************************************
+	MARKDOWN
+****************************************/
+.elgg-markdown {
+	margin: 15px;
+}
+.elgg-markdown h1,
+.elgg-markdown h2,
+.elgg-markdown h3,
+.elgg-markdown h4,
+.elgg-markdown h5,
+.elgg-markdown h6 {
+	margin: 1em 0 1em -15px;
+	color: #333;
+}
+.elgg-markdown ol {
+	list-style: decimal;
+	padding-left: 2em;
+}
+.elgg-markdown ul {
+	list-style: disc;
+	padding-left: 2em;
+}
+.elgg-markdown p {
+	margin: 15px 0;
 }
 
-.elgg-state-unavailable {
-	color: #888;
+/* ***************************************
+	MISC
+*************************************** */
+.elgg-content-thin {
+	max-width: 600px;
 }
 
-.elgg-state-success {
-	background: #e6efc2;
-	color: #264409;
-	border-color: #c6d880;
+.elgg-subtext {
+	color: #666;
+	font-size: 85%;
+	line-height: 1.2em;
+	font-style: italic;
+	margin-bottom: 5px;
 }
 
-.elgg-state-error {
-	background: #fbe3e4;
-	color: #8a1f11;
-	border-color: #fbc2c4;
-	font-weight: bold;
+.elgg-text-help {
+	display: block;
+	font-size: 85%;
+	font-style: italic;
 }
 
-p.elgg-state-error {
-	padding: 5px;
+.elgg-longtext-control {
+	margin-left: 14px;
+	font-size: 80%;
+	cursor: pointer;
 }
 
-<?php //@todo elgg-drag-handle instead? ?>
-.elgg-state-draggable .elgg-head {
-	cursor: move;
+table.mceLayout {
+	width:100% !important;
 }
 
-<?php //What to do with states that don't have default styles? ?>
-.elgg-state-selected {}
-.elgg-state-disabled {}
+.elgg-output dt {
+	font-weight: bold;
+}
+.elgg-output dd {
+	margin: 0 0 1em 2em;
+}
 
 /* ***************************************
-	Footer and horizontal menus
+    SITE SECRET
 *************************************** */
+.elgg-form-admin-site-regenerate-secret table {
+	width: 60%;
+	margin: 1em auto;
+}
+td.elgg-strength-strong,
+td.elgg-strength-strong h4 {
+	background: #DFF0D8; color: #468847;
+}
+td.elgg-strength-moderate,
+td.elgg-strength-moderate h4 {
+	background: #FCF8E3; color: #C09853;
+}
+td.elgg-strength-weak,
+td.elgg-strength-weak h4 {
+	background: #F2DEDE; color: #B94A48;
+}
 
-/* Horizontal menus w/ separator support */
-.elgg-menu-hz > li,
-.elgg-menu-hz > li:after,
-.elgg-menu-hz > li > a {
-	display:inline-block;
-	vertical-align:middle;
+/* ***************************************
+	HELPERS
+*************************************** */
+.hidden {
+	display: none;
+}
+.centered {
+	margin: 0 auto;
+}
+.center {
+	text-align: center;
+}
+.float {
+	float: left;
+}
+.float-alt {
+	float: right;
+}
+.elgg-toggle {
+	cursor: pointer;
+}
+.elgg-discover .elgg-discoverable {
+	display: none;
+}
+.elgg-discover:hover .elgg-discoverable {
+	display: block;
+}
+.elgg-transition:hover {
+	opacity: .7;
 }
 
-/* Allow inline image blocks in horizontal menus */
-.elgg-menu-hz .elgg-body:after {
-	content: '.';
+/* ***************************************
+	BORDERS AND SEPARATORS
+*************************************** */
+.elgg-border-plain {
+	border: 1px solid #eeeeee;
 }
-.elgg-menu-admin-footer a {
-	color: #eee;
+.elgg-border-transition {
+	border: 1px solid #eeeeee;
+}
+.elgg-divide-top {
+	border-top: 1px solid #CCCCCC;
+}
+.elgg-divide-bottom {
+	border-bottom: 1px solid #CCCCCC;
+}
+.elgg-divide-left {
+	border-left: 1px solid #CCCCCC;
+}
+.elgg-divide-right {
+	border-right: 1px solid #CCCCCC;
 }
 
-.elgg-menu-admin-footer > li {
-	padding-right: 25px;
-}
\ No newline at end of file
+/* ***************************************
+	SPACING (from OOCSS)
+*************************************** */
+.pan{padding:0}
+.pas{padding:5px}
+.pam{padding:10px}
+.pal{padding:20px}
+.ptn{padding-top:0}
+.pts{padding-top:5px}
+.ptm{padding-top:10px}
+.ptl{padding-top:20px}
+.prn{padding-right:0}
+.prs{padding-right:5px}
+.prm{padding-right:10px}
+.prl{padding-right:20px}
+.pbn{padding-bottom:0}
+.pbs{padding-bottom:5px}
+.pbm{padding-bottom:10px}
+.pbl{padding-bottom:20px}
+.pln{padding-left:0}
+.pls{padding-left:5px}
+.plm{padding-left:10px}
+.pll{padding-left:20px}
+.phn{padding-left:0;padding-right:0}
+.phs{padding-left:5px;padding-right:5px}
+.phm{padding-left:10px;padding-right:10px}
+.phl{padding-left:20px;padding-right:20px}
+.pvn{padding-top:0;padding-bottom:0}
+.pvs{padding-top:5px;padding-bottom:5px}
+.pvm{padding-top:10px;padding-bottom:10px}
+.pvl{padding-top:20px;padding-bottom:20px}
+.man{margin:0}
+.mas{margin:5px}
+.mam{margin:10px}
+.mal{margin:20px}
+.mtn{margin-top:0}
+.mts{margin-top:5px}
+.mtm{margin-top:10px}
+.mtl{margin-top:20px}
+.mrn{margin-right:0}
+.mrs{margin-right:5px}
+.mrm{margin-right:10px}
+.mrl{margin-right:20px}
+.mbn{margin-bottom:0}
+.mbs{margin-bottom:5px}
+.mbm{margin-bottom:10px}
+.mbl{margin-bottom:20px}
+.mln{margin-left:0}
+.mls{margin-left:5px}
+.mlm{margin-left:10px}
+.mll{margin-left:20px}
+.mhn{margin-left:0;margin-right:0}
+.mhs{margin-left:5px;margin-right:5px}
+.mhm{margin-left:10px;margin-right:10px}
+.mhl{margin-left:20px;margin-right:20px}
+.mvn{margin-top:0;margin-bottom:0}
+.mvs{margin-top:5px;margin-bottom:5px}
+.mvm{margin-top:10px;margin-bottom:10px}
+.mvl{margin-top:20px;margin-bottom:20px}
diff --git a/views/default/css/elements/buttons.php b/views/default/css/elements/buttons.php
index a6fd2f794..e9c99cf96 100644
--- a/views/default/css/elements/buttons.php
+++ b/views/default/css/elements/buttons.php
@@ -18,7 +18,7 @@
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
-	
+
 	width: auto;
 	padding: 2px 4px;
 	cursor: pointer;
diff --git a/views/default/css/elements/chrome.php b/views/default/css/elements/chrome.php
deleted file mode 100644
index d9db124d6..000000000
--- a/views/default/css/elements/chrome.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * Visual styling
- *
- * @package Elgg.Core
- * @subpackage UI
- */
-
-/* Colors:
-
-	#4690D6 - elgg light blue
-	#0054A7 - elgg dark blue
-	#e4ecf5 - elgg very light blue
-*/
-
-?>
-
-a {
-	color: #4690D6;
-}
-a:hover,
-a.selected {
-	color: #555555;
-	text-decoration: underline;
-}
-
-h1, h2, h3, h4, h5, h6 {
-	color: #0054A7;
-}
-p {
-	margin-bottom: 15px;
-}
-p:last-child {
-	margin-bottom: 0;
-}
-
-dt {
-	font-weight: bold;
-}
-dd {
-	margin: 0 0 1em 1em;
-}
-pre, code {
-	background:#EBF5FF;
-	color:#000000;
-	overflow:auto;
-
-	overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */
-
-	white-space: pre-wrap;
-	word-wrap: break-word; /* IE 5.5-7 */
-}
-code {
-	padding:2px 3px;
-}
-pre {
-	padding:3px 15px;
-	margin:0px 0 15px 0;
-	line-height:1.3em;
-}
-blockquote {
-	padding:3px 15px;
-	margin:0px 0 15px 0;
-	background:#EBF5FF;
-	border:none;
-	
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
-}
-
-h2 {
-	padding-bottom:5px;
-}
-
-.elgg-quiet {
-	color: #666;
-}
-
-.elgg-loud {
-	color: #0054A7;
-}
-
-.elgg-photo {
-	border: 1px solid #ccc;
-	padding: 3px;
-	background-color: white;
-}
-
-.elgg-comments {
-	margin-top: 25px;
-}
-.elgg-comments > form {
-	margin-top: 15px;
-}
-
-/* ***************************************
-	BORDERS AND SEPARATORS
-*************************************** */
-.elgg-border-plain {
-	border: 1px solid #eeeeee;
-}
-elgg-divide-top {
-	border-top: 1px solid #CCCCCC;
-}
-elgg-divide-bottom {
-	border-bottom: 1px solid #CCCCCC;
-}
-elgg-divide-left {
-	border-left: 1px solid #CCCCCC;
-}
-elgg-divide-right {
-	border-right: 1px solid #CCCCCC;
-}
-
-/* ***************************************
-	USER INPUT DISPLAY RESET
-*************************************** */
-.elgg-output {
-	margin-top: 10px;
-}
-.elgg-output ul, ol {
-	margin: 0 1.5em 1.5em 0;
-	padding-left: 1.5em;
-}
-.elgg-output ul {
-	list-style-type: disc;
-}
-.elgg-output ol {
-	list-style-type: decimal;
-}
-.elgg-output table {
-	border: 1px solid #ccc;
-}
-.elgg-output table td {
-	border: 1px solid #ccc;
-	padding: 3px 5px;
-}
diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index df1632db4..7fe535d57 100644
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -7,37 +7,9 @@
  * @package Elgg.Core
  * @subpackage UI
  */
-/**
- * elgg-body fills the space available to it.
- * It uses hidden text to expand itself. The combination of auto width, overflow
- * hidden, and the hidden text creates this effect.
- *
- * This allows us to float fixed width divs to either side of an .elgg-body div
- * without having to specify the body div's width.
- *
- * @todo check what happens with long <pre> tags or large images
- * @todo Move this to its own file -- it is very complicated and should not have to be overridden.
- */
 ?>
 
 /* ***************************************
-	Body
-*************************************** */
-.elgg-body {
-	width: auto;
-	word-wrap: break-word;
-	overflow: hidden;
-}
-.elgg-body:after {
-	display: block;
-	visibility: hidden;
-	height: 0 !important;
-	line-height: 0;
-	font-size: xx-large;
-	content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
-}
-
-/* ***************************************
 	Image Block
 *************************************** */
 .elgg-image-block {
@@ -64,10 +36,10 @@
 	border-bottom: 1px dotted #CCCCCC;
 }
 
-.elgg-list-item .elgg-subtext {
+.elgg-item .elgg-subtext {
 	margin-bottom: 5px;
 }
-.elgg-list-content {
+.elgg-item .elgg-content {
 	margin: 10px 5px;
 }
 
@@ -82,9 +54,12 @@
 .elgg-gallery td {
 	padding: 5px;
 }
-.elgg-gallery-fluid li {
+.elgg-gallery-fluid > li {
 	float: left;
 }
+.elgg-gallery-users > li {
+	margin: 0 2px;
+}
 
 /* ***************************************
 	Tables
@@ -110,7 +85,11 @@
 	width: 100%;
 	border-top: 1px solid #ccc;
 }
-.elgg-table-alt td {
+.elgg-table-alt th {
+	background-color: #eee;
+	font-weight: bold;
+}
+.elgg-table-alt td, .elgg-table-alt th {
 	padding: 2px 4px 2px 4px;
 	border-bottom: 1px solid #ccc;
 }
@@ -160,10 +139,10 @@
 /* ***************************************
 	River
 *************************************** */
-.elgg-river {
+.elgg-list-river {
 	border-top: 1px solid #CCC;
 }
-.elgg-river > li {
+.elgg-list-river > li {
 	border-bottom: 1px solid #CCC;
 }
 .elgg-river-item {
@@ -178,6 +157,9 @@
 	font-style: italic;
 	line-height: 1.2em;
 }
+
+.elgg-river-attachments,
+.elgg-river-message,
 .elgg-river-content {
 	border-left: 1px solid #CCC;
 	font-size: 85%;
@@ -185,9 +167,8 @@
 	margin: 8px 0 5px 0;
 	padding-left: 5px;
 }
-
-<?php //@todo location-dependent styles ?>
-.elgg-river-content .elgg-avatar {
+.elgg-river-attachments .elgg-avatar,
+.elgg-river-attachments .elgg-icon {
 	float: left;
 }
 .elgg-river-layout .elgg-input-dropdown {
@@ -255,7 +236,6 @@
 	-webkit-border-radius: 5px;
 	border-radius: 5px;
 	
-	display: none;
 	height: 30px;
 }
 .elgg-river-item input[type=text] {
@@ -265,21 +245,40 @@
 	margin: 0 0 0 10px;
 }
 
+
+/* **************************************
+	Comments (from elgg_view_comments)
+************************************** */
+.elgg-comments {
+	margin-top: 25px;
+}
+.elgg-comments > form {
+	margin-top: 15px;
+}
+
+/* ***************************************
+	Image-related
+*************************************** */
+.elgg-photo {
+	border: 1px solid #ccc;
+	padding: 3px;
+	background-color: white;
+}
+
 /* ***************************************
 	Tags
 *************************************** */
 .elgg-tags {
-	display: inline;
 	font-size: 85%;
 }
-.elgg-tags li {
-	display: inline;
+.elgg-tags > li {
+	float:left;
 	margin-right: 5px;
 }
-.elgg-tags li:after {
+.elgg-tags li.elgg-tag:after {
 	content: ",";
 }
-.elgg-tags li:last-child:after {
+.elgg-tags li.elgg-tag:last-child:after {
 	content: "";
 }
 .elgg-tagcloud {
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
new file mode 100644
index 000000000..74f21ee59
--- /dev/null
+++ b/views/default/css/elements/core.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Core CSS
+ * 
+ * This file holds all the complicated/hacky stuff that you really
+ * shouldn't touch or override unless you're sure you know what you're doing.
+ * 
+ * Provides classes that implement cross-browser support for the following features:
+ *   * clearfix
+ *   * fluid-width content area that doesn't wrap around floats
+ *   * menu's with separators
+ *   * inline-block
+ *   * horizontal menus
+ *   * fluid gallery without using tables
+ */
+?>
+
+/* Clearfix */
+.clearfix:after,
+.elgg-grid:after,
+.elgg-layout:after,
+.elgg-inner:after,
+.elgg-page-header:after,
+.elgg-page-footer:after,
+.elgg-head:after,
+.elgg-foot:after,
+.elgg-col:after,
+.elgg-image-block:after {
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;	
+}
+
+/* Fluid width container that does not wrap floats */
+.elgg-body,
+.elgg-col-last {
+	display: block;
+	width: auto;
+	word-wrap: break-word;
+	overflow: hidden;
+	
+	/* IE 6, 7 */
+	zoom:1;
+	*overflow:visible;
+}
+
+<?php
+/**
+ * elgg-body fills the space available to it.
+ * It uses hidden text to expand itself. The combination of auto width, overflow
+ * hidden, and the hidden text creates this effect.
+ *
+ * This allows us to float fixed width divs to either side of an .elgg-body div
+ * without having to specify the body div's width.
+ *
+ * @todo check what happens with long <pre> tags or large images
+ * @todo Move this to its own file -- it is very complicated and should not have to be overridden.
+ */
+
+//@todo isn't this only needed if we use display:table-cell?
+?>
+.elgg-body:after,
+.elgg-col-last:after {
+	display: block;
+	visibility: hidden;
+	height: 0 !important;
+	line-height: 0;
+	overflow: hidden;
+	
+	/* Stretch to fill up available space */
+	font-size: xx-large;
+	content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
+}
+
+/* ***************************************
+ * MENUS
+ *
+ * To add separators to a menu:
+ * .elgg-menu-$menu > li:after {content: '|'; background: ...;}
+ *************************************** */
+/* Enabled nesting of dropdown/flyout menus */
+.elgg-menu > li { position: relative; }
+
+.elgg-menu > li:last-child::after {
+	display: none;
+}
+
+/* Maximize click target */
+.elgg-menu > li > a { display: block }
+
+/* Horizontal menus w/ separator support */
+.elgg-menu-hz > li,
+.elgg-menu-hz > li:after,
+.elgg-menu-hz > li > a,
+.elgg-menu-hz > li > span {
+	vertical-align: middle;
+}
+
+/* Allow inline image blocks in horizontal menus */
+.elgg-menu-hz .elgg-body:after { content: '.'; }
+
+<?php //@todo This isn't going to work as-is.  Needs testing ?>
+/* Inline block */
+.elgg-gallery > li,
+.elgg-button,
+.elgg-icon,
+.elgg-menu-hz > li,
+.elgg-menu-hz > li:after,
+.elgg-menu-hz > li > a,
+.elgg-menu-hz > li > span {
+	/* Google says do this, but why? */
+	position: relative;
+
+	display: inline-block;
+}
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index d783b5123..068cc8fd6 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -16,6 +16,10 @@ fieldset > div {
 fieldset > div:last-child {
 	margin-bottom: 0;
 }
+.elgg-form-alt > fieldset > .elgg-foot {
+	border-top: 1px solid #CCC;
+	padding: 10px 0;
+}
 
 label {
 	font-weight: bold;
@@ -28,18 +32,16 @@ input, textarea {
 	color: #666;
 	font: 120% Arial, Helvetica, sans-serif;
 	padding: 5px;
-	width: 100%;
-	
+	width: 100%;	
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
-	
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }
 
-input:focus, textarea:focus {
+input[type=text]:focus, textarea:focus {
 	border: solid 1px #4690d6;
 	background: #e4ecf5;
 	color:#333;
@@ -67,17 +69,25 @@ input[type="radio"] {
 	margin:0 3px 0 0;
 	padding:0;
 	border:none;
+	border-radius:0;
 	width:auto;
 }
 .elgg-input-checkboxes.elgg-horizontal li,
-.elgg-input-radio.elgg-horizontal li {
+.elgg-input-radios.elgg-horizontal li {
 	display: inline;
 	padding-right: 10px;
 }
 
+.elgg-form-login, .elgg-form-account {
+	max-width: 450px;
+}
+
 /* ***************************************
 	FRIENDS PICKER
 *************************************** */
+.friends-picker-main-wrapper {
+	margin-bottom: 15px;
+}
 .friends-picker-container h3 {
 	font-size:4em !important;
 	text-align: left;
@@ -95,7 +105,7 @@ input[type="radio"] {
 	margin: 0;
 	padding:0;
 	position: relative;
-	width: 100%;
+	width: 730px;
 }
 .friends-picker {
 	position: relative;
@@ -225,16 +235,141 @@ input[type="radio"] {
 }
 
 /* ***************************************
+	AUTOCOMPLETE
+*************************************** */
+<?php //autocomplete will expand to fullscreen without max-width ?>
+.ui-autocomplete {
+	position: absolute;
+	cursor: default;
+}
+.elgg-autocomplete-item .elgg-body {
+	max-width: 600px;
+}
+.ui-autocomplete {
+	background-color: white;
+	border: 1px solid #ccc;
+	overflow: hidden;
+
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.ui-autocomplete .ui-menu-item {
+	padding: 0px 4px;
+	
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.ui-autocomplete .ui-menu-item:hover {
+	background-color: #eee;
+}
+.ui-autocomplete a:hover {
+	text-decoration: none;
+	color: #4690D6;
+}
+.ui-autocomplete a.ui-state-hover {
+	background-color: #eee;
+	display: block;
+}
+
+/* ***************************************
 	USER PICKER
 *************************************** */
+.elgg-user-picker-list li:first-child {
+	border-top: 1px dotted #ccc;
+	margin-top: 5px;
+}
+.elgg-user-picker-list > li {
+	border-bottom: 1px dotted #ccc;
+}
+
+/* ***************************************
+      DATE PICKER
+**************************************** */
+.ui-datepicker {
+	display: none;
+
+	margin-top: 3px;
+	width: 208px;
+	background-color: white;
+	border: 1px solid #0054A7;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	overflow: hidden;
+
+	-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+	-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+	box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+}
+.ui-datepicker-inline {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
 
-.user-picker .user-picker-entry {
-	clear:both;
-	height:25px;
-	padding:5px;
-	margin-top:5px;
-	border-bottom:1px solid #cccccc;
+.ui-datepicker-header {
+	position: relative;
+	background: #4690D6;
+	color: white;
+	padding: 2px 0;
+	border-bottom: 1px solid #0054A7;
+}
+.ui-datepicker-header a {
+	color: white;
+}
+.ui-datepicker-prev, .ui-datepicker-next {
+	position: absolute;
+	top: 5px;
+	cursor: pointer;
+}
+.ui-datepicker-prev {
+	left: 6px;
+}
+.ui-datepicker-next {
+	right: 6px;
+}
+.ui-datepicker-title {
+	line-height: 1.8em;
+	margin: 0 30px;
+	text-align: center;
+	font-weight: bold;
+}
+.ui-datepicker-calendar {
+	margin: 4px;
+}
+.ui-datepicker th {
+	color: #0054A7;
+	border: none;
+	font-weight: bold;
+	padding: 5px 6px;
+	text-align: center;
+}
+.ui-datepicker td {
+	padding: 1px;
+}
+.ui-datepicker td span, .ui-datepicker td a {
+	display: block;
+	padding: 2px;
+	line-height: 1.2em;
+	text-align: right;
+	text-decoration: none;
+}
+.ui-datepicker-calendar .ui-state-default {
+	border: 1px solid #ccc;
+	color: #4690D6;;
+	background: #fafafa;
+}
+.ui-datepicker-calendar .ui-state-hover {
+	border: 1px solid #aaa;
+	color: #0054A7;
+	background: #eee;
+}
+.ui-datepicker-calendar .ui-state-active,
+.ui-datepicker-calendar .ui-state-active.ui-state-hover {
+	font-weight: bold;
+	border: 1px solid #0054A7;
+	color: #0054A7;
+	background: #E4ECF5;
 }
-.user-picker-entry .elgg-button-delete {
-	margin-right:10px;
-}
\ No newline at end of file
diff --git a/views/default/css/elements/grid.php b/views/default/css/elements/grid.php
index 00cd448b9..fdbaf4aca 100644
--- a/views/default/css/elements/grid.php
+++ b/views/default/css/elements/grid.php
@@ -13,14 +13,6 @@
 /* ***************************************
 	GRID
 *************************************** */
-.elgg-grid:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
-
 .elgg-col {
 	float: left;
 }
@@ -60,18 +52,3 @@
 .elgg-col-5of6 {
 	width: 83.33%;
 }
-.elgg-col-last {
-	width: auto;
-	float: none;
-	display: table-cell;
-}
-.elgg-col-last:after {
-	clear: both;
-	display: block;
-	visibility: hidden;
-	overflow: hidden;
-	height: 0 !important;
-	line-height: 0;
-	font-size: xx-large;
-	content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
-}
diff --git a/views/default/css/elements/helpers.php b/views/default/css/elements/helpers.php
index ac13c0efc..e9a9e0a30 100644
--- a/views/default/css/elements/helpers.php
+++ b/views/default/css/elements/helpers.php
@@ -13,14 +13,6 @@
 	clear: both;
 }
 
-.clearfix:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
-
 .hidden {
 	display: none;
 }
@@ -33,27 +25,18 @@
 	text-align: center;
 }
 
-.right {
-	float: right;
+.float {
+	float: left;
 }
 
-.left {
-	float: left;
+.float-alt {
+	float: right;
 }
 
 .link {
 	cursor: pointer;
 }
 
-<?php @todo // do we need something like large and small? ?>
-.large {
-	font-size: 120%;
-}
-
-.small {
-	font-size: 80%;
-}
-
 .elgg-discover .elgg-discoverable {
 	display: none;
 }
@@ -62,6 +45,32 @@
 	display: block;
 }
 
+.elgg-transition:hover {
+	opacity: .7;
+}
+
+/* ***************************************
+	BORDERS AND SEPARATORS
+*************************************** */
+.elgg-border-plain {
+	border: 1px solid #eeeeee;
+}
+.elgg-border-transition {
+	border: 1px solid #eeeeee;
+}
+.elgg-divide-top {
+	border-top: 1px solid #CCCCCC;
+}
+.elgg-divide-bottom {
+	border-bottom: 1px solid #CCCCCC;
+}
+.elgg-divide-left {
+	border-left: 1px solid #CCCCCC;
+}
+.elgg-divide-right {
+	border-right: 1px solid #CCCCCC;
+}
+
 /* ***************************************
 	Spacing (from OOCSS)
 *************************************** */
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index d0d2ea777..9b12e0a57 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -16,73 +16,267 @@
 	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left;
 	width: 16px;
 	height: 16px;
-	display: inline-block;
 	margin: 0 2px;
 }
-.elgg-icon-settings {
-	background-position: -302px -44px;
+.elgg-icon-arrow-left {
+	background-position: 0 -0px;
 }
-.elgg-icon-friends {
-	background-position: 0 -300px;
-	width: 36px;
+.elgg-icon-arrow-right {
+	background-position: 0 -18px;
 }
-.elgg-icon-friends:hover {
-	background-position: 0 -340px;
+.elgg-icon-arrow-two-head {
+	background-position: 0 -36px;
 }
-.elgg-icon-help {
-	background-position: -302px -136px;
+.elgg-icon-attention:hover {
+	background-position: 0 -54px;
 }
-.elgg-icon-delete {
-	background-position: -199px 1px;
+.elgg-icon-attention {
+	background-position: 0 -72px;
+}
+.elgg-icon-calendar {
+	background-position: 0 -90px;
+}
+.elgg-icon-cell-phone {
+	background-position: 0 -108px;
+}
+.elgg-icon-checkmark:hover {
+	background-position: 0 -126px;
+}
+.elgg-icon-checkmark {
+	background-position: 0 -144px;
+}
+.elgg-icon-clip:hover {
+	background-position: 0 -162px;
+}
+.elgg-icon-clip {
+	background-position: 0 -180px;
+}
+.elgg-icon-cursor-drag-arrow {
+	background-position: 0 -198px;
+}
+.elgg-icon-delete-alt:hover {
+	background-position: 0 -216px;
+}
+.elgg-icon-delete-alt {
+	background-position: 0 -234px;
 }
 .elgg-icon-delete:hover {
-	background-position: -199px -15px;
+	background-position: 0 -252px;
 }
-.elgg-icon-thumbs-up {
-	background-position: 0px -101px;
-	width: 20px;
-	height: 20px;
+.elgg-icon-delete {
+	background-position: 0 -270px;
 }
-.elgg-icon-thumbs-up:hover {
-	background-position: 0px -131px;
+.elgg-icon-download:hover {
+	background-position: 0 -288px;
 }
-.elgg-icon-thumbs-up-alt {
-	background-position: 0px -131px;
-	width: 20px;
-	height: 20px;
+.elgg-icon-download {
+	background-position: 0 -306px;
 }
-.elgg-icon-arrow-s {
-	background-position: -146px -56px;
+.elgg-icon-eye {
+	background-position: 0 -324px;
 }
-.elgg-icon-arrow-s:hover {
-	background-position: -146px -76px;
+.elgg-icon-facebook {
+	background-position: 0 -342px;
 }
-.elgg-icon-tag {
-	background-position: 2px -197px;
+.elgg-icon-grid:hover {
+	background-position: 0 -360px;
 }
-.elgg-icon-following {
-	background-position: -35px -100px;
-	width: 22px;
-	height: 20px;
+.elgg-icon-grid {
+	background-position: 0 -378px;
 }
-.elgg-icon-rss {
-	background-position: -249px 1px;
+.elgg-icon-home:hover {
+	background-position: 0 -396px;
 }
-.elgg-icon-hover-menu {
-	background-position: -150px 0;
+.elgg-icon-home {
+	background-position: 0 -414px;
 }
 .elgg-icon-hover-menu:hover {
-	background-position: -150px -32px;
+	background-position: 0 -432px;
+}
+.elgg-icon-hover-menu {
+	background-position: 0 -450px;
+}
+.elgg-icon-info:hover {
+	background-position: 0 -468px;
+}
+.elgg-icon-info {
+	background-position: 0 -486px;
+}
+.elgg-icon-link:hover {
+	background-position: 0 -504px;
+}
+.elgg-icon-link {
+	background-position: 0 -522px;
+}
+.elgg-icon-list {
+	background-position: 0 -540px;
+}
+.elgg-icon-lock-closed {
+	background-position: 0 -558px;
+}
+.elgg-icon-lock-open {
+	background-position: 0 -576px;
+}
+.elgg-icon-mail-alt:hover {
+	background-position: 0 -594px;
+}
+.elgg-icon-mail-alt {
+	background-position: 0 -612px;
+}
+.elgg-icon-mail:hover {
+	background-position: 0 -630px;
+}
+.elgg-icon-mail {
+	background-position: 0 -648px;
+}
+.elgg-icon-photo {
+	background-position: 0 -666px;
+}
+.elgg-icon-print-alt {
+	background-position: 0 -684px;
+}
+.elgg-icon-print {
+	background-position: 0 -702px;
+}
+.elgg-icon-push-pin-alt {
+	background-position: 0 -720px;
+}
+.elgg-icon-push-pin {
+	background-position: 0 -738px;
+}
+.elgg-icon-redo {
+	background-position: 0 -756px;
+}
+.elgg-icon-refresh:hover {
+	background-position: 0 -774px;
+}
+.elgg-icon-refresh {
+	background-position: 0 -792px;
+}
+.elgg-icon-round-arrow-left {
+	background-position: 0 -810px;
+}
+.elgg-icon-round-arrow-right {
+	background-position: 0 -828px;
+}
+.elgg-icon-round-checkmark {
+	background-position: 0 -846px;
 }
-.elgg-icon-dragger {
-	background-position: -302px -186px;
-	width: 21px;
-	height: 21px;
+.elgg-icon-round-minus {
+	background-position: 0 -864px;
 }
-.elgg-icon-gear {
-	background-position: -300px -2px;
+.elgg-icon-round-plus {
+	background-position: 0 -882px;
+}
+.elgg-icon-rss {
+	background-position: 0 -900px;
+}
+.elgg-icon-search-focus {
+	background-position: 0 -918px;
+}
+.elgg-icon-search {
+	background-position: 0 -936px;
+}
+.elgg-icon-settings-alt:hover {
+	background-position: 0 -954px;
+}
+.elgg-icon-settings-alt {
+	background-position: 0 -972px;
+}
+.elgg-icon-settings {
+	background-position: 0 -990px;
+}
+.elgg-icon-share:hover {
+	background-position: 0 -1008px;
+}
+.elgg-icon-share {
+	background-position: 0 -1026px;
+}
+.elgg-icon-shop-cart:hover {
+	background-position: 0 -1044px;
+}
+.elgg-icon-shop-cart {
+	background-position: 0 -1062px;
+}
+.elgg-icon-speech-bubble-alt:hover {
+	background-position: 0 -1080px;
+}
+.elgg-icon-speech-bubble-alt {
+	background-position: 0 -1098px;
+}
+.elgg-icon-speech-bubble:hover {
+	background-position: 0 -1116px;
+}
+.elgg-icon-speech-bubble {
+	background-position: 0 -1134px;
+}
+.elgg-icon-star-alt {
+	background-position: 0 -1152px;
+}
+.elgg-icon-star-empty:hover {
+	background-position: 0 -1170px;
+}
+.elgg-icon-star-empty {
+	background-position: 0 -1188px;
+}
+.elgg-icon-star:hover {
+	background-position: 0 -1206px;
+}
+.elgg-icon-star {
+	background-position: 0 -1224px;
+}
+.elgg-icon-tag:hover {
+	background-position: 0 -1242px;
+}
+.elgg-icon-tag {
+	background-position: 0 -1260px;
+}
+.elgg-icon-thumbs-down-alt:hover {
+	background-position: 0 -1278px;
+}
+.elgg-icon-thumbs-down:hover,
+.elgg-icon-thumbs-down-alt {
+	background-position: 0 -1296px;
+}
+.elgg-icon-thumbs-down {
+	background-position: 0 -1314px;
+}
+.elgg-icon-thumbs-up-alt:hover {
+	background-position: 0 -1332px;
+}
+.elgg-icon-thumbs-up:hover,
+.elgg-icon-thumbs-up-alt {
+	background-position: 0 -1350px;
+}
+.elgg-icon-thumbs-up {
+	background-position: 0 -1368px;
+}
+.elgg-icon-trash {
+	background-position: 0 -1386px;
+}
+.elgg-icon-twitter {
+	background-position: 0 -1404px;
+}
+.elgg-icon-undo {
+	background-position: 0 -1422px;
+}
+.elgg-icon-user:hover {
+	background-position: 0 -1440px;
+}
+.elgg-icon-user {
+	background-position: 0 -1458px;
+}
+.elgg-icon-users:hover {
+	background-position: 0 -1476px;
+}
+.elgg-icon-users {
+	background-position: 0 -1494px;
+}
+.elgg-icon-video {
+	background-position: 0 -1512px;
 }
 
+
 .elgg-avatar > .elgg-icon-hover-menu {
 	display: none;
 	position: absolute;
@@ -94,8 +288,8 @@
 
 .elgg-ajax-loader {
 	background: white url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif) no-repeat center center;
-	min-height: 33px;
-	min-width: 33px;
+	min-height: 31px;
+	min-width: 31px;
 }
 
 /* ***************************************
@@ -103,6 +297,7 @@
 *************************************** */
 .elgg-avatar {
 	position: relative;
+	display: inline-block;
 }
 .elgg-avatar > a > img {
 	display: block;
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index d52938aee..9d92752b4 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -15,6 +15,10 @@
 	PAGE LAYOUT
 *************************************** */
 /***** DEFAULT LAYOUT ******/
+<?php // the width is on the page rather than topbar to handle small viewports ?>
+.elgg-page-default {
+	min-width: 998px;
+}
 .elgg-page-default .elgg-page-header > .elgg-inner {
 	width: 990px;
 	margin: 0 auto;
@@ -35,7 +39,6 @@
 .elgg-page-topbar {
 	background: #333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left;
 	border-bottom: 1px solid #000000;
-	min-width: 998px;
 	position: relative;
 	height: 24px;
 	z-index: 9000;
@@ -50,7 +53,7 @@
 	top: 24px;
 	right: 20px;
 	max-width: 500px;
-	z-index: 1000;
+	z-index: 2000;
 }
 .elgg-system-messages li {
 	margin-top: 10px;
@@ -72,15 +75,15 @@
 .elgg-layout {
 	min-height: 360px;
 }
-.elgg-layout-one-column {
-	padding: 10px 0;
-}
 .elgg-layout-one-sidebar {
 	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif) repeat-y right top;
 }
 .elgg-layout-two-sidebar {
 	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/two_sidebar_background.gif) repeat-y right top;
 }
+.elgg-layout-error {
+	margin-top: 20px;
+}
 .elgg-sidebar {
 	position: relative;
 	padding: 20px 10px;
@@ -115,4 +118,4 @@
 }
 .elgg-page-footer a:hover {
 	color: #666;
-}
\ No newline at end of file
+}
diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index c8ba4f735..d9622d34a 100644
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -8,10 +8,6 @@
 	z-index: 100;
 }
 
-#dashboard-info .elgg-inner {
-	border: 2px solid #dedede;
-}
-
 /* ***************************************
 	AVATAR UPLOADING & CROPPING
 *************************************** */
@@ -22,7 +18,7 @@
 #avatar-croppingtool {
 	border-top: 1px solid #ccc;
 }
-#user-avatar {
+#user-avatar-cropper {
 	float: left;
 }
 #user-avatar-preview {
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index bc30548b6..a37ae094b 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -2,6 +2,7 @@
 	Modules
 *************************************** */
 .elgg-module {
+	overflow: hidden;
 	margin-bottom: 20px;
 }
 
@@ -145,54 +146,44 @@
 	background-color: #ccc;
 }
 .elgg-module-widget > .elgg-head {
-	background-color: #dedede;
-	height: 30px;
-	line-height: 30px;
+	background-color: #eeeeee;
+	height: 26px;
 	overflow: hidden;
 }
 .elgg-module-widget > .elgg-head h3 {
 	float: left;
-	padding: 0 45px 0 20px;
-	color: #333;
+	padding: 4px 45px 0 20px;
+	color: #666;
 }
-.elgg-module-widget.elgg-state-draggable > .elgg-head {
+.elgg-module-widget.elgg-state-draggable .elgg-widget-handle {
 	cursor: move;
 }
-.elgg-module-widget > .elgg-head a {
-	position: absolute;
-	top: 5px;
-	display: inline-block;
-	width: 18px;
-	height: 18px;
-	padding: 2px 2px 0 0;
-	border: 1px solid transparent;
-}
 a.elgg-widget-collapse-button {
-	left: 5px;
-	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 0px -385px;
+	color: #c5c5c5;
 }
-a.elgg-widget-collapsed {
-	background-position: 0px -365px;
+a.elgg-widget-collapse-button:hover,
+a.elgg-widget-collapsed:hover {
+	color: #9d9d9d;
+	text-decoration: none;
 }
-a.elgg-widget-delete-button {
-	right: 5px;
+a.elgg-widget-collapse-button:before {
+	content: "\25BC";
 }
-a.elgg-widget-edit-button {
-	right: 25px;
-}
-a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
-	border: 1px solid #ccc;
+a.elgg-widget-collapsed:before {
+	content: "\25BA";
 }
 .elgg-module-widget > .elgg-body {
 	background-color: white;
 	width: 100%;
 	overflow: hidden;
+	border-top: 2px solid #dedede;
 }
 .elgg-widget-edit {
 	display: none;
 	width: 96%;
 	padding: 2%;
 	border-bottom: 2px solid #dedede;
+	background-color: #f9f9f9;
 }
 .elgg-widget-content {
 	padding: 10px;
@@ -200,4 +191,4 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
 .elgg-widget-placeholder {
 	border: 2px dashed #dedede;
 	margin-bottom: 15px;
-}
\ No newline at end of file
+}
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index a098759a5..6b29e4c19 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -16,7 +16,7 @@
 	text-align: center;
 }
 .elgg-pagination li {
-	display: inline;
+	display: inline-block;
 	margin: 0 6px 0 0;
 	text-align: center;
 }
@@ -24,7 +24,8 @@
 	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
 	border-radius: 4px;
-	
+
+	display: block;
 	padding: 2px 6px;
 	color: #4690d6;
 	border: 1px solid #4690d6;
@@ -74,7 +75,7 @@
 }
 .elgg-tabs a:hover {
 	background: #dedede;
-	color:#4690D6;
+	color: #4690D6;
 }
 .elgg-tabs .elgg-state-selected {
 	border-color: #ccc;
@@ -87,47 +88,6 @@
 }
 
 /* ***************************************
- * MENUS
- *
- * To add separators to a menu:
- * .elgg-menu-$menu > li:after {content: '|'; background: ...;}
- *************************************** */
-/* For dropdown/flyout menus */
-.elgg-menu > li {
-	position:relative;
-} 
-
-/* For separators */
-.elgg-menu > li:last-child:after {
-	display:none
-} 
-
-/* Maximize click target */
-.elgg-menu > li > a {
-	display:block
-} 
-
-/* Image placement correction */
-.elgg-menu img, 
-.elgg-menu .elgg-icon {
-	vertical-align: middle; 
-	margin-top: -2px;
-} 
-
-/* Horizontal menus w/ separator support */
-.elgg-menu-hz > li,
-.elgg-menu-hz > li:after,
-.elgg-menu-hz > li > a {
-	display:inline-block;
-	vertical-align:middle;
-}
-
-/* Allow inline image blocks in horizontal menus */
-.elgg-menu-hz .elgg-body:after {
-	content: '.';
-}
-
-/* ***************************************
 	BREADCRUMBS
 *************************************** */
 .elgg-breadcrumbs {
@@ -139,7 +99,7 @@
 .elgg-breadcrumbs > li {
 	display: inline-block;
 }
-.elgg-breadcrumbs > li:after{
+.elgg-breadcrumbs > li:after {
 	content: "\003E";
 	padding: 0 4px;
 	font-weight: normal;
@@ -167,30 +127,46 @@
 }
 
 .elgg-menu-topbar > li {
-	float:left;
+	float: left;
 }
 
 .elgg-menu-topbar > li > a {
-	padding: 2px 15px;
+	padding-top: 2px;
 	color: #eee;
-	margin-top: 2px;
-	line-height: 1.1em;
+	margin: 1px 15px 0;
 }
 
 .elgg-menu-topbar > li > a:hover {
-	color: #71cbff;
+	color: #4690D6;
 	text-decoration: none;
 }
 
 .elgg-menu-topbar-alt {
-	float:right;
+	float: right;
+}
+
+.elgg-menu-topbar .elgg-icon {
+	vertical-align: middle;
+	margin-top: -1px;
+}
+
+.elgg-menu-topbar > li > a.elgg-topbar-logo {
+	margin-top: 0;
+	padding-left: 5px;
+	width: 38px;
+	height: 20px;
+}
+
+.elgg-menu-topbar > li > a.elgg-topbar-avatar {
+	width: 18px;
+	height: 18px;
 }
 
 /* ***************************************
 	SITE MENU
 *************************************** */
 .elgg-menu-site {
-	z-index: 7000;
+	z-index: 1;
 }
 
 .elgg-menu-site > li > a {
@@ -203,7 +179,6 @@
 	text-decoration: none;
 }
 
-
 .elgg-menu-site-default {
 	position: absolute;
 	bottom: 0;
@@ -216,62 +191,68 @@
 	margin-right: 1px;
 }
 
-.elgg-menu-site-default > li > a {color: white}
+.elgg-menu-site-default > li > a {
+	color: white;
+}
+
+.elgg-menu-site > li > ul {
+	display: none;
+	background-color: white;
+}
 
+.elgg-menu-site > li:hover > ul {
+	display: block;
+}
 
 .elgg-menu-site-default > .elgg-state-selected > a,
 .elgg-menu-site-default > li:hover > a {
 	background: white;
 	color: #555;
-	
+
 	-webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
 	-moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
 	box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-	
+
 	-webkit-border-radius: 4px 4px 0 0;
 	-moz-border-radius: 4px 4px 0 0;
 	border-radius: 4px 4px 0 0;
 }
 
 .elgg-menu-site-more {
-	display:none;
-	position:relative;
+	position: relative;
 	left: -1px;
 	width: 100%;
-	z-index: 7000;
 	min-width: 150px;
 	border: 1px solid #999;
 	border-top: 0;
-	
+
 	-webkit-border-radius: 0 0 4px 4px;
 	-moz-border-radius: 0 0 4px 4px;
 	border-radius: 0 0 4px 4px;
-	
+
 	-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
 	-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
 	box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
 }
 
-li:hover > .elgg-menu-site-more {
-	display:block;
-}
-
 .elgg-menu-site-more > li > a {
-	background: white;
+	background-color: white;
 	color: #555;
-	
+
 	-webkit-border-radius: 0;
 	-moz-border-radius: 0;
 	border-radius: 0;
-	
+
 	-webkit-box-shadow: none;
 	-moz-box-shadow: none;
 	box-shadow: none;
 }
+
 .elgg-menu-site-more > li > a:hover {
 	background: #4690D6;
 	color: white;
 }
+
 .elgg-menu-site-more > li:last-child > a,
 .elgg-menu-site-more > li:last-child > a:hover {
 	-webkit-border-radius: 0 0 4px 4px;
@@ -281,7 +262,7 @@ li:hover > .elgg-menu-site-more {
 
 .elgg-more > a:before {
 	content: "\25BC";
-	font-size:smaller;
+	font-size: smaller;
 	margin-right: 4px;
 }
 
@@ -330,7 +311,7 @@ li:hover > .elgg-menu-site-more {
 }
 .elgg-menu-filter > li > a:hover {
 	background: #dedede;
-	color:#4690D6;
+	color: #4690D6;
 }
 .elgg-menu-filter > .elgg-state-selected {
 	border-color: #ccc;
@@ -392,7 +373,10 @@ li:hover > .elgg-menu-site-more {
 	position: absolute;
 	z-index: 10000;
 
-	width: 165px;
+	overflow: hidden;
+
+	min-width: 165px;
+	max-width: 250px;
 	border: solid 1px;
 	border-color: #E5E5E5 #999 #999 #E5E5E5;
 	background-color: #FFF;
@@ -427,12 +411,12 @@ li:hover > .elgg-menu-site-more {
 }
 
 /* ***************************************
-	FOOTER
+	SITE FOOTER
 *************************************** */
 .elgg-menu-footer > li,
 .elgg-menu-footer > li > a {
 	display: inline-block;
-	color:#999;
+	color: #999;
 }
 
 .elgg-menu-footer > li:after {
@@ -440,26 +424,53 @@ li:hover > .elgg-menu-site-more {
 	padding: 0 4px;
 }
 
-.elgg-menu-footer-alt {
+.elgg-menu-footer-default {
 	float: right;
 }
 
+.elgg-menu-footer-alt {
+	float: left;
+}
+
+/* ***************************************
+	GENERAL MENU
+*************************************** */
+.elgg-menu-general > li,
+.elgg-menu-general > li > a {
+	display: inline-block;
+	color: #999;
+}
+
+.elgg-menu-general > li:after {
+	content: "\007C";
+	padding: 0 4px;
+}
+
 /* ***************************************
-	ENTITY
+	ENTITY AND ANNOTATION
 *************************************** */
-.elgg-menu-entity {
+<?php // height depends on line height/font size ?>
+.elgg-menu-entity, .elgg-menu-annotation {
 	float: right;
 	margin-left: 15px;
 	font-size: 90%;
 	color: #aaa;
+	line-height: 16px;
+	height: 16px;
 }
-.elgg-menu-entity > li {
-	display: inline-block;
+.elgg-menu-entity > li, .elgg-menu-annotation > li {
 	margin-left: 15px;
 }
-.elgg-menu-entity > li > a {
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
 	color: #aaa;
 }
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
+	display: block;
+}
+.elgg-menu-entity > li > span, .elgg-menu-annotation > li > span {
+	vertical-align: baseline;
+}
 
 /* ***************************************
 	OWNER BLOCK
@@ -496,7 +507,27 @@ li:hover > .elgg-menu-site-more {
 	RIVER
 *************************************** */
 .elgg-menu-river {
+	float: right;
+	margin-left: 15px;
 	font-size: 90%;
+	color: #aaa;
+	line-height: 16px;
+	height: 16px;
+}
+.elgg-menu-river > li {
+	display: inline-block;
+	margin-left: 5px;
+}
+.elgg-menu-river > li > a {
+	color: #aaa;
+	height: 16px;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-river > li > a {
+	display: block;
+}
+.elgg-menu-river > li > span {
+	vertical-align: baseline;
 }
 
 /* ***************************************
@@ -504,4 +535,26 @@ li:hover > .elgg-menu-site-more {
 *************************************** */
 .elgg-menu-extras {
 	margin-bottom: 15px;
-}
\ No newline at end of file
+}
+
+/* ***************************************
+	WIDGET MENU
+*************************************** */
+.elgg-menu-widget > li {
+	position: absolute;
+	top: 4px;
+	display: inline-block;
+	width: 18px;
+	height: 18px;
+	padding: 2px 2px 0 0;
+}
+
+.elgg-menu-widget > .elgg-menu-item-collapse {
+	left: 5px;
+}
+.elgg-menu-widget > .elgg-menu-item-delete {
+	right: 5px;
+}
+.elgg-menu-widget > .elgg-menu-item-settings {
+	right: 25px;
+}
diff --git a/views/default/css/elements/reset.php b/views/default/css/elements/reset.php
index 6360e1c76..44bf2fac9 100644
--- a/views/default/css/elements/reset.php
+++ b/views/default/css/elements/reset.php
@@ -31,6 +31,11 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 body {
 	background-color: white;
 }
+<?php // force vertical scroll bar ?>
+html, body {
+	height: 100%;
+	margin-bottom: 1px;
+}
 img {
 	border-width:0;
 	border-color:transparent;
diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
index 82d55cc04..c044cb1cc 100644
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -15,30 +15,78 @@ body {
 	line-height: 1.4em;
 	font-family: "Lucida Grande", Arial, Tahoma, Verdana, sans-serif;
 }
+
+a {
+	color: #4690D6;
+}
+
+a:hover,
+a.selected { <?php //@todo remove .selected ?>
+	color: #555555;
+	text-decoration: underline;
+}
+
+p {
+	margin-bottom: 15px;
+}
+
+p:last-child {
+	margin-bottom: 0;
+}
+
 pre, code {
 	font-family: Monaco, "Courier New", Courier, monospace;
 	font-size: 12px;
+	
+	background:#EBF5FF;
+	color:#000000;
+	overflow:auto;
+
+	overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */
+
+	white-space: pre-wrap;
+	word-wrap: break-word; /* IE 5.5-7 */
+	
+}
+
+pre {
+	padding:3px 15px;
+	margin:0px 0 15px 0;
+	line-height:1.3em;
+}
+
+code {
+	padding:2px 3px;
 }
-input, textarea {
-	font: 120% Arial, Helvetica, sans-serif;
+
+.elgg-monospace {
+	font-family: Monaco, "Courier New", Courier, monospace;
 }
+
 blockquote {
 	line-height: 1.3em;
+	padding:3px 15px;
+	margin:0px 0 15px 0;
+	background:#EBF5FF;
+	border:none;
+	
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
 }
+
 h1, h2, h3, h4, h5, h6 {
 	font-weight: bold;
+	color: #0054A7;
 }
+
 h1 { font-size: 1.8em; }
-h2 { font-size: 1.5em; line-height: 1.1em; }
+h2 { font-size: 1.5em; line-height: 1.1em; padding-bottom:5px}
 h3 { font-size: 1.2em; }
 h4 { font-size: 1.0em; }
 h5 { font-size: 0.9em; }
 h6 { font-size: 0.8em; }
 
-.elgg-monospace {
-	font-family: Monaco, "Courier New", Courier, monospace;
-}
-
 .elgg-heading-site, .elgg-heading-site:hover {
 	font-size: 2em;
 	line-height: 1.4em;
@@ -48,6 +96,7 @@ h6 { font-size: 0.8em; }
 	text-shadow: 1px 2px 4px #333333;
 	text-decoration: none;
 }
+
 .elgg-heading-main {
 	float: left;
 	max-width: 530px;
@@ -65,3 +114,49 @@ h6 { font-size: 0.8em; }
 	line-height: 1.2em;
 	font-style: italic;
 }
+
+.elgg-text-help {
+	display: block;
+	font-size: 85%;
+	font-style: italic;
+}
+
+.elgg-quiet {
+	color: #666;
+}
+
+.elgg-loud {
+	color: #0054A7;
+}
+
+/* ***************************************
+	USER INPUT DISPLAY RESET
+*************************************** */
+.elgg-output {
+	margin-top: 10px;
+}
+
+.elgg-output dt { font-weight: bold }
+.elgg-output dd { margin: 0 0 1em 1em }
+
+.elgg-output ul, .elgg-output ol {
+	margin: 0 1.5em 1.5em 0;
+	padding-left: 1.5em;
+}
+.elgg-output ul {
+	list-style-type: disc;
+}
+.elgg-output ol {
+	list-style-type: decimal;
+}
+.elgg-output table {
+	border: 1px solid #ccc;
+}
+.elgg-output table td {
+	border: 1px solid #ccc;
+	padding: 3px 5px;
+}
+.elgg-output img {
+	max-width: 100%;
+	height: auto;
+}
diff --git a/views/default/css/elgg.php b/views/default/css/elgg.php
index 96ef4587b..4960e6ade 100644
--- a/views/default/css/elgg.php
+++ b/views/default/css/elgg.php
@@ -6,6 +6,13 @@
  * @subpackage UI
  */
 
+/* 
+ * Colors:
+ *  #4690D6 - elgg light blue
+ *  #0054A7 - elgg dark blue
+ *  #e4ecf5 - elgg very light blue
+ */
+
 // check if there is a theme overriding the old css view and use it, if it exists
 $old_css_view = elgg_get_view_location('css');
 if ($old_css_view != elgg_get_config('viewpath')) {
@@ -18,12 +25,13 @@ if ($old_css_view != elgg_get_config('viewpath')) {
 
 Base CSS
  * CSS reset
- * helpers
+ * core
+ * helpers (moved to end to have a higher priority)
  * grid
 
 *******************************************************************************/
 echo elgg_view('css/elements/reset', $vars);
-echo elgg_view('css/elements/helpers', $vars);
+echo elgg_view('css/elements/core', $vars);
 echo elgg_view('css/elements/grid', $vars);
 
 
@@ -31,7 +39,6 @@ echo elgg_view('css/elements/grid', $vars);
 
 Skin CSS
  * typography     - fonts, line spacing
- * chrome         - general skin
  * forms          - forms, inputs
  * buttons        - action, cancel, delete, submit, dropdown, special
  * navigation     - menus, breadcrumbs, pagination
@@ -43,7 +50,6 @@ Skin CSS
 
 *******************************************************************************/
 echo elgg_view('css/elements/typography', $vars);
-echo elgg_view('css/elements/chrome', $vars);
 echo elgg_view('css/elements/forms', $vars);
 echo elgg_view('css/elements/buttons', $vars);
 echo elgg_view('css/elements/icons', $vars);
@@ -54,5 +60,9 @@ echo elgg_view('css/elements/layout', $vars);
 echo elgg_view('css/elements/misc', $vars);
 
 
+// included last to have higher priority
+echo elgg_view('css/elements/helpers', $vars);
+
+
 // in case plugins are still extending the old 'css' view, display it
 echo elgg_view('css', $vars);
diff --git a/views/default/css/ie.php b/views/default/css/ie.php
index 6760d3886..34ececa89 100644
--- a/views/default/css/ie.php
+++ b/views/default/css/ie.php
@@ -1,74 +1,16 @@
 /**
- * elgg_layout css for Internet Explorer > ie6
- * @uses $vars['wwwroot'] The site URL
-*/
-* {zoom: 1;} /* trigger hasLayout in IE */
+ * CSS for IE8 and above
+ */
 
-/* tools drop-down menu */
-#elgg-header {z-index:1;}
-.navigation li a:hover ul {display:block; position:absolute; top:21px; left:0;}
-.navigation li a:hover ul li a {display:block;}
-.navigation li.navigation-more ul li a {width:150px;background-color: #dedede;}
-
-.clearfix { display: block; }
-.hidden.clearfix { display: none; }
-#elgg-page-contents {overflow: hidden;} /* remove horizontal scroll on riverdash */
-#breadcrumbs {top:-2px; margin-bottom: 5px;}
-
-/* entity list views */
-.entity-metadata {max-width: 300px;}
-.entity-edit {float:right;}
-.access_level {float:left;}
-.elgg-image-block .entity-metadata {
-	min-width:400px;
-	text-align: right;
-}
-
-/* profile */
-.elgg-tabs.profile .profile_name {margin-left: -260px;}
-#profile_content .river_comment_form.hidden .input-text { width:510px; }
-
-/* notifications */
-.friends-picker-navigation {margin:0;padding:0;}
-.friends-picker-container h3 {margin:0;padding:0;line-height: 1em;}
-
-/* private messages */
-#elgg-topbar-contents a.privatemessages.new span { 
-	display:block;
-	padding:1px;
-	position:relative;
-	text-align:center;
-	float:left;
-	top:-1px;
-	right:auto;
-}
-#elgg-topbar-contents a.privatemessages.new  {padding:0 0 0 20px;}
-#elgg-topbar-contents a.privatemessages:hover {background-position:left 2px;}
-#elgg-topbar-contents a.privatemessages.new:hover {background-position: left 2px;}
-
-/* riverdashboard mod rules */
-#riverdashboard_updates {clear:both;}
-#riverdashboard_updates a.update_link {margin:0 0 9px 0;}
-.riverdashboard_filtermenu {margin:10px 0 0 0;}
-.river_comment_form.hidden .input-text {
-	width:530px;
-	float:left;
+/* ie8 does not like shrink wrapping this div with inline-block */
+.elgg-avatar {
+	display: block;
 }
-.river_link_divider {
-	width:10px;
-	text-align: center;
-}
-
-/* shared access */
-.shared_access_collection h2.shared_access_name {margin-top:-15px;}
 
-/* dropdown login */
-*:first-child+html #login-dropdown #signin-button {
-	line-height:10px;
+/* ie8 adds space to the top of .elgg-gallery which causes jumpiness if this is display: block; */
+.elgg-gallery .elgg-avatar > a > img {
+    display: inline-block;
 }
-*:first-child+html #login-dropdown #signin-button a.signin span {
-	background-position:-150px -54px;
+.elgg-gallery .elgg-avatar > .elgg-icon-hover-menu {
+    bottom: 4px;
 }
-*:first-child+html #login-dropdown #signin-button a.signin.menu-open span {
-	background-position:-150px -74px;
-}
\ No newline at end of file
diff --git a/views/default/css/ie6.php b/views/default/css/ie6.php
index f8ed208f6..cf49d33f2 100644
--- a/views/default/css/ie6.php
+++ b/views/default/css/ie6.php
@@ -1,15 +1,11 @@
 /**
- * elgg_layout css for Internet Explorer6
- * @uses $vars['wwwroot'] The site URL
-*/
+ * CSS for IE6
+ */
 
 * {zoom: 1;} /* trigger hasLayout in IE */
 
 /* main nav drop-down */
 #elgg-header {z-index:1;}
-.navigation li a:hover ul {display:block; position:absolute; top:21px; left:0;}
-.navigation li a:hover ul li a {display:block;}
-.navigation li.navigation-more ul li a {width:150px;background-color: #dedede;}
 
 /* @todo check this one */
 .elgg-button-delete a { background-position-y: 2px; }
diff --git a/views/default/css/ie7.php b/views/default/css/ie7.php
new file mode 100644
index 000000000..90274797d
--- /dev/null
+++ b/views/default/css/ie7.php
@@ -0,0 +1,75 @@
+/**
+ * CSS for IE7
+ */
+
+/* trigger hasLayout in IE */
+* {
+	zoom: 1;
+}
+
+/* site menu drop-down z-index fix for IE7 */
+.elgg-page-header {
+    z-index: 1;
+}
+
+/* inline-block fixes */
+.elgg-gallery > li,
+.elgg-button,
+.elgg-icon,
+.elgg-menu-hz > li,
+.elgg-menu-hz > li:after,
+.elgg-menu-hz > li > a,
+.elgg-menu-hz > li > span,
+.elgg-breadcrumbs > li,
+.elgg-menu-footer > li > a,
+.elgg-menu-footer li,
+.elgg-menu-general > li > a,
+.elgg-pagination li,
+.elgg-menu-general li {
+	display: inline;
+}
+
+/* IE7 does not support :after */
+.elgg-breadcrumbs > li > a {
+	display: inline;
+	padding-right: 4px;
+	margin-right: 4px;
+	border-right: 1px solid #bababa;
+}
+.elgg-menu-footer li,
+.elgg-menu-user li,
+.elgg-menu-general li {
+	padding-left: 4px;
+	padding-right: 4px;
+}
+
+/* longtext menu would not display horizontally without this */
+.elgg-menu-longtext {
+	width: 100%;
+}
+.elgg-menu-longtext li {
+	width: 100px;
+	float: right;
+}
+
+.elgg-avatar {
+	display: inline;
+}
+
+.elgg-body-walledgarden .elgg-col-1of2 {
+	width: 255px;
+}
+
+.elgg-module-walledgarden > .elgg-head,
+.elgg-module-walledgarden > .elgg-foot {
+	width: 530px;
+}
+
+input, textarea {
+	width: 98%;
+}
+
+.elgg-tag a {
+	/* IE7 had a weird wrapping issue for tags */
+	word-wrap: normal;
+}
diff --git a/views/default/css/lightbox.php b/views/default/css/lightbox.php
new file mode 100644
index 000000000..7d5917cc3
--- /dev/null
+++ b/views/default/css/lightbox.php
@@ -0,0 +1,371 @@
+<?php
+/**
+ * Fancybox lightbox CSS.
+ *
+ * Used as a view because we need to pass a full URL to AlphaImageLoader.
+ *
+ * @package    Elgg.Core
+ * @subpackage UI
+ */
+
+$jquery_path = elgg_get_site_url() . 'vendors/jquery/';
+?>
+
+/*
+ * FancyBox - jQuery Plugin
+ * Simple and fancy lightbox alternative
+ *
+ * Examples and documentation at: http://fancybox.net
+ *
+ * Copyright (c) 2008 - 2010 Janis Skarnelis
+ * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated.
+ *
+ * Version: 1.3.4 (11/11/2010)
+ * Requires: jQuery v1.3+
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+
+#fancybox-loading {
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	width: 40px;
+	height: 40px;
+	margin-top: -20px;
+	margin-left: -20px;
+	cursor: pointer;
+	overflow: hidden;
+	z-index: 1104;
+	display: none;
+}
+
+#fancybox-loading div {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 40px;
+	height: 480px;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+}
+
+#fancybox-overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	z-index: 1100;
+	display: none;
+}
+
+#fancybox-tmp {
+	padding: 0;
+	margin: 0;
+	border: 0;
+	overflow: auto;
+	display: none;
+}
+
+#fancybox-wrap {
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding: 20px;
+	z-index: 1101;
+	outline: none;
+	display: none;
+}
+
+#fancybox-outer {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	background: #fff;
+}
+
+#fancybox-content {
+	width: 0;
+	height: 0;
+	padding: 0;
+	outline: none;
+	position: relative;
+	overflow: hidden;
+	z-index: 1102;
+	border: 0px solid #fff;
+}
+
+#fancybox-hide-sel-frame {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: transparent;
+	z-index: 1101;
+}
+
+#fancybox-close {
+	position: absolute;
+	top: -15px;
+	right: -15px;
+	width: 30px;
+	height: 30px;
+	background: transparent url('<?php echo $jquery_path; ?>fancybox/fancybox.png') -40px 0px;
+	cursor: pointer;
+	z-index: 1103;
+	display: none;
+}
+
+#fancybox-error {
+	color: #444;
+	font: normal 12px/20px Arial;
+	padding: 14px;
+	margin: 0;
+}
+
+#fancybox-img {
+	width: 100%;
+	height: 100%;
+	padding: 0;
+	margin: 0;
+	border: none;
+	outline: none;
+	line-height: 0;
+	vertical-align: top;
+}
+
+#fancybox-frame {
+	width: 100%;
+	height: 100%;
+	border: none;
+	display: block;
+}
+
+#fancybox-left, #fancybox-right {
+	position: absolute;
+	bottom: 0px;
+	height: 100%;
+	width: 35%;
+	cursor: pointer;
+	outline: none;
+	background: transparent url('<?php echo $jquery_path; ?>fancybox/blank.gif');
+	z-index: 1102;
+	display: none;
+}
+
+#fancybox-left {
+	left: 0px;
+}
+
+#fancybox-right {
+	right: 0px;
+}
+
+#fancybox-left-ico, #fancybox-right-ico {
+	position: absolute;
+	top: 50%;
+	left: -9999px;
+	width: 30px;
+	height: 30px;
+	margin-top: -15px;
+	cursor: pointer;
+	z-index: 1102;
+	display: block;
+}
+
+#fancybox-left-ico {
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+	background-position: -40px -30px;
+}
+
+#fancybox-right-ico {
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+	background-position: -40px -60px;
+}
+
+#fancybox-left:hover, #fancybox-right:hover {
+	visibility: visible; /* IE6 */
+}
+
+#fancybox-left:hover span {
+	left: 20px;
+}
+
+#fancybox-right:hover span {
+	left: auto;
+	right: 20px;
+}
+
+.fancybox-bg {
+	position: absolute;
+	padding: 0;
+	margin: 0;
+	border: 0;
+	width: 20px;
+	height: 20px;
+	z-index: 1001;
+}
+
+#fancybox-bg-n {
+	top: -20px;
+	left: 0;
+	width: 100%;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-x.png');
+}
+
+#fancybox-bg-ne {
+	top: -20px;
+	right: -20px;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+	background-position: -40px -162px;
+}
+
+#fancybox-bg-e {
+	top: 0;
+	right: -20px;
+	height: 100%;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-y.png');
+	background-position: -20px 0px;
+}
+
+#fancybox-bg-se {
+	bottom: -20px;
+	right: -20px;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+	background-position: -40px -182px;
+}
+
+#fancybox-bg-s {
+	bottom: -20px;
+	left: 0;
+	width: 100%;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-x.png');
+	background-position: 0px -20px;
+}
+
+#fancybox-bg-sw {
+	bottom: -20px;
+	left: -20px;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+	background-position: -40px -142px;
+}
+
+#fancybox-bg-w {
+	top: 0;
+	left: -20px;
+	height: 100%;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-y.png');
+}
+
+#fancybox-bg-nw {
+	top: -20px;
+	left: -20px;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+	background-position: -40px -122px;
+}
+
+#fancybox-title {
+	font-family: Helvetica;
+	font-size: 12px;
+	z-index: 1102;
+}
+
+.fancybox-title-inside {
+	padding-bottom: 10px;
+	text-align: center;
+	color: #333;
+	background: #fff;
+	position: relative;
+}
+
+.fancybox-title-outside {
+	padding-top: 10px;
+	color: #fff;
+}
+
+.fancybox-title-over {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	color: #FFF;
+	text-align: left;
+}
+
+#fancybox-title-over {
+	padding: 10px;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancy_title_over.png');
+	display: block;
+}
+
+.fancybox-title-float {
+	position: absolute;
+	left: 0;
+	bottom: -20px;
+	height: 32px;
+}
+
+#fancybox-title-float-wrap {
+	border: none;
+	border-collapse: collapse;
+	width: auto;
+}
+
+#fancybox-title-float-wrap td {
+	border: none;
+	white-space: nowrap;
+}
+
+#fancybox-title-float-left {
+	padding: 0 0 0 15px;
+	background: url('<?php echo $jquery_path; ?>fancybox/fancybox.png') -40px -90px no-repeat;
+}
+
+#fancybox-title-float-main {
+	color: #FFF;
+	line-height: 29px;
+	font-weight: bold;
+	padding: 0 0 3px 0;
+	background: url('<?php echo $jquery_path; ?>fancybox/fancybox-x.png') 0px -40px;
+}
+
+#fancybox-title-float-right {
+	padding: 0 0 0 15px;
+	background: url('<?php echo $jquery_path; ?>fancybox/fancybox.png') -55px -90px no-repeat;
+}
+
+/* IE6 */
+
+.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_close.png', sizingMethod='scale'); }
+
+.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_nav_left.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_nav_right.png', sizingMethod='scale'); }
+
+.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_over.png', sizingMethod='scale'); zoom: 1; }
+.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_left.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_main.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_right.png', sizingMethod='scale'); }
+
+.fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame {
+	height: expression(this.parentNode.clientHeight + "px");
+}
+
+#fancybox-loading.fancybox-ie6 {
+	position: absolute; margin-top: 0;
+	top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px');
+}
+
+#fancybox-loading.fancybox-ie6 div	{ background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_loading.png', sizingMethod='scale'); }
+
+/* IE6, IE7, IE8 */
+.fancybox-ie .fancybox-bg { background: transparent !important; }
+
+.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_n.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_ne.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_e.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_se.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_s.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_sw.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_w.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_nw.png', sizingMethod='scale'); }
\ No newline at end of file
diff --git a/views/default/css/walled_garden.php b/views/default/css/walled_garden.php
index 75bf0f29e..f6f7f97dc 100644
--- a/views/default/css/walled_garden.php
+++ b/views/default/css/walled_garden.php
@@ -6,60 +6,76 @@
 $url = elgg_get_site_url();
 
 ?>
-#elgg-walledgarden {
+.elgg-body-walledgarden {
 	margin: 100px auto 0 auto;
-	width: 563px;
-	min-height: 230px;
-	background: url(<?php echo $url; ?>_graphics/walled_garden_background_top.gif) no-repeat left top;
-	padding: 0;
 	position: relative;
+	width: 530px;
+}
+.elgg-module-walledgarden {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+.elgg-module-walledgarden > .elgg-head {
+	height: 17px;
+}
+.elgg-module-walledgarden > .elgg-body {
+	padding: 0 10px;
+}
+.elgg-module-walledgarden > .elgg-foot {
+	height: 17px;
+}
+.elgg-walledgarden-double > .elgg-head {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_top.png) no-repeat left top;
+}
+.elgg-walledgarden-double > .elgg-body {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_middle.png) repeat-y left top;
+}
+.elgg-walledgarden-double > .elgg-foot {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_bottom.png) no-repeat left top;
+}
+.elgg-walledgarden-single > .elgg-head {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_top.png) no-repeat left top;
+}
+.elgg-walledgarden-single > .elgg-body {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_middle.png) repeat-y left top;
+}
+.elgg-walledgarden-single > .elgg-foot {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_bottom.png) no-repeat left top;
 }
 
-#elgg-walledgarden-bottom {
-	margin:0 auto;
-	background: url(<?php echo $url; ?>_graphics/walled_garden_background_bottom.gif) no-repeat left bottom;
-	width:563px;
-	height:54px;
+.elgg-col > .elgg-inner {
+	margin: 0 0 0 5px;
+}
+.elgg-col:first-child > .elgg-inner {
+	margin: 0 5px 0 0;
+}
+.elgg-col > .elgg-inner {
+	padding: 0 8px;
 }
 
-#elgg-walledgarden-intro {
-	width: 230px;
-	float: left;
-	margin: 35px 15px 15px 35px;
+.elgg-walledgarden-single > .elgg-body {
+	padding: 0 18px;
 }
 
-#elgg-walledgarden-login {
-	width: 230px;
-	float: left;
-	margin: 30px 15px 45px 19px;
+.elgg-module-walledgarden-login {
+	margin: 0;
+}
+.elgg-body-walledgarden h3 {
+	font-size: 1.5em;
+	line-height: 1.1em;
+	padding-bottom: 5px;
 }
 
 .elgg-heading-walledgarden {
-	color: #666666;
 	margin-top: 60px;
 	line-height: 1.1em;
 }
 
-#elgg-walledgarden-lostpassword,
-#elgg-walledgarden-registration {
-	position: absolute;
-	right: 0;
-	top: 0;
-	width: 563px;
-	background-color: white;
-	padding: 0;
-	background: url(<?php echo $url; ?>_graphics/walled_garden_backgroundfull_top.gif) no-repeat left top;
-	height: auto;
+h1, h2, h3, h4, h5, h6 {
+	color: #666;
 }
 
-.elgg-hiddenform-body {
-	padding: 30px 40px 0 40px;
-	height: auto;
-}
-.elgg-hiddenform-bottom {
-	margin: 0 auto;
-	background: url(<?php echo $url; ?>_graphics/walled_garden_backgroundfull_bottom.gif) no-repeat left bottom;
-	width: 563px;
-	height: 54px;
-	position: relative;
-}
+a {
+	color: #999;
+}
\ No newline at end of file