From 785bfd4b922b13e3254f7580056fdc3ed54a4538 Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Mon, 1 Nov 2010 16:30:27 +0000
Subject: [PATCH] First pass of wp-admin.css cleanup from JohnONolan. Merge
 conflicts manually resolved and marked for review Not recompressed for now to
 allow for easier side by side testing. So test with SCRIPT_DEBUG set to true.
 See #14770 props JohnONolan

git-svn-id: https://develop.svn.wordpress.org/trunk@16136 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/wp-admin.dev.css | 4288 ++++++++++++++++++---------------
 1 file changed, 2402 insertions(+), 1886 deletions(-)

diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css
index 78ee7c115b..cd1a5ff6cc 100644
--- a/wp-admin/css/wp-admin.dev.css
+++ b/wp-admin/css/wp-admin.dev.css
@@ -1,3 +1,140 @@
+/*------------------------------------------------------------------------------
+
+
+Hello, this is the main WordPress admin CSS file.
+All the important stuff is in here.
+
+
+IMPORTANT:
+----------
+Please be careful when editing this file, do not just add 
+another ID or Class because it's easy, we want to try and 
+maintain the WordPress CSS with good styles, not easy ones!
+
+Before editing or adding to this file, please review the table 
+of contents and ensure that you add new styles in the correct 
+location. This makes it easier to maintain going forwards.
+
+Be obvious, not clever. Styles which can be easily changed
+are far more desirable than a complex cascading masterpiece.
+
+
+TABLE OF CONTENTS:
+------------------
+ 1.0 - Text Elements
+ 2.0 - Forms
+ 3.0 - Actions
+ 4.0 - Notifications
+ 5.0 - TinyMCE
+ 6.0 - Admin Header
+	6.1 - Favorites Menu
+	6.2 - Screen Options Tabs
+ 7.0 - Main Navigation
+ 8.0 - Layout Blocks
+ 9.0 - Dashboard
+10.0 - List Posts
+	10.1 - Inline Editing
+11.0 - Write/Edit Post Screen
+	11.1 - Custom Fields
+	11.2 - Post Revisions
+12.0 - Categories
+13.0 - Tags
+14.0 - Media Screen
+	14.1 - Media Uploader
+	14.2 - Image Editor
+15.0 - Comments Screen
+16.0 - Themes
+	16.1 - Custom Header
+	16.2 - Custom Background
+	16.3 - Tabbed Admin Screen Interface
+17.0 - Plugins
+18.0 - Users
+19.0 - Tools
+20.0 - Settings
+21.0 - Admin Footer
+22.0 - Misc
+23.0 - Dead
+
+
+------------------------------------------------------------------------------*/
+
+
+
+
+/*------------------------------------------------------------------------------
+  1.0 - Text Styles
+------------------------------------------------------------------------------*/
+
+p,
+ul,
+ol,
+blockquote,
+input,
+select {
+	font-size: 12px;
+}
+
+ol {
+	list-style-type: decimal;
+	margin-left: 2em;
+}
+
+.code, code {
+	font-family: Consolas, Monaco, Courier, monospace;
+}
+
+kbd, code {
+	padding: 1px 3px;
+	margin: 0 1px;
+	font-size: 11px;
+}
+
+.quicktags, .search {
+	font: 12px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+}
+
+.icon32 {
+	float: left;
+	height: 36px;
+	margin: 14px 6px 0 0;
+	width: 36px;
+}
+
+.key-labels label {
+	line-height: 24px;
+}
+
+.subtitle {
+	font-size: 0.75em;
+	line-height: 1;
+	padding-left: 25px;
+}
+
+.pre {
+	/* http://www.longren.org/2006/09/27/wrapping-text-inside-pre-tags/ */
+	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+ */
+}
+
+.howto {
+	font-style: italic;
+	display: block;
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+}
+
+p.install-help {
+	margin: 8px 0;
+	font-style: italic;
+}
+
+
+/*------------------------------------------------------------------------------
+  2.0 - Forms
+------------------------------------------------------------------------------*/
+
 textarea,
 input[type="text"],
 input[type="password"],
@@ -14,261 +151,10 @@ select {
 	border-radius: 4px;
 }
 
-p,
-ul,
-ol,
-blockquote,
-input,
-select {
-	font-size: 12px;
-}
-
 select option {
 	padding: 2px;
 }
 
-.plugins #name {width: 33%}
-
-.plugins .name,
-#pass-strength-result.strong,
-#pass-strength-result.short,
-.button-highlighted,
-input.button-highlighted,
-#quicktags #ed_strong,
-#ed_reply_toolbar #ed_reply_strong {
-	font-weight: bold;
-}
-
-.plugins p {
-	margin: 0 4px;
-	padding: 0;
-}
-
-.plugins .desc p {
-	margin: 0 0 8px;
-}
-
-.plugins td.desc {
-	line-height: 1.5em;
-}
-
-.plugins .desc ul,
-.plugins .desc ol {
-	margin: 0 0 0 2em;
-}
-
-.plugins .desc ul {
-	list-style-type: disc;
-}
-
-.plugins .action-links {
-	white-space: nowrap;
-}
-
-.plugins .row-actions-visible {
-	padding: 0;
-}
-
-.plugins tbody th.check-column {
-	padding: 7px 0;
-}
-
-.plugins td, .plugins th {
-	border-bottom: 0 none;
-}
-
-#install-plugins .plugins td,
-#install-plugins .plugins th {
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-}
-
-.plugins .inactive td,
-.plugins .inactive th,
-.plugins .active td,
-.plugins .active th {
-	border-top-style: solid;
-	border-top-width: 1px;
-	padding: 5px 7px 0;
-}
-
-#wpbody-content .plugins .plugin-title {
-	padding-right: 12px;
-}
-
-.plugins .second td,
-.plugins .second th {
-	border-top: 0 none;
-	padding: 0 7px 5px;
-}
-
-.plugins-php .widefat tfoot th,
-.plugins-php .widefat tfoot td {
-	border-top-style: solid;
-	border-top-width: 1px;
-}
-
-.import-system {
-	font-size: 16px;
-}
-
-.anchors {
-	margin: 10px 20px 10px 20px;
-}
-
-#loading-items {
-	position: absolute;
-	z-index: 9999;
-	padding: 10px;
-	background-color: #fff;
-	font-weight: bold;
-	text-align: center;
-	opacity: 0.5;
-}
-
-table#availablethemes {
-	border-spacing: 0;
-	border-width: 1px 0;
-	border-style: solid none;
-	margin: 10px auto;
-	width: 100%;
-}
-
-td.available-theme {
-	vertical-align: top;
-	width: 240px;
-	margin: 0;
-	padding: 20px;
-	text-align: left;
-}
-
-table#availablethemes td {
-	border-width: 0 1px 1px;
-	border-style: none solid solid;
-}
-
-table#availablethemes td.right,
-table#availablethemes td.left  {
-	border-right: 0 none;
-	border-left: 0 none;
-}
-
-table#availablethemes td.bottom {
-	border-bottom: 0 none;
-}
-
-.available-theme a.screenshot {
-	width: 240px;
-	height: 180px;
-	display: block;
-	border-width: 1px;
-	border-style: solid;
-	margin-bottom: 10px;
-	overflow: hidden;
-}
-
-.available-theme img {
-	width: 240px;
-}
-
-.available-theme h3 {
-	margin: 15px 0 5px;
-}
-
-#current-theme {
-	margin: 1em 0 1.5em;
-}
-
-#current-theme a {
-	border-bottom: none;
-}
-
-#current-theme h3 {
-	font-size: 17px;
-	font-weight: normal;
-	margin: 0;
-}
-
-#current-theme .theme-description {
-	margin-top: 5px;
-}
-
-#current-theme img {
-	float: left;
-	border-width: 1px;
-	border-style: solid;
-	margin-right: 1em;
-	margin-bottom: 1.5em;
-	width: 150px;
-}
-
-.theme-options span {
-	text-transform: uppercase;
-	font-size: 13px;
-}
-
-.theme-options a {
-	font-size: 15px;
-}
-
-#TB_window #TB_title a.tb-theme-preview-link,
-#TB_window #TB_title a.tb-theme-preview-link:visited {
-	font-weight: bold;
-	text-decoration: none;
-}
-
-#TB_window #TB_title {
-	background-color: #222;
-	color: #cfcfcf;
-}
-
-.checkbox {
-	border: none;
-	margin: 0;
-	padding: 0;
-}
-
-.code, code {
-	font-family: Consolas, Monaco, Courier, monospace;
-}
-
-kbd, code {
-	padding: 1px 3px;
-	margin: 0 1px;
-	font-size: 11px;
-}
-
-.commentlist li {
-	padding: 1em 1em .2em;
-	margin: 0;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
-
-.commentlist li li {
-	border-bottom: 0;
-	padding: 0;
-}
-
-.commentlist p {
-	padding: 0;
-	margin: 0 0 .8em;
-}
-
-.post-categories {
-	display: inline;
-	margin: 0;
-	padding: 0;
-}
-
-.post-categories li {
-	display: inline;
-}
-
-.quicktags, .search {
-	font: 12px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-}
-
 .submit {
 	padding: 1.5em 0;
 	margin: 5px 0;
@@ -285,8 +171,164 @@ form p.submit a.cancel:hover {
 	text-decoration: none;
 }
 
-#submitdiv h3 {
-	margin-bottom: 0 !important;
+.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: 11px !important;
+	line-height: 13px;
+	padding: 3px 8px;
+	cursor: pointer;
+	border-width: 1px;
+	border-style: solid;
+	-moz-border-radius: 11px;
+	-khtml-border-radius: 11px;
+	-webkit-border-radius: 11px;
+	border-radius: 11px;
+	-moz-box-sizing: content-box;
+	-webkit-box-sizing: content-box;
+	-khtml-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;
+}
+
+input.large-text,
+textarea.large-text {
+	width: 99%;
+}
+
+input.regular-text,
+#adduser .form-field input {
+	width: 25em;
+}
+
+input.small-text {
+	width: 50px;
+}
+
+#doaction,
+#doaction2,
+#post-query-submit {
+	margin-right: 8px;
+}
+
+.tablenav select[name="action"],
+.tablenav select[name="action2"] {
+	width: 130px;
+}
+
+.tablenav select[name="m"] {
+	width: 155px;
+}
+
+.tablenav select#cat {
+	width: 170px;
+}
+
+#wpcontent select {
+	padding: 2px;
+	height: 2em;
+	font-size: 11px;
+}
+
+#wpcontent option {
+	padding: 2px;
+}
+
+#timezone_string option {
+	margin-left: 1em;
+}
+
+label,
+#your-profile label + a {
+	vertical-align: middle;
+}
+
+#misc-publishing-actions label {
+	vertical-align: baseline;
+}
+
+#pass-strength-result {
+	border-style: solid;
+	border-width: 1px;
+	float: left;
+	margin: 12px 5px 5px 1px;
+	padding: 3px 5px;
+	text-align: center;
+	width: 200px;
+	display: none;
+}
+.indicator-hint {
+	padding-top: 8px;
+}
+
+p.search-box {
+	float: right;
+	margin: -5px 0 0;
+}
+
+
+/*------------------------------------------------------------------------------
+  3.0 - Actions
+------------------------------------------------------------------------------*/
+
+#major-publishing-actions {
+	padding: 6px;
+	clear: both;
+	border-top: none;
+}
+
+
+
+#delete-action {
+	line-height: 25px;
+	vertical-align: middle;
+	text-align: left;
+	float: left;
+}
+
+#publishing-action {
+	text-align: right;
+	float: right;
+	line-height: 23px;
+}
+
+#post-body #minor-publishing {
+	padding-bottom: 10px;
+}
+
+#post-body #misc-publishing-actions {
+	padding: 0;
+}
+
+#post-body .misc-pub-section {
+	border-right-width: 1px;
+	border-right-style: solid;
+	border-bottom: 0 none;
+	min-height: 30px;
+	float: left;
+	max-width: 32%;
+}
+
+#post-body .misc-pub-section-last {
+	border-right: 0;
 }
 
 #misc-publishing-actions {
@@ -326,52 +368,7 @@ form p.submit a.cancel:hover {
 	float: right;
 }
 
-#major-publishing-actions {
-	padding: 6px;
-	clear: both;
-	border-top: none;
-}
 
-#minor-publishing-actions input,
-#major-publishing-actions input,
-#minor-publishing-actions .preview {
-	min-width: 80px;
-	text-align: center;
-}
-
-#delete-action {
-	line-height: 25px;
-	vertical-align: middle;
-	text-align: left;
-	float: left;
-}
-
-#publishing-action {
-	text-align: right;
-	float: right;
-	line-height: 23px;
-}
-
-#post-body #minor-publishing {
-	padding-bottom: 10px;
-}
-
-#post-body #misc-publishing-actions {
-	padding: 0;
-}
-
-#post-body .misc-pub-section {
-	border-right-width: 1px;
-	border-right-style: solid;
-	border-bottom: 0 none;
-	min-height: 30px;
-	float: left;
-	max-width: 32%;
-}
-
-#post-body .misc-pub-section-last {
-	border-right: 0;
-}
 
 #sticky-span {
 	margin-left: 18px;
@@ -402,33 +399,6 @@ form p.submit a.cancel:hover {
 	list-style: square;
 }
 
-.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: 11px !important;
-	line-height: 13px;
-	padding: 3px 8px;
-	cursor: pointer;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 11px;
-	-khtml-border-radius: 11px;
-	-webkit-border-radius: 11px;
-	border-radius: 11px;
-	-moz-box-sizing: content-box;
-	-webkit-box-sizing: content-box;
-	-khtml-box-sizing: content-box;
-	box-sizing: content-box;
-}
-
 a.button,
 a.button-primary,
 a.button-secondary {
@@ -438,39 +408,6 @@ a.button-secondary {
 	-webkit-border-radius: 10px;
 }
 
-#doaction,
-#doaction2,
-#post-query-submit {
-	margin-right: 8px;
-}
-
-.tablenav select[name="action"],
-.tablenav select[name="action2"] {
-	width: 130px;
-}
-
-.tablenav select[name="m"] {
-	width: 155px;
-}
-
-.tablenav select#cat {
-	width: 170px;
-}
-
-#wpcontent select {
-	padding: 2px;
-	height: 2em;
-	font-size: 11px;
-}
-
-#wpcontent option {
-	padding: 2px;
-}
-
-#timezone_string option {
-	margin-left: 1em;
-}
-
 .approve {
 	display: none;
 }
@@ -485,45 +422,82 @@ a.button-secondary {
 	display: none;
 }
 
-.narrow {
-	width: 70%;
-	margin-bottom: 40px;
+.add-new-h2 {
+	font-style: normal;
+	margin: 0 6px;
+	position: relative;
+	top: -3px;
 }
 
-.narrow p {
-	line-height: 150%;
+td.action-links,
+th.action-links {
+	text-align: right;
 }
 
-textarea.all-options, input.all-options {
-	width: 250px;
+.describe .del-link {
+	padding-left: 5px;
 }
 
-#namediv table {
-	width: 100%;
+
+/*------------------------------------------------------------------------------
+  4.0 - Notifications
+------------------------------------------------------------------------------*/
+
+#update-nag, .update-nag {
+	line-height: 19px;
+	padding: 5px 0;
+	font-size: 12px;
+	text-align: center;
+	margin: 0 15px;
+	border-width: 1px;
+	border-style: solid;
+	border-top-width: 0;
+	border-top-style: none;
+	-moz-border-radius: 0 0 6px 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-khtml-border-bottom-right-radius: 6px;
+	-khtml-border-bottom-left-radius: 6px;
+	border-bottom-right-radius: 6px;
+	border-bottom-left-radius: 6px;
 }
 
-#namediv td.first {
-	width: 10px;
-	white-space: nowrap;
+.plugins .plugin-update {
+	padding: 0;
 }
 
-#namediv input {
-	width: 98%;
+.plugin-update .update-message {
+	margin: 0 10px 8px 31px;
+	font-weight: bold;
 }
 
-#namediv p {
-	margin: 10px 0;
+ul#dismissed-updates {
+	display: none;
+}
+form.upgrade {
+	margin-top: 8px;
 }
 
-#wpbody-content .metabox-holder {
-	padding-top: 10px;
+form.upgrade .hint {
+	font-style: italic;
+	font-size: 85%;
+	margin: -0.5em 0 2em 0;
 }
 
-#content {
-	margin: 0;
-	width: 100%;
+.ajax-feedback {
+	visibility: hidden;
+	vertical-align: bottom;
 }
 
+#ajax-response.alignleft {
+	margin-left: 2em;
+}
+
+
+/*------------------------------------------------------------------------------
+  5.0 - TinyMCE
+------------------------------------------------------------------------------*/
+
 #editorcontainer #content {
 	padding: 6px;
 	line-height: 150%;
@@ -592,16 +566,20 @@ textarea.all-options, input.all-options {
 	font-style: italic;
 }
 
-#excerpt, .attachmentlinks {
-	margin: 0;
-	height: 4em;
-	width: 98%;
+#wp_editbtns,
+#wp_gallerybtns {
+	padding: 2px;
+	position: absolute;
+	display: none;
+	z-index: 999998;
 }
 
-/* post meta postbox */
-#postcustomstuff table,
-#postcustomstuff input,
-#postcustomstuff textarea {
+#wp_editimgbtn,
+#wp_delimgbtn,
+#wp_editgallery,
+#wp_delgallery {
+	margin: 2px;
+	padding: 2px;
 	border-width: 1px;
 	border-style: solid;
 	-moz-border-radius: 3px;
@@ -610,285 +588,10 @@ textarea.all-options, input.all-options {
 	border-radius: 3px;
 }
 
-#postcustomstuff .updatemeta,
-#postcustomstuff .deletemeta {
-	margin: auto;
-}
 
-#postcustomstuff thead th {
-	padding: 5px 8px 8px;
-}
-
-#postcustom #postcustomstuff .submit {
-	border: 0 none;
-	float: none;
-	padding: 5px 8px;
-}
-
-#side-sortables #postcustom #postcustomstuff .submit {
-	padding: 0 5px;
-}
-
-#side-sortables #postcustom #postcustomstuff td.left input {
-	margin: 3px 3px 0;
-}
-
-#side-sortables #postcustom #postcustomstuff #the-list textarea {
-	height: 85px;
-	margin: 3px;
-}
-
-#postcustomstuff table {
-	margin: 0;
-	width: 100%;
-	border-width: 1px;
-	border-style: solid;
-	border-spacing: 0;
-}
-
-#postcustomstuff table input,
-#postcustomstuff table select,
-#postcustomstuff table textarea {
-	width: 95%;
-	margin: 8px 0 8px 8px;
-}
-
-#postcustomstuff th.left,
-#postcustomstuff td.left {
-	width: 38%;
-}
-
-#postcustomstuff .submit input {
-	width: auto;
-}
-
-#postcustomstuff #newmeta .submit {
-	padding: 0 8px;
-}
-
-#postcustomstuff table #addmetasub {
-	width: auto;
-}
-
-#postcustomstuff #newmetaleft {
-	vertical-align: top;
-}
-
-#postcustomstuff #newmetaleft a {
-	padding: 0 10px;
-	text-decoration: none;
-}
-
-#save {
-	width: 15em;
-}
-
-#template div {
-	margin-right: 190px;
-}
-
-* html #template div {
-	margin-right: 0;
-}
-
-/* A handy div class for hiding controls.
-Some browsers will disable them when you
-set display: none; */
-.zerosize {
-	height: 0;
-	width: 0;
-	margin: 0;
-	border: 0;
-	padding: 0;
-	overflow: hidden;
-	position: absolute;
-}
-
-* html #themeselect {
-	padding: 0 3px;
-	height: 22px;
-}
-
-#your-profile legend {
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-size: 22px;
-}
-
-#your-profile #rich_editing {
-	border: none;
-}
-
-#howto {
-	font-size: 11px;
-	margin: 0 5px;
-	display: block;
-}
-
-#ajax-response.alignleft {
-	margin-left: 2em;
-}
-
-div.nav {
-	height: 2em;
-	padding: 7px 10px;
-	vertical-align: text-top;
-	margin: 5px 0;
-}
-
-.nav .button-secondary {
-	padding: 2px 4px;
-}
-
-.tablenav-pages a {
-	border-bottom-style: solid;
-	border-bottom-width: 2px;
-	font-weight: bold;
-	margin-right: 1px;
-	padding: 0 2px;
-}
-.tablenav-pages .current-page {
-	text-align: center;
-}
-.tablenav-pages .next-page {
-	margin-left: 2px;
-}
-
-p.pagenav {
-	margin: 0;
-	display: inline;
-}
-
-.pagenav span {
-	font-weight: bold;
-	margin: 0 6px;
-}
-
-.row-title {
-	font-size: 12px !important;
-	font-weight: bold;
-}
-
-.widefat .column-comment p {
-	margin: 0.6em 0;
-}
-
-.column-author img, .column-username img {
-	float: left;
-	margin-right: 10px;
-	margin-top: 3px;
-}
-
-.tablenav a.button-secondary {
-	display: block;
-	margin: 3px 8px 0 0;
-}
-
-.tablenav {
-	clear: both;
-	height: 30px;
-	margin: 6px 0 4px;
-	vertical-align: middle;
-}
-
-.tablenav .tablenav-pages {
-	float: right;
-	display: block;
-	cursor: default;
-	height: 30px;
-	line-height: 30px;
-	font-size: 11px;
-}
-
-.tablenav .tablenav-pages a,
-.tablenav-pages span.current  {
-	text-decoration: none;
-	border: none;
-	padding: 3px 6px;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 5px;
-	-khtml-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-}
-
-.tablenav .displaying-num {
-	margin-right: 10px;
-	font-size: 12px;
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-style: italic;
-}
-
-.tablenav .actions {
-	padding: 2px 8px 0 0;
-}
-
-td.media-icon {
-	text-align: center;
-	width: 80px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-td.media-icon img {
-	max-width: 80px;
-	max-height: 60px;
-}
-
-#update-nag, .update-nag {
-	line-height: 19px;
-	padding: 5px 0;
-	font-size: 12px;
-	text-align: center;
-	margin: 0 15px;
-	border-width: 1px;
-	border-style: solid;
-	border-top-width: 0;
-	border-top-style: none;
-	-moz-border-radius: 0 0 6px 6px;
-	-webkit-border-bottom-right-radius: 6px;
-	-webkit-border-bottom-left-radius: 6px;
-	-khtml-border-bottom-right-radius: 6px;
-	-khtml-border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-	border-bottom-left-radius: 6px;
-}
-
-.plugins .plugin-update {
-	padding: 0;
-}
-
-.plugin-update .update-message {
-	margin: 0 10px 8px 31px;
-	font-weight: bold;
-}
-
-#pass-strength-result {
-	border-style: solid;
-	border-width: 1px;
-	float: left;
-	margin: 12px 5px 5px 1px;
-	padding: 3px 5px;
-	text-align: center;
-	width: 200px;
-	display: none;
-}
-
-.row-actions {
-	visibility: hidden;
-	padding: 2px 0 0;
-}
-
-tr:hover .row-actions,
-div.comment-item:hover .row-actions {
-	visibility: visible;
-}
-
-.row-actions-visible {
-	padding: 2px 0 0;
-}
-
-/* Admin Header */
+/*------------------------------------------------------------------------------
+  6.0 - Admin Header
+------------------------------------------------------------------------------*/
 #wphead-info {
 	margin: 0 0 0 15px;
 	padding-right: 15px;
@@ -953,6 +656,170 @@ div.comment-item:hover .row-actions {
 	text-decoration:underline;
 }
 
+
+/*------------------------------------------------------------------------------
+  6.1 - Favorites Menu
+------------------------------------------------------------------------------*/
+
+#favorite-actions {
+	float: right;
+	margin: 11px 12px 0;
+	min-width: 130px;
+	position: relative;
+}
+
+#favorite-first {
+	-moz-border-radius: 12px;
+	-khtml-border-radius: 12px;
+	-webkit-border-radius: 12px;
+	border-radius: 12px;
+	line-height: 15px;
+	padding: 3px 30px 4px 12px;
+	border-width: 1px;
+	border-style: solid;
+}
+
+#favorite-inside {
+	margin: 0 0 0 0px;
+	padding: 2px 1px;
+	border-width: 1px;
+	border-style: solid;
+	position: absolute;
+	z-index: 11;
+	display: none;
+	-moz-border-radius: 0 0 12px 12px;
+	-webkit-border-bottom-right-radius: 12px;
+	-webkit-border-bottom-left-radius: 12px;
+	-khtml-border-bottom-right-radius: 12px;
+	-khtml-border-bottom-left-radius: 12px;
+	border-bottom-right-radius: 12px;
+	border-bottom-left-radius: 12px;
+}
+
+#favorite-actions a {
+	display: block;
+	text-decoration: none;
+	font-size: 11px;
+}
+
+#favorite-inside a {
+	padding: 3px 5px 3px 10px;
+}
+
+#favorite-toggle {
+	height: 22px;
+	position: absolute;
+	right: 0;
+	top: 1px;
+	width: 28px;
+}
+
+#favorite-actions .slide-down {
+	-moz-border-radius: 12px 12px 0 0;
+	-webkit-border-bottom-right-radius: 0;
+	-webkit-border-bottom-left-radius: 0;
+	-khtml-border-bottom-right-radius: 0;
+	-khtml-border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0;
+	border-bottom: none;
+}
+
+
+/*------------------------------------------------------------------------------
+  6.2 - Screen Options Tabs
+------------------------------------------------------------------------------*/
+
+#screen-meta {
+	position: relative;
+	clear: both;
+}
+
+#screen-meta-links {
+	margin: 0 18px 0 0;
+}
+
+#screen-meta .screen-reader-text {
+	visibility: hidden;
+}
+
+#screen-options-link-wrap,
+#contextual-help-link-wrap {
+	float: right;
+	height: 22px;
+	padding: 0;
+	margin: 0 6px 0 0;
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	background: #e3e3e3;
+	-moz-border-radius-bottomleft: 3px;
+	-moz-border-radius-bottomright: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+}
+
+#contextual-help-wrap li {
+	list-style-type: disc;
+	margin-left: 18px;
+}
+
+#screen-meta a.show-settings {
+	text-decoration: none;
+	z-index: 1;
+	padding: 0 16px 0 6px;
+	height: 22px;
+	line-height: 22px;
+	font-size: 10px;
+	display: block;
+	background-repeat: no-repeat;
+	background-position: right bottom;
+}
+
+#screen-meta a.show-settings {
+	background-image: url( ../images/screen-options-right.gif?ver=20100531 );
+}
+
+#screen-meta a.show-settings:hover {
+	text-decoration: none;
+}
+
+#screen-options-wrap h5,
+#contextual-help-wrap h5 {
+	margin: 8px 0;
+	font-size: 13px;
+}
+
+#screen-options-wrap,
+#contextual-help-wrap {
+	border-style: none solid solid;
+	border-top: 0 none;
+	border-width: 0 1px 1px;
+	margin: 0 15px;
+	padding: 8px 12px 12px;
+	-moz-border-radius: 0 0 0 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-khtml-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+}
+
+.metabox-prefs label {
+	padding-right: 15px;
+	white-space: nowrap;
+	line-height: 30px;
+}
+
+.metabox-prefs label input {
+	margin: 0 5px 0 2px;
+}
+
+.metabox-prefs label a {
+	display: none;
+}
+
+
+/*------------------------------------------------------------------------------
+  7.0 - Main Navigation (Left Menu)
+------------------------------------------------------------------------------*/
+
 /* side admin menu */
 #adminmenu * {
 	-webkit-user-select: none;
@@ -1199,9 +1066,6 @@ div.comment-item:hover .row-actions {
 	padding: 6px 0 0 1px;
 }
 
-/* end side admin menu */
-
-/* comments/plugins bubble in menu */
 #adminmenu #awaiting-mod,
 #adminmenu span.update-plugins,
 #sidemenu li a span.update-plugins {
@@ -1229,9 +1093,7 @@ div.comment-item:hover .row-actions {
 #sidemenu li a .count-0 {
 	display: none;
 }
-/* end menu stuff */
 
-/* comments bubble */
 .post-com-count-wrapper {
 	min-width: 22px;
 	font-family: Helvetica, Arial, sans-serif;
@@ -1285,401 +1147,35 @@ strong .post-com-count {
 	padding: 4px 8px;
 }
 
-/* Admin Footer */
-#footer {
-	margin-top: -46px;
-	border-top: 1px;
-	border-style: solid;
+
+/*------------------------------------------------------------------------------
+  8.0 - Layout Blocks
+------------------------------------------------------------------------------*/
+
+body.wp-admin {
+	min-width: 785px;
 }
 
-#footer,
-#footer a {
-	font-size: 12px;
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-style: italic;
+.narrow {
+	width: 70%;
+	margin-bottom: 40px;
 }
 
-#footer p {
-	margin: 0;
-	padding: 15px;
-	line-height: 15px;
+.narrow p {
+	line-height: 150%;
 }
 
-#footer a {
-	text-decoration: none;
-}
-
-#footer a:hover {
-	text-decoration: underline;
-}
-
-/* Tables used on comment.php and option/setting pages */
-
-.form-table {
-	border-collapse: collapse;
-	margin-top: 0.5em;
-	width: 100%;
-	margin-bottom: -8px;
-	clear: both;
-}
-
-.form-table td {
-	margin-bottom: 9px;
-	padding: 8px 10px;
-	line-height: 20px;
-	font-size: 11px;
-}
-
-.form-table th,
-.form-wrap label {
-	font-weight: normal;
-	text-shadow: rgba(255,255,255,1) 0 1px 0;
-}
-
-.form-table th {
-	vertical-align: top;
-	text-align: left;
-	padding: 10px;
-	width: 200px;
-}
-
-.form-table th.th-full {
-	width: auto;
-}
-
-.form-table div.color-option {
-	display: block;
-	clear: both;
-	margin-top: 12px;
-}
-
-.form-table input.tog {
-	margin-top: 2px;
-	margin-right: 2px;
-	float: left;
-}
-
-.form-table td p {
-	margin-top: 4px;
-}
-
-.form-table table.color-palette {
-	vertical-align: bottom;
-	float: left;
-	margin: -12px 3px 11px;
-}
-
-.form-table .color-palette td {
-	border-width: 1px 1px 0;
-	border-style: solid solid none;
-	height: 10px;
-	line-height: 20px;
-	width: 10px;
-}
-
-input.large-text,
-textarea.large-text {
-	width: 99%;
-}
-
-input.regular-text,
-#adduser .form-field input {
-	width: 25em;
-}
-
-input.small-text {
-	width: 50px;
-}
-
-#profile-page .form-table textarea {
-	width: 500px;
-	margin-bottom: 6px;
-}
-
-#profile-page .form-table #rich_editing {
-	margin-right: 5px
-}
-
-.form-table .pre {
-	padding: 8px;
-	margin: 0;
-}
-
-.pre {
-	/* http://www.longren.org/2006/09/27/wrapping-text-inside-pre-tags/ */
-	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+ */
-}
-
-table.form-table td .updated {
-	font-size: 13px;
-}
-
-/* divs for cats and tags pages */
-
-.form-wrap {
-	margin: 10px 0;
-	width: 97%;
-}
-
-.form-wrap p,
-.form-wrap label {
-	font-size: 11px;
-}
-
-.form-wrap label {
-	display: block;
-	padding: 2px;
-	font-size: 12px;
-}
-
-.form-field input,
-.form-field textarea {
-	border-style: solid;
-	border-width: 1px;
-	width: 95%;
-}
-
-p.description,
-.form-wrap p {
-	margin: 2px 0 5px;
-}
-
-p.help,
-p.description,
-span.description,
-.form-wrap p {
-	font-size: 12px;
-	font-style: italic;
-	font-family: Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-}
-
-.form-wrap .form-field {
-	margin: 0 0 10px;
-	padding: 8px;
-}
-
-.col-wrap h3 {
-	margin: 12px 0;
-	font-size: 1.1em;
-}
-
-.col-wrap p.submit {
-	margin-top: -10px;
-}
-
-.tagcloud {
-	width: 97%;
-	margin: 0 0 40px;
-	text-align: justify;
-}
-
-.tagcloud h3 {
-	margin: 2px 0 12px;
-}
-
-/* Post Screen */
-#post-body #normal-sortables {
-	min-height: 50px;
-}
-
-#post-body #advanced-sortables {
-	min-height: 20px;
-}
-
-.postbox {
-	position: relative;
-	min-width: 255px;
-	width: 99.5%;
-}
-
-#trackback_url {
-	width: 99%;
-}
-
-#normal-sortables .postbox .submit {
-	background: transparent none;
-	border: 0 none;
-	float: right;
-	padding: 0 12px;
-	margin: 0;
-}
-
-#normal-sortables .postbox #replyrow .submit {
-	float: none;
-	margin: 0;
-	padding: 3px 7px;
-}
-
-#side-sortables .submitbox .submit input,
-#side-sortables .submitbox .submit .preview,
-#side-sortables .submitbox .submit a.preview:hover {
-	border: 0 none;
-}
-
-#side-sortables .inside-submitbox .insidebox,
-.stuffbox .insidebox {
-	margin: 11px 0;
-}
-
-#side-sortables .comments-box,
-#normal-sortables .comments-box {
-	border: 0 none;
-}
-
-#side-sortables .comments-box thead th,
-#normal-sortables .comments-box thead th {
-	background: transparent;
-	padding: 0 7px 4px;
-	font-style: italic;
-}
-
-#commentsdiv img.waiting {
-	padding-left: 5px;
-	vertical-align: middle;
-}
-
-#post-body .tagsdiv #newtag {
-	margin-right: 5px;
-	width: 16em;
-}
-
-#side-sortables input#post_password {
-	width: 94%
-}
-
-#side-sortables .tagsdiv #newtag {
-	width: 68%;
-}
-
-#post-status-info {
-	border-width: 0 1px 1px;
-	border-style: none solid solid;
-	width: 100%;
-	-moz-border-radius: 0 0 6px 6px;
-	-webkit-border-bottom-left-radius: 6px;
-	-webkit-border-bottom-right-radius: 6px;
-	-khtml-border-bottom-left-radius: 6px;
-	-khtml-border-bottom-right-radius: 6px;
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-#post-status-info td {
-	font-size: 11px;
-}
-
-.autosave-info {
-	padding: 2px 15px 2px 2px;
-	text-align: right;
-}
-
-#editorcontent #post-status-info {
-	border: none;
-}
-
-#post-body .wp_themeSkin .mceStatusbar a.mceResize {
-	display: block;
-	background: transparent url(../images/resize.gif) no-repeat scroll right bottom;
-	width: 12px;
-	cursor: se-resize;
-	margin: 0 2px;
-	position: relative;
-	top: 22px;
-}
-
-#linksubmitdiv div.inside,
-div.inside {
-	padding: 0;
-	margin: 0;
-}
-
-#comment-status-radio p {
-	margin: 3px 0 5px;
-}
-
-#comment-status-radio input {
-	margin: 2px 3px 5px 0;
-	vertical-align: middle;
-}
-
-#comment-status-radio label {
-	padding: 5px 0;
-}
-
-.tagchecklist {
-	margin-left: 14px;
-	font-size: 12px;
-	overflow: auto;
-}
-
-.tagchecklist strong {
-	margin-left: -8px;
-	position: absolute;
-}
-
-.tagchecklist span {
-	margin-right: 25px;
-	display: block;
-	float: left;
-	font-size: 11px;
-	line-height: 1.8em;
-	white-space: nowrap;
-	cursor: default;
-}
-
-.tagchecklist span a {
-	margin: 6px 0pt 0pt -9px;
-	cursor: pointer;
-	width: 10px;
-	height: 10px;
-	display: block;
-	float: left;
-	text-indent: -9999px;
+.widefat th,
+.widefat td {
 	overflow: hidden;
-	position: absolute;
 }
 
-.howto {
-	font-style: italic;
-	display: block;
-	font-family: Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+.widefat td p {
+	margin: 2px 0 0.8em;
 }
 
-.ac_results {
-	padding: 0;
-	margin: 0;
-	list-style: none;
-	position: absolute;
-	z-index: 10000;
-	display: none;
-	border-width: 1px;
-	border-style: solid;
-}
-
-.ac_results li {
-	padding: 2px 5px;
-	white-space: nowrap;
-	text-align: left;
-}
-
-.ac_over {
-	cursor: pointer;
-}
-
-.ac_match {
-	text-decoration: underline;
-}
-
-#poststuff h2 {
-	margin-top: 20px;
-	font-size: 1.5em;
-	margin-bottom: 15px;
-	padding: 0 0 3px;
-	clear: left;
+.widefat .column-comment p {
+	margin: 0.6em 0;
 }
 
 .widget .widget-top,
@@ -1691,6 +1187,15 @@ div.inside {
 	user-select: none;
 }
 
+.postbox-container {
+	float: left;
+	padding-right: 0.5%;
+}
+
+.postbox-container .meta-box-sortables {
+	min-height: 300px;
+}
+
 .postbox .hndle span {
 	padding: 6px 0;
 }
@@ -1704,10 +1209,6 @@ div.inside {
 	font-weight: normal;
 }
 
-#dashboard-widgets .meta-box-sortables {
-	margin: 0 5px;
-}
-
 .postbox .handlediv {
 	float: right;
 	width: 23px;
@@ -1720,15 +1221,6 @@ div.inside {
 	margin-bottom: 20px;
 }
 
-#poststuff h3,
-.metabox-holder h3 {
-	font-size: 12px;
-	font-weight: bold;
-	padding: 7px 9px;
-	margin: 0;
-	line-height: 1;
-}
-
 .widget,
 .postbox,
 .stuffbox {
@@ -1755,6 +1247,7 @@ div.inside {
 	border-top-left-radius: 6px;
 }
 
+/* TODO: Review this was a conflict - PJW */
 .postbox.closed h3 {
 	-moz-border-radius-bottomleft: 4px;
 	-webkit-border-bottom-left-radius: 4px;
@@ -1766,6 +1259,17 @@ div.inside {
 	border-bottom-right-radius: 4px;
 }
 
+.form-table td p {
+	margin-top: 4px;
+}
+
+.form-table table.color-palette {
+	vertical-align: bottom;
+	float: left;
+	margin: -12px 3px 11px;
+}
+/* Conflict END */
+
 .postbox table.form-table {
 	margin-bottom: 0;
 }
@@ -1778,29 +1282,516 @@ div.inside {
 	border-style: solid;
 }
 
-#poststuff .inside,
-#poststuff .inside p {
+.temp-border {
+	border: 1px dotted #ccc;
+}
+
+.columns-prefs label {
+	padding: 0 5px;
+}
+
+
+/*------------------------------------------------------------------------------
+  9.0 - Dashboard
+------------------------------------------------------------------------------*/
+
+#wpbody-content .metabox-holder {
+	padding-top: 10px;
+}
+
+#dashboard-widgets .meta-box-sortables {
+	margin: 0 5px;
+}
+
+#dashboard_recent_comments div.undo {
+	border-top-style: solid;
+	border-top-width: 1px;
+	margin: 0 -10px;
+	padding: 3px 8px;
 	font-size: 11px;
-	margin: 6px 6px 8px;
 }
 
-#poststuff .inside .submitbox p {
-	margin: 1em 0;
+#the-comment-list td.comment p.comment-author {
+	margin-top: 0;
+	margin-left: 0;
 }
 
-#post-visibility-select {
-	line-height: 1.5em;
-	margin-top: 3px;
+#the-comment-list p.comment-author img {
+	float: left;
+	margin-right: 8px;
 }
 
-#poststuff #submitdiv .inside {
+#the-comment-list p.comment-author strong a {
+	border: none;
+}
+
+#the-comment-list td {
+	vertical-align: top;
+}
+
+#the-comment-list td.comment {
+	word-wrap: break-word;
+}
+
+#the-comment-list .check-column {
+	padding-top: 8px;
+}
+
+
+/*------------------------------------------------------------------------------
+  10.0 - List Posts (/Pages/etc)
+------------------------------------------------------------------------------*/
+
+table.fixed {
+	table-layout: fixed;
+}
+.fixed .column-rating,
+.fixed .column-visible {
+	width: 8%;
+}
+.fixed .column-date,
+.fixed .column-parent,
+.fixed .column-links {
+	width: 10%;
+}
+.fixed .column-response,
+.fixed .column-author,
+.fixed .column-categories,
+.fixed .column-tags,
+.fixed .column-rel,
+.fixed .column-role {
+	width: 15%;
+}
+.fixed .column-comments {
+	width: 4em;
+	padding: 8px 0;
+	text-align: left;
+}
+.fixed .column-comments .vers {
+	padding-left: 3px;
+}
+.fixed .column-comments a {
+	float: left;
+}
+.fixed .column-slug {
+	width: 25%;
+}
+.fixed .column-posts {
+	width: 10%;
+}
+.fixed .column-icon {
+	width: 80px;
+}
+#commentsdiv .fixed .column-author,
+#comments-form .fixed .column-author {
+	width: 20%;
+}
+
+.sorting-indicator {
+	display: none;
+	float: left;
+	width: 21px;
+	height: 4px;
+	margin-top: 5px;
+}
+th.sortable a, th.sorted-asc a, th.sorted-desc a {
+	float: left;
+}
+th.sorted-asc .sorting-indicator, th.sorted-desc:hover .sorting-indicator, th.sortable:hover .sorting-indicator {
+	display: block;
+	background: url(../images/sort_asc.gif) no-repeat scroll 0 0;
+}
+th.sorted-desc .sorting-indicator, th.sorted-asc:hover .sorting-indicator {
+	display: block;
+	background: url(../images/sort_desc.gif) no-repeat scroll 0 0;
+}
+
+/* Bulk Actions */
+
+.tablenav-pages a {
+	border-bottom-style: solid;
+	border-bottom-width: 2px;
+	font-weight: bold;
+	margin-right: 1px;
+	padding: 0 2px;
+}
+.tablenav-pages .current-page {
+	text-align: center;
+}
+.tablenav-pages .next-page {
+	margin-left: 2px;
+}
+
+.tablenav a.button-secondary {
+	display: block;
+	margin: 3px 8px 0 0;
+}
+
+.tablenav {
+	clear: both;
+	height: 30px;
+	margin: 6px 0 4px;
+	vertical-align: middle;
+}
+
+.tablenav .tablenav-pages {
+	float: right;
+	display: block;
+	cursor: default;
+	height: 30px;
+	line-height: 30px;
+	font-size: 11px;
+}
+
+.tablenav .tablenav-pages a,
+.tablenav-pages span.current  {
+	text-decoration: none;
+	border: none;
+	padding: 3px 6px;
+	border-width: 1px;
+	border-style: solid;
+	-moz-border-radius: 5px;
+	-khtml-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+}
+
+/* TODO: Review this was a conflict - font-family - PJW */
+.tablenav .displaying-num {
+	margin-right: 10px;
+	font-size: 12px;
+	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	font-style: italic;
+	font-family: Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+}
+
+.tablenav .actions {
+	padding: 2px 8px 0 0;
+}
+
+.tablenav .delete {
+	margin-right: 20px;
+}
+
+.view-switch {
+	float: right;
+	margin: 6px 8px 0;
+}
+
+.view-switch a {
+	text-decoration: none;
+}
+
+.filter {
+	float: left;
+	margin: -5px 0 0 10px;
+}
+
+.filter .subsubsub {
+	margin-left: -10px;
+	margin-top: 13px;
+}
+.screen-per-page {
+	width: 3em;
+}
+
+#posts-filter fieldset {
+	float: left;
+	margin: 0 1.5ex 1em 0;
+	padding: 0;
+}
+
+#posts-filter fieldset legend {
+	padding: 0 0 .2em 1px;
+}
+
+
+/*------------------------------------------------------------------------------
+  10.1 - Inline Editing
+------------------------------------------------------------------------------*/
+
+/*
+.quick-edit* is for Quick Edit
+.bulk-edit* is for Bulk Edit
+.inline-edit* is for everything
+*/
+
+/*	Layout */
+tr.inline-edit-row td {
+	padding: 0 0.5em;
+}
+
+#wpbody-content .inline-edit-row fieldset {
+	font-size: 12px;
+	float: left;
+	margin: 0;
+	padding: 0;
+	width: 100%;
+}
+
+#wpbody-content .inline-edit-row fieldset .inline-edit-col {
+	padding: 0 0.5em;
+}
+
+#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col {
+	border-width: 0 0 0 1px;
+	border-style: none none none solid;
+}
+
+#wpbody-content .quick-edit-row-post .inline-edit-col-left {
+	width: 40%;
+}
+
+#wpbody-content .quick-edit-row-post .inline-edit-col-right {
+	width: 39%;
+}
+
+#wpbody-content .inline-edit-row-post .inline-edit-col-center {
+	width: 20%;
+}
+
+#wpbody-content .quick-edit-row-page .inline-edit-col-left {
+	width: 50%;
+}
+
+#wpbody-content .quick-edit-row-page .inline-edit-col-right,
+#wpbody-content .bulk-edit-row-post .inline-edit-col-right {
+	width: 49%;
+}
+
+#wpbody-content .bulk-edit-row .inline-edit-col-left {
+	width: 30%;
+}
+
+#wpbody-content .bulk-edit-row-page .inline-edit-col-right {
+	width: 69%;
+}
+
+#wpbody-content .bulk-edit-row .inline-edit-col-bottom {
+	float: right;
+	width: 69%;
+}
+
+#wpbody-content .inline-edit-row-page .inline-edit-col-right,
+#owpbody-content .bulk-edit-row-post .inline-edit-col-right {
+	margin-top: 27px;
+}
+
+.inline-edit-row fieldset .inline-edit-group {
+	clear: both;
+}
+
+.inline-edit-row fieldset .inline-edit-group:after {
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;
+}
+
+.inline-edit-row p.submit {
+	clear: both;
+	padding: 0.5em;
+	margin: 0.5em 0 0;
+}
+
+.inline-edit-row span.error {
+	line-height: 22px;
+	margin: 0 15px;
+	padding: 3px 5px;
+}
+
+/*	Positioning */
+.inline-edit-row h4 {
+	margin: .2em 0;
+	padding: 0;
+	line-height: 23px;
+}
+.inline-edit-row fieldset span.title,
+.inline-edit-row fieldset span.checkbox-title {
+	margin: 0;
+	padding: 0;
+	line-height: 27px;
+}
+
+.inline-edit-row fieldset label,
+.inline-edit-row fieldset span.inline-edit-categories-label {
+	display: block;
+	margin: .2em 0;
+}
+
+.inline-edit-row fieldset label.inline-edit-tags {
+	margin-top: 0;
+}
+
+.inline-edit-row fieldset label.inline-edit-tags span.title {
+	margin: .2em 0;
+}
+
+.inline-edit-row fieldset label span.title {
+	display: block;
+	float: left;
+	width: 5em;
+}
+
+.inline-edit-row fieldset label span.input-text-wrap {
+	display: block;
+	margin-left: 5em;
+}
+
+/* TODO: Review this was a conflict - PJW */
+.quick-edit-row-post fieldset.inline-edit-col-right label span.title {
+	width: auto;
+	padding-right: 0.5em;
+}
+.howto {
+	font-style: italic;
+	display: block;
+	font-family: Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+}
+/* END Conflict */
+
+.inline-edit-row .input-text-wrap input[type=text] {
+	width: 100%;
+}
+
+.inline-edit-row fieldset label input[type=checkbox] {
+	vertical-align: text-bottom;
+}
+
+.inline-edit-row fieldset label textarea {
+	width: 100%;
+	height: 4em;
+}
+
+#wpbody-content .bulk-edit-row fieldset .inline-edit-group label {
+	max-width: 50%;
+}
+
+#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child {
+	margin-right: 0.5em
+}
+
+/*	Styling */
+.inline-edit-row h4 {
+	text-transform: uppercase;
+}
+
+.inline-edit-row fieldset span.title,
+.inline-edit-row fieldset span.checkbox-title {
+	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	font-style: italic;
+	line-height: 1.8em;
+}
+
+/*	Specific Elements */
+.inline-edit-row fieldset input[type="text"],
+.inline-edit-row fieldset textarea {
+	border-style: solid;
+	border-width: 1px;
+}
+
+.inline-edit-row fieldset .inline-edit-date {
+	float: left;
+}
+
+.inline-edit-row fieldset input[name=jj],
+.inline-edit-row fieldset input[name=hh],
+.inline-edit-row fieldset input[name=mn] {
+	font-size: 12px;
+	width: 2.1em;
+}
+
+.inline-edit-row fieldset input[name=aa] {
+	font-size: 12px;
+	width: 3.5em;
+}
+
+.inline-edit-row fieldset label input.inline-edit-password-input {
+	width: 8em;
+}
+
+.inline-edit-row .catshow,
+.inline-edit-row .cathide {
+	cursor: pointer;
+}
+
+ul.cat-checklist {
+	height: 12em;
+	border-style: solid;
+	border-width: 1px;
+	overflow-y: scroll;
+	padding: 0 5px;
 	margin: 0;
 }
 
-#titlediv, #poststuff .postarea {
-	margin-bottom: 20px;
+#bulk-titles {
+	display: block;
+	height: 12em;
+	border-style: solid;
+	border-width: 1px;
+	overflow-y: scroll;
+	padding: 0 5px;
+	margin: 0 0 5px;
 }
 
+.inline-edit-row fieldset ul.cat-checklist li,
+.inline-edit-row fieldset ul.cat-checklist input {
+	margin: 0;
+}
+
+.inline-edit-row fieldset ul.cat-checklist label,
+.inline-edit-row .catshow,
+.inline-edit-row .cathide,
+.inline-edit-row #bulk-titles div {
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	font-style: normal;
+	font-size: 11px;
+}
+
+table .inline-edit-row fieldset ul.cat-hover {
+	height: auto;
+	max-height: 30em;
+	overflow-y: auto;
+	position: absolute;
+}
+
+.inline-edit-row fieldset label input.inline-edit-menu-order-input {
+	width: 3em;
+}
+
+.inline-edit-row fieldset label input.inline-edit-slug-input {
+	width: 75%;
+}
+
+.quick-edit-row-post fieldset label.inline-edit-status {
+	float: left;
+}
+
+#bulk-titles {
+	line-height: 140%;
+}
+#bulk-titles div {
+	margin: 0.2em 0.3em;
+}
+
+#bulk-titles div a {
+	cursor: pointer;
+	display: block;
+	float: left;
+	height: 10px;
+	margin: 3px 3px 0 -2px;
+	overflow: hidden;
+	position: relative;
+	text-indent: -9999px;
+	width: 10px;
+}
+
+
+/*------------------------------------------------------------------------------
+  11.0 - Write/Edit Post Screen
+------------------------------------------------------------------------------*/
+
 #titlediv {
 	position: relative;
 	margin-bottom: 20px;
@@ -1970,25 +1961,34 @@ input#link_url {
 	margin-top: 3px;
 }
 
-/* Categories */
-
-.category-adder {
-	margin-left: 120px;
-	padding: 4px 0;
+/* Post Screen */
+#post-body #normal-sortables {
+	min-height: 50px;
 }
 
-.category-adder h4 {
-	margin: 0 0 8px;
+#post-body #advanced-sortables {
+	min-height: 20px;
 }
 
-#side-sortables .category-adder {
-	margin: 0;
+.postbox {
+	position: relative;
+	min-width: 255px;
+	width: 99.5%;
 }
 
-#post-body .category-add input, .category-add select {
-	width: 30%;
+#trackback_url {
+	width: 99%;
 }
 
+/* TODO: Review this was a conflict - PJW */
+#normal-sortables .postbox .submit {
+	background: transparent none;
+	border: 0 none;
+	float: right;
+	padding: 0 12px;
+}
+/* END */
+
 #side-sortables .category-add input {
 	width: 94%;
 }
@@ -2095,34 +2095,42 @@ div.tabs-panel-inactive {
 	margin: 0;
 }
 
-#front-page-warning,
-#front-static-pages ul,
-.inline-editor ul.cat-checklist ul,
-.categorydiv ul.categorychecklist ul,
-.customlinkdiv ul.categorychecklist ul,
-.posttypediv ul.categorychecklist ul,
-.taxonomydiv ul.categorychecklist ul,
-#linkcategorydiv ul.categorychecklist ul {
-	margin-left: 18px;
-}
-
-ul.categorychecklist li {
+/* TODO: Review this was a conflict - PJW */
+#normal-sortables .postbox #replyrow .submit {
+	float: none;
 	margin: 0;
-	padding: 0;
-	line-height: 19px;
-	word-wrap: break-word;
+	padding: 3px 7px;
 }
 
-.category-adder h4 {
-	margin-top: 4px;
-	margin-bottom: 0px;
+#side-sortables .submitbox .submit input,
+#side-sortables .submitbox .submit .preview,
+#side-sortables .submitbox .submit a.preview:hover {
+	border: 0 none;
 }
 
+#side-sortables .inside-submitbox .insidebox,
+.stuffbox .insidebox {
+	margin: 11px 0;
+}
+
+#side-sortables .comments-box,
+#normal-sortables .comments-box {
+	border: 0 none;
+}
 ul.category-tabs,
 ul.add-menu-item-tabs,
 ul.wp-tab-bar {
 	margin-top: 12px;
 }
+/* END Conflict */
+
+/* TODO: Review this was a conflict - PJW */
+#side-sortables .comments-box thead th,
+#normal-sortables .comments-box thead th {
+	background: transparent;
+	padding: 0 7px 4px;
+	font-style: italic;
+}
 
 ul.category-tabs li.tabs,
 ul.add-menu-item-tabs li.tabs,
@@ -2131,6 +2139,11 @@ ul.add-menu-item-tabs li.tabs,
 	border-width: 1px 1px 0;
 }
 
+#commentsdiv img.waiting {
+	padding-left: 5px;
+}
+/* END Conflcit */
+
 #post-body .category-tabs li.tabs,
 #post-body .add-menu-item-tabs li.tabs {
 	border-style: solid none solid solid;
@@ -2202,103 +2215,59 @@ td.plugin-title {
 	vertical-align: text-top;
 }
 
+/* TODO: Review this was a conflict - PJW */
 .defaultavatarpicker .avatar {
 	margin: 2px 0;
 	vertical-align: middle;
 }
 
-body.wp-admin {
-	min-width: 785px;
+#post-body .tagsdiv #newtag {
+	margin-right: 5px;
+	width: 16em;
 }
 
-.view-switch {
-	float: right;
-	margin: 6px 8px 0;
+#side-sortables input#post_password {
+	width: 94%
 }
 
-.view-switch a {
-	text-decoration: none;
+#side-sortables .tagsdiv #newtag {
+	width: 68%;
 }
 
-.filter {
-	float: left;
-	margin: -5px 0 0 10px;
+#post-status-info {
+	border-width: 0 1px 1px;
+	border-style: none solid solid;
+	width: 100%;
+	-moz-border-radius: 0 0 6px 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-khtml-border-bottom-left-radius: 6px;
+	-khtml-border-bottom-right-radius: 6px;
+	border-bottom-left-radius: 6px;
+	border-bottom-right-radius: 6px;
 }
 
-.filter .subsubsub {
-	margin-left: -10px;
-	margin-top: 13px;
+#post-status-info td {
+	font-size: 11px;
 }
 
-#the-comment-list td.comment p.comment-author {
-	margin-top: 0;
-	margin-left: 0;
-}
-
-#the-comment-list p.comment-author img {
-	float: left;
-	margin-right: 8px;
-}
-
-#the-comment-list p.comment-author strong a {
-	border: none;
-}
-
-#the-comment-list td {
-	vertical-align: top;
-}
-
-#the-comment-list td.comment {
-	word-wrap: break-word;
-}
-
-#the-comment-list .check-column {
-	padding-top: 8px;
-}
-
-#templateside ul li a {
-	text-decoration: none;
-}
-
-.indicator-hint {
-	padding-top: 8px;
-}
-
-#display_name {
-	width: 15em;
-}
-
-.tablenav .delete {
-	margin-right: 20px;
-}
-
-td.action-links,
-th.action-links {
+.autosave-info {
+	padding: 2px 15px 2px 2px;
 	text-align: right;
 }
 
-/* Diff */
-
-table.diff {
-	width: 100%;
-}
-
-table.diff col.content {
-	width: 50%;
-}
-
-table.diff tr {
-	background-color: transparent;
-}
-
-table.diff td, table.diff th {
-	padding: .5em;
-	font-family: Consolas, Monaco, Courier, monospace;
+#editorcontent #post-status-info {
 	border: none;
 }
 
-table.diff .diff-deletedline del, table.diff .diff-addedline ins {
-	text-decoration: none;
+#post-body .wp_themeSkin .mceStatusbar a.mceResize {
+	display: block;
+	background: transparent url(../images/resize.gif) no-repeat scroll right bottom;
+	width: 12px;
+	cursor: se-resize;
+	margin: 0 2px;
+	position: relative;
+	top: 22px;
 }
 
 #wp-word-count {
@@ -2306,61 +2275,6 @@ table.diff .diff-deletedline del, table.diff .diff-addedline ins {
 	padding: 2px 7px;
 }
 
-fieldset {
-	border: 0;
-	padding: 0;
-	margin: 0;
-}
-
-.tool-box {
-	margin: 15px 0 35px;
-}
-
-.tool-box .buttons {
-	margin: 15px 0;
-}
-
-.tool-box .title {
-	margin: 8px 0;
-	font: 18px/24px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-}
-
-.pressthis a {
-	font-size: 1.2em;
-}
-
-#wp_editbtns,
-#wp_gallerybtns {
-	padding: 2px;
-	position: absolute;
-	display: none;
-	z-index: 999998;
-}
-
-#wp_editimgbtn,
-#wp_delimgbtn,
-#wp_editgallery,
-#wp_delgallery {
-	margin: 2px;
-	padding: 2px;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-.settings-toggle {
-	text-align: right;
-	margin: 5px 7px 15px 0;
-	font-size: 12px;
-}
-
-.settings-toggle h3 {
-	margin: 0;
-}
-
 #timestampdiv select {
 	height: 20px;
 	line-height: 14px;
@@ -2400,176 +2314,119 @@ fieldset {
 	border-style: solid;
 }
 
-/* media popup 0819 */
-#sidemenu {
-	margin: -30px 15px 0 315px;
-	list-style: none;
-	position: relative;
-	float: right;
-	padding-left: 10px;
-	font-size: 12px;
-}
 
-#sidemenu a {
-	padding: 0 7px;
-	display: block;
-	float: left;
-	line-height: 28px;
-	border-top-width: 1px;
-	border-top-style: solid;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
+/*------------------------------------------------------------------------------
+  11.1 - Custom Fields
+------------------------------------------------------------------------------*/
 
-#sidemenu li {
-	display: inline;
-	line-height: 200%;
-	list-style: none;
-	text-align: center;
-	white-space: nowrap;
-	margin: 0;
-	padding: 0;
-}
-
-#sidemenu a.current {
-	font-weight: normal;
-	padding-left: 6px;
-	padding-right: 6px;
-	-moz-border-radius: 4px 4px 0 0;
-	-webkit-border-top-left-radius: 4px;
-	-webkit-border-top-right-radius: 4px;
-	-khtml-border-top-left-radius: 4px;
-	-khtml-border-top-right-radius: 4px;
-	border-top-left-radius: 4px;
-	border-top-right-radius: 4px;
+#postcustomstuff table,
+#postcustomstuff input,
+#postcustomstuff textarea {
 	border-width: 1px;
 	border-style: solid;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
 }
 
-#sidemenu {
-	margin: -30px 15px 0 315px;
-	list-style: none;
-	position: relative;
-	float: right;
-	padding-left: 10px;
-	font-size: 12px;
+#postcustomstuff .updatemeta,
+#postcustomstuff .deletemeta {
+	margin: auto;
 }
 
-#sidemenu a {
-	padding: 0 7px;
-	display: block;
-	float: left;
-	line-height: 28px;
-	border-top-width: 1px;
-	border-top-style: solid;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
+#postcustomstuff thead th {
+	padding: 5px 8px 8px;
 }
 
-#sidemenu li a .count-0 {
-	display: none;
-}
-
-/* reply to comments */
-#replyrow {
-	font-size: 11px;
-}
-
-#replyrow input {
-	border-width: 1px;
-	border-style: solid;
-}
-
-#replyrow td {
-	padding: 2px;
-}
-
-#replyrow #editorcontainer {
+#postcustom #postcustomstuff .submit {
 	border: 0 none;
+	float: none;
+	padding: 5px 8px;
 }
 
-#replysubmit {
-	margin: 0;
-	padding: 3px 7px;
+#side-sortables #postcustom #postcustomstuff .submit {
+	padding: 0 5px;
 }
 
-#replysubmit img.waiting,
-.inline-edit-save img.waiting {
-	padding: 4px 10px 0;
-	vertical-align: top;
-	float: right;
+#side-sortables #postcustom #postcustomstuff td.left input {
+	margin: 3px 3px 0;
 }
 
-#replysubmit .button {
-	margin-right: 5px;
+#side-sortables #postcustom #postcustomstuff #the-list textarea {
+	height: 85px;
+	margin: 3px;
 }
 
-#replyrow #editor-toolbar {
-	display: none;
-}
-
-#replyhead {
-	font-size: 12px;
-	font-weight: bold;
-	padding: 2px 10px 4px;
-}
-
-#edithead .inside {
-	float: left;
-	padding: 3px 0 2px 5px;
-	margin: 0;
-	text-align: center;
-	font-size: 11px;
-}
-
-#edithead .inside input {
-	width: 180px;
-	font-size: 11px;
-}
-
-#edithead label {
-	padding: 2px 0;
-}
-
-#replycontainer {
-	padding: 5px;
-	border: 0 none;
-	height: 120px;
-	overflow: hidden;
-	position: relative;
-}
-
-#replycontent {
-	resize: none;
+#postcustomstuff table {
 	margin: 0;
 	width: 100%;
-	height: 100%;
-	padding: 0;
-	line-height: 150%;
-	border: 0 none;
-	outline: none;
-	font-size: 12px;
+	border-width: 1px;
+	border-style: solid;
+	border-spacing: 0;
 }
 
-#replyrow #ed_reply_toolbar {
-	margin: 0;
-	padding: 2px 3px;
+#postcustomstuff table input,
+#postcustomstuff table select,
+#postcustomstuff table textarea {
+	width: 95%;
+	margin: 8px 0 8px 8px;
 }
 
-/* show/hide settings */
-#screen-meta {
-	position: relative;
-	clear: both;
+#postcustomstuff th.left,
+#postcustomstuff td.left {
+	width: 38%;
 }
 
-#screen-meta-links {
-	margin: 0 18px 0 0;
+#postcustomstuff .submit input {
+	width: auto;
 }
 
-#screen-meta .screen-reader-text {
-	visibility: hidden;
+#postcustomstuff #newmeta .submit {
+	padding: 0 8px;
 }
 
+#postcustomstuff table #addmetasub {
+	width: auto;
+}
+
+#postcustomstuff #newmetaleft {
+	vertical-align: top;
+}
+
+#postcustomstuff #newmetaleft a {
+	padding: 0 10px;
+	text-decoration: none;
+}
+
+
+/*------------------------------------------------------------------------------
+  11.2 - Post Revisions
+------------------------------------------------------------------------------*/
+
+table.diff {
+	width: 100%;
+}
+
+table.diff col.content {
+	width: 50%;
+}
+
+table.diff tr {
+	background-color: transparent;
+}
+
+table.diff td, table.diff th {
+	padding: .5em;
+	font-family: Consolas, Monaco, Courier, monospace;
+	border: none;
+}
+
+table.diff .diff-deletedline del, table.diff .diff-addedline ins {
+	text-decoration: none;
+}
+
+/* TODO: Review this was a conflict - PJW */
 #screen-options-link-wrap,
 #contextual-help-link-wrap {
 	float: right;
@@ -2583,37 +2440,39 @@ fieldset {
 	-webkit-border-bottom-left-radius: 3px;
 	-webkit-border-bottom-right-radius: 3px;
 }
+/* END */
 
-#contextual-help-wrap li {
-	list-style-type: disc;
-	margin-left: 18px;
+/*------------------------------------------------------------------------------
+  12.0 - Categories
+------------------------------------------------------------------------------*/
+
+.category-adder {
+	margin-left: 120px;
+	padding: 4px 0;
 }
 
-#screen-meta a.show-settings {
-	text-decoration: none;
-	z-index: 1;
-	padding: 0 16px 0 6px;
-	height: 22px;
-	line-height: 22px;
-	font-size: 10px;
-	display: block;
-	background-repeat: no-repeat;
-	background-position: right bottom;
+/* TODO: Review this was a conflict - PJW */
+.category-adder h4 {
+	margin: 0 0 8px;
 }
 
 #screen-meta a.show-settings {
 	background-image: url( ../images/screen-options-toggle.gif?ver=20100531 );
 	background-position: top right;
 }
+/* END */
 
-#screen-meta a.show-settings:hover {
-	text-decoration: none;
+#side-sortables .category-adder {
+	margin: 0;
 }
 
-#screen-options-wrap h5,
-#contextual-help-wrap h5 {
-	margin: 8px 0;
-	font-size: 13px;
+#post-body .category-add input, .category-add select {
+	width: 30%;
+}
+
+/* TODO: Review this was a conflict - PJW */
+#side-sortables .category-add input {
+	width: 94%;
 }
 
 #screen-options-wrap,
@@ -2628,241 +2487,278 @@ fieldset {
 	-khtml-border-radius: 0 0 4px 4px;
 	border-radius: 0 0 4px 4px;
 }
+/* END */
 
-.metabox-prefs label {
-	padding-right: 15px;
-	white-space: nowrap;
-	line-height: 30px;
-}
-
-.metabox-prefs label input {
-	margin: 0 5px 0 2px;
-}
-
-.metabox-prefs label a {
-	display: none;
-}
-
-/* Inline Editor
-	.quick-edit* is for Quick Edit
-	.bulk-edit* is for Bulk Edit
-	.inline-edit* is for everything
-*/
-/*	Layout */
-tr.inline-edit-row td {
-	padding: 0 0.5em;
-}
-
-#wpbody-content .inline-edit-row fieldset {
-	font-size: 12px;
-	float: left;
-	margin: 0;
-	padding: 0;
+#side-sortables .category-add select {
 	width: 100%;
 }
 
-#wpbody-content .inline-edit-row fieldset .inline-edit-col {
-	padding: 0 0.5em;
-}
-
-#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col {
-	border-width: 0 0 0 1px;
-	border-style: none none none solid;
-}
-
-#wpbody-content .quick-edit-row-post .inline-edit-col-left {
-	width: 40%;
-}
-
-#wpbody-content .quick-edit-row-post .inline-edit-col-right {
-	width: 39%;
-}
-
-#wpbody-content .inline-edit-row-post .inline-edit-col-center {
-	width: 20%;
-}
-
-#wpbody-content .quick-edit-row-page .inline-edit-col-left {
-	width: 50%;
-}
-
-#wpbody-content .quick-edit-row-page .inline-edit-col-right,
-#wpbody-content .bulk-edit-row-post .inline-edit-col-right {
-	width: 49%;
-}
-
-#wpbody-content .bulk-edit-row .inline-edit-col-left {
-	width: 30%;
-}
-
-#wpbody-content .bulk-edit-row-page .inline-edit-col-right {
-	width: 69%;
-}
-
-#wpbody-content .bulk-edit-row .inline-edit-col-bottom {
-	float: right;
-	width: 69%;
-}
-
-#wpbody-content .inline-edit-row-page .inline-edit-col-right,
-#owpbody-content .bulk-edit-row-post .inline-edit-col-right {
-	margin-top: 27px;
-}
-
-.inline-edit-row fieldset .inline-edit-group {
-	clear: both;
-}
-
-.inline-edit-row fieldset .inline-edit-group:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
-
-.inline-edit-row p.submit {
-	clear: both;
-	padding: 0.5em;
-	margin: 0.5em 0 0;
-}
-
-.inline-edit-row span.error {
-	line-height: 22px;
-	margin: 0 15px;
-	padding: 3px 5px;
-}
-
-/*	Positioning */
-.inline-edit-row h4 {
-	margin: .2em 0;
-	padding: 0;
-	line-height: 23px;
-}
-.inline-edit-row fieldset span.title,
-.inline-edit-row fieldset span.checkbox-title {
-	margin: 0;
-	padding: 0;
-	line-height: 27px;
-}
-
-.inline-edit-row fieldset label,
-.inline-edit-row fieldset span.inline-edit-categories-label {
-	display: block;
-	margin: .2em 0;
-}
-
-.inline-edit-row fieldset label.inline-edit-tags {
-	margin-top: 0;
-}
-
-.inline-edit-row fieldset label.inline-edit-tags span.title {
-	margin: .2em 0;
-}
-
-.inline-edit-row fieldset label span.title {
-	display: block;
-	float: left;
-	width: 5em;
-}
-
-.inline-edit-row fieldset label span.input-text-wrap {
-	display: block;
-	margin-left: 5em;
-}
-
-.quick-edit-row-post fieldset.inline-edit-col-right label span.title {
+#side-sortables .category-add input.category-add-sumbit, #post-body .category-add input.category-add input.category-add-sumbit {
 	width: auto;
-	padding-right: 0.5em;
 }
 
-.inline-edit-row .input-text-wrap input[type=text] {
-	width: 100%;
-}
-
-.inline-edit-row fieldset label input[type=checkbox] {
-	vertical-align: text-bottom;
-}
-
-.inline-edit-row fieldset label textarea {
-	width: 100%;
-	height: 4em;
-}
-
-#wpbody-content .bulk-edit-row fieldset .inline-edit-group label {
-	max-width: 50%;
-}
-
-#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child {
-	margin-right: 0.5em
-}
-
-/*	Styling */
-.inline-edit-row h4 {
-	text-transform: uppercase;
-}
-
-.inline-edit-row fieldset span.title,
-.inline-edit-row fieldset span.checkbox-title {
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-style: italic;
-	line-height: 1.8em;
-}
-
-/*	Specific Elements */
-.inline-edit-row fieldset input[type="text"],
-.inline-edit-row fieldset textarea {
-	border-style: solid;
-	border-width: 1px;
-}
-
-.inline-edit-row fieldset .inline-edit-date {
+#post-body ul.category-tabs,
+#post-body ul.add-menu-item-tabs {
 	float: left;
+	width: 120px;
+	text-align: right;
+	/* Negative margin for the sake of those without JS: all tabs display */
+	margin: 0 -120px 0 5px;
+	padding: 0;
 }
 
-.inline-edit-row fieldset input[name=jj],
-.inline-edit-row fieldset input[name=hh],
-.inline-edit-row fieldset input[name=mn] {
-	font-size: 12px;
-	width: 2.1em;
+#post-body ul.category-tabs li,
+#post-body ul.add-menu-item-tabs li {
+	padding: 8px;
 }
 
-.inline-edit-row fieldset input[name=aa] {
-	font-size: 12px;
-	width: 3.5em;
+#post-body ul.category-tabs li.tabs,
+#post-body ul.add-menu-item-tabs li.tabs {
+	-moz-border-radius: 3px 0 0 3px;
+	-webkit-border-top-left-radius: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-khtml-border-top-left-radius: 3px;
+	-khtml-border-bottom-left-radius: 3px;
+	border-top-left-radius: 3px;
+	border-bottom-left-radius: 3px;
 }
 
-.inline-edit-row fieldset label input.inline-edit-password-input {
-	width: 8em;
+#post-body ul.category-tabs li.tabs a,
+#post-body ul.add-menu-item-tabs li.tabs a {
+	font-weight: bold;
+	text-decoration: none;
 }
 
-.inline-edit-row .catshow,
-.inline-edit-row .cathide {
-	cursor: pointer;
-}
-
-ul.cat-checklist {
-	height: 12em;
+.categorydiv div.tabs-panel,
+.customlinkdiv div.tabs-panel,
+.posttypediv div.tabs-panel,
+.taxonomydiv div.tabs-panel,
+#linkcategorydiv div.tabs-panel {
+	height: 200px;
+	overflow: auto;
+	padding: 0.5em 0.9em;
 	border-style: solid;
 	border-width: 1px;
-	overflow-y: scroll;
-	padding: 0 5px;
+}
+
+.nav-menus-php .customlinkdiv div.tabs-panel,
+.nav-menus-php .posttypediv div.tabs-panel,
+.nav-menus-php .taxonomydiv div.tabs-panel {
+	height: auto;
+	max-height: 205px;
+}
+
+div.tabs-panel-active {
+	display:block;
+}
+
+div.tabs-panel-inactive {
+	display:none;
+}
+
+#post-body .categorydiv div.tabs-panel,
+.taxonomy div.tabs-panel,
+#post-body #linkcategorydiv div.tabs-panel {
+	margin: 0 5px 0 125px;
+}
+
+#side-sortables .category-tabs li,
+#side-sortables .add-menu-item-tabs li {
+	display: inline;
+}
+
+#side-sortables .category-tabs a,
+#side-sortables .add-menu-item-tabs a {
+	text-decoration: none;
+}
+
+#side-sortables .category-tabs,
+#side-sortables .add-menu-item-tabs {
+	margin-bottom: 3px;
+}
+
+.categorydiv ul,
+.customlinkdiv ul,
+.posttypediv ul,
+.taxonomydiv ul,
+#linkcategorydiv ul {
+	list-style: none;
+	padding: 0;
 	margin: 0;
 }
 
-#bulk-titles {
+#front-page-warning,
+#front-static-pages ul,
+.inline-editor ul.cat-checklist ul,
+.categorydiv ul.categorychecklist ul,
+.customlinkdiv ul.categorychecklist ul,
+.posttypediv ul.categorychecklist ul,
+.taxonomydiv ul.categorychecklist ul,
+#linkcategorydiv ul.categorychecklist ul {
+	margin-left: 18px;
+}
+
+ul.categorychecklist li {
+	margin: 0;
+	padding: 0;
+	line-height: 19px;
+	word-wrap: break-word;
+}
+
+.category-adder h4 {
+	margin-top: 4px;
+	margin-bottom: 0px;
+}
+
+.categorydiv .tabs-panel,
+.customlinkdiv .tabs-panel,
+.posttypediv .tabs-panel,
+.taxonomydiv .tabs-panel {
+	border-width: 3px;
+	border-style: solid;
+}
+
+ul.category-tabs,
+ul.add-menu-item-tabs {
+	margin-top: 12px;
+}
+
+ul.category-tabs li.tabs,
+ul.add-menu-item-tabs li.tabs {
+	border-style: solid solid none;
+	border-width: 1px 1px 0;
+}
+
+#post-body .category-tabs li.tabs,
+#post-body .add-menu-item-tabs li.tabs {
+	border-style: solid none solid solid;
+	border-width: 1px 0 1px 1px;
+	margin-right: -1px;
+}
+
+ul.category-tabs li,
+ul.add-menu-item-tabs li {
+	padding: 5px;
+	-moz-border-radius: 3px 3px 0 0;
+	-webkit-border-top-left-radius: 3px;
+	-webkit-border-top-right-radius: 3px;
+	-khtml-border-top-left-radius: 3px;
+	-khtml-border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
+}
+
+.form-wrap {
+	margin: 10px 0;
+	width: 97%;
+}
+
+.form-wrap p,
+.form-wrap label {
+	font-size: 11px;
+}
+
+.form-wrap label {
 	display: block;
-	height: 12em;
-	border-style: solid;
-	border-width: 1px;
-	overflow-y: scroll;
-	padding: 0 5px;
-	margin: 0 0 5px;
+	padding: 2px;
+	font-size: 12px;
 }
 
-.inline-edit-row fieldset ul.cat-checklist li,
-.inline-edit-row fieldset ul.cat-checklist input {
-	margin: 0;
+.form-field input,
+.form-field textarea {
+	border-style: solid;
+	border-width: 1px;
+	width: 95%;
+}
+
+p.description,
+.form-wrap p {
+	margin: 2px 0 5px;
+}
+
+p.help,
+p.description,
+span.description,
+.form-wrap p {
+	font-size: 12px;
+	font-style: italic;
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+}
+
+.form-wrap .form-field {
+	margin: 0 0 10px;
+	padding: 8px;
+}
+
+.col-wrap h3 {
+	margin: 12px 0;
+	font-size: 1.1em;
+}
+
+.col-wrap p.submit {
+	margin-top: -10px;
+}
+
+
+/*------------------------------------------------------------------------------
+  13.0 - Tags
+------------------------------------------------------------------------------*/
+
+.taghint {
+	color: #aaa;
+	margin: 15px 0 -24px 12px;
+}
+
+#poststuff .tagsdiv .howto {
+	margin: 0 0 6px 8px;
+}
+
+.ajaxtag .newtag {
+	background: transparent;
+	position: relative;
+}
+
+.tagsdiv .newtag {
+	width: 180px;
+}
+
+.tagsdiv .the-tags {
+	display: block;
+	height: 60px;
+	margin: 0 auto;
+	overflow: auto;
+	width: 260px;
+}
+
+#post-body-content .tagsdiv .the-tags {
+	margin: 0 5px;
+}
+
+p.popular-tags {
+	-moz-border-radius: 8px;
+	-khtml-border-radius: 8px;
+	-webkit-border-radius: 8px;
+	border-radius: 8px;
+	border-width: 1px;
+	border-style: solid;
+	line-height: 2em;
+	padding: 8px 12px 12px;
+	text-align: justify;
+}
+
+p.popular-tags a {
+	padding: 0 3px;
+}
+
+.tagcloud {
+	width: 97%;
+	margin: 0 0 40px;
+	text-align: justify;
+}
+
+/* TODO: Review this was a conflict - PJW */
+.tagcloud h3 {
+	margin: 2px 0 12px;
 }
 
 .inline-edit-row fieldset ul.cat-checklist label,
@@ -2873,46 +2769,38 @@ ul.cat-checklist {
 	font-style: normal;
 	font-size: 11px;
 }
+/* END */
 
-table .inline-edit-row fieldset ul.cat-hover {
-	height: auto;
-	max-height: 30em;
-	overflow-y: auto;
+.ac_results {
+	padding: 0;
+	margin: 0;
+	list-style: none;
 	position: absolute;
+	z-index: 10000;
+	display: none;
+	border-width: 1px;
+	border-style: solid;
 }
 
-.inline-edit-row fieldset label input.inline-edit-menu-order-input {
-	width: 3em;
+.ac_results li {
+	padding: 2px 5px;
+	white-space: nowrap;
+	text-align: left;
 }
 
-.inline-edit-row fieldset label input.inline-edit-slug-input {
-	width: 75%;
-}
-
-.quick-edit-row-post fieldset label.inline-edit-status {
-	float: left;
-}
-
-#bulk-titles {
-	line-height: 140%;
-}
-#bulk-titles div {
-	margin: 0.2em 0.3em;
-}
-
-#bulk-titles div a {
+.ac_over {
 	cursor: pointer;
-	display: block;
-	float: left;
-	height: 10px;
-	margin: 3px 3px 0 -2px;
-	overflow: hidden;
-	position: relative;
-	text-indent: -9999px;
-	width: 10px;
 }
 
-/* Media library */
+.ac_match {
+	text-decoration: underline;
+}
+
+
+/*------------------------------------------------------------------------------
+  14.0 - Media Screen
+------------------------------------------------------------------------------*/
+
 #wpbody-content #media-items .describe {
 	border-collapse: collapse;
 	width: 100%;
@@ -3084,7 +2972,11 @@ abbr.required {
 	width: 25%;
 }
 
-/* find posts */
+
+/*------------------------------------------------------------------------------
+  14.1 - Media Uploader
+------------------------------------------------------------------------------*/
+
 .find-box {
 	width: 500px;
 	height: 300px;
@@ -3146,6 +3038,8 @@ abbr.required {
 	bottom: 1px;
 }
 
+<<<<<<< .mine
+=======
 /* favorite-actions */
 #favorite-actions {
 	float: right;
@@ -3248,215 +3142,16 @@ br.clear {
 	line-height: 2px;
 }
 
+/* TODO: Review this was a conflict - PJW */
 .swfupload {
 	margin: 5px 10px;
 	vertical-align: middle;
 }
+/* END */
 
-/* table.fixed column width */
-table.fixed {
-	table-layout: fixed;
-}
-
-.fixed .column-rating,
-.fixed .column-visible {
-	width: 8%;
-}
-
-.fixed .column-date,
-.fixed .column-parent,
-.fixed .column-links {
-	width: 10%;
-}
-
-.fixed .column-response,
-.fixed .column-author,
-.fixed .column-categories,
-.fixed .column-tags,
-.fixed .column-rel,
-.fixed .column-role {
-	width: 15%;
-}
-
-.fixed .column-comments {
-	width: 4em;
-	padding: 8px 0;
-	text-align: left;
-}
-.fixed .column-comments .vers {
-	padding-left: 3px;
-}
-.fixed .column-comments a {
-	float: left;
-}
-
-.fixed .column-slug {
-	width: 25%;
-}
-
-.fixed .column-posts {
-	width: 10%;
-}
-
-.fixed .column-icon {
-	width: 80px;
-}
-
-#commentsdiv .fixed .column-author,
-#comments-form .fixed .column-author {
-	width: 20%;
-}
-
-.widefat th,
-.widefat td {
-	overflow: hidden;
-}
-
-.widefat td p {
-	margin: 2px 0 0.8em;
-}
-
-table .vers,
-table .column-visible,
-table .column-rating {
-	text-align: center;
-}
-
-.sorting-indicator {
-	display: none;
-	float: left;
-	width: 21px;
-	height: 4px;
-	margin-top: 5px;
-}
-th.sortable a, th.sorted-asc a, th.sorted-desc a {
-	float: left;
-}
-th.sorted-asc .sorting-indicator, th.sorted-desc:hover .sorting-indicator, th.sortable:hover .sorting-indicator {
-	display: block;
-	background: url(../images/sort_asc.gif) no-repeat scroll 0 0;
-}
-th.sorted-desc .sorting-indicator, th.sorted-asc:hover .sorting-indicator {
-	display: block;
-	background: url(../images/sort_desc.gif) no-repeat scroll 0 0;
-}
-
-.icon32 {
-	float: left;
-	height: 36px;
-	margin: 14px 6px 0 0;
-	width: 36px;
-}
-
-.key-labels label {
-	line-height: 24px;
-}
-
-.subtitle {
-	font-size: 0.75em;
-	line-height: 1;
-	padding-left: 25px;
-}
-
-ol {
-	list-style-type: decimal;
-	margin-left: 2em;
-}
-
-.postbox-container {
-	float: left;
-	padding-right: 0.5%;
-}
-
-.postbox-container .meta-box-sortables {
-	min-height: 300px;
-}
-
-.temp-border {
-	border: 1px dotted #ccc;
-}
-
-.columns-prefs label {
-	padding: 0 5px;
-}
-
-.theme-install-php h4,
-.plugin-install-php h4 {
-	margin: 2.5em 0 8px;
-}
-
-p.install-help {
-	margin: 8px 0;
-	font-style: italic;
-}
-
-p.popular-tags {
-	-moz-border-radius: 8px;
-	-khtml-border-radius: 8px;
-	-webkit-border-radius: 8px;
-	border-radius: 8px;
-	border-width: 1px;
-	border-style: solid;
-	line-height: 2em;
-	padding: 8px 12px 12px;
-	text-align: justify;
-}
-
-p.popular-tags a {
-	padding: 0 3px;
-}
-
-.stuffbox .editcomment {
-	clear: none;
-}
-
-.ajax-feedback {
-	visibility: hidden;
-	vertical-align: bottom;
-}
-
-.tagsdiv .newtag {
-	width: 180px;
-}
-
-.tagsdiv .the-tags {
-	display: block;
-	height: 60px;
-	margin: 0 auto;
-	overflow: auto;
-	width: 260px;
-}
-
-#post-body-content .tagsdiv .the-tags {
-	margin: 0 5px;
-}
-
-label,
-#your-profile label + a {
-	vertical-align: middle;
-}
-
-#misc-publishing-actions label {
-	vertical-align: baseline;
-}
-
-.plugin-update-tr .update-message {
-	margin: 5px;
-	padding: 3px 5px;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 5px;
-	-khtml-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-}
-
-.add-new-h2 {
-	font-style: normal;
-	margin: 0 6px;
-	position: relative;
-	top: -3px;
-}
+/*------------------------------------------------------------------------------
+  14.2 - Image Editor
+------------------------------------------------------------------------------*/
 
 .describe .image-editor {
 	vertical-align: top;
@@ -3690,14 +3385,183 @@ span.imgedit-scale-warn {
 	padding: 2px 10px;
 }
 
-#dashboard_recent_comments div.undo {
-	border-top-style: solid;
-	border-top-width: 1px;
-	margin: 0 -10px;
-	padding: 3px 8px;
+
+/*------------------------------------------------------------------------------
+  15.0 - Comments Screen
+------------------------------------------------------------------------------*/
+
+.form-table {
+	border-collapse: collapse;
+	margin-top: 0.5em;
+	width: 100%;
+	margin-bottom: -8px;
+	clear: both;
+}
+
+.form-table td {
+	margin-bottom: 9px;
+	padding: 8px 10px;
+	line-height: 20px;
 	font-size: 11px;
 }
 
+.form-table th,
+.form-wrap label {
+	font-weight: normal;
+	text-shadow: rgba(255,255,255,1) 0 1px 0;
+}
+
+.form-table th {
+	vertical-align: top;
+	text-align: left;
+	padding: 10px;
+	width: 200px;
+}
+
+.form-table th.th-full {
+	width: auto;
+}
+
+.form-table div.color-option {
+	display: block;
+	clear: both;
+	margin-top: 12px;
+}
+
+.form-table input.tog {
+	margin-top: 2px;
+	margin-right: 2px;
+	float: left;
+}
+
+.form-table table.color-palette {
+	vertical-align: bottom;
+	float: left;
+	margin: -12px 3px 11px;
+}
+
+.form-table .color-palette td {
+	border-width: 1px 1px 0;
+	border-style: solid solid none;
+	height: 10px;
+	line-height: 20px;
+	width: 10px;
+}
+
+.commentlist li {
+	padding: 1em 1em .2em;
+	margin: 0;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+
+.commentlist li li {
+	border-bottom: 0;
+	padding: 0;
+}
+
+.commentlist p {
+	padding: 0;
+	margin: 0 0 .8em;
+}
+
+/* reply to comments */
+#replyrow {
+	font-size: 11px;
+}
+
+#replyrow input {
+	border-width: 1px;
+	border-style: solid;
+}
+
+#replyrow td {
+	padding: 2px;
+}
+
+#replyrow #editorcontainer {
+	border: 0 none;
+}
+
+#replysubmit {
+	margin: 0;
+	padding: 3px 7px;
+}
+
+#replysubmit img.waiting,
+.inline-edit-save img.waiting {
+	padding: 4px 10px 0;
+	vertical-align: top;
+	float: right;
+}
+
+#replysubmit .button {
+	margin-right: 5px;
+}
+
+#replyrow #editor-toolbar {
+	display: none;
+}
+
+#replyhead {
+	font-size: 12px;
+	font-weight: bold;
+	padding: 2px 10px 4px;
+}
+
+#edithead .inside {
+	float: left;
+	padding: 3px 0 2px 5px;
+	margin: 0;
+	text-align: center;
+	font-size: 11px;
+}
+
+#edithead .inside input {
+	width: 180px;
+	font-size: 11px;
+}
+
+#edithead label {
+	padding: 2px 0;
+}
+
+#replycontainer {
+	padding: 5px;
+	border: 0 none;
+	height: 120px;
+	overflow: hidden;
+	position: relative;
+}
+
+#replycontent {
+	resize: none;
+	margin: 0;
+	width: 100%;
+	height: 100%;
+	padding: 0;
+	line-height: 150%;
+	border: 0 none;
+	outline: none;
+	font-size: 12px;
+}
+
+#replyrow #ed_reply_toolbar {
+	margin: 0;
+	padding: 2px 3px;
+}
+
+.comment-ays {
+	margin-bottom: 0;
+	border-style: solid;
+	border-width: 1px;
+}
+
+.comment-ays th {
+	border-right-style: solid;
+	border-right-width: 1px;
+}
+
 .trash-undo-inside,
 .spam-undo-inside {
 	margin: 1px 8px 1px 0;
@@ -3712,19 +3576,131 @@ span.imgedit-scale-warn {
 	vertical-align: middle;
 }
 
-/* tag hints */
-.taghint {
-	color: #aaa;
-	margin: 15px 0 -24px 12px;
+.stuffbox .editcomment {
+	clear: none;
 }
 
-#poststuff .tagsdiv .howto {
-	margin: 0 0 6px 8px;
+#comment-status-radio p {
+	margin: 3px 0 5px;
 }
 
-.ajaxtag .newtag {
-	background: transparent;
-	position: relative;
+#comment-status-radio input {
+	margin: 2px 3px 5px 0;
+	vertical-align: middle;
+}
+
+#comment-status-radio label {
+	padding: 5px 0;
+}
+
+.commentlist .avatar {
+	vertical-align: text-top;
+}
+
+
+/*------------------------------------------------------------------------------
+  16.0 - Themes
+------------------------------------------------------------------------------*/
+
+table#availablethemes {
+	border-spacing: 0;
+	border-width: 1px 0;
+	border-style: solid none;
+	margin: 10px auto;
+	width: 100%;
+}
+
+td.available-theme {
+	vertical-align: top;
+	width: 240px;
+	margin: 0;
+	padding: 20px;
+	text-align: left;
+}
+
+table#availablethemes td {
+	border-width: 0 1px 1px;
+	border-style: none solid solid;
+}
+
+table#availablethemes td.right,
+table#availablethemes td.left  {
+	border-right: 0 none;
+	border-left: 0 none;
+}
+
+table#availablethemes td.bottom {
+	border-bottom: 0 none;
+}
+
+.available-theme a.screenshot {
+	width: 240px;
+	height: 180px;
+	display: block;
+	border-width: 1px;
+	border-style: solid;
+	margin-bottom: 10px;
+	overflow: hidden;
+}
+
+.available-theme img {
+	width: 240px;
+}
+
+.available-theme h3 {
+	margin: 15px 0 5px;
+}
+
+#current-theme {
+	margin: 1em 0 1.5em;
+}
+
+#current-theme a {
+	border-bottom: none;
+}
+
+#current-theme h3 {
+	font-size: 17px;
+	font-weight: normal;
+	margin: 0;
+}
+
+#current-theme .theme-description {
+	margin-top: 5px;
+}
+
+#current-theme img {
+	float: left;
+	border-width: 1px;
+	border-style: solid;
+	margin-right: 1em;
+	margin-bottom: 1.5em;
+	width: 150px;
+}
+
+.theme-options span {
+	text-transform: uppercase;
+	font-size: 13px;
+}
+
+.theme-options a {
+	font-size: 15px;
+}
+
+#TB_window #TB_title a.tb-theme-preview-link,
+#TB_window #TB_title a.tb-theme-preview-link:visited {
+	font-weight: bold;
+	text-decoration: none;
+}
+
+#TB_window #TB_title {
+	background-color: #222;
+	color: #cfcfcf;
+}
+
+.themes-php .wrap h2, .theme-install-php .wrap h2 {
+	border-bottom: 1px solid #ccc;
+	padding-bottom: 0;
 }
 
 #broken-themes {
@@ -3734,38 +3710,15 @@ span.imgedit-scale-warn {
 	padding: 3px;
 }
 
-.describe .del-link {
-	padding-left: 5px;
+.theme-install-php h4 {
+	margin: 2.5em 0 8px;
 }
 
-.comment-ays {
-	margin-bottom: 0;
-	border-style: solid;
-	border-width: 1px;
-}
 
-.comment-ays th {
-	border-right-style: solid;
-	border-right-width: 1px;
-}
+/*------------------------------------------------------------------------------
+  16.1 - Custom Header Screen
+------------------------------------------------------------------------------*/
 
-/* Custom Background  */
-
-div#custom-background-image {
-	min-height: 100px;
-	border: 1px solid #dfdfdf;
-}
-
-div#custom-background-image img {
-	max-width: 400px;
-	max-height: 300px;
-}
-
-#custom-background label {
-	padding-right: 15px;
-}
-
-/* Custom Header */
 .appearance_page_custom-header #headimg {
 	border: 1px solid #DFDFDF;
 	min-height: 100px;
@@ -3789,7 +3742,29 @@ div#custom-background-image img {
 	vertical-align: middle;
 }
 
-/* Tab Interface */
+
+/*------------------------------------------------------------------------------
+  16.2 - Custom Background Screen
+------------------------------------------------------------------------------*/
+
+div#custom-background-image {
+	min-height: 100px;
+	border: 1px solid #dfdfdf;
+}
+
+div#custom-background-image img {
+	max-width: 400px;
+	max-height: 300px;
+}
+
+#custom-background label {
+	padding-right: 15px;
+}
+
+
+/*------------------------------------------------------------------------------
+  16.3 - Tabbed Admin Screen Interface (Experimental)
+------------------------------------------------------------------------------*/
 
 .nav-tab {
 	border-style: solid;
@@ -3817,6 +3792,7 @@ div#custom-background-image img {
 	color: #464646;
 }
 
+/* TODO: Review this was a conflict - PJW */
 h2.nav-tab-wrapper, h3.nav-tab-wrapper {
 	border-bottom: 1px solid #ccc;
 	padding-bottom: 0;
@@ -3826,8 +3802,548 @@ h2 .nav-tab {
 	padding: 4px 20px 6px;
 	font: italic normal normal 24px/35px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
 }
+/* END */
+
+/*------------------------------------------------------------------------------
+  17.0 - Plugins
+------------------------------------------------------------------------------*/
+
+.plugins #name {width: 33%}
+
+.plugins .name,
+#pass-strength-result.strong,
+#pass-strength-result.short,
+.button-highlighted,
+input.button-highlighted,
+#quicktags #ed_strong,
+#ed_reply_toolbar #ed_reply_strong {
+	font-weight: bold;
+}
+
+.plugins p {
+	margin: 0 4px;
+	padding: 0;
+}
+
+.plugins .desc p {
+	margin: 0 0 8px;
+}
+
+.plugins td.desc {
+	line-height: 1.5em;
+}
+
+.plugins .desc ul,
+.plugins .desc ol {
+	margin: 0 0 0 2em;
+}
+
+.plugins .desc ul {
+	list-style-type: disc;
+}
+
+.plugins .action-links {
+	white-space: nowrap;
+}
+
+.plugins .row-actions-visible {
+	padding: 0;
+}
+
+.plugins tbody th.check-column {
+	padding: 7px 0;
+}
+
+.plugins td, .plugins th {
+	border-bottom: 0 none;
+}
+
+#install-plugins .plugins td,
+#install-plugins .plugins th {
+	border-bottom-style: solid;
+	border-bottom-width: 1px;
+}
+
+.plugins .inactive td,
+.plugins .inactive th,
+.plugins .active td,
+.plugins .active th {
+	border-top-style: solid;
+	border-top-width: 1px;
+	padding: 5px 7px 0;
+}
+
+#wpbody-content .plugins .plugin-title {
+	padding-right: 12px;
+}
+
+.plugins .second td,
+.plugins .second th {
+	border-top: 0 none;
+	padding: 0 7px 5px;
+}
+
+.plugins-php .widefat tfoot th,
+.plugins-php .widefat tfoot td {
+	border-top-style: solid;
+	border-top-width: 1px;
+}
+
+.plugin-update-tr .update-message {
+	margin: 5px;
+	padding: 3px 5px;
+	border-width: 1px;
+	border-style: solid;
+	-moz-border-radius: 5px;
+	-khtml-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+}
+
+.plugin-install-php h4 {
+	margin: 2.5em 0 8px;
+}
+
+
+/*------------------------------------------------------------------------------
+  18.0 - Users
+------------------------------------------------------------------------------*/
+
+#profile-page .form-table textarea {
+	width: 500px;
+	margin-bottom: 6px;
+}
+
+#profile-page .form-table #rich_editing {
+	margin-right: 5px
+}
+
+#your-profile legend {
+	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	font-size: 22px;
+}
+
+#your-profile #rich_editing {
+	border: none;
+}
+
+#display_name {
+	width: 15em;
+}
+
+
+/*------------------------------------------------------------------------------
+  19.0 - Tools
+------------------------------------------------------------------------------*/
+
+
+
+
+/*------------------------------------------------------------------------------
+  20.0 - Settings
+------------------------------------------------------------------------------*/
+
+#utc-time, #local-time {
+	padding-left: 25px;
+	font-style: italic;
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+}
+
+.defaultavatarpicker .avatar {
+	margin: 2px 0;
+	vertical-align: middle;
+}
+
+
+/*------------------------------------------------------------------------------
+  21.0 - Admin Footer
+------------------------------------------------------------------------------*/
+
+#footer {
+	margin-top: -46px;
+	border-top: 1px;
+	border-style: solid;
+}
+
+#footer,
+#footer a {
+	font-size: 12px;
+	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	font-style: italic;
+}
+
+#footer p {
+	margin: 0;
+	padding: 15px;
+	line-height: 15px;
+}
+
+#footer a {
+	text-decoration: none;
+}
+
+#footer a:hover {
+	text-decoration: underline;
+}
+
+
+/*------------------------------------------------------------------------------
+  22.0 - Misc
+------------------------------------------------------------------------------*/
+
+#excerpt, .attachmentlinks {
+	margin: 0;
+	height: 4em;
+	width: 98%;
+}
+
+#template div {
+	margin-right: 190px;
+}
+
+p.pagenav {
+	margin: 0;
+	display: inline;
+}
+
+.pagenav span {
+	font-weight: bold;
+	margin: 0 6px;
+}
+
+.row-title {
+	font-size: 12px !important;
+	font-weight: bold;
+}
+
+.column-author img, .column-username img {
+	float: left;
+	margin-right: 10px;
+	margin-top: 3px;
+}
+
+.row-actions {
+	visibility: hidden;
+	padding: 2px 0 0;
+}
+
+tr:hover .row-actions,
+div.comment-item:hover .row-actions {
+	visibility: visible;
+}
+
+.row-actions-visible {
+	padding: 2px 0 0;
+}
+
+.form-table .pre {
+	padding: 8px;
+	margin: 0;
+}
+
+table.form-table td .updated {
+	font-size: 13px;
+}
+
+
+.tagchecklist {
+	margin-left: 14px;
+	font-size: 12px;
+	overflow: auto;
+}
+.tagchecklist strong {
+	margin-left: -8px;
+	position: absolute;
+}
+.tagchecklist span {
+	margin-right: 25px;
+	display: block;
+	float: left;
+	font-size: 11px;
+	line-height: 1.8em;
+	white-space: nowrap;
+	cursor: default;
+}
+.tagchecklist span a {
+	margin: 6px 0pt 0pt -9px;
+	cursor: pointer;
+	width: 10px;
+	height: 10px;
+	display: block;
+	float: left;
+	text-indent: -9999px;
+	overflow: hidden;
+	position: absolute;
+}
+
+
+#poststuff h2 {
+	margin-top: 20px;
+	font-size: 1.5em;
+	margin-bottom: 15px;
+	padding: 0 0 3px;
+	clear: left;
+}
+#poststuff h3,
+.metabox-holder h3 {
+	font-size: 12px;
+	font-weight: bold;
+	padding: 7px 9px;
+	margin: 0;
+	line-height: 1;
+}
+#poststuff .inside,
+#poststuff .inside p {
+	font-size: 11px;
+	margin: 6px 6px 8px;
+}
+#poststuff .inside .submitbox p {
+	margin: 1em 0;
+}
+#post-visibility-select {
+	line-height: 1.5em;
+	margin-top: 3px;
+}
+#poststuff #submitdiv .inside {
+	margin: 0;
+}
+#titlediv, #poststuff .postarea {
+	margin-bottom: 20px;
+}
+
+
+td.post-title strong, td.plugin-title strong {
+	display: block;
+	margin-bottom: .2em;
+}
+td.post-title p, td.plugin-title p {
+	margin: 6px 0;
+}
+td.plugin-title {
+	white-space: nowrap;
+}
+
+
+.wp-hidden-children .wp-hidden-child,
+.ui-tabs-hide {
+	display: none;
+}
+
+#templateside ul li a {
+	text-decoration: none;
+}
+
+
+.tool-box {
+	margin: 15px 0 35px;
+}
+.tool-box .buttons {
+	margin: 15px 0;
+}
+.tool-box .title {
+	margin: 8px 0;
+	font: 18px/24px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+}
+
+
+.pressthis a {
+	font-size: 1.2em;
+}
+
+
+#sidemenu {
+	margin: -30px 15px 0 315px;
+	list-style: none;
+	position: relative;
+	float: right;
+	padding-left: 10px;
+	font-size: 12px;
+}
+#sidemenu a {
+	padding: 0 7px;
+	display: block;
+	float: left;
+	line-height: 28px;
+	border-top-width: 1px;
+	border-top-style: solid;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+#sidemenu li {
+	display: inline;
+	line-height: 200%;
+	list-style: none;
+	text-align: center;
+	white-space: nowrap;
+	margin: 0;
+	padding: 0;
+}
+#sidemenu a.current {
+	font-weight: normal;
+	padding-left: 6px;
+	padding-right: 6px;
+	-moz-border-radius: 4px 4px 0 0;
+	-webkit-border-top-left-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	-khtml-border-top-left-radius: 4px;
+	-khtml-border-top-right-radius: 4px;
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	border-width: 1px;
+	border-style: solid;
+}
+#sidemenu li a .count-0 {
+	display: none;
+}
+
+#poststuff .inside .the-tagcloud {
+	margin: 5px 0 10px;
+	padding: 8px;
+	border-width: 1px;
+	border-style: solid;
+	line-height: 1.8em;
+	word-spacing: 3px;
+	-moz-border-radius: 6px;
+	-khtml-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+}
+
+table .vers,
+table .column-visible,
+table .column-rating {
+	text-align: center;
+}
 
 /* Scrollbar fix for bulk upgrade iframe */
 body.update-php {
 	height: 98%;
 }
+
+
+/*------------------------------------------------------------------------------
+  23.0  - Dead
+------------------------------------------------------------------------------*/
+
+/* - Not used anywhere in WordPress - verify and then deprecate
+------------------------------------------------------------------------------*/
+.anchors {
+	margin: 10px 20px 10px 20px;
+}
+div.nav {
+	height: 2em;
+	padding: 7px 10px;
+	vertical-align: text-top;
+	margin: 5px 0;
+}
+.nav .button-secondary {
+	padding: 2px 4px;
+}
+* html #themeselect {
+	padding: 0 3px;
+	height: 22px;
+}
+.settings-toggle {
+	text-align: right;
+	margin: 5px 7px 15px 0;
+	font-size: 12px;
+}
+.settings-toggle h3 {
+	margin: 0;
+}
+form#tags-filter {
+	position: relative;
+}
+
+/* - Only used once or twice in all of WP - deprecate for global style
+------------------------------------------------------------------------------*/
+td.media-icon {
+	text-align: center;
+	width: 80px;
+	padding-top: 8px;
+	padding-bottom: 8px;
+}
+
+td.media-icon img {
+	max-width: 80px;
+	max-height: 60px;
+}
+.screen-per-page {
+	width: 3em;
+}
+* html #template div {margin-right: 0;}
+#save {width: 15em;}
+#loading-items {
+	position: absolute;
+	z-index: 9999;
+	padding: 10px;
+	background-color: #fff;
+	font-weight: bold;
+	text-align: center;
+	opacity: 0.5;
+}
+#howto {
+	font-size: 11px;
+	margin: 0 5px;
+	display: block;
+}
+.import-system {font-size: 16px;}
+#namediv table {
+	width: 100%;
+}
+#namediv td.first {
+	width: 10px;
+	white-space: nowrap;
+}
+#namediv input {
+	width: 98%;
+}
+#namediv p {
+	margin: 10px 0;
+}
+#submitdiv h3 {
+	margin-bottom: 0 !important;
+}
+
+/* - Used - but could/should be deprecated with a CSS reset
+------------------------------------------------------------------------------*/
+.zerosize {
+	height: 0;
+	width: 0;
+	margin: 0;
+	border: 0;
+	padding: 0;
+	overflow: hidden;
+	position: absolute;
+}
+br.clear {
+	height: 2px;
+	line-height: 2px;
+}
+.checkbox {
+	border: none;
+	margin: 0;
+	padding: 0;
+}
+#content {
+	margin: 0;
+	width: 100%;
+}
+fieldset {
+	border: 0;
+	padding: 0;
+	margin: 0;
+}
+#linksubmitdiv div.inside,
+div.inside {
+	padding: 0;
+	margin: 0;
+}
+.post-categories {
+	display: inline;
+	margin: 0;
+	padding: 0;
+}
+.post-categories li {
+	display: inline;
+}