12 files changed, 1097 insertions, 1280 deletions

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 854c053c6..54feccc31 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -8,12 +8,19 @@
 
 
 echo elgg_view('css/elements/reset', $vars);
-echo elgg_view('css/elements/core', $vars);
-echo elgg_view('css/elements/typography', $vars);
-echo elgg_view('css/elements/spacing', $vars);
-echo elgg_view('css/elements/navigation', $vars);
 echo elgg_view('css/elements/grid', $vars);
+echo elgg_view('css/elements/spacing', $vars);
+echo elgg_view('css/elements/base', $vars);
+
+// remove these as we finish the admin theme
+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/navigation', $vars);
+echo elgg_view('css/elements/core', $vars);
+echo elgg_view('css/elements/icons', $vars);
+echo elgg_view('css/elements/layout', $vars);
+echo elgg_view('css/elements/misc', $vars);
 
 ?>
 
diff --git a/views/default/css/elements/base.php b/views/default/css/elements/base.php
new file mode 100644
index 000000000..56a692c63
--- /dev/null
+++ b/views/default/css/elements/base.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ *
+ */
+
+
+?>
+
+.clearfloat { clear:both; }
+
+/* Clearfix! */
+.clearfix:after {
+	content:".";
+	display:block;
+	height:0;
+	clear:both;
+	visibility:hidden;
+}
+.hidden {
+	display:none;
+}
+.center {
+	margin:0 auto;
+}
+
+/**
+ * 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
+ */
+.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 ";
+}
\ No newline at end of file
diff --git a/views/default/css/elements/chrome.php b/views/default/css/elements/chrome.php
new file mode 100644
index 000000000..eb131c7bd
--- /dev/null
+++ b/views/default/css/elements/chrome.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ *
+ */
+
+/* Colors:
+
+	#4690D6 - elgg light blue
+	#0054A7 - elgg dark blue
+	#e4ecf5 - elgg v light blue
+*/
+
+?>
+
+a {
+	color: #4690D6;
+}
+a:hover,
+a.selected {
+	color: #555555;
+}
+a:hover,
+a.selected {
+	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; /* css-3 */
+	white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
+	white-space: -pre-wrap; /* Opera 4-6 */
+	white-space: -o-pre-wrap; /* Opera 7 */
+	word-wrap: break-word; /* Internet Explorer 5.5+ */
+}
+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;
+}
+
+
+/* ***************************************
+	GENERIC SELECTORS
+*************************************** */
+h2 {
+/*	border-bottom:1px solid #CCCCCC; */
+	padding-bottom:5px;
+}
+
+
+.listing .icon { float: left; margin-right: 10px; }
+.listing .icon img { width: auto }
+.listing .info { display: table-cell; }
+
+
+
+.link {
+	cursor:pointer;
+}
+.small {
+	font-size: 90%;
+}
+.divider {
+	border-top:1px solid #cccccc;
+}
+
+
+.radius8 {
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+}
+.margin-none {
+	margin:0;
+}
+.margin-top {
+	margin-top:10px;
+}
+
+.elgg-tags {
+	background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
+	background-repeat: no-repeat;
+	background-position: left -196px;
+	padding:1px 0 0 14px;
+	font-size: 85%;
+}
+.elgg-tagcloud {
+	text-align:justify;
+}
+.elgg-discover .elgg-discoverable {
+	display: none;
+}
+.elgg-discover:hover .elgg-discoverable {
+	display: block;
+}
+.elgg_hrt {
+	border-top: 1px solid #CCCCCC;
+}
+.elgg_hrb {
+	border-bottom: 1px solid #CCCCCC;
+}
+
+
+
+.elgg-border-plain {
+	border: 1px solid #eeeeee;
+}
+
+
+
+.elgg-rss {
+	float: right;
+}
+
+
+.elgg-text ul, ol {
+	margin: 0 1.5em 1.5em 0;
+	padding-left: 1.5em;
+}
+.elgg-text ul {
+	list-style-type: disc;
+}
+.elgg-text ol {
+	list-style-type: decimal;
+}
\ No newline at end of file
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index e730c4ee2..374903c59 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -6,185 +6,13 @@
  * @subpackage UI
  */
 ?>
-/* ***************************************
-	Core
-*************************************** */
-a:hover,
-a.selected {
-	text-decoration: underline;
-}
-p {
-	margin-bottom:15px;
-}
-p:last-child {
-	margin-bottom:0;
-}
-small {
-	font-size: 90%;
-}
-h1, h2, h3, h4, h5, h6 {
-	font-weight: bold;
-	line-height: auto;
-	color:#0054A7;
-}
-h1 { font-size: 1.8em; }
-h2 { font-size: 1.5em; line-height: 1.1em; }
-h3 { font-size: 1.2em; }
-h4 { font-size: 1.0em; }
-h5 { font-size: 0.9em; }
-h6 { font-size: 0.8em; }
-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; /* css-3 */
-	white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
-	white-space: -pre-wrap; /* Opera 4-6 */
-	white-space: -o-pre-wrap; /* Opera 7 */
-	word-wrap: break-word; /* Internet Explorer 5.5+ */
-}
-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;
-}
-
-
-/* ***************************************
-	GENERIC SELECTORS
-*************************************** */
-h2 {
-/*	border-bottom:1px solid #CCCCCC; */
-	padding-bottom:5px;
-}
-
-.clearfloat { clear:both; }
-
-/* Clearfix! */
-.clearfix:after,
-.listing:after,
-.listing .info:after {
-	content:".";
-	display:block;
-	height:0;
-	clear:both;
-	visibility:hidden;
-}
-
-.listing .icon { float: left; margin-right: 10px; }
-.listing .icon img { width: auto }
-.listing .info { display: table-cell; }
-
-.hidden {
-	display:none;
-}
-.center {
-	margin: 0 auto;
-}
-
-
-.link {
-	cursor:pointer;
-}
-.small {
-	font-size: 90%;
-}
-.divider {
-	border-top:1px solid #cccccc;
-}
-
-
-.radius8 {
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-}
-.margin-none {
-	margin:0;
-}
-.margin-top {
-	margin-top:10px;
-}
-
-.elgg-tags {
-	background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
-	background-repeat: no-repeat;
-	background-position: left -196px;
-	padding:1px 0 0 14px;
-	font-size: 85%;
-}
-.elgg-tagcloud {
-	text-align:justify;
-}
-.elgg-discover .elgg-discoverable {
-	display: none;
-}
-.elgg-discover:hover .elgg-discoverable {
-	display: block;
-}
-.elgg_hrt {
-	border-top: 1px solid #CCCCCC;
-}
-.elgg_hrb {
-	border-bottom: 1px solid #CCCCCC;
-}
 
 /* ***************************************
-	CSS LAYOUT OBJECTS
+	Image Block
 *************************************** */
-
-/**
- * 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
- */
-.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 ";
-}
-
-.elgg_inner {
-}
-
-.elgg-footer {
-}
-
 .elgg-image-block {
 	padding: 3px 0;
 }
-
 .elgg-image-block .elgg-image {
 	float: left;
 	margin-right: 5px;
@@ -193,7 +21,9 @@ h2 {
 	float: right;
 	margin-left: 5px;
 }
-
+/* ***************************************
+	List
+*************************************** */
 .elgg-list {
     border-top: 1px dotted #CCCCCC;
 	margin: 5px 0;
@@ -230,21 +60,237 @@ h2 {
 .elgg-list-content {
 	margin: 10px 5px;
 }
-.elgg-center {
-	margin: 0 auto;
+/* ***************************************
+	Modules
+*************************************** */
+.elgg-aside-module {
+	margin-bottom: 20px;
+}
+.elgg-aside-module .elgg-head {
+	border-bottom: 1px solid #CCCCCC;
+	margin-bottom: 5px;
+	padding-bottom: 5px;
+}
+.elgg-group-module {
+	margin-bottom: 20px;
+}
+.elgg-group-module .elgg-head {
+	padding: 5px 5px 3px;
+	background-color: #e4e4e4;
+	border-bottom: 1px solid #cccccc;
+	-moz-border-radius: 4px 4px 0 0;
+}
+.elgg-group-module .elgg-head h3 {
+	color: #333333;
+}
+.elgg-info-module {
+	margin-bottom: 20px;
+}
+.elgg-info-module .elgg-head {
+	background: #e4e4e4;
+	padding: 5px;
+	margin-bottom: 10px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+}
+.elgg-info-module .elgg-head h3 {
+	color: #333333;
+}
+.elgg-popup-module {
+	background-color: white;
+	border: 1px solid #cccccc;
+	z-index: 9999;
+	padding: 5px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+	-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+}
+.elgg-sidebar .elgg-module {
+	margin-top: 20px;
+}
+.elgg-sidebar .elgg-module .elgg-head {
+	border-bottom: 1px solid #CCCCCC;
+	margin-bottom: 5px;
+	padding-bottom: 5px;
 }
-
-.elgg-width-classic {
-	width: 990px;
+/* ***************************************
+	WIDGETS
+*************************************** */
+.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: #dedede;
+	border: 2px solid #cccccc;
+}
+.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: #cccccc;
+	border: 2px solid #b0b0b0;
+	font-weight: bold;
+}
+.elgg-widgets-add-panel li a {
+	display: block;
+}
+.elgg-widget-available {
+	color: #333333;
+	cursor: pointer;
+}
+.elgg-widget-available:hover {
+	background-color: #bcbcbc;
+}
+.elgg-widget-unavailable {
+	color: #888888;
+}
+.elgg-widget {
+	background-color: #dedede;
+	padding: 2px;
+	margin: 0 5px 15px;
+	position: relative;
+}
+.elgg-widget:hover {
+	background-color: #cccccc;
+}
+.elgg-widget-title {
+	background-color: #dedede;
+	height: 30px;
+	line-height: 30px;
+	overflow: hidden;
+}
+.elgg-widget-title h3 {
+	float: left;
+	padding: 0 45px 0 20px;
+	color: #333333;
+}
+.elgg-widget-controls a {
+	position: absolute;
+	top: 5px;
+	display: block;
+	width: 18px;
+	height: 18px;
+	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;
+}
+.elgg-widget-controls a.elgg-widget-collapsed {
+	background-position: 0px -365px;
+}
+a.elgg-widget-delete-button {
+	right: 5px;
+	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -198px 3px;
+}
+a.elgg-widget-edit-button {
+	right: 25px;
+	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -1px;
+}
+a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
+	border: 1px solid #cccccc;
+}
+.elgg-widget-container {
+	background-color: white;
+	width: 100%;
+	overflow: hidden;
+}
+.elgg-widget-edit {
+	display: none;
+	width: 96%;
+	padding: 2%;
+	border-bottom: 2px solid #dedede;
+}
+.elgg-widget-content {
+	padding: 10px;
+}
+.drag-handle {
+	cursor: move;
+}
+.elgg-widget-placeholder {
+	border: 2px dashed #dedede;
+	margin-bottom: 15px;
 }
 
-.elgg-text ul, ol {
-	margin: 0 1.5em 1.5em 0;
-	padding-left: 1.5em;
+/* ***************************************
+	SYSTEM MESSAGES
+*************************************** */
+
+.elgg-system-messages li {
+	color:white;
+	font-weight:bold;
+	display:block;
+	padding:3px 10px;
+	margin-top:10px;
+	cursor:pointer;
+	opacity:0.9;
+	-webkit-box-shadow:0 2px 5px rgba(0, 0, 0, 0.45);
+	-moz-box-shadow:0 2px 5px rgba(0, 0, 0, 0.45);
 }
-.elgg-text ul {
-	list-style-type: disc;
+.elgg-state-success {
+	background-color:black;
 }
-.elgg-text ol {
-	list-style-type: decimal;
+.elgg-state-error {
+	background-color:red;
+}
+
+.elgg-system-message p {
+	margin:0;
+}
+
+/* ***************************************
+	AVATAR ICONS
+*************************************** */
+.elgg-user-icon {
+	position:relative;
+}
+.elgg-user-icon.tiny,
+img.tiny {
+	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;
+	-moz-background-clip:  border;
+
+	-o-background-size: 25px;
+	-webkit-background-size: 25px;
+	-khtml-background-size: 25px;
+	-moz-background-size: 25px;
+}
+.elgg-user-icon.small,
+img.small {
+	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;
+	-moz-background-clip:  border;
+
+	-o-background-size: 40px;
+	-webkit-background-size: 40px;
+	-khtml-background-size: 40px;
+	-moz-background-size: 40px;
+}
+img.large {
+	width:200px;
+	height:200px;
+}
+img.medium {
+	width:100px;
+	height:100px;
 }
\ No newline at end of file
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
new file mode 100644
index 000000000..39c3ab148
--- /dev/null
+++ b/views/default/css/elements/icons.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ *
+ */
+
+?>
+
+/* ***************************************
+	ICONS
+*************************************** */
+
+.elgg-icon {
+	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left;
+	width: 16px;
+	height: 16px;
+	display: block;
+	float: left;
+	margin: 0 2px;
+}
+.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-likes {
+	background-position: 0px -101px;
+	width: 20px;
+	height: 20px;
+}
+.elgg-icon-likes:hover {
+	background-position: 0px -131px;
+}
+.elgg-icon-liked {
+	background-position: 0px -131px;
+	width: 20px;
+	height: 20px;
+}
+.elgg-icon-arrow-s {
+	background-position: -146px -56px;
+}
+.elgg-icon-arrow-s:hover {
+	background-position: -146px -76px;
+}
+.elgg-icon-following {
+	background-position: -35px -100px;
+	width: 22px;
+	height: 20px;
+}
+.elgg-icon-rss {
+	background-position: -249px 1px;
+}
+
+.ajax-loader {
+	background-color: white;
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif);
+	background-repeat: no-repeat;
+	background-position: center center;
+	min-height:33px;
+	min-width:33px;
+}
+.ajax-loader.left {
+	background-position: left center;
+}
+
diff --git a/views/default/css/elements/skin.php b/views/default/css/elements/layout.php
index 0c8ff05ad..63e1dc1c8 100644
--- a/views/default/css/elements/skin.php
+++ b/views/default/css/elements/layout.php
@@ -1,33 +1,15 @@
 <?php
 /**
- * Skin of the theme
  *
- * - theme chrome
- * - page layout
- * - icons
- *
- * @package Elgg.Core
- * @subpackage UI
  */
 ?>
 
 /* ***************************************
-	THEME CHROME
+	PAGE LAYOUT
 *************************************** */
 body {
 	background-color: white;
 }
-a {
-	color: #4690D6;
-}
-a:hover,
-a.selected {
-	color: #555555;
-}
-
-/* ***************************************
-	PAGE LAYOUT
-*************************************** */
 
 /***** TOPBAR ******/
 
@@ -61,6 +43,15 @@ a.selected {
 	margin-top: -1px;
 }
 
+/***** PAGE MESSAGES ******/
+.elgg-system-messages {
+	position:fixed;
+	top:24px;
+	right:20px;
+	max-width:500px;
+	z-index:9600;
+}
+
 /***** PAGE HEADER ******/
 
 .elgg-page-header {
@@ -114,6 +105,7 @@ a.selected {
 	min-height: 360px;
 	padding: 10px;
 }
+
 .elgg-aside {
 	padding: 20px 10px;
 	position: relative;
@@ -129,6 +121,7 @@ a.selected {
 	width: 160px;
 	margin: 0 10px 0 0;
 }
+
 .elgg-main .elgg-header {
     border-bottom: 1px solid #CCCCCC;
     padding-bottom: 3px;
@@ -143,21 +136,6 @@ a.selected {
 	float: right;
 }
 
-/***** PAGE SIDEBAR ******/
-
-.elgg-sidebar .elgg-module {
-	margin-top: 20px;
-}
-.elgg-sidebar .elgg-module .elgg-head {
-	border-bottom: 1px solid #CCCCCC;
-	margin-bottom: 5px;
-	padding-bottom: 5px;
-}
-
-.elgg-rss {
-	float: right;
-}
-
 /***** PAGE FOOTER ******/
 
 .elgg-page-footer {
@@ -188,121 +166,3 @@ a.selected {
 .elgg-page-footer .elgg-inner a:hover {
 	color: #666666;
 }
-
-/* ***************************************
-	ICONS
-*************************************** */
-
-.elgg-icon {
-	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left;
-	width: 16px;
-	height: 16px;
-	display: block;
-	float: left;
-	margin: 0 2px;
-}
-.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-likes {
-	background-position: 0px -101px;
-	width: 20px;
-	height: 20px;
-}
-.elgg-icon-likes:hover {
-	background-position: 0px -131px;
-}
-.elgg-icon-liked {
-	background-position: 0px -131px;
-	width: 20px;
-	height: 20px;
-}
-.elgg-icon-arrow-s {
-	background-position: -146px -56px;
-}
-.elgg-icon-arrow-s:hover {
-	background-position: -146px -76px;
-}
-.elgg-icon-following {
-	background-position: -35px -100px;
-	width: 22px;
-	height: 20px;
-}
-.elgg-icon-rss {
-	background-position: -249px 1px;
-}
-
-.ajax-loader {
-	background-color: white;
-	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif);
-	background-repeat: no-repeat;
-	background-position: center center;
-	min-height:33px;
-	min-width:33px;
-}
-.ajax-loader.left {
-	background-position: left center;
-}
-
-/*******************
-
-*********************/
-.elgg-aside-module {
-	margin-bottom: 20px;
-}
-.elgg-aside-module .elgg-head {
-	border-bottom: 1px solid #CCCCCC;
-	margin-bottom: 5px;
-	padding-bottom: 5px;
-}
-.elgg-group-module {
-	margin-bottom: 20px;
-}
-.elgg-group-module .elgg-head {
-	padding: 5px 5px 3px;
-	background-color: #e4e4e4;
-	border-bottom: 1px solid #cccccc;
-	-moz-border-radius: 4px 4px 0 0;
-}
-.elgg-group-module .elgg-head h3 {
-	color: #333333;
-}
-.elgg-info-module {
-	margin-bottom: 20px;
-}
-.elgg-info-module .elgg-head {
-	background: #e4e4e4;
-	padding: 5px;
-	margin-bottom: 10px;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-}
-.elgg-info-module .elgg-head h3 {
-	color: #333333;
-}
-.elgg-popup-module {
-	background-color: white;
-	border: 1px solid #cccccc;
-	z-index: 9999;
-	padding: 5px;
-	-webkit-border-radius: 6px;
-	-moz-border-radius: 6px;
-	-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
-	-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
-}
diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
new file mode 100644
index 000000000..87b012b22
--- /dev/null
+++ b/views/default/css/elements/misc.php
@@ -0,0 +1,486 @@
+<?php
+/**
+ *
+ */
+
+?>
+
+/* ***************************************
+	LIKES
+*************************************** */
+.elgg-likes-list {
+	background-color: white;
+	border:1px solid #cccccc;
+	width: 345px;
+	height: auto;
+	position: absolute;
+	text-align: left;
+	z-index: 9999;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+	-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+}
+
+/* ***************************************
+	RIVER
+*************************************** */
+.elgg-river {
+	border-top: 1px solid #CCCCCC;
+}
+.elgg-river > li {
+	border-bottom: 1px solid #CCCCCC;
+}
+.elgg-river-item {
+	padding: 7px 0;
+}
+.elgg-river-item .elgg-pict {
+	margin-right: 20px;
+}
+.elgg-river-timestamp {
+    color: #666666;
+    font-size: 85%;
+    font-style: italic;
+    line-height: 1.2em;
+}
+.elgg-river-content {
+	border-left: 1px solid #CCCCCC;
+	font-size: 85%;
+	line-height: 1.5em;
+	margin: 8px 0 5px 0;
+	padding-left: 5px;
+}
+.elgg-river-content .elgg-user-icon {
+	float: left;
+}
+.elgg-river-layout .elgg-input-dropdown {
+	float: right;
+	margin: 10px 0;
+}
+
+.elgg-river-comments-tab {
+	display: block;
+	background-color: #EEEEEE;
+	color: #4690D6;
+	margin-top: 5px;
+	width: auto;
+	float: right;
+	font-size: 85%;
+	padding: 1px 7px;
+	-moz-border-radius-topleft: 5px;
+	-moz-border-radius-topright: 5px;
+	-webkit-border-top-left-radius: 5px;
+	-webkit-border-top-right-radius: 5px;
+}
+.elgg-river-comments {
+	margin: 0;
+	border-top: none;
+}
+.elgg-river-comments li:first-child {
+	-moz-border-radius-topleft: 5px;
+	-webkit-border-top-left-radius: 5px;
+}
+.elgg-river-comments li:last-child {
+	-moz-border-radius-bottomleft: 5px;
+	-moz-border-radius-bottomright: 5px;
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
+}
+.elgg-river-comments li {
+	background-color: #EEEEEE;
+	border-bottom: none;
+	padding: 4px;
+	margin-bottom: 2px;
+}
+.elgg-river-comments .elgg-media {
+	padding: 0;
+}
+.elgg-river-more {
+	background-color: #EEEEEE;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	padding: 2px 4px;
+	font-size: 85%;
+	margin-bottom: 2px;
+}
+.elgg-river-item form {
+	background-color: #EEEEEE;
+	padding: 4px 4px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	display: none;
+	height: 30px;
+}
+.elgg-river-item input[type=text] {
+	width: 80%;
+}
+.elgg-river-item input[type=submit] {
+	margin: 0 0 0 10px;
+}
+.elgg-river-item > .elgg-alt a {
+	font-size: 90%;
+	float: right;
+	clear: both;
+}
+
+/* ***************************************
+	LOGIN / REGISTER
+*************************************** */
+/* login in sidebar */
+.elgg-aside #login {
+	width:auto;
+}
+.elgg-aside #login form {
+	width:auto;
+}
+.elgg-aside #login .login-textarea {
+	width:196px;
+}
+/* default login and register forms */
+#login input[type="text"],
+#login input[type="password"],
+.register input[type="text"],
+.register input[type="password"] {
+	margin:0 0 10px 0;
+}
+.register input[type="text"],
+.register input[type="password"] {
+	width:380px;
+}
+.rememberme label {
+	font-weight:normal;
+	font-size:100%;
+}
+.loginbox .elgg-submit-button {
+	margin-right: 15px;
+}
+#login .persistent-login {
+	float:right;
+	display:block;
+	margin-top:-34px;
+	margin-left:80px;
+}
+#login .persistent-login label {
+	font-size:1.0em;
+	font-weight: normal;
+	cursor: pointer;
+}
+#login-dropdown {
+	float:right;
+	position: absolute;
+	top:10px;
+	right:0;
+	z-index: 9599;
+}
+#login-dropdown #signin-button {
+	padding:10px 0px 12px;
+	line-height:23px;
+	text-align:right;
+}
+#login-dropdown #signin-button a.signin {
+	padding:2px 6px 3px 6px;
+	text-decoration:none;
+	font-weight:bold;
+	position:relative;
+	margin-left:0;
+	color:white;
+	border:1px solid #71B9F7;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+}
+#login-dropdown #signin-button a.signin span {
+	padding:4px 0 6px 12px;
+	background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
+	background-position:-150px -51px;
+	background-repeat:no-repeat;
+}
+#login-dropdown #signin-button a.signin:hover {
+	background-color:#71B9F7;
+	/* color:black; */
+}
+#login-dropdown #signin-button a.signin:hover span {
+	/* background-position:-150px -71px; */
+}
+#login-dropdown #signin-button a.signin.menu-open {
+	background:#cccccc !important;
+	color:#666666 !important;
+	border:1px solid #cccccc;
+	outline:none;
+}
+#login-dropdown #signin-button a.signin.menu-open span {
+	background-position:-150px -71px;
+	color:#333333;
+}
+#login-dropdown #signin-menu {
+	-moz-border-radius-topleft:5px;
+	-moz-border-radius-bottomleft:5px;
+	-moz-border-radius-bottomright:5px;
+	-webkit-border-top-left-radius:5px;
+	-webkit-border-bottom-left-radius:5px;
+	-webkit-border-bottom-right-radius:5px;
+	display:none;
+	background-color:white;
+	position:absolute;
+	width:210px;
+	z-index:100;
+	border:5px solid #CCCCCC;
+	text-align:left;
+	padding:12px;
+	top: 26px;
+	right: 0px;
+	margin-top:5px;
+	margin-right: 0px;
+	color:#333333;
+	-webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
+	-moz-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
+}
+#login-dropdown #signin-menu input[type=text],
+#login-dropdown #signin-menu input[type=password] {
+	width:203px;
+	margin:0 0 5px;
+}
+#login-dropdown #signin-menu p {
+	margin:0;
+}
+#login-dropdown #signin-menu label {
+	font-weight:normal;
+	font-size: 100%;
+}
+#login-dropdown #signin-menu .elgg-submit-button {
+	margin-right:15px;
+}
+
+
+/* ***************************************
+	USER SETTINGS
+*************************************** */
+.user-settings {
+	margin-bottom:20px;
+}
+.user-settings h3 {
+	background:#e4e4e4;
+	color:#333333;
+	padding:5px;
+	margin-top:10px;
+	margin-bottom:10px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+}
+.user-settings label {
+	color:#333333;
+	font-size:100%;
+	font-weight:normal;
+}
+.user-settings table.styled {
+	width:100%;
+}
+.user-settings table.styled {
+	border-top:1px solid #cccccc;
+}
+.user-settings table.styled td {
+	padding:2px 4px 2px 4px;
+	border-bottom:1px solid #cccccc;
+}
+.user-settings table.styled td.column-one {
+	width:200px;
+}
+.user-settings table.styled tr:hover {
+	background: #E4E4E4;
+}
+.add-user form {
+	width:300px;
+}
+
+/* ***************************************
+	FRIENDS PICKER
+*************************************** */
+.friends-picker-container h3 {
+	font-size:4em !important;
+	text-align: left;
+	margin:10px 0 20px 0 !important;
+	color:#999999 !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: 100%;
+}
+.friends-picker {
+	position: relative;
+	overflow: hidden;
+	margin: 0;
+	padding:0;
+	width: 730px;
+	height: auto;
+}
+.friendspicker-savebuttons {
+	background: white;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	margin:0 10px 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 0;
+	padding:0 0 10px 0;
+	border-bottom:1px solid #cccccc;
+}
+.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: #999999;
+	text-decoration: none;
+	display: block;
+	padding: 0;
+	width:20px;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+}
+.tabHasContent {
+	background: white;
+	color:#333333 !important;
+}
+.friends-picker-navigation li a:hover {
+	background: #333333;
+	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: 43px;
+	width: 43px;
+}
+.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/elgg_sprites.png") no-repeat left top;
+}
+.friends-picker-navigation-r {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -60px top;
+}
+.friends-picker-navigation-l:hover {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat left -44px;
+}
+.friends-picker-navigation-r:hover {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -60px -44px;
+}
+.friendspicker-savebuttons .elgg-submit-button,
+.friendspicker-savebuttons .elgg-cancel-button {
+	margin:5px 20px 5px 5px;
+}
+#collectionMembersTable {
+	background: #dedede;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	margin:10px 0 0 0;
+	padding:10px 10px 0 10px;
+}
+
+
+
+
+/* ***************************************
+	AVATAR UPLOADING & CROPPING
+*************************************** */
+#avatar-upload {
+	height:145px;
+}
+#current-user-avatar {
+	float:left;
+	width:160px;
+	height:130px;
+	border-right:1px solid #cccccc;
+	margin:0 20px 0 0;
+}
+#avatar-croppingtool {
+	border-top: 1px solid #cccccc;
+	margin:20px 0 0 0;
+	padding:10px 0 0 0;
+}
+#user-avatar {
+	float: left;
+	margin-right: 20px;
+}
+#user-avatar-preview {
+	float: left;
+	position: relative;
+	overflow: hidden;
+	width: 100px;
+	height: 100px;
+}
+
+/* ***************************************
+	MISC
+*************************************** */
+
+.user-picker .user-picker-entry {
+	clear:both;
+	height:25px;
+	padding:5px;
+	margin-top:5px;
+	border-bottom:1px solid #cccccc;
+}
+.user-picker-entry .delete-button {
+	margin-right:10px;
+}
+#dashboard-info {
+	float: left;
+	margin-bottom: 15px;
+}
+#dashboard-info .elgg-inner {
+	margin: 0 5px;
+	border: 2px solid #dedede;
+	padding: 5px;
+}
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index e4524b7f7..52e8bd1d4 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -279,14 +279,42 @@
 	color: white;
 	background-color: red;
 }
+.avatar_menu_button {
+	width:15px;
+	height:15px;
+	position:absolute;
+	cursor:pointer;
+	display:none;
+	right:0;
+	bottom:0;
+}
+.avatar_menu_arrow {
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px top;
+	width:15px;
+	height:15px;
+}
+.avatar_menu_arrow_on {
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px -16px;
+	width:15px;
+	height:15px;
+}
+.avatar_menu_arrow_hover {
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px -32px;
+	width:15px;
+	height:15px;
+}
+
 /* ***************************************
-	MISC NAVIGATION
+	OWNER BLOCK
 *************************************** */
 .elgg-owner-block-menu li {
 	float: left;
 	width: 50%;
 	font-size: 90%;
 }
+/* ***************************************
+	FOOTER
+*************************************** */
 .elgg-footer-menu li {
 	float: left;
 }
diff --git a/views/default/css/elements/spacing.php b/views/default/css/elements/spacing.php
index d65e2fc09..3dd2ad41d 100644
--- a/views/default/css/elements/spacing.php
+++ b/views/default/css/elements/spacing.php
@@ -6,6 +6,7 @@
  * @subpackage UI
  */
 ?>
+
 /* ***************************************
 	Spacing (from OOCSS)
 *************************************** */
@@ -15,14 +16,6 @@
 * Please use judiciously. You want to be using defaults most of the time, these are exceptions!
 * <type><location><size>
 */
-/* ====== Default spacing ====== */
-/* comment out for now
-h1, h2, h3, h4, h5, h6, ul, ol, dl, p, blockquote, .media {margin:10px;}
-h1, h2, h3, h4, h5, h6, img{padding-bottom:0px;}
-pre{margin: 10px;}
-table h1,table h2,table h3, table h4, table h5, table h6, table p, table ul, table ol, table dl{padding:0;}
-*/
-
 .pan{padding:0}
 .pas{padding:5px}
 .pam{padding:10px}
diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
index ac98c87f1..aece7a49d 100644
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -20,4 +20,17 @@ pre, code {
 }
 blockquote {
 	line-height:1.3em;
-}
\ No newline at end of file
+}
+small {
+	font-size: 90%;
+}
+h1, h2, h3, h4, h5, h6 {
+	font-weight: bold;
+	line-height: auto;
+}
+h1 { font-size: 1.8em; }
+h2 { font-size: 1.5em; line-height: 1.1em; }
+h3 { font-size: 1.2em; }
+h4 { font-size: 1.0em; }
+h5 { font-size: 0.9em; }
+h6 { font-size: 0.8em; }
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 44e489385..ec8336d9e 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -14,938 +14,42 @@ if ($old_css_view != "{$CONFIG->viewpath}") {
 }
 
 
+/*******************************************************************************
+
+ Base CSS
+ * CSS reset
+ * spacing
+ * grid
+
+*******************************************************************************/
 echo elgg_view('css/elements/reset', $vars);
-echo elgg_view('css/elements/core', $vars);
-echo elgg_view('css/elements/typography', $vars);
 echo elgg_view('css/elements/spacing', $vars);
-echo elgg_view('css/elements/navigation', $vars);
 echo elgg_view('css/elements/grid', $vars);
+echo elgg_view('css/elements/base', $vars);
+
+
+/*******************************************************************************
+ 
+ Skin CSS
+ * typography - fonts, line spacing
+ * chrome - general skin
+ * forms - form elements, buttons
+ * navigation - menus, breadcrumbs, pagination
+ * core - modules, lists, content blocks, notifications, avatars, widgets
+ * icons - icons, sprites, graphics
+ * layout - page layout
+ * misc - river, login, settings, profile
+ 
+*******************************************************************************/
+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/skin', $vars);
-
-
-?>
-
-/**
- * ELGG DEFAULT CSS
- */
-
-/* Table of Contents:
-
-	RESET CSS 					reduce browser inconsistencies in line height, margins, font size...
-	CSS BASICS					<body> <p> <a> <h1>
-	PAGE LAYOUT					main page content blocks: header, sidebar, footer...
-	GENERIC SELECTORS			reusable generic classes
-	ELGG TOPBAR					elgg topbar
-	HEADER CONTENTS
-	ELGG SITE NAVIGATION		Primary site navigation in header
-	FOOTER CONTENTS
-	SYSTEM MESSAGES				system messages overlay
-	BREADCRUMBS
-	SUBMENU						current page/tool submenu in sidebar
-	PAGINATION					re-usable default page navigation
-	ELGG TABBED NAVIGATION 		re-usable tabbed navigation
-	WIDGETS
-	LOGIN / REGISTER			login box, register, and lost password page styles
-	CONTENT HEADER
-	DEFAULT COMMENTS
-	ENTITY LISTINGS				elgg's default entity listings
-	USER SETTINGS				styles for user settings
-	GENERAL FORM ELEMENTS		default styles for all elgg input/form elements
-	FRIENDS PICKER
-	LIKES
-	MISC
-
-*/
-/* Colors:
-
-	#4690D6 - elgg light blue
-	#0054A7 - elgg dark blue
-	#e4ecf5 - elgg v light blue
-*/
-
-
-
-
-
-.elgg-border-plain {
-	border: 1px solid #eeeeee;
-}
-
-/* ***************************************
-	SYSTEM MESSAGES
-*************************************** */
-.elgg-system-messages {
-	position:fixed;
-	top:24px;
-	right:20px;
-	max-width:500px;
-	z-index:9600;
-}
-.elgg-system-messages li {
-	color:white;
-	font-weight:bold;
-	display:block;
-	padding:3px 10px;
-	margin-top:10px;
-	cursor:pointer;
-	opacity:0.9;
-	-webkit-box-shadow:0 2px 5px rgba(0, 0, 0, 0.45);
-	-moz-box-shadow:0 2px 5px rgba(0, 0, 0, 0.45);
-}
-.elgg-state-success {
-	background-color:black;
-}
-.elgg-state-error {
-	background-color:red;
-}
-
-.elgg-system-message p {
-	margin:0;
-}
-
-/* ***************************************
-	AVATAR
-*************************************** */
-#avatar-upload {
-	height:145px;
-}
-#current-user-avatar {
-	float:left;
-	width:160px;
-	height:130px;
-	border-right:1px solid #cccccc;
-	margin:0 20px 0 0;
-}
-#avatar-croppingtool {
-	border-top: 1px solid #cccccc;
-	margin:20px 0 0 0;
-	padding:10px 0 0 0;
-}
-#user-avatar {
-	float: left;
-	margin-right: 20px;
-}
-#user-avatar-preview {
-	float: left;
-	position: relative;
-	overflow: hidden;
-	width: 100px;
-	height: 100px;
-}
-
-/* ***************************************
-	WIDGETS
-*************************************** */
-.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: #dedede;
-	border: 2px solid #cccccc;
-}
-.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: #cccccc;
-	border: 2px solid #b0b0b0;
-	font-weight: bold;
-}
-.elgg-widgets-add-panel li a {
-	display: block;
-}
-.elgg-widget-available {
-	color: #333333;
-	cursor: pointer;
-}
-.elgg-widget-available:hover {
-	background-color: #bcbcbc;
-}
-.elgg-widget-unavailable {
-	color: #888888;
-}
-.elgg-widget {
-	background-color: #dedede;
-	padding: 2px;
-	margin: 0 5px 15px;
-	position: relative;
-}
-.elgg-widget:hover {
-	background-color: #cccccc;
-}
-.elgg-widget-title {
-	background-color: #dedede;
-	height: 30px;
-	line-height: 30px;
-	overflow: hidden;
-}
-.elgg-widget-title h3 {
-	float: left;
-	padding: 0 45px 0 20px;
-	color: #333333;
-}
-.elgg-widget-controls a {
-	position: absolute;
-	top: 5px;
-	display: block;
-	width: 18px;
-	height: 18px;
-	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;
-}
-.elgg-widget-controls a.elgg-widget-collapsed {
-	background-position: 0px -365px;
-}
-a.elgg-widget-delete-button {
-	right: 5px;
-	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -198px 3px;
-}
-a.elgg-widget-edit-button {
-	right: 25px;
-	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -1px;
-}
-a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
-	border: 1px solid #cccccc;
-}
-.elgg-widget-container {
-	background-color: white;
-	width: 100%;
-	overflow: hidden;
-}
-.elgg-widget-edit {
-	display: none;
-	width: 96%;
-	padding: 2%;
-	border-bottom: 2px solid #dedede;
-}
-.elgg-widget-content {
-	padding: 10px;
-}
-.drag-handle {
-	cursor: move;
-}
-.elgg-widget-placeholder {
-	border: 2px dashed #dedede;
-	margin-bottom: 15px;
-}
-
-/* ***************************************
-	RIVER
-*************************************** */
-.elgg-river {
-	border-top: 1px solid #CCCCCC;
-}
-.elgg-river > li {
-	border-bottom: 1px solid #CCCCCC;
-}
-.elgg-river-item {
-	padding: 7px 0;
-}
-.elgg-river-item .elgg-pict {
-	margin-right: 20px;
-}
-.elgg-river-timestamp {
-    color: #666666;
-    font-size: 85%;
-    font-style: italic;
-    line-height: 1.2em;
-}
-.elgg-river-content {
-	border-left: 1px solid #CCCCCC;
-	font-size: 85%;
-	line-height: 1.5em;
-	margin: 8px 0 5px 0;
-	padding-left: 5px;
-}
-.elgg-river-content .elgg-user-icon {
-	float: left;
-}
-.elgg-river-layout .elgg-input-dropdown {
-	float: right;
-	margin: 10px 0;
-}
-
-.elgg-river-comments-tab {
-	display: block;
-	background-color: #EEEEEE;
-	color: #4690D6;
-	margin-top: 5px;
-	width: auto;
-	float: right;
-	font-size: 85%;
-	padding: 1px 7px;
-	-moz-border-radius-topleft: 5px;
-	-moz-border-radius-topright: 5px;
-	-webkit-border-top-left-radius: 5px;
-	-webkit-border-top-right-radius: 5px;
-}
-.elgg-river-comments {
-	margin: 0;
-	border-top: none;
-}
-.elgg-river-comments li:first-child {
-	-moz-border-radius-topleft: 5px;
-	-webkit-border-top-left-radius: 5px;
-}
-.elgg-river-comments li:last-child {
-	-moz-border-radius-bottomleft: 5px;
-	-moz-border-radius-bottomright: 5px;
-	-webkit-border-bottom-right-radius: 5px;
-	-webkit-border-bottom-left-radius: 5px;
-}
-.elgg-river-comments li {
-	background-color: #EEEEEE;
-	border-bottom: none;
-	padding: 4px;
-	margin-bottom: 2px;
-}
-.elgg-river-comments .elgg-media {
-	padding: 0;
-}
-.elgg-river-more {
-	background-color: #EEEEEE;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	padding: 2px 4px;
-	font-size: 85%;
-	margin-bottom: 2px;
-}
-.elgg-river-item form {
-	background-color: #EEEEEE;
-	padding: 4px 4px;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	display: none;
-	height: 30px;
-}
-.elgg-river-item input[type=text] {
-	width: 80%;
-}
-.elgg-river-item input[type=submit] {
-	margin: 0 0 0 10px;
-}
-.elgg-river-item > .elgg-alt a {
-	font-size: 90%;
-	float: right;
-	clear: both;
-}
-
-/* ***************************************
-	LOGIN / REGISTER
-*************************************** */
-/* login in sidebar */
-.elgg-aside #login {
-	width:auto;
-}
-.elgg-aside #login form {
-	width:auto;
-}
-.elgg-aside #login .login-textarea {
-	width:196px;
-}
-/* default login and register forms */
-#login input[type="text"],
-#login input[type="password"],
-.register input[type="text"],
-.register input[type="password"] {
-	margin:0 0 10px 0;
-}
-.register input[type="text"],
-.register input[type="password"] {
-	width:380px;
-}
-.rememberme label {
-	font-weight:normal;
-	font-size:100%;
-}
-.loginbox .elgg-submit-button {
-	margin-right: 15px;
-}
-#login .persistent-login {
-	float:right;
-	display:block;
-	margin-top:-34px;
-	margin-left:80px;
-}
-#login .persistent-login label {
-	font-size:1.0em;
-	font-weight: normal;
-	cursor: pointer;
-}
-#login-dropdown {
-	float:right;
-	position: absolute;
-	top:10px;
-	right:0;
-	z-index: 9599;
-}
-#login-dropdown #signin-button {
-	padding:10px 0px 12px;
-	line-height:23px;
-	text-align:right;
-}
-#login-dropdown #signin-button a.signin {
-	padding:2px 6px 3px 6px;
-	text-decoration:none;
-	font-weight:bold;
-	position:relative;
-	margin-left:0;
-	color:white;
-	border:1px solid #71B9F7;
-	-webkit-border-radius:4px;
-	-moz-border-radius:4px;
-	border-radius:4px;
-}
-#login-dropdown #signin-button a.signin span {
-	padding:4px 0 6px 12px;
-	background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
-	background-position:-150px -51px;
-	background-repeat:no-repeat;
-}
-#login-dropdown #signin-button a.signin:hover {
-	background-color:#71B9F7;
-	/* color:black; */
-}
-#login-dropdown #signin-button a.signin:hover span {
-	/* background-position:-150px -71px; */
-}
-#login-dropdown #signin-button a.signin.menu-open {
-	background:#cccccc !important;
-	color:#666666 !important;
-	border:1px solid #cccccc;
-	outline:none;
-}
-#login-dropdown #signin-button a.signin.menu-open span {
-	background-position:-150px -71px;
-	color:#333333;
-}
-#login-dropdown #signin-menu {
-	-moz-border-radius-topleft:5px;
-	-moz-border-radius-bottomleft:5px;
-	-moz-border-radius-bottomright:5px;
-	-webkit-border-top-left-radius:5px;
-	-webkit-border-bottom-left-radius:5px;
-	-webkit-border-bottom-right-radius:5px;
-	display:none;
-	background-color:white;
-	position:absolute;
-	width:210px;
-	z-index:100;
-	border:5px solid #CCCCCC;
-	text-align:left;
-	padding:12px;
-	top: 26px;
-	right: 0px;
-	margin-top:5px;
-	margin-right: 0px;
-	color:#333333;
-	-webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
-	-moz-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
-}
-#login-dropdown #signin-menu input[type=text],
-#login-dropdown #signin-menu input[type=password] {
-	width:203px;
-	margin:0 0 5px;
-}
-#login-dropdown #signin-menu p {
-	margin:0;
-}
-#login-dropdown #signin-menu label {
-	font-weight:normal;
-	font-size: 100%;
-}
-#login-dropdown #signin-menu .elgg-submit-button {
-	margin-right:15px;
-}
-
-/* ***************************************
-	CONTENT HEADER
-**************************************** */
-#content-header {
-	border-bottom:1px solid #CCCCCC;
-}
-#content-header:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
-.content-header-title {
-	float:left;
-}
-.content-header-title {
-	margin-right:10px;
-	max-width: 530px;
-}
-.content-header-title h2 {
-	border:none;
-	margin-bottom:0;
-	padding-bottom:5px;
-}
-.content-header-options {
-	float:right;
-}
-.content-header-options .elgg-action-button {
-	float:right;
-	margin:0 0 5px 10px;
-}
-
-/* ***************************************
-	DEFAULT ENTITY LISTINGS
-**************************************** */
-.entity-listing {
-	border-bottom:1px dotted #cccccc;
-	padding:4px 0;
-	position:relative;
-}
-.entity-listing:first-child {
-	border-top:1px dotted #cccccc;
-}
-.entity-listing:hover {
-	background-color: #eeeeee;
-}
-.entity-listing .icon {
-	margin-left:3px;
-	margin-top:3px;
-}
-.entity-listing .info {
-	min-height:28px;
-	width:693px;
-}
-.entity-listing-info p {
-	margin:0;
-	/* line-height:1.2em; */
-}
-.entity-title {
-	font-weight: bold;
-	font-size: 1.1em;
-	line-height:1.2em;
-	color:#666666;
-	padding-bottom:4px;
-}
-.entity-title a {
-	color:#0054A7;
-}
-.entity-subtext {
-	color:#666666;
-	font-size: 85%;
-	font-style: italic;
-	line-height:1.2em;
-}
-/* entity metadata block */
-.elgg-metadata {
-	float:right;
-	margin-left:15px;
-	color:#aaaaaa;
-	font-size: 90%;
-}
-.entity-metadata {
-	float:right;
-	margin:0 3px 0 15px;
-	color:#aaaaaa;
-	font-size: 90%;
-}
-.entity-metadata span, .elgg-metadata span {
-	margin-left:14px;
-	text-align:right;
-	float:left;
-}
-.entity-metadata .entity-edit a, .elgg-metadata .entity-edit a {
-	color:#aaaaaa;
-}
-.entity-metadata .entity-edit a:hover, .elgg-metadata .entity-edit a:hover {
-	color:#555555;
-}
-.entity-metadata .delete-button, .elgg-metadata .delete-button {
-	margin-top:3px;
-}
-
-/* override hover for lists of site users/members */
-.members-list .entity-listing:hover {
-	background-color:white;
-}
-
-
-/* ***************************************
-	USER SETTINGS
-*************************************** */
-.user-settings {
-	margin-bottom:20px;
-}
-.user-settings h3 {
-	background:#e4e4e4;
-	color:#333333;
-	padding:5px;
-	margin-top:10px;
-	margin-bottom:10px;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-}
-.user-settings label {
-	color:#333333;
-	font-size:100%;
-	font-weight:normal;
-}
-.user-settings table.styled {
-	width:100%;
-}
-.user-settings table.styled {
-	border-top:1px solid #cccccc;
-}
-.user-settings table.styled td {
-	padding:2px 4px 2px 4px;
-	border-bottom:1px solid #cccccc;
-}
-.user-settings table.styled td.column-one {
-	width:200px;
-}
-.user-settings table.styled tr:hover {
-	background: #E4E4E4;
-}
-.add-user form {
-	width:300px;
-}
-
-/* ***************************************
-	FRIENDS PICKER
-*************************************** */
-.friends-picker-container h3 {
-	font-size:4em !important;
-	text-align: left;
-	margin:10px 0 20px 0 !important;
-	color:#999999 !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: 100%;
-}
-.friends-picker {
-	position: relative;
-	overflow: hidden;
-	margin: 0;
-	padding:0;
-	width: 730px;
-	height: auto;
-}
-.friendspicker-savebuttons {
-	background: white;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	margin:0 10px 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 0;
-	padding:0 0 10px 0;
-	border-bottom:1px solid #cccccc;
-}
-.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: #999999;
-	text-decoration: none;
-	display: block;
-	padding: 0;
-	width:20px;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-}
-.tabHasContent {
-	background: white;
-	color:#333333 !important;
-}
-.friends-picker-navigation li a:hover {
-	background: #333333;
-	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: 43px;
-	width: 43px;
-}
-.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/elgg_sprites.png") no-repeat left top;
-}
-.friends-picker-navigation-r {
-	background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -60px top;
-}
-.friends-picker-navigation-l:hover {
-	background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat left -44px;
-}
-.friends-picker-navigation-r:hover {
-	background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -60px -44px;
-}
-.friendspicker-savebuttons .elgg-submit-button,
-.friendspicker-savebuttons .elgg-cancel-button {
-	margin:5px 20px 5px 5px;
-}
-#collectionMembersTable {
-	background: #dedede;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	margin:10px 0 0 0;
-	padding:10px 10px 0 10px;
-}
-
-
-/* ***************************************
-	LIKES
-*************************************** */
-.elgg-likes-list {
-	background-color: white;
-	border:1px solid #cccccc;
-	width: 345px;
-	height: auto;
-	position: absolute;
-	text-align: left;
-	z-index: 9999;
-	-webkit-border-radius: 6px;
-	-moz-border-radius: 6px;
-	-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
-	-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
-}
-
-/* ***************************************
-	MISC
-*************************************** */
-
-.user-picker .user-picker-entry {
-	clear:both;
-	height:25px;
-	padding:5px;
-	margin-top:5px;
-	border-bottom:1px solid #cccccc;
-}
-.user-picker-entry .delete-button {
-	margin-right:10px;
-}
-
-
-#dashboard-info {
-	float: left;
-	margin-bottom: 15px;
-}
-#dashboard-info .elgg-inner {
-	margin: 0 5px;
-	border: 2px solid #dedede;
-	padding: 5px;
-}
-
-/* ***************************************
-	default avatar icons
-*************************************** */
-.elgg-user-icon {
-	position:relative;
-}
-.elgg-user-icon.tiny,
-img.tiny {
-	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;
-	-moz-background-clip:  border;
-
-	-o-background-size: 25px;
-	-webkit-background-size: 25px;
-	-khtml-background-size: 25px;
-	-moz-background-size: 25px;
-}
-.elgg-user-icon.small,
-img.small {
-	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;
-	-moz-background-clip:  border;
-
-	-o-background-size: 40px;
-	-webkit-background-size: 40px;
-	-khtml-background-size: 40px;
-	-moz-background-size: 40px;
-}
-img.large {
-	width:200px;
-	height:200px;
-}
-img.medium {
-	width:100px;
-	height:100px;
-}
-
-/* ***************************************
-	avatar drop-down menu
-*************************************** */
-.avatar_menu_button {
-	width:15px;
-	height:15px;
-	position:absolute;
-	cursor:pointer;
-	display:none;
-	right:0;
-	bottom:0;
-}
-.avatar_menu_arrow {
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px top;
-	width:15px;
-	height:15px;
-}
-.avatar_menu_arrow_on {
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px -16px;
-	width:15px;
-	height:15px;
-}
-.avatar_menu_arrow_hover {
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px -32px;
-	width:15px;
-	height:15px;
-}
-/* user avatar submenu options */
-.elgg-user-icon .sub_menu {
-	display:none;
-	position:absolute;
-	padding:0;
-	margin:0;
-	border-top:solid 1px #E5E5E5;
-	border-left:solid 1px #E5E5E5;
-	border-right:solid 1px #999999;
-	border-bottom:solid 1px #999999;
-	width:164px;
-	background:#FFFFFF;
-	text-align:left;
-	-webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
-	-moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
-	font-size:14px;
-}
-div.elgg-user-icon a.icon img {
-	z-index:10;
-}
-.elgg-user-icon .sub_menu a:link,
-.elgg-user-icon .sub_menu a:visited,
-.elgg-user-icon .sub_menu a:hover {
-	display:block;
-	font-weight: normal;
-}
-.elgg-user-icon .sub_menu a:hover {
-	background:#cccccc;
-	text-decoration:none;
-}
-.elgg-user-icon .sub_menu .displayname {
-	padding:0 !important;
-	margin:0 !important;
-	border-bottom:solid 1px #dddddd !important;
-	font-size:14px !important;
-}
-.elgg-user-icon .sub_menu .displayname a {
-	padding:3px 3px 3px 8px;
-	font-size:14px;
-	font-weight: bold;
-}
-.elgg-user-icon .sub_menu .displayname a .username {
-	display:block;
-	font-weight: normal;
-	font-size:12px;
-	text-align: left;
-	margin:0;
-}
-.sub_menu ul.sub_menu_list {
-	list-style: none;
-	margin-bottom:0;
-	padding-left:0;
-}
-.elgg-user-icon .sub_menu a {
-	padding:2px 3px 2px 8px;
-	font-size:12px;
-}
-/* admin menu options in avatar submenu */
-.user_menu_admin {
-	border-top:solid 1px #dddddd;
-}
-.elgg-user-icon .sub_menu li.user_menu_admin a {
-	color:red;
-}
-.elgg-user-icon .sub_menu li.user_menu_admin a:hover {
-	color:white;
-	background:red;
-}
-
-
+echo elgg_view('css/elements/navigation', $vars);
+echo elgg_view('css/elements/core', $vars);
+echo elgg_view('css/elements/icons', $vars);
+echo elgg_view('css/elements/layout', $vars);
+echo elgg_view('css/elements/misc', $vars);
 
-<?php
 
 // in case plugins are still extending the old 'css' view, display it
 echo elgg_view('css', $vars);
diff --git a/views/default/layout/shells/one_column_with_sidebar.php b/views/default/layout/shells/one_column_with_sidebar.php
index 6698b7372..0705e9766 100644
--- a/views/default/layout/shells/one_column_with_sidebar.php
+++ b/views/default/layout/shells/one_column_with_sidebar.php
@@ -10,7 +10,7 @@
  */
 ?>
 
-<div class="elgg-layout-sidebar elgg-center elgg-width-classic clearfix">
+<div class="elgg-layout-sidebar center clearfix" style="width: 990px;">
 	<div class="elgg-sidebar elgg-aside">
 		<?php
 			echo elgg_view('layout/elements/sidebar', $vars);