Index: wp-admin/css/wp-admin.dev.css
===================================================================
--- wp-admin/css/wp-admin.dev.css	(revision 21520)
+++ wp-admin/css/wp-admin.dev.css	(working copy)
@@ -334,7 +334,14 @@
 }
 
 textarea,
-input,
+input[type="text"],
+input[type="password"],
+input[type="file"],
+input[type="email"],
+input[type="number"],
+input[type="search"],
+input[type="tel"],
+input[type="url"],
 select {
 	margin: 1px;
 	padding: 3px;
@@ -471,9 +478,6 @@
 input[type="text"],
 input[type="password"],
 input[type="file"],
-input[type="button"],
-input[type="submit"],
-input[type="reset"],
 input[type="email"],
 input[type="number"],
 input[type="search"],
@@ -769,37 +773,6 @@
 	text-decoration: none;
 }
 
-.submit input,
-.button,
-input.button,
-.button-primary,
-input.button-primary,
-.button-secondary,
-input.button-secondary,
-.button-highlighted,
-input.button-highlighted,
-#postcustomstuff .submit input {
-	text-decoration: none;
-	font-size: 12px !important;
-	line-height: 13px;
-	padding: 3px 8px;
-	cursor: pointer;
-	border-width: 1px;
-	border-style: solid;
-	-webkit-border-radius: 11px;
-	border-radius: 11px;
-	-moz-box-sizing: content-box;
-	-webkit-box-sizing: content-box;
-	box-sizing: content-box;
-}
-
-#minor-publishing-actions input,
-#major-publishing-actions input,
-#minor-publishing-actions .preview {
-	min-width: 80px;
-	text-align: center;
-}
-
 textarea.all-options,
 input.all-options {
 	width: 250px;
@@ -920,6 +893,20 @@
 	cursor: pointer;
 }
 
+.tablenav select {
+	float: left;
+	margin-right: 5px;
+}
+
+.tablenav input.button-secondary {
+	float: left;
+	margin-top: 1px;
+}
+
+input[name='s'] {
+	padding: 6px;
+}
+
 /*------------------------------------------------------------------------------
   3.0 - Actions
 ------------------------------------------------------------------------------*/
@@ -1011,15 +998,6 @@
 	list-style: square;
 }
 
-a.button,
-a.button-primary,
-a.button-secondary {
-	line-height: 15px;
-	padding: 3px 10px;
-	white-space: nowrap;
-	-webkit-border-radius: 10px;
-}
-
 .approve,
 .unapproved .unapprove {
 	display: none;
@@ -4636,6 +4614,9 @@
 	vertical-align: middle;
 }
 
+#choose-from-library-link {
+	float: left;
+}
 
 /*------------------------------------------------------------------------------
   16.2 - Custom Background Screen
Index: wp-admin/css/colors-classic.dev.css
===================================================================
--- wp-admin/css/colors-classic.dev.css	(revision 21520)
+++ wp-admin/css/colors-classic.dev.css	(working copy)
@@ -34,9 +34,6 @@
 input[type="text"],
 input[type="password"],
 input[type="file"],
-input[type="button"],
-input[type="submit"],
-input[type="reset"],
 input[type="email"],
 input[type="number"],
 input[type="search"],
@@ -56,9 +53,6 @@
 input[type="text"]:focus,
 input[type="password"]:focus,
 input[type="file"]:focus,
-input[type="button"]:focus,
-input[type="submit"]:focus,
-input[type="reset"]:focus,
 input[type="email"]:focus,
 input[type="number"]:focus,
 input[type="search"]:focus,
@@ -370,81 +364,217 @@
 	color: #666;
 }
 
+/* =Buttons
+----------------------------------------------- */
+
+.submit input,
 .button,
+input.button,
+.button-primary,
+a.button-primary,
+input.button-primary,
 .button-secondary,
-.submit input,
-input[type=button],
-input[type=submit] {
-	border-color: #bbb;
-	color: #464646;
+a.button-secondary,
+input.button-secondary,
+.button-highlighted,
+input.button-highlighted,
+#postcustomstuff .submit input {
+	cursor: pointer;
+	font-size: 13px;
+	font-family: sans-serif;
+	text-decoration: none;
+	height: auto;
+	line-height: 1;
+	padding: .4em 1.2em;
+	font-weight: normal;
+	
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	-o-border-radius: 3px;
+	-ms-border-radius: 3px;
+	border-radius: 3px;
 }
 
-.button:hover,
-.button-secondary:hover,
-.submit input:hover,
-input[type=button]:hover,
-input[type=submit]:hover {
-	color: #000;
-	border-color: #666;
+.button-secondary,
+a.button-secondary,
+input.button-secondary {
+	font-size: 12px;
+	padding: .3em 1.2em;
 }
 
+a.button {
+	padding: .5em 1.2em .5em;
+}
+
+.submit input[name='Submit'],
 .button,
-.submit input,
-.button-secondary {
-	text-shadow: 0 1px 0 #fff;
-	background: #f2f2f2;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#ededed), to(#fff));
-	background-image: -webkit-linear-gradient(bottom, #ededed, #fff);
-	background-image:    -moz-linear-gradient(bottom, #ededed, #fff);
-	background-image:      -o-linear-gradient(bottom, #ededed, #fff);
-	background-image: linear-gradient(to top, #ededed, #fff);
+input.button,
+.button-secondary, 
+a.button-secondary,
+input.button-secondary {
+	color: #555;
+	text-shadow: 0 1px 0 rgba(255,255,255,.7);
+		
+	background-color: #e5e5e5;
+	background-image: -moz-linear-gradient(top, #f7f7f7 0%, #e5e5e5 100%);
+	background-image: -webkit-linear-gradient(top, #f7f7f7 0%, #e5e5e5 100%);
+	background-image: -ms-linear-gradient(top, #f7f7f7 0%, #e5e5e5 100%);
+	background-image: -o-linear-gradient(top, #f7f7f7 0%, #e5e5e5 100%);
+	background-image: linear-gradient(top, #f7f7f7 0%, #e5e5e5 100%);
+	
+	border: 1px solid #D2D2D2;
+	
+	-moz-box-shadow: inset 0 2px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.4), inset 0 -1px 1px rgba(0,0,0,0.1);
+	-webkit-box-shadow: inset 0 2px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.4), inset 0 -1px 1px rgba(0,0,0,0.1);
+	-o-box-shadow: inset 0 2px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.4), inset 0 -1px 1px rgba(0,0,0,0.1);
+	-ms-box-shadow: inset 0 2px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.4), inset 0 -1px 1px rgba(0,0,0,0.1);
+	box-shadow: inset 0 2px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.4), inset 0 -1px 1px rgba(0,0,0,0.1);
 }
 
+.submit input[name='Submit']:hover,
+.button:hover,
+input.button:hover,
+.button-secondary:hover, 
+a.button-secondary:hover,
+input.button-secondary:hover {
+	color: #111;
+	text-shadow: 0 1px 0 rgba(255,255,255,.7);
+
+	background-color: #f1f1f1;
+	background-image: -moz-linear-gradient(top, #fff 0%, #ddd 100%);
+	background-image: -webkit-linear-gradient(top, #fff 0%, #ddd 100%);
+	background-image: -ms-linear-gradient(top, #fff 0%, #ddd 100%);
+	background-image: -o-linear-gradient(top, #fff 0%, #ddd 100%);
+	background-image: linear-gradient(top, #fff 0%, #ddd 100%);
+	
+	-moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.5), inset 0 -1px 1px rgba(0,0,0,0.1);
+	-webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.5), inset 0 -1px 1px rgba(0,0,0,0.1);
+	-o-box-shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.5), inset 0 -1px 1px rgba(0,0,0,0.1);
+	-ms-box-shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.5), inset 0 -1px 1px rgba(0,0,0,0.1);
+	box-shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.5), inset 0 -1px 1px rgba(0,0,0,0.1);
+}
+
+.submit input[name='Submit']:active,
 .button:active,
-.submit input:active,
-.button-secondary:active {
-	background: #eee;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff));
-	background-image: -webkit-linear-gradient(top, #ededed, #fff);
-	background-image:    -moz-linear-gradient(top, #ededed, #fff);
-	background-image:      -o-linear-gradient(top, #ededed, #fff);
-	background-image: linear-gradient(to bottom, #ededed, #fff);
+input.button:active,
+.button-secondary:active, 
+a.button-secondary:active,
+input.button-secondary:active {
+	color: #555;
+	text-shadow: 0 1px 0 rgba(255,255,255,.3);
+
+	background-color: #e5e5e5;
+	background-image: -moz-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: -ms-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: -o-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	
+	-moz-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	-webkit-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	-o-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	-ms-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
 }
 
-input.button-primary,
-button.button-primary,
+.submit input[name='Submit']:focus,
+.button:focus,
+input.button:focus,
+.button-secondary:focus, 
+a.button-secondary:focus,
+input.button-secondary:focus {
+	color: #555;
+	text-shadow: 0 1px 0 rgba(255,255,255,.3);
+
+	background-color: #e5e5e5;
+	background-image: -moz-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: -ms-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: -o-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	
+	border: 1px solid #888;
+	
+	-moz-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	-webkit-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	-o-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	-ms-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+}
+
+.button-primary, 
 a.button-primary {
-	border-color: #298cba;
-	font-weight: bold;
 	color: #fff;
-	text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
-	background: #21759b;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#227199), to(#298cba));
-	background-image: -webkit-linear-gradient(bottom, #227199, #298cba);
-	background-image:    -moz-linear-gradient(bottom, #227199, #298cba);
-	background-image:      -o-linear-gradient(bottom, #227199, #298cba);
-	background-image: linear-gradient(to top, #227199, #298cba);
+	text-shadow: 0 -1px 0 rgba(0,116,162,0.8);
+	
+	background-color: #2ea2cc;
+	background-image: -moz-linear-gradient(top, #1e8cbe 0%, #0074a2 100%);
+	background-image: -webkit-linear-gradient(top, #1e8cbe 0%,#0074a2 100%);
+	background-image: -ms-linear-gradient(top, #1e8cbe 0%,#0074a2 100%);
+	background-image: -o-linear-gradient(top, #1e8cbe 0%,#0074a2 100%);
+	background-image: linear-gradient(top, #1e8cbe 0%,#0074a2 100%);
+	
+	border: 1px solid #026896;
+	
+	-moz-box-shadow: inset 0 1px 0 #1e8cbe, inset 0 2px 0 rgba(120,200,230,0.5);
+	-webkit-box-shadow: inset 0 1px 0 #1e8cbe, inset 0 2px 0 rgba(120,200,230,0.5);
+	-o-box-shadow: inset 0 1px 0 #1e8cbe, inset 0 2px 0 rgba(120,200,230,0.5);
+	-ms-box-shadow: inset 0 1px 0 #1e8cbe, inset 0 2px 0 rgba(120,200,230,0.5);
+	box-shadow: inset 0 1px 0 #1e8cbe, inset 0 2px 0 rgba(120,200,230,0.5);
 }
 
-input.button-primary:active,
-button.button-primary:active,
+.button-primary:hover,
+a.button-primary:hover {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgb(0,116,162);
+
+	background-image: -moz-linear-gradient(top, #2ea2cc 0%, #0074a2 100%);
+	background-image: -webkit-linear-gradient(top, #2ea2cc 0%,#0074a2 100%);
+	background-image: -o-linear-gradient(top, #2ea2cc 0%,#0074a2 100%);
+	background-image: -ms-linear-gradient(top, #2ea2cc 0%,#0074a2 100%);
+	background-image: linear-gradient(top, #2ea2cc 0%,#0074a2 100%);
+	
+	-moz-box-shadow: inset 0 1px 0 #2ea2cc, inset 0 2px 0 rgba(120,200,230,0.7);
+	-webkit-box-shadow: inset 0 1px 0 #2ea2cc, inset 0 2px 0 rgba(120,200,230,0.7);
+	-o-box-shadow: inset 0 1px 0 #2ea2cc, inset 0 2px 0 rgba(120,200,230,0.7);
+	-ms-box-shadow: inset 0 1px 0 #2ea2cc, inset 0 2px 0 rgba(120,200,230,0.7);
+	box-shadow: inset 0 1px 0 #2ea2cc, inset 0 2px 0 rgba(120,200,230,0.7);
+}
+ 
+.button-primary:active,
 a.button-primary:active {
-	color: #eaf2fa;
-	background: #298cba;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#227199), to(#298cba));
-	background-image: -webkit-linear-gradient(top, #227199, #298cba);
-	background-image:    -moz-linear-gradient(top, #227199, #298cba);
-	background-image:      -o-linear-gradient(top, #227199, #298cba);
-	background-image: linear-gradient(to bottom, #227199, #298cba);
+	color:rgba(255,255,255,.9)
+
+	background-image: -moz-linear-gradient(top, #1E8CBE 0%, #0074a2 100%);
+	background-image: -webkit-linear-gradient(top, #1E8CBE 0%,#0074a2 100%);
+	background-image: -o-linear-gradient(top, #1E8CBE 0%,#0074a2 100%);
+	background-image: -ms-linear-gradient(top, #1E8CBE 0%,#0074a2 100%);
+	background-image: linear-gradient(top, #1E8CBE 0%,#0074a2 100%);
+	
+	-moz-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	-webkit-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	-o-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	-ms-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
 }
 
-input.button-primary:hover,
-button.button-primary:hover,
-a.button-primary:hover,
-a.button-primary:focus,
-a.button-primary:active {
-	border-color: #13455b;
-	color: #eaf2fa;
+.button-primary:focus,
+a.button-primary:focus {
+	color:rgba(255,255,255,.9)
+
+	background-image: -moz-linear-gradient(top, #1e8cbc 0%, #0074a2 100%);
+	background-image: -webkit-linear-gradient(top, #1e8cbc 0%,#0074a2 100%);
+	background-image: -o-linear-gradient(top, #1e8cbc 0%,#0074a2 100%);
+	background-image: -ms-linear-gradient(top, #1e8cbc 0%,#0074a2 100%);
+	background-image: linear-gradient(top, #1e8cbc 0%,#0074a2 100%);
+	
+	border: 1px solid #001f2e;
+	
+	-moz-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	-webkit-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	-o-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	-ms-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
 }
 
 .button-disabled,
Index: wp-admin/css/colors-fresh.dev.css
===================================================================
--- wp-admin/css/colors-fresh.dev.css	(revision 21520)
+++ wp-admin/css/colors-fresh.dev.css	(working copy)
@@ -29,9 +29,6 @@
 input[type="text"],
 input[type="password"],
 input[type="file"],
-input[type="button"],
-input[type="submit"],
-input[type="reset"],
 input[type="email"],
 input[type="number"],
 input[type="search"],
@@ -51,9 +48,6 @@
 input[type="text"]:focus,
 input[type="password"]:focus,
 input[type="file"]:focus,
-input[type="button"]:focus,
-input[type="submit"]:focus,
-input[type="reset"]:focus,
 input[type="email"]:focus,
 input[type="number"]:focus,
 input[type="search"]:focus,
@@ -361,81 +355,217 @@
 	color: #666;
 }
 
+/* =Buttons
+----------------------------------------------- */
+
+.submit input,
 .button,
+input.button,
+.button-primary,
+a.button-primary,
+input.button-primary,
 .button-secondary,
-.submit input,
-input[type=button],
-input[type=submit] {
-	border-color: #bbb;
-	color: #464646;
+a.button-secondary,
+input.button-secondary,
+.button-highlighted,
+input.button-highlighted,
+#postcustomstuff .submit input {
+	cursor: pointer;
+	font-size: 13px;
+	font-family: sans-serif;
+	text-decoration: none;
+	height: auto;
+	line-height: 1;
+	padding: .4em 1.2em;
+	font-weight: normal;
+	
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	-o-border-radius: 3px;
+	-ms-border-radius: 3px;
+	border-radius: 3px;
 }
 
-.button:hover,
-.button-secondary:hover,
-.submit input:hover,
-input[type=button]:hover,
-input[type=submit]:hover {
-	color: #000;
-	border-color: #666;
+.button-secondary,
+a.button-secondary,
+input.button-secondary {
+	font-size: 12px;
+	padding: .3em 1.2em;
 }
 
+a.button {
+	padding: .5em 1.2em .5em;
+}
+
+.submit input[name='Submit'],
 .button,
-.submit input,
-.button-secondary {
-	text-shadow: 0 1px 0 #fff;
-	background: #f2f2f2;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#ededed), to(#fff));
-	background-image: -webkit-linear-gradient(bottom, #ededed, #fff);
-	background-image:    -moz-linear-gradient(bottom, #ededed, #fff);
-	background-image:      -o-linear-gradient(bottom, #ededed, #fff);
-	background-image: linear-gradient(to top, #ededed, #fff);
+input.button,
+.button-secondary, 
+a.button-secondary,
+input.button-secondary {
+	color: #555;
+	text-shadow: 0 1px 0 rgba(255,255,255,.7);
+		
+	background-color: #e5e5e5;
+	background-image: -moz-linear-gradient(top, #f7f7f7 0%, #e5e5e5 100%);
+	background-image: -webkit-linear-gradient(top, #f7f7f7 0%, #e5e5e5 100%);
+	background-image: -ms-linear-gradient(top, #f7f7f7 0%, #e5e5e5 100%);
+	background-image: -o-linear-gradient(top, #f7f7f7 0%, #e5e5e5 100%);
+	background-image: linear-gradient(top, #f7f7f7 0%, #e5e5e5 100%);
+	
+	border: 1px solid #D2D2D2;
+	
+	-moz-box-shadow: inset 0 2px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.4), inset 0 -1px 1px rgba(0,0,0,0.1);
+	-webkit-box-shadow: inset 0 2px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.4), inset 0 -1px 1px rgba(0,0,0,0.1);
+	-o-box-shadow: inset 0 2px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.4), inset 0 -1px 1px rgba(0,0,0,0.1);
+	-ms-box-shadow: inset 0 2px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.4), inset 0 -1px 1px rgba(0,0,0,0.1);
+	box-shadow: inset 0 2px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.4), inset 0 -1px 1px rgba(0,0,0,0.1);
 }
 
+.submit input[name='Submit']:hover,
+.button:hover,
+input.button:hover,
+.button-secondary:hover, 
+a.button-secondary:hover,
+input.button-secondary:hover {
+	color: #111;
+	text-shadow: 0 1px 0 rgba(255,255,255,.7);
+
+	background-color: #f1f1f1;
+	background-image: -moz-linear-gradient(top, #fff 0%, #ddd 100%);
+	background-image: -webkit-linear-gradient(top, #fff 0%, #ddd 100%);
+	background-image: -ms-linear-gradient(top, #fff 0%, #ddd 100%);
+	background-image: -o-linear-gradient(top, #fff 0%, #ddd 100%);
+	background-image: linear-gradient(top, #fff 0%, #ddd 100%);
+	
+	-moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.5), inset 0 -1px 1px rgba(0,0,0,0.1);
+	-webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.5), inset 0 -1px 1px rgba(0,0,0,0.1);
+	-o-box-shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.5), inset 0 -1px 1px rgba(0,0,0,0.1);
+	-ms-box-shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.5), inset 0 -1px 1px rgba(0,0,0,0.1);
+	box-shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 2px 0 rgba(255,255,255,.5), inset 0 -1px 1px rgba(0,0,0,0.1);
+}
+
+.submit input[name='Submit']:active,
 .button:active,
-.submit input:active,
-.button-secondary:active {
-	background: #eee;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff));
-	background-image: -webkit-linear-gradient(top, #ededed, #fff);
-	background-image:    -moz-linear-gradient(top, #ededed, #fff);
-	background-image:      -o-linear-gradient(top, #ededed, #fff);
-	background-image: linear-gradient(to bottom, #ededed, #fff);
+input.button:active,
+.button-secondary:active, 
+a.button-secondary:active,
+input.button-secondary:active {
+	color: #555;
+	text-shadow: 0 1px 0 rgba(255,255,255,.3);
+
+	background-color: #e5e5e5;
+	background-image: -moz-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: -ms-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: -o-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	
+	-moz-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	-webkit-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	-o-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	-ms-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
 }
 
-input.button-primary,
-button.button-primary,
+.submit input[name='Submit']:focus,
+.button:focus,
+input.button:focus,
+.button-secondary:focus, 
+a.button-secondary:focus,
+input.button-secondary:focus {
+	color: #555;
+	text-shadow: 0 1px 0 rgba(255,255,255,.3);
+
+	background-color: #e5e5e5;
+	background-image: -moz-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: -ms-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: -o-linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	background-image: linear-gradient(top, #f5f5f5 0%, #ddd 100%);
+	
+	border: 1px solid #888;
+	
+	-moz-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	-webkit-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	-o-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	-ms-box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+	box-shadow: inset 0 1px 5px rgba(0,0,0,.3), inset 0 -1px 0 rgba(255,255,255,.5);
+}
+
+.button-primary, 
 a.button-primary {
-	border-color: #298cba;
-	font-weight: bold;
 	color: #fff;
-	text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
-	background: #21759b;
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#227199), to(#298cba));
-	background-image: -webkit-linear-gradient(bottom, #227199, #298cba);
-	background-image:    -moz-linear-gradient(bottom, #227199, #298cba);
-	background-image:      -o-linear-gradient(bottom, #227199, #298cba);
-	background-image: linear-gradient(to top, #227199, #298cba);
+	text-shadow: 0 -1px 0 rgba(0,116,162,0.8);
+	
+	background-color: #2ea2cc;
+	background-image: -moz-linear-gradient(top, #1e8cbe 0%, #0074a2 100%);
+	background-image: -webkit-linear-gradient(top, #1e8cbe 0%,#0074a2 100%);
+	background-image: -ms-linear-gradient(top, #1e8cbe 0%,#0074a2 100%);
+	background-image: -o-linear-gradient(top, #1e8cbe 0%,#0074a2 100%);
+	background-image: linear-gradient(top, #1e8cbe 0%,#0074a2 100%);
+	
+	border: 1px solid #026896;
+	
+	-moz-box-shadow: inset 0 1px 0 #1e8cbe, inset 0 2px 0 rgba(120,200,230,0.5);
+	-webkit-box-shadow: inset 0 1px 0 #1e8cbe, inset 0 2px 0 rgba(120,200,230,0.5);
+	-o-box-shadow: inset 0 1px 0 #1e8cbe, inset 0 2px 0 rgba(120,200,230,0.5);
+	-ms-box-shadow: inset 0 1px 0 #1e8cbe, inset 0 2px 0 rgba(120,200,230,0.5);
+	box-shadow: inset 0 1px 0 #1e8cbe, inset 0 2px 0 rgba(120,200,230,0.5);
 }
 
-input.button-primary:active,
-button.button-primary:active,
+.button-primary:hover,
+a.button-primary:hover {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgb(0,116,162);
+
+	background-image: -moz-linear-gradient(top, #2ea2cc 0%, #0074a2 100%);
+	background-image: -webkit-linear-gradient(top, #2ea2cc 0%,#0074a2 100%);
+	background-image: -o-linear-gradient(top, #2ea2cc 0%,#0074a2 100%);
+	background-image: -ms-linear-gradient(top, #2ea2cc 0%,#0074a2 100%);
+	background-image: linear-gradient(top, #2ea2cc 0%,#0074a2 100%);
+	
+	-moz-box-shadow: inset 0 1px 0 #2ea2cc, inset 0 2px 0 rgba(120,200,230,0.7);
+	-webkit-box-shadow: inset 0 1px 0 #2ea2cc, inset 0 2px 0 rgba(120,200,230,0.7);
+	-o-box-shadow: inset 0 1px 0 #2ea2cc, inset 0 2px 0 rgba(120,200,230,0.7);
+	-ms-box-shadow: inset 0 1px 0 #2ea2cc, inset 0 2px 0 rgba(120,200,230,0.7);
+	box-shadow: inset 0 1px 0 #2ea2cc, inset 0 2px 0 rgba(120,200,230,0.7);
+}
+ 
+.button-primary:active,
 a.button-primary:active {
-	color: #eaf2fa;
-	background: #298cba;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#227199), to(#298cba));
-	background-image: -webkit-linear-gradient(top, #227199, #298cba);
-	background-image:    -moz-linear-gradient(top, #227199, #298cba);
-	background-image:      -o-linear-gradient(top, #227199, #298cba);
-	background-image: linear-gradient(to bottom, #227199, #298cba);
+	color:rgba(255,255,255,.9)
+
+	background-image: -moz-linear-gradient(top, #1E8CBE 0%, #0074a2 100%);
+	background-image: -webkit-linear-gradient(top, #1E8CBE 0%,#0074a2 100%);
+	background-image: -o-linear-gradient(top, #1E8CBE 0%,#0074a2 100%);
+	background-image: -ms-linear-gradient(top, #1E8CBE 0%,#0074a2 100%);
+	background-image: linear-gradient(top, #1E8CBE 0%,#0074a2 100%);
+	
+	-moz-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	-webkit-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	-o-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	-ms-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
 }
 
-input.button-primary:hover,
-button.button-primary:hover,
-a.button-primary:hover,
-a.button-primary:focus,
-a.button-primary:active {
-	border-color: #13455b;
-	color: #eaf2fa;
+.button-primary:focus,
+a.button-primary:focus {
+	color:rgba(255,255,255,.9)
+
+	background-image: -moz-linear-gradient(top, #1e8cbc 0%, #0074a2 100%);
+	background-image: -webkit-linear-gradient(top, #1e8cbc 0%,#0074a2 100%);
+	background-image: -o-linear-gradient(top, #1e8cbc 0%,#0074a2 100%);
+	background-image: -ms-linear-gradient(top, #1e8cbc 0%,#0074a2 100%);
+	background-image: linear-gradient(top, #1e8cbc 0%,#0074a2 100%);
+	
+	border: 1px solid #001f2e;
+	
+	-moz-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	-webkit-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	-o-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	-ms-box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
+	box-shadow: inset 0 1px 5px #005684, inset 0 -1px 0 #1e8cbe;
 }
 
 .button-disabled,