diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 4f50a8a93..67976cae7 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -30,7 +30,7 @@ get_admin_page_title();
 <?php
 wp_admin_css( 'css/global' );
 wp_admin_css();
-wp_admin_css( 'css/colors-fresh' );
+wp_admin_css( 'css/colors-classic' );
 ?>
 <!--[if gte IE 6]>
 <?php wp_admin_css( 'css/ie' );
diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index fb65cfe81..4a955da27 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -28,7 +28,7 @@ div.dashboard-widget-submit, ul.widget-control-list div.widget-control-actions {
 }
 
 div.ui-tabs-panel {
-	border-color: #cee1ef;
+	border-color: #83b4d5;
 }
 
 input.disabled, textarea.disabled {
@@ -42,7 +42,7 @@ li.widget-list-control-item h4.widget-title a:hover, .submit a, #user_info a, #d
 }
 
 li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form {
-	background-color: #eaf3fa;
+	background-color: #cfebf7;
 }
 
 select {
@@ -55,7 +55,7 @@ strong .post-com-count span {
 }
 
 ul#category-tabs li.ui-tabs-selected, .button-secondary, #quicktags, #login form .submit input {
-	background-color: #cee1ef !important;
+	background-color: #83b4d5 !important;
 }
 
 ul#widget-list li.widget-list-item h4.widget-title {
@@ -128,7 +128,7 @@ ul.widget-control-list .sorthelper {
 }
 
 .highlight {
-	background-color: #e4f2fd;
+	background-color: #14568a;
 	color: #d54e21;
 }
 
@@ -205,7 +205,7 @@ ul.widget-control-list .sorthelper {
 }
 
 .submitbox #previewview {
-	background-color: #2683ae;
+	background-color: #5488af;
 }
 
 .submitbox #previewview a, #rightnow .rbutton {
@@ -229,20 +229,20 @@ ul.widget-control-list .sorthelper {
 }
 
 .tablenav .dots {
-	background-color: #e4f2fd;
-	border-color: #e4f2fd;
+	background-color: #14568a;
+	border-color: #14568a;
 }
 
 .tablenav .next, .tablenav .prev{
-	background-color: #e4f2fd;
+	background-color: #14568a;
 	border-bottom-color: #2583ad;
-	border-color: #e4f2fd;
+	border-color: #14568a;
 	color: #2583ad;
 }
 
 .tablenav .next:hover, .tablenav .prev:hover {
 	border-bottom-color: #d54e21;
-	border-color: #e4f2fd;
+	border-color: #14568a;
 	color: #d54e21;
 }
 
@@ -260,12 +260,12 @@ ul.widget-control-list .sorthelper {
 }
 
 .widefat thead, .thead {
-	background-color: #464646;
+	background-color: #07273e;
 	color: #d7d7d7;
 }
 
 .widget-control-save, .widget-control-remove {
-	background-color: #cee1ef;
+	background-color: #83b4d5;
 	color: #246;
 }
 
@@ -274,8 +274,12 @@ ul.widget-control-list .sorthelper {
 	color: #666;
 }
 
-#adminmenu a, #submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, a {
-	color: #2583ad;
+#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, a {
+	color: #2e7ca0;
+}
+
+#adminmenu a, #submenu a {
+	color: #cfebf6;
 }
 
 /* Because we don't want visited on these links */
@@ -300,7 +304,7 @@ ul.widget-control-list .sorthelper {
 }
 
 #adminmenu, div#media-upload-header {
-	background-color: #e4f2fd;
+	background-color: #14568a;
 	border-bottom-color: #c6d9e9;
 }
 
@@ -321,8 +325,8 @@ input.readonly {
 }
 
 #dashmenu a.current {
-	background-color: #e4f2fd;
-	color: #555;
+	background-color: #14568a;
+	color: #cfebf6;
 }
 
 #dragHelper h4.widget-title, li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4 {
@@ -392,7 +396,7 @@ input.readonly {
 }
 
 #poststuff #editor-toolbar .active {
-	background-color: #cee1ef;
+	background-color: #83b4d5;
 	color: #333;
 }
 
@@ -425,9 +429,9 @@ input.readonly {
 }
 
 #sidemenu a {
-	background-color: #e4f2fd;
+	background-color: #14568a;
 	border-bottom-color: #c6d9e9;
-	border-top-color: #e4f2fd;
+	border-top-color: #14568a;
 }
 
 #tagchecklist span a {
@@ -451,7 +455,7 @@ input.readonly {
 	background-color: #fffeeb;
 	border-bottom-color: #ccc;
 	border-top-color: #ccc;
-	color: #555;
+	color: #cfebf6;
 }
 
 #upload-files a.file-link {
@@ -489,11 +493,11 @@ input.readonly {
 }
 
 #wphead {
-	background-color: #e4f2fd;
+	background-color: #14568a;
 }
 
 #wphead, body.login {
-	border-top-color: #464646;
+	border-top-color: #07273e;
 }
 
 #wphead #viewsite a {
@@ -507,9 +511,13 @@ input.readonly {
 }
 
 #wphead h1, #dashmenu a.current:hover, #login form input {
-	color: #555;
+	color: #cfebf6;
 }
 
 div#media-upload-error, .file-error, .required abbr, .widget-control-remove:hover, .delete:hover {
 	color: #f00;
+}
+
+#media-upload a.delete { 
+	color: #888; 
 }
\ No newline at end of file
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index fb65cfe81..df55da994 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -512,4 +512,8 @@ input.readonly {
 
 div#media-upload-error, .file-error, .required abbr, .widget-control-remove:hover, .delete:hover {
 	color: #f00;
-}
\ No newline at end of file
+}
+
+#media-upload a.delete {
+	color: #888;
+}
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index e289e20f1..182fc9c2f 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -128,7 +128,7 @@ function wp_iframe($content_func /* ... */) {
 <?php
 wp_admin_css( 'css/global' );
 wp_admin_css();
-wp_admin_css( 'css/colors-fresh' );
+wp_admin_css( 'css/colors-classic' );
 ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -142,7 +142,7 @@ if ( is_string($content_func) )
 	do_action( "admin_head_{$content_func}" );
 ?>
 </head>
-<body>
+<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?>>
 <?php
 	$args = func_get_args();
 	$args = array_slice($args, 1);
diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index 924326884..e75616695 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -30,6 +30,8 @@ if ( isset($_GET['tab']) )
 else
 	$tab = apply_filters('media_upload_default_tab', 'type');
 
+$body_id = 'media-upload';
+
 // let the action code decide how to handle the request
 if ( $tab == 'type' )
 	do_action("media_upload_$type");
diff --git a/wp-login.php b/wp-login.php
index 6394b9e0b..33ef9e8fa 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -15,7 +15,7 @@ function login_header($title = 'Login', $message = '', $wp_error = '') {
 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
 	<?php
 	wp_admin_css( 'css/login' );
-	wp_admin_css( 'css/colors-fresh' );
+	wp_admin_css( 'css/colors-classic' );
 	?>
 	<script type="text/javascript">
 		function focusit() {