Index: skins/colibri/src/main/resources/colibri/colibri.css
===================================================================
--- skins/colibri/src/main/resources/colibri/colibri.css	(revision 23063)
+++ skins/colibri/src/main/resources/colibri/colibri.css	(working copy)
@@ -1,3 +1,50 @@
+## Initialization of the theme with the defaults
+## All keys must match the ColorThemeClass properties
+#set($theme = $util.hashMap)
+#set($discard = $theme.put('pageBackgroundColor', '#DDDDDD'))
+#set($discard = $theme.put('pageHeaderBackgroundColor', '#FFFFFF'))
+#set($discard = $theme.put('pageContentBackgroundColor', '#FFFFFF'))
+#set($discard = $theme.put('textColor', '#000000'))
+#set($discard = $theme.put('textPrimaryColor', '#888888'))
+#set($discard = $theme.put('textSecondaryColor', '#b3b3b3'))
+#set($discard = $theme.put('titleColor', '#888888'))
+#set($discard = $theme.put('borderColor', '#CCCCCC'))
+#set($discard = $theme.put('linkColor', '#0089DC'))
+#set($discard = $theme.put('highlightColor', '#FFFFDD'))
+#set($discard = $theme.put('menuBackgroundColor', '#CCCCCC'))
+#set($discard = $theme.put('menuLinkColor', '#FFFFFF'))
+#set($discard = $theme.put('menuSelectedEntryBackgroundColor', '#EFEFEF'))
+#set($discard = $theme.put('menuSelectedEntryLinkColor', '#888888'))
+#set($discard = $theme.put('panelBackgroundColor', '#FFFFFF'))
+#set($discard = $theme.put('panelHeaderBackgroundColor', '#FFFFFF'))
+#set($discard = $theme.put('panelHeaderTextColor', '#888888'))
+#set($discard = $theme.put('panelTextColor', '#000000'))
+#set($discard = $theme.put('panelCollapsedBackgroundColor', '#CCCCCC'))
+#set($discard = $theme.put('panelCollapsedTextColor', '#FFFFFF'))
+#set($discard = $theme.put('buttonPrimaryBackgroundColor', '#0089DC'))
+#set($discard = $theme.put('buttonPrimaryTextColor', '#FFFFFF'))
+#set($discard = $theme.put('buttonSecondaryBackgroundColor', '#FFFFFF'))
+#set($discard = $theme.put('buttonSecondaryTextColor', '#0089DC'))
+#set($discard = $theme.put('backgroundSecondaryColor', '#EFEFEF'))
+##
+## Overwrite with the values set in the custom theme
+#set($themeDocFullName = "$!xwiki.getUserPreference('colorTheme')")
+#if($themeDocFullName == '')
+  #set($themeDocFullName = 'ColorThemes.DefaultColorTheme')
+#end
+#set($themeDoc = $xwiki.getDocument($themeDocFullName))
+#set($obj = $themeDoc.getObject('ColorThemes.ColorThemeClass', true))
+#if("$!obj" != '')
+  #foreach($prop in $obj.properties)
+     #if(!$prop.name.endsWith('Color') || $prop.value.matches('transparent|#[0-9a-fA-F]{3}|#[0-9a-fA-F]{6}'))
+       #set($discard = $theme.put($prop.name, $prop.value))
+     #end
+     #if($prop.name.endsWith('Image'))
+       #set($discard = $theme.put($prop.name, "url(${themeDoc.getAttachmentURL($prop.value)})"))
+     #end
+  #end
+#end
+
 /* @group RESET */
 /* --------------------------------------------------------------
 
@@ -39,15 +86,18 @@
 }
 
 a, a:link, a:active, a:visited {
-    color: #39397f;
+    color: $theme.linkColor;
     text-decoration: none;
 }
 
 a:hover {
-    color: #00007e;
     text-decoration: underline;
 }
 
+a img {
+    border: none;
+}
+
 /* Remember to define focus styles! */
 :focus {
     outline: 0;
@@ -85,8 +135,10 @@
 
 .clearfloats {
     clear: both;
-    height: 1px;
+    height: 0px;
+	line-height: 0px;
     margin: 0 220px;
+	background-color: transparent;
 }
 
 body.hideleft .clearfloat {
@@ -123,10 +175,6 @@
     background-repeat: no-repeat;
 }
 
-a img {
-    border: none;
-}
-
 /* Used to signify a rendering error in the rendered page. Valid only with new rendering */
 .xwikirenderingerror {
   background-color: #eee;
@@ -1034,7 +1082,7 @@
 }
 
 #editPanels.panels .panel {
-    margin: 0;
+    margin:0 0 10px;
     width: 210px;
     padding: 0;
 }
@@ -1168,11 +1216,16 @@
 }
 
 #xdocFooter {
-  margin: 1em 0 0;
-  padding-top: 0.5em;
+  margin: 0;
+  padding:5px 25px 10px;
   font-size: 90%;
-  border-top: 1px solid;
+  background: $theme.pageContentBackgroundColor;
+  color: $theme.textPrimaryColor;
+  border-top: 1px solid $theme.borderColor;
+  width: auto;
+  overflow: auto;
 }
+
 #xdocAuthors {
   text-align: right;
 }
@@ -1252,12 +1305,6 @@
     margin: 8px;
 }
 
-.button {
-    font-family: Helvetica, sans-serif;
-    font-weight: bold;
-    text-align: center;
-}
-
 /* @end */
 /* @group Comments, attachments, History...  */
 /*
@@ -1641,8 +1688,9 @@
     padding: 0;
 }
 
-#globalsearch {
-    margin: 0 0 0 10px;
+/* Hide the Search panel since this functionality is included in the header */
+.panels .Search {
+  display: none;
 }
 
 .xwikipanelcontents form {
@@ -1650,19 +1698,6 @@
     padding: 0;
 }
 
-#body #globalsearch input {
-    font-size: 0.9em;
-    display: inline !important;
-}
-
-#body #globalsearch input.button {
-    vertical-align: middle;
-    font-size: 1em;
-    border: 0;
-    padding: 0;
-    width: auto;
-}
-
 #leftPanels, #rightPanels {
     padding: 0;
     height: 1%;
@@ -1728,18 +1763,21 @@
 
 h5.xwikipaneltitle {
     margin: 0;
-    font-size: 1.1em;
+    font-size: 0.8em;
     letter-spacing: -1px;
     line-height: 1.2em;
     padding: 8px 20px 8px 15px;
     text-align: center;
+	font-weight: bold;
     cursor: pointer;
+	text-transform: uppercase;
+	background-color: $theme.panelHeaderBackgroundColor;
+    border-bottom: 1px dotted $theme.borderColor;
+    color: $theme.panelHeaderTextColor;
+    text-align: left;
+    letter-spacing:0;
 }
 
-#globalsearch h5.xwikipaneltitle.hidden {
-    display: none;
-}
-
 h5.xwikipaneltitle.hidden {
     display: block;
     height: 10px;
@@ -1755,6 +1793,7 @@
 div.xwikipanelcontents ul.star {
     list-style-type: none;
     list-style-position: inside;
+	*list-style-position: outside; /* IE6, IE7*/
     padding: 0;
     margin: 0;
 }
@@ -1771,44 +1810,33 @@
     display: none;
 }
 
+.collapsed h5.xwikipaneltitle {
+  background-color: $theme.panelCollapsedBackgroundColor;
+  border: none;
+  color: $theme.panelCollapsedTextColor;
+}
+
 span.panelitem {
     display: block;
 }
 
 /*  edit panels */
-#editPanels .expanded h5.xwikipaneltitle {
-    height: auto;
-    font-size: 1em;
-    text-align: center;
-    letter-spacing: -1px;
-    padding: 5px 25px 5px 10px;
-}
 
-#editPanels .editmodes h5 {
-    height: auto;
-    font-size: 1em;
-    text-align: center;
-    letter-spacing: -1px;
-    padding: 5px 25px 5px 10px;
-}
-
 #editPanels .collapsed h5.xwikipaneltitle {
-    text-align: center;
-    letter-spacing: -1px;
-    padding: 5px 25px 5px 10px;
+    background-color: $theme.panelCollapsedBackgroundColor;
+    border: none;
+    color: $theme.panelCollapsedTextColor;
 }
 
 #editPanels .xwikipanelcontents {
+    background: $theme.panelBackgroundColor;
+    padding: 10px 15px;
+    color: $theme.panelTextColor;
     height: auto;
-    padding: 0 25px 35px 10px;
     font-size: 0.8em;
     font-weight: normal;
 }
 
-#editPanels .EditModes .xwikipanelcontents {
-    padding-bottom: 2em;
-}
-
 #editPanels .xwikipanelcontents p {
     margin: 0 0 1em 0;
 }
@@ -1824,10 +1852,6 @@
     font-size: 1em;
 }
 
-.collapsed h5.xwikipaneltitle {
-    background-position: top right;
-}
-
 #editPanels .EditModes .xwikipanelcontents ul {
     padding-top: 1em;
     margin-left: -15px;
@@ -1944,14 +1968,15 @@
     font-weight: bold;
 }
 
+.xwikipanelcontents dl dd table#xwikiincludeddocuments {
+	width: 100%;
+}
+
 .xwikipanelcontents dl dd table#xwikiincludeddocuments td {
     border-top: 1px dotted #EEE;
 }
 
 .xwikipanelcontents dl dd table#xwikiincludeddocuments td a {
-    display: block;
-    width: 148px;
-    position: relative;
     overflow: hidden;
 }
 
@@ -2151,7 +2176,7 @@
 }
 
 .padded {
-    padding: 8px;
+    padding: 4px;
 }
 
 .editactions {
@@ -2313,18 +2338,14 @@
 .alleditcontent label {
     position: relative;
     display: block;
-    text-align: center;
-    padding: 5px;
+    text-align: left;
+    padding: 0px;
     font-weight: bold;
     font-size: 1em;
-    margin: 0px 0px 1em;
+    margin: 1em 0;
+	text-transform: uppercase;
 }
 
-#xwikidoctitleinput {
-    margin-top: 1em;
-    width: 70%;
-}
-
 #xwikicontent .floatcontainer {
     overflow: hidden;
     width: auto;
@@ -2436,11 +2457,13 @@
 }
 
 #editcolumn div.alleditcontent label {
-    display: block;
+    display: inline-block;
     text-transform: uppercase;
     padding: 0;
-    text-align: center;
+    text-align: left;
     margin-bottom: 20px;
+	margin-top: 10px;
+	width: 100%;
 }
 
 #editcolumn div.alleditcontent #pagetitle label {
@@ -2450,7 +2473,7 @@
 }
 
 #editcolumn div.alleditcontent #pagetitle label input {
-    width: 100%;
+   width: 100%; 
 }
 
 div#xwikiclassproperties.accordion dt label,
@@ -2483,11 +2506,11 @@
     width: 98%;
 }
 
-div#xwikiclassproperties.accordion
+div#xwikiclassproperties.accordion {}
 
 #xwikidoctitleinput {
-    width: 40%;
-    font-size: 1em;
+    width: 100%;
+	display: block;
 }
 
 .topbuttons, .bottombuttons {
@@ -2553,16 +2576,6 @@
     text-align: center;
 }
 
-/* panels */
-#panellistaccordion input[type=text], #panellistaccordion textarea,
-    #body .panel input[type=text], #body .panel textarea {
-    width: 100%;
-}
-
-.viewbody form .centered input[type=text] {
-    width: auto;
-}
-
 #leftPanels.xwikipanelcontents ol,
     #leftPanels .xwikipanelcontents ul.minus,
     #rightPanels.xwikipanelcontents ol,
@@ -2587,36 +2600,6 @@
     margin-left: 2em;
 }
 
-.panel input, .panel select, #editPanels dl dd input {
-  width: 100%;
-}
-.panel .buttonwrapper, #editPanels .buttonwrapper {
-  margin-left: 0;
-}
-
-.buttonwrapper {
-    background: transparent;
-    display: inline-block;
-    display: inline;
-    margin: 10px 0px 10px 10px;
-    padding-top: 10px;
-}
-
-#body .buttonwrapper * {
-    display: inline-block;
-    display: inline;
-    line-height: 1.35em !important;
-    margin: 0px !important;
-    min-height: 24px !important;
-    white-space: nowrap;
-}
-
-#body .buttonwrapper a {
-    padding: 3px 5px;
-    line-height: 26px;
-    font-weight: bold;
-}
-
 body.importbody .alleditcontent .padded h3,
     body.exportbody .alleditcontent .padded h3 {
     font-size: 1.4em;
@@ -3138,10 +3121,6 @@
     height: 400px;
 }
 
-* html #globalsearch {
-    margin-bottom: 1em
-}
-
 * html #editPanels .EditModes .xwikipanelcontents ul li.active {
     background-image: none;
 }
@@ -3250,10 +3229,6 @@
   background: none;
 }
 
-input#tags {
-	width: 80%;
-}
-
 #tageditsavesuccess {
 	color: green;
 	margin-left: 6px;
@@ -3283,11 +3258,11 @@
 }
 
 ul.xlist li.xunderline {
-  border-bottom: solid 1px #efefef !important;
+  border-bottom:  1px solid $theme.borderColor !important;
 }
 
 ul.xlist li.xhighlight:hover {
-  background-color: lemonChiffon;
+  background-color: $theme.highlightColor;
 }
 
 ul.xlist li {
@@ -3376,52 +3351,6 @@
 }
 
 /* Start Colibri.css */
-## Initialization of the theme with the defaults
-## All keys must match the ColorThemeClass properties
-#set($theme = $util.hashMap)
-#set($discard = $theme.put('pageBackgroundColor', '#DDDDDD'))
-#set($discard = $theme.put('pageHeaderBackgroundColor', '#FFFFFF'))
-#set($discard = $theme.put('pageContentBackgroundColor', '#FFFFFF'))
-#set($discard = $theme.put('textColor', '#000000'))
-#set($discard = $theme.put('textPrimaryColor', '#888888'))
-#set($discard = $theme.put('textSecondaryColor', '#b3b3b3'))
-#set($discard = $theme.put('titleColor', '#888888'))
-#set($discard = $theme.put('borderColor', '#CCCCCC'))
-#set($discard = $theme.put('linkColor', '#0089DC'))
-#set($discard = $theme.put('highlightColor', '#FFFFDD'))
-#set($discard = $theme.put('menuBackgroundColor', '#CCCCCC'))
-#set($discard = $theme.put('menuLinkColor', '#FFFFFF'))
-#set($discard = $theme.put('menuSelectedEntryBackgroundColor', '#EFEFEF'))
-#set($discard = $theme.put('menuSelectedEntryLinkColor', '#888888'))
-#set($discard = $theme.put('panelBackgroundColor', '#FFFFFF'))
-#set($discard = $theme.put('panelHeaderBackgroundColor', '#FFFFFF'))
-#set($discard = $theme.put('panelHeaderTextColor', '#888888'))
-#set($discard = $theme.put('panelTextColor', '#000000'))
-#set($discard = $theme.put('panelCollapsedBackgroundColor', '#CCCCCC'))
-#set($discard = $theme.put('panelCollapsedTextColor', '#FFFFFF'))
-#set($discard = $theme.put('buttonPrimaryBackgroundColor', '#0089DC'))
-#set($discard = $theme.put('buttonPrimaryTextColor', '#FFFFFF'))
-#set($discard = $theme.put('buttonSecondaryBackgroundColor', '#FFFFFF'))
-#set($discard = $theme.put('buttonSecondaryTextColor', '#0089DC'))
-#set($discard = $theme.put('backgroundSecondaryColor', '#EFEFEF'))
-##
-## Overwrite with the values set in the custom theme
-#set($themeDocFullName = "$!xwiki.getUserPreference('colorTheme')")
-#if($themeDocFullName == '')
-  #set($themeDocFullName = 'ColorThemes.DefaultColorTheme')
-#end
-#set($themeDoc = $xwiki.getDocument($themeDocFullName))
-#set($obj = $themeDoc.getObject('ColorThemes.ColorThemeClass', true))
-#if("$!obj" != '')
-  #foreach($prop in $obj.properties)
-     #if(!$prop.name.endsWith('Color') || $prop.value.matches('transparent|#[0-9a-fA-F]{3}|#[0-9a-fA-F]{6}'))
-       #set($discard = $theme.put($prop.name, $prop.value))
-     #end
-     #if($prop.name.endsWith('Image'))
-       #set($discard = $theme.put($prop.name, "url(${themeDoc.getAttachmentURL($prop.value)})"))
-     #end
-  #end
-#end
 
 @import "microformats.css";
 @import "rss.css";
@@ -3447,16 +3376,7 @@
 
 /**********************************************************************************************/
 /** Link Colors **/
-a, a:link, a:active, a:visited, a:link:visited {
-  color: $theme.linkColor;
-  text-decoration: none;
-}
 
-a:hover {
-  color: $theme.linkColor;
-  text-decoration: underline;
-}
-
 body.hideright #globallinks a,
 body.hidelefthideright #globallinks a,
 body.exportbody #globallinks a,
@@ -3552,7 +3472,6 @@
   padding:0 25px 5px;
 }
 
-
 #headerglobal {
   margin-bottom: 16px;
 }
@@ -3583,16 +3502,6 @@
   font-size: 90%;
 }
 
-#xdocFooter {
-  background: $theme.pageContentBackgroundColor;
-  margin-top: 0px;
-  border-top-color: $theme.borderColor;
-  padding:5px 25px 10px;
-  width: auto;
-  overflow: auto;
-  color: $theme.textPrimaryColor;
-}
-
 body.hideright #xwikimaincontainerinner {
   padding-right: 0px;
 }
@@ -3619,23 +3528,7 @@
     margin-top: 0px;
 }
 
-/* Overridden with .panel for IE6 */
-.panel h5.xwikipaneltitle {
-  background-color: $theme.panelHeaderBackgroundColor;
-  border-bottom: 1px dotted $theme.borderColor;
-  color: $theme.panelHeaderTextColor;
-  text-align: left;
-  letter-spacing:0;
-}
-
 /* Overridden with .div for IE6 */
-div.collapsed h5.xwikipaneltitle {
-  background-color: $theme.panelCollapsedBackgroundColor;
-  border: none;
-  color: $theme.panelCollapsedTextColor;
-}
-
-/* Overridden with .div for IE6 */
 div.xwikipanelcontents {
   background: $theme.panelBackgroundColor;
   background-image: none;
@@ -3650,13 +3543,12 @@
 /**********************************************************************************************/
 /** Tabs **/
 
-/* Bg-color needed for IE6 */
 #docExtraTabs {
-  background: $theme.menuBackgroundColor;
+  background: $theme.menuBackgroundColor; /* IE6 */
 }
 
 #xwikidatacontents {
-  background: $theme.menuBackgroundColor;
+  background: $theme.menuBackgroundColor; /* IE6 */
 }
 
 /**********************************************************************************************/
@@ -3773,7 +3665,7 @@
 
 ul.xwikitabbar li.active a {
   color: $theme.menuSelectedEntryLinkColor;
-  height: 21px; /* Because of IE7 */
+  height: 21px; /* IE7 */
 }
 
 /** Attachments **/
@@ -3986,21 +3878,59 @@
 }
 
 /**********************************************************************************************/
+/** Inputs **/
+
+#panellistaccordion input[type="text"], #panellistaccordion textarea{
+  background-color:$theme.pageContentBackgroundColor ;
+  border:1px solid $theme.borderColor;
+  width: 100%;
+}
+
+.bottombuttons input[type="text"] {
+  background-color:$theme.pageContentBackgroundColor ;
+  border:1px solid $theme.borderColor;
+}
+
+.panel input, .panel select, .panel textarea{
+    width: 100%;
+	background-color:$theme.pageContentBackgroundColor; /* IE6 */
+	color: $theme.textColor;
+	border: 1px solid $theme.borderColor; /* IE6, IE7*/
+}
+
+input[type="text"] , textarea, select {
+  background-color:$theme.pageContentBackgroundColor ;
+  border:1px solid $theme.borderColor;
+  color: $theme.textColor;
+}
+
+/**********************************************************************************************/
 /** Buttons **/
 
+.buttonwrapper {
+  display:inline;
+  margin:5px 10px 5px 0;
+  padding: 0px;
+}
+
 #body .buttonwrapper * {
+  display: inline;
+  line-height: 1.35em !important;
+  margin: 0px !important;
+  min-height: 24px !important;
   background: $theme.buttonPrimaryBackgroundColor;
   color: $theme.buttonPrimaryTextColor;
   border: 1px solid $theme.buttonPrimaryBackgroundColor;
   cursor: pointer;
+  font-style: normal;
+  font-size: 0.8em;
+  font-weight: bold;
+  text-transform: uppercase;
+  white-space: nowrap;
 }
 
-.buttonwrapper {
-  display:inline-block;
-  margin:5px;
-  margin-left: 0px;
-  margin-right: 10px;
-  padding: 0px;
+#body .buttonwrapper a {
+  padding:5px 5px 3px;
 }
 
 #body .buttonwrapper a:hover, #body .buttonwrapper button:hover, #body .buttonwrapper input.button:hover {
@@ -4010,6 +3940,17 @@
   border: 1px solid $theme.buttonPrimaryBackgroundColor;
 }
 
+input.button {
+    font-family: Helvetica, sans-serif;
+    font-weight: bold;
+    text-align: center;
+    background: $theme.buttonPrimaryBackgroundColor;
+    color: $theme.buttonPrimaryTextColor;
+    border: 1px solid $theme.buttonPrimaryBackgroundColor;
+	text-transform: uppercase;
+	font-size: 0.9em;
+}
+
 /**********************************************************************************************/
 /** Other elements **/
 
@@ -4017,10 +3958,6 @@
   color: $theme.textPrimaryColor;
 }
 
-.clearfloats {
-  background-color: transparent;
-}
-
 .alleditcontent {
   background: $theme.pageContentBackgroundColor;
 }
@@ -4063,28 +4000,6 @@
   color: $theme.textPrimaryColor;
 }
 
-/* Input border + bg-color */
-#panellistaccordion input[type="text"], #panellistaccordion textarea, #body .panel input[type="text"], #body .panel textarea {
-  background-color:$theme.pageContentBackgroundColor ;
-  border:1px solid $theme.borderColor;
-}
-
-.panel input, .panel select, #editPanels dl dd input {
-  background-color:$theme.pageContentBackgroundColor ;
-  border:1px solid $theme.borderColor;
-}
-
-.bottombuttons input[type="text"] {
-  background-color:$theme.pageContentBackgroundColor ;
-  border:1px solid $theme.borderColor;
-}
-
-input[type="text"] {
-  background-color:$theme.pageContentBackgroundColor ;
-  border:1px solid $theme.borderColor;
-  color: $theme.textColor;
-}
-
 /**********************************************************************************************/
 /** EDIT MODE **/
 
@@ -4093,36 +4008,6 @@
   margin: 0px;
 }
 
-/** Edit Panels **/
-
-#editPanels .expanded h5.xwikipaneltitle {
-  background-color: $theme.panelHeaderBackgroundColor;
-  border-bottom: 1px dotted $theme.borderColor;
-  color: $theme.panelHeaderTextColor;
-  text-align: left;
-}
-
-#editPanels .collapsed h5.xwikipaneltitle {
-  background-color: $theme.panelCollapsedBackgroundColor;
-  border: none;
-  color: $theme.panelCollapsedTextColor;
-  text-align: left;
-}
-
-#editPanels .xwikipanelcontents {
-  background: $theme.panelBackgroundColor;
-  padding: 10px 15px;
-  color: $theme.panelTextColor;
-}
-
-#editPanels.panels .panel {
-  margin-bottom:10px;
-}
-
-#editPanels .EditModes .xwikipanelcontents {
-  padding-bottom: 10px;
-}
-
 #editPanels .EditModes .xwikipanelcontents ul {
   padding-top: 0px;
 }
@@ -4152,20 +4037,8 @@
   padding:0 25px 5px;
 }
 
-#admin-page-content p.legend { /* These legends should be standardized */
-  margin-left: 20px;
-  margin-top: 10px;
-}
-
-div#admin-page-content fieldset legend { /* These legends should be standardized */
-  padding-left: 20px;
-  padding-top: 20px;
-  padding-bottom: 20px;
-}
-
 #panelwizardbuttons, .bottombuttons {
   text-align: left;
-  margin-left: 20px;
 }
 
 #xwikieditcontent  {
@@ -4181,13 +4054,23 @@
   border: 1px solid $theme.borderColor;
 }
 
-#editcolumn div.alleditcontent label {
-  text-align: left;
-}
-
 /**********************************************************************************************/
 /** ADMIN**/
 
+#admin-page-content p.legend { /* These legends should be standardized */
+  margin-left: 20px;
+  margin-top: 10px;
+}
+
+div#admin-page-content fieldset {
+  border: 0px; 
+}
+
+div#admin-page-content fieldset legend { /* These legends should be standardized */
+  padding:15px 0 0;
+  color: $theme.titleColor;
+}
+
 #contentcolumn #admin-page-header {
   background-color: $theme.panelCollapsedBackgroundColor ;
 }
@@ -4244,17 +4127,44 @@
   color: $theme.textPrimaryColor ;
 }
 
+#goto-select  {
+  margin-bottom: 5px;
+}
+
+/* Overrides XWiki.AdminSheet ssx */
+div#admin-page-content fieldset p label {
+  float: none;
+  display: block;
+  margin:10px 0 0;
+  padding: 0;
+  text-transform: uppercase;
+  font-size: 0.85em;
+  color: $theme.textPrimaryColor;
+}
+
+div#admin-page-content fieldset p, div#admin-page-content fieldset p input, div#admin-page-content fieldset p textarea , div#admin-page-content fieldset p select  {
+  width: 100%;
+  margin: 0;
+  padding: 0;
+}
+
 /**********************************************************************************************/
 /** SEARCH **/
-#body #globalsearch input {
-  background-color:$theme.pageContentBackgroundColor ;
-  border:1px solid $theme.borderColor;
-  padding:0 2px;
+#globalsearch #globalsearchinput {
+  width: 155px;
+  padding-right: 18px;
+  min-height: 16px;
+  padding: 0 2px;
+  background-color:$theme.pageContentBackgroundColor;   /* IE6 */
+  border:1px solid $theme.borderColor;   /* IE6 */
+  color: $theme.textColor;   /* IE6 */
 }
 
-#body #globalsearch input.button {
-  background: transparent;
-  color: $theme.buttonPrimaryTextColor;
+#globalsearch input.button {
+  margin: 0 2px -3px -17px;
+  border: 0;
+  background: transparent none;
+  padding: 0;
 }
 
 /**********************************************************************************************/
@@ -4332,23 +4242,7 @@
 html>#body #globallinks {
   width: 180px !important;
 }
-#globalsearch {
-  margin: 0 !important;
-  text-align: right;
-}
-#body #globalsearch #globalsearchinput {
-  width: 155px;
-  padding-right: 18px;
-  min-height: 16px;
-}
-html>#body #globalsearch #globalsearchinput {
-  width: 137px;
-}
-#globalsearch input.button {
-  width: 16px;
-  height: 16px;
-  margin: 0 2px 0 -18px;
-}
+
 #document-title h1 {
   border-bottom: 1px dotted $theme.borderColor;
   color: $theme.titleColor;
@@ -4374,10 +4268,6 @@
 /**********************************************************************************************/
 /** MODIFIED PROPERTIES**/
 
-.itemCount {
-  color: $theme.textPrimaryColor;
-}
-
 .code, .box {
   background-color: $theme.backgroundSecondaryColor;
   border: 1px dotted $theme.borderColor;
@@ -4453,15 +4343,9 @@
 /* Added .xwikipanelcontents dt label, .xwikipanelcontents label, .accordionTabTitleBar h6  */
 /* This are all the elements that are made uppercase in the new skin - maybe we could do a new class for them */
 .xwikitabbar li.active a, .xwikitabbar li a,
-h5.xwikipaneltitle,
-#editPanels .expanded h5.xwikipaneltitle ,
-#editPanels .collapsed h5.xwikipaneltitle,
 table.xwikidatatable th,
 #actionmenu a,
 #_information dt,
-#body .buttonwrapper a:hover, #body .buttonwrapper button:hover, #body .buttonwrapper input.button:hover ,
-#body .buttonwrapper *,
-#body #globalsearch input.button,
 .xwikipanelcontents dt label, .xwikipanelcontents label,
 .accordionTabTitleBar h6,
 #xwikieditcontent div.accordionTabTitleBar h6 /*Needs testing in IE6 */  {
@@ -4470,7 +4354,8 @@
   font-weight: bold;
   text-transform: uppercase;
 }
-#body .buttonwrapper *, #actionmenu a {
+
+#actionmenu a {
   white-space: nowrap;
 }
 
@@ -4491,24 +4376,10 @@
   font-size: 1.3em;
 }
 
-#editPanels .xwikipanelcontents .buttonwrapper input.button {
-  font-size: 1em;
-}
-
-/* class padded should be removed from "Add Property" Panel */
-.xwikipanelcontents div.padded {
-  font-size: 1em;
-  padding: 0px;
-}
-
 .xwikipanelcontents dt label{
   font-size: 1em;
 }
 
-#editPanels .expanded h5.xwikipaneltitle {
-  letter-spacing: 0;
-}
-
 /* Should have the same styling as #xwikieditcontent .accordionTabTitleBar h6 */
 /* This is found in Rights Editor Help Panel */
 .accordionTabTitleBar h6 {
@@ -4535,7 +4406,33 @@
   margin: 0 !important;
 }
 
-/* Hide the Search panel since this functionality is included in the header */
-.panels .Search {
-  display: none;
+/*** Dashboard ***/
+/* Overrides Main.RecentChanges ssx */
+table.recentChanges {
+  border-collapse:separate;
+}
+
+td.recentChangesLeft {
+  background-color: $theme.backgroundSecondaryColor;
+  text-align:center;
+}
+
+div.xitemcontainer div.commentContainer, div.xitemcontainer div.attachmentContainer {
+  background-color: $theme.pageContentBackgroundColor; /* This could be replaced with backgroundPrimaryColor, if created */
+  border-top:1px dashed $theme.borderColor;
+}
+
+/*** Spaces ***/
+/* Overrides Main.Spaces ssx*/
+div#spSpaceCreateLabel a {
+  color: $theme.linkColor;
+}
+
+div#spSpaceCreateForm  {
+  background-color:$theme.pageContentBackgroundColor;
+  border-top:1px dashed $theme.borderColor;
+}
+
+p#autosaveControl {
+  margin-left: 0px;
 }
\ No newline at end of file