Index: src/wp-admin/css/colors.css
===================================================================
--- src/wp-admin/css/colors.css	(revision 27059)
+++ src/wp-admin/css/colors.css	(working copy)
@@ -16,107 +16,7 @@
   1.0 - General
 ------------------------------------------------------------------------------*/
 
-html {
-	background: #f1f1f1;
-}
 
-/* Checkbooms */
-
-input[type=checkbox],
-input[type=radio] {
-	background: #fff;
-	border-color: #bbb;
-	color: #555;
-
-	-webkit-box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
-	box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
-}
-
-input[type=checkbox]:checked:before {
-	color: #1e8cbe;
-}
-
-input[type=radio]:checked:before {
-	background-color: #1e8cbe;
-}
-
-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
-	color: #2ea2cc;
-}
-
-
-/* Helper classes for plugins to leverage the active WordPress color scheme */
-
-.wp-ui-primary {
-	color: #fff;
-	background-color: #333;
-}
-.wp-ui-text-primary {
-	color: #333;
-}
-
-.wp-ui-highlight {
-	color: white;
-	background-color: #1e8cbe;
-}
-.wp-ui-text-highlight {
-	color: #1e8cbe;
-}
-
-.wp-ui-notification {
-	color: #fff;
-	background-color: #D54E21;
-}
-.wp-ui-text-notification {
-	color: #D54E21;
-}
-
-.wp-ui-text-icon {
-	color: #999;
-}
-
-
-#adminmenu .wp-has-current-submenu .wp-submenu,
-.no-js li.wp-has-current-submenu:hover .wp-submenu,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu,
-#adminmenu .wp-has-current-submenu .wp-submenu.sub-open,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu {
-	background-color: #333;
-}
-
-#adminmenu .wp-has-current-submenu .wp-submenu a,
-.no-js li.wp-has-current-submenu:hover .wp-submenu a,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a,
-#adminmenu .wp-has-current-submenu .wp-submenu.sub-open a,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
-	color: #bbb;
-}
-
-#adminmenu .wp-submenu a:hover,
-#adminmenu .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu .wp-submenu a:focus,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu .wp-submenu.sub-open a:hover,
-#adminmenu .wp-has-current-submenu .wp-submenu.sub-open a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-.no-js li.wp-has-current-submenu:hover .wp-submenu a:hover,
-.no-js li.wp-has-current-submenu:hover .wp-submenu a:focus,
-.folded #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-.folded #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
-.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
-.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus {
-	background: none;
-	color: #2ea2cc;
-}
-
-ul#adminmenu a.wp-has-current-submenu:after,
-ul#adminmenu > li.current > a.current:after {
-	border-right-color: #f1f1f1;
-}
-
 .row-actions {
 	color: #ddd;
 }
@@ -692,13 +592,6 @@
 	transition: none;
 }
 
-#adminmenu a {
-	color: #eee;
-}
-
-#adminmenu .awaiting-mod,
-#adminmenu .update-plugins,
-#sidemenu a .update-plugins,
 #rightnow .reallynow {
 	background-color: #d54e21;
 	color: #fff;
@@ -708,12 +601,6 @@
 	color: #fff;
 }
 
-#adminmenu li.current a .awaiting-mod,
-#adminmenu	li a.wp-has-current-submenu .update-plugins {
-	background-color: #2ea2cc;
-	color: #fff;
-}
-
 div#media-upload-header,
 div#plugin-information-header {
 	background-color: #f9f9f9;
@@ -1163,142 +1050,7 @@
 	border-color: #ddd;
 }
 
-/* menu */
-#adminmenuback,
-#adminmenuwrap,
-#adminmenu {
-	background-color: #222;
-}
 
-#adminmenu li.wp-menu-separator {
-	background: transparent;
-	border-color: transparent;
-}
-
-#adminmenu div.separator {
-	border-color: transparent;
-}
-
-#adminmenu li.wp-menu-open {
-	border-color: #dfdfdf;
-}
-
-#adminmenu li.menu-top:hover,
-#adminmenu li.opensub > a.menu-top,
-#adminmenu li > a.menu-top:focus {
-	background-color: #111;
-	color: #2ea2cc;
-}
-
-/* flyout menu arrow */
-#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after {
-	border-right-color: #333;
-}
-
-#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
-#adminmenu li.current a.menu-top,
-.folded #adminmenu li.wp-has-current-submenu,
-.folded #adminmenu li.current.menu-top,
-#adminmenu .wp-menu-arrow,
-#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head,
-#adminmenu .wp-menu-arrow div {
-	background: #0074a2;
-}
-
-#adminmenu li.wp-not-current-submenu .wp-menu-arrow {
-	border-top-color: #f9f9f9;
-	border-bottom-color: #dfdfdf;
-	background: transparent;
-}
-
-#adminmenu li.wp-not-current-submenu .wp-menu-arrow div {
-	background: #111;
-	border-color: #111;
-}
-
-#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
-#adminmenu li.current a.menu-top,
-#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head {
-	color: #fff;
-}
-
-.folded #adminmenu li.wp-has-current-submenu,
-.folded #adminmenu li.current.menu-top {
-	border-color: #666;	/* Match the background color of the current menu item for a flat appearance */
-}
-
-#adminmenu .wp-submenu li.current,
-#adminmenu .wp-submenu li.current a,
-#adminmenu .opensub .wp-submenu li.current a,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a,
-#adminmenu .wp-submenu li.current a:hover,
-#adminmenu .wp-submenu li.current a:focus {
-	color: #fff;
-	background: transparent;
-}
-
-#adminmenu .wp-submenu,
-.folded #adminmenu a.wp-has-current-submenu:focus + .wp-submenu,
-.folded #adminmenu .wp-has-current-submenu .wp-submenu {
-	background-color: #333;
-
-	-webkit-box-shadow: 0 3px 5px rgba(0,0,0,0.2);
-	box-shadow:         0 3px 5px rgba(0,0,0,0.2);
-}
-
-#adminmenu .wp-submenu a,
-.folded #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a,
-.folded #adminmenu .wp-has-current-submenu .wp-submenu a {
-	color: #bbb;
-}
-
-#adminmenu .wp-submenu .wp-submenu-head {
-	color: #fff;
-}
-
-/* collapse menu button */
-#collapse-menu {
-	color: #aaa;
-	-webkit-transition: all .1s ease-in-out;
-	-moz-transition:    all .1s ease-in-out;
-	transition:         all .1s ease-in-out;
-}
-
-#collapse-menu:hover {
-	color: #2ea2cc;
-}
-
-#collapse-button div:after {
-	color: #aaa;
-}
-
-#collapse-menu:hover #collapse-button div:after {
-	color: #2ea2cc;
-}
-
-#adminmenu div.wp-menu-image:before {
-	color: #999;
-}
-
-.icon16:before {
-	color: #999;
-}
-
-#adminmenu li.wp-has-current-submenu:hover div.wp-menu-image:before {
-	color: #fff;
-}
-
-#adminmenu li:hover div.wp-menu-image:before {
-	color: #2ea2cc;
-}
-
-#adminmenu .wp-has-current-submenu div.wp-menu-image:before,
-#adminmenu .current div.wp-menu-image:before,
-#adminmenu a.wp-has-current-submenu:hover div.wp-menu-image:before,
-#adminmenu a.current:hover div.wp-menu-image:before {
-	color: #fff;
-}
-
 /* Collapse button in theme preview */
 
 .wp-full-overlay a.collapse-sidebar {
Index: src/wp-admin/css/wp-admin.css
===================================================================
--- src/wp-admin/css/wp-admin.css	(revision 27059)
+++ src/wp-admin/css/wp-admin.css	(working copy)
@@ -85,6 +85,7 @@
 #adminmenu,
 #adminmenu .wp-submenu {
 	width: 160px;
+	background-color: #222;
 }
 
 #adminmenuback {
@@ -259,8 +260,9 @@
 
 input[type="checkbox"],
 input[type="radio"] {
-	border-width: 1px;
-	border-style: solid;
+	border: 1px solid #bbb;
+	background: #fff;
+	color: #555;
 	clear: none;
 	cursor: pointer;
 	display: inline-block;
@@ -276,8 +278,15 @@
 	-webkit-appearance: none;
 	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
+	-webkit-box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
+	box-shadow:         inset 0px 1px 2px rgba(0,0,0,0.1);
 }
 
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+	color: #2ea2cc;
+}
+
 td > input[type="checkbox"],
 .wp-admin p input[type=checkbox],
 .wp-admin p input[type=radio] {
@@ -320,6 +329,7 @@
 input[type=checkbox]:checked:before {
 	content: '\f147';
 	margin: -3px 0 0 -4px;
+	color: #1e8cbe;
 }
 
 input[type=radio]:checked:before {
@@ -331,6 +341,7 @@
 	height: 6px;
 	margin: 4px;
 	line-height: 16px;
+	background-color: #1e8cbe;
 }
 
 @-moz-document url-prefix() {
@@ -363,6 +374,10 @@
 	padding: 0;
 }
 
+html {
+	background: #f1f1f1;
+}
+
 body {
 	font-family: "Open Sans", sans-serif;
 	font-size: 13px;
@@ -850,7 +865,6 @@
 	padding-right: 0;
 }
 
-html,
 .wp-dialog {
 	background-color: #fff;
 }
@@ -904,6 +918,36 @@
    color: #a9a9a9;
 }
 
+/* Helper classes for plugins to leverage the active WordPress color scheme */
+
+.wp-ui-primary {
+	color: #fff;
+	background-color: #333;
+}
+.wp-ui-text-primary {
+	color: #333;
+}
+
+.wp-ui-highlight {
+	color: white;
+	background-color: #1e8cbe;
+}
+.wp-ui-text-highlight {
+	color: #1e8cbe;
+}
+
+.wp-ui-notification {
+	color: #fff;
+	background-color: #D54E21;
+}
+.wp-ui-text-notification {
+	color: #D54E21;
+}
+
+.wp-ui-text-icon {
+	color: #999;
+}
+
 /*------------------------------------------------------------------------------
   1.0 - Text Styles
 ------------------------------------------------------------------------------*/
@@ -947,6 +991,7 @@
 /* New Menu icons */
 
 .icon16:before {
+	color: #999;
 	font: normal 20px/1 'dashicons';
 	speak: none;
 	padding: 6px 0;
@@ -1741,6 +1786,7 @@
 	display: block;
 	line-height: 18px;
 	padding: 2px 5px;
+	color: #eee;
 }
 
 #adminmenu li.menu-top {
@@ -1763,8 +1809,18 @@
 .folded #adminmenu .wp-has-current-submenu .wp-submenu {
 	padding: 7px 0 8px;
 	z-index: 9999;
+	background-color: #333;
+
+	-webkit-box-shadow: 0 3px 5px rgba(0,0,0,0.2);
+	box-shadow:         0 3px 5px rgba(0,0,0,0.2);
 }
 
+#adminmenu .wp-submenu a,
+.folded #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a,
+.folded #adminmenu .wp-has-current-submenu .wp-submenu a {
+	color: #bbb;
+}
+
 .js #adminmenu .sub-open,
 .js #adminmenu .opensub .wp-submenu,
 #adminmenu a.menu-top:focus + .wp-submenu,
@@ -1787,8 +1843,20 @@
 	margin-top: 0;
 	-webkit-box-shadow: none;
 	box-shadow: none;
+	background-color: #333;
 }
 
+#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
+#adminmenu li.current a.menu-top,
+.folded #adminmenu li.wp-has-current-submenu,
+.folded #adminmenu li.current.menu-top,
+#adminmenu .wp-menu-arrow,
+#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head,
+#adminmenu .wp-menu-arrow div {
+	background: #0074a2;
+	color: #fff;
+}
+
 .folded #adminmenu .wp-submenu.sub-open,
 .folded #adminmenu .opensub .wp-submenu,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu.sub-open,
@@ -1819,6 +1887,15 @@
 	padding: 6px 0;
 }
 
+#adminmenu .wp-submenu li.current,
+#adminmenu .wp-submenu li.current a,
+#adminmenu .opensub .wp-submenu li.current a,
+#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a,
+#adminmenu .wp-submenu li.current a:hover,
+#adminmenu .wp-submenu li.current a:focus {
+	color: #fff;
+}
+
 #adminmenu .wp-not-current-submenu li > a,
 .folded #adminmenu .wp-has-current-submenu li > a {
 	padding-right: 16px;
@@ -1895,6 +1972,22 @@
 	transition: all .1s ease-in-out;
 }
 
+#adminmenu div.wp-menu-image:before {
+	color: #999;
+}
+
+#adminmenu li.wp-has-current-submenu:hover div.wp-menu-image:before,
+#adminmenu .wp-has-current-submenu div.wp-menu-image:before,
+#adminmenu .current div.wp-menu-image:before,
+#adminmenu a.wp-has-current-submenu:hover div.wp-menu-image:before,
+#adminmenu a.current:hover div.wp-menu-image:before {
+	color: #fff;
+}
+
+#adminmenu li:hover div.wp-menu-image:before {
+	color: #2ea2cc;
+}
+
 .folded #adminmenu div.wp-menu-image {
 	width: 35px;
 	height: 30px;
@@ -1939,13 +2032,13 @@
 ul#adminmenu a.wp-has-current-submenu:after,
 ul#adminmenu > li.current > a.current:after {
 	right: 0;
-	border: solid transparent;
+	border: solid 8px transparent;
 	content: " ";
 	height: 0;
 	width: 0;
 	position: absolute;
 	pointer-events: none;
-	border-width: 8px;
+	border-right-color: #f1f1f1;
 	top: 50%;
 	margin-top: -8px;
 }
@@ -1980,11 +2073,16 @@
 	top: 18px;
 }
 
+#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after {
+	border-right-color: #333;
+}
+
 /* ensure that wp-submenu's box shadow doesn't appear on top of the focused menu item's background. */
 #adminmenu li.menu-top:hover,
 #adminmenu li.opensub > a.menu-top,
 #adminmenu li > a.menu-top:focus {
 	position: relative;
+	background-color: #111;
 }
 
 .folded #adminmenu li.menu-top:hover,
@@ -2000,22 +2098,20 @@
 }
 
 #adminmenu li.wp-menu-separator {
-	height: 3px;
+	height: 5px;
 	padding: 0;
 	margin: 0 0 6px 0;
-	border-width: 1px 0;
-	border-style: solid;
 	cursor: inherit;
 }
 
+/* is this even needed given that it's nested beneath the above li.wp-menu-separator? */
 #adminmenu div.separator {
-	height: 1px;
+	height: 2px;
 	padding: 0;
-	border-width: 1px 0 0 0;
-	border-style: solid;
 }
 
 #adminmenu .wp-submenu .wp-submenu-head {
+	color: #fff;
 	font-weight: 400;
 	font-size: 14px;
 	padding: 8px 4px 8px 11px;
@@ -2031,6 +2127,8 @@
 #adminmenu span.update-plugins,
 #sidemenu li a span.update-plugins {
 	display: inline-block;
+	background-color: #d54e21;
+	color: #fff;
 	font-size: 9px;
 	line-height: 17px;
 	font-weight: 600;
@@ -2048,6 +2146,12 @@
 	padding: 0 6px;
 }
 
+#adminmenu li.current a .awaiting-mod,
+#adminmenu	li a.wp-has-current-submenu .update-plugins {
+	background-color: #2ea2cc;
+	color: #fff;
+}
+
 #adminmenu li span.count-0,
 #sidemenu li a .count-0 {
 	display: none;
@@ -2057,8 +2161,17 @@
 	font-size: 13px;
 	line-height: 34px;
 	margin-top: 10px;
+	color: #aaa;
+	-webkit-transition: all .1s ease-in-out;
+	-moz-transition:    all .1s ease-in-out;
+	transition:         all .1s ease-in-out;
 }
 
+#adminmenu #collapse-menu:hover,
+#collapse-menu:hover #collapse-button div:after {
+	color: #2ea2cc;
+}
+
 .folded #collapse-menu span {
 	display: none;
 }
@@ -2089,6 +2202,7 @@
 	line-height: 15px;
 	left: -3px;
 	top: -3px;
+	color: #aaa;
 	font: normal 20px/1 'dashicons' !important;
 	speak: none;
 	margin: 0 auto;