### Eclipse Workspace Patch 1.0
#P xwiki-web-standard
Index: src/main/webapp/resources/js/xwiki/xwiki.js
===================================================================
--- src/main/webapp/resources/js/xwiki/xwiki.js	(revision 25034)
+++ src/main/webapp/resources/js/xwiki/xwiki.js	(working copy)
@@ -394,6 +394,82 @@
           }
       }
   },
+  
+  /**
+   * Watchlist methods.
+   */
+  watchlist : {
+      
+    /**
+     * Update the given menu (menuview or contentmenu). Allows to update the menu icon without page reload.
+     */
+    updateMenu : function(menu) {
+      new Ajax.Updater(
+              menu,
+              window.docviewurl + "?xpage=xpart&vm=" + menu + ".vm",
+              {
+                method: 'get',
+                evalScripts: true
+              });
+    },
+    
+    /**
+     * Add or remove the current document from the current user's watchlist.
+     * 
+     * @param add True to add the document to the user's watchlist, false to remove it.
+     */
+    toggleDocument : function(add) {
+      var action = "removedocument";
+      if (add) {
+        action = "adddocument";
+      }
+      var surl = window.docviewurl + "?xpage=watch&do=" + action;
+      var myAjax = new Ajax.Request(
+        surl,
+        {
+          method: 'get',
+          onComplete: function() { XWiki.watchlist.updateMenu("contentmenu") }
+        });
+    },
+    
+    /**
+     * Add or remove the current space from the current user's watchlist.
+     * 
+     * @param add True to add the space to the user's watchlist, false to remove it.
+     */
+    toggleSpace : function(add) {
+        var action = "removespace";
+        if (add) {
+          action = "addspace";
+        }
+        var surl = window.docviewurl + "?xpage=watch&do=" + action;
+        var myAjax = new Ajax.Request(
+          surl,
+          {
+            method: 'get',
+            onComplete: function() { XWiki.watchlist.updateMenu("menuview") }
+          });
+    },
+    
+    /**
+     * Add or remove the current wiki from the current user's watchlist.
+     * 
+     * @param add True to add the wiki to the user's watchlist, false to remove it.
+     */
+    toggleWiki : function(add) {
+        var action = "removewiki";
+        if (add) {
+          action = "addwiki";
+        }
+        var surl = window.docviewurl + "?xpage=watch&do=" + action;
+        var myAjax = new Ajax.Request(
+          surl,
+          {
+            method: 'get',
+            onComplete: function() { XWiki.watchlist.updateMenu("menuview") }
+          });
+    }
+  },
 
   /**
    * Initialize method for the XWiki object. This is to be called only once upon dom loading.
@@ -490,7 +566,7 @@
         if (element.getStyle("float") == "left") {
             element.lastChild.style.left = (coords[0]  - 10) + "px";
         } else {
-            element.lastChild.style.left = (coords[0]  - 70) + "px";
+            element.lastChild.style.right = (document.viewport.getWidth() - coords[0] - element.getWidth()) + "px";
         }
         element.lastChild.style.top = (coords[1] + element.offsetHeight) + "px";
         element.lastChild.className = element.lastChild.className.replace("hidden", "visible");
Index: src/main/webapp/templates/macros.vm
===================================================================
--- src/main/webapp/templates/macros.vm	(revision 25034)
+++ src/main/webapp/templates/macros.vm	(working copy)
@@ -1083,8 +1083,8 @@
 ### @param actionurl The URL this entry points to
 ### @param linktext The menu item text
 ###
-#macro(xwikitopmenuentrystart $actionurl $linktext $id)
-<div class="topmenuentry" onmouseover="showsubmenu(this);" onmouseout="hidesubmenu(this);" id="$id">
+#macro(xwikitopmenuentrystart $actionurl $linktext $id $class)
+<div class="topmenuentry dropdownmenuentry $!class" onmouseover="showsubmenu(this);" onmouseout="hidesubmenu(this);" id="$id">
 <a class="tme"#if ($actionurl != '') href="$actionurl"#end><strong>$linktext</strong></a><span class="hidden menucolon">: </span><span class="submenu hidden">
 #end
 
@@ -1096,8 +1096,8 @@
 ### @param actionurl The URL this entry points to
 ### @param linktext The menu item text
 ###
-#macro(xwikitopmenuentry $actionurl $linktext $id)
-<div class="topmenuentry" id="$id"><a href="$actionurl"><strong>$linktext</strong></a></div>
+#macro(xwikitopmenuentry $actionurl $linktext $id $class)
+<div class="topmenuentry $!class" id="$id"><a href="$actionurl"><strong>$linktext</strong></a></div>
 #end
 
 ###
@@ -1108,8 +1108,8 @@
 ### @param actionurl The URL this entry points to
 ### @param linktext The menu item text
 ###
-#macro(submenuitem $actionurl $linktext $linkid)
-<span class="submenuitem"><a href="$actionurl" id="$linkid">$linktext</a></span>
+#macro(submenuitem $actionurl $linktext $linkid $class)
+<span class="submenuitem $!class"><a href="$actionurl" id="$linkid">$linktext</a></span>
 #end
 
 ###
#P xwiki-core
Index: src/main/resources/ApplicationResources.properties
===================================================================
--- src/main/resources/ApplicationResources.properties	(revision 25034)
+++ src/main/resources/ApplicationResources.properties	(working copy)
@@ -663,14 +663,9 @@
 core.minoredit.hide=Hide minor edits
 
 # top menu
-core.menu.documentation=Documentation
-core.menu.create=Create
-core.menu.create.page=Page
-core.menu.create.space=Space
-core.menu.create.importFromOffice=Page from Office document
-core.menu.create.blogpost=Blog entry
-core.menu.create.event=Event
-core.menu.create.panel=Panel
+core.menu.create.page=Create Page
+core.menu.create.pageFromOffice=Create Page from Office document
+core.menu.create.space=Create Space
 core.menu.copy=Copy
 core.menu.edit=Edit
 core.menu.edit.wiki=Wiki
@@ -678,42 +673,33 @@
 core.menu.edit.form=Inline form
 core.menu.edit.object=Objects
 core.menu.edit.class=Class
-core.menu.edit.rights=Access rights
-core.menu.view=Show
-core.menu.view.code=Wiki code
-core.menu.view.xml=XML export
-core.menu.view.attributes=Attributes
+core.menu.edit.rights=Access Rights
+core.menu.view.source=View Source
 core.menu.view.comments=Comments
 core.menu.view.attachments=Attachments
 core.menu.view.history=History
 core.menu.view.information=Information
-core.menu.print=Print
-core.menu.print.pdf=PDF
-core.menu.print.rtf=RTF
-core.menu.print.preview=Preview
+core.menu.print.preview=Print Preview
 core.menu.delete=Delete
 core.menu.rename=Rename
 core.menu.import=Import Office Document
-core.menu.actions=Actions
+core.menu.actions=More actions
 core.menu.preview=Print preview
 core.menu.export=Export
 core.menu.export.pdf=Export as PDF
 core.menu.export.rtf=Export as RTF
 core.menu.export.html=Export as HTML
 core.menu.export.xar=Export as XAR
-core.menu.rights=Page access rights
-core.menu.watch=Watch
-core.menu.unwatch=Unwatch
-core.menu.watchlist.add.page=Watch this page
-core.menu.watchlist.remove.page=Unwatch this page
-core.menu.watchlist.add.space=Watch the current space
-core.menu.watchlist.remove.space=Unwatch the current space
-core.menu.watchlist.add.wiki=Watch the current wiki
-core.menu.watchlist.remove.wiki=Unwatch the current wiki
-core.menu.watchlist.management=Manage your watchlist
+core.menu.watchlist.add.page=Watch
+core.menu.watchlist.remove.page=Unwatch
+core.menu.watchlist.add.space=Watch space
+core.menu.watchlist.remove.space=Unwatch space
+core.menu.watchlist.add.wiki=Watch wiki
+core.menu.watchlist.remove.wiki=Unwatch wiki
+core.menu.watchlist.management=Watchlist
 core.menu.admin=Administration
-core.menu.admin.wiki=Administer wiki
-core.menu.admin.space=Administer space: {0}
+core.menu.admin.wiki=Administer Wiki
+core.menu.admin.space=Administer Space
 
 # Messages for the various document viewers (history, attachments, info...)
 core.viewers.comments.title=Comments on <a href="{1}">{0}</a>
#P xwiki-skin-colibri
Index: src/main/resources/colibri/menuview.vm
===================================================================
--- src/main/resources/colibri/menuview.vm	(revision 25034)
+++ src/main/resources/colibri/menuview.vm	(working copy)
@@ -1,9 +1,22 @@
+#macro(xwikitopmenuentrystart $actionurl $linktext $id $class)
+<div class="topmenuentry dropdownmenuentry $!class" onmouseover="showsubmenu(this);" onmouseout="hidesubmenu(this);" id="$id">
+<a class="tme"#if ($actionurl != '') href="$actionurl"#end><strong>$linktext</strong></a><span class="hidden menucolon">: </span><span class="submenu hidden">
+#end
+#macro(xwikitopmenuentry $actionurl $linktext $id $class)
+<div class="topmenuentry $!class" id="$id"><a href="$actionurl"><strong>$linktext</strong></a></div>
+#end
+#macro(submenuitem $actionurl $linktext $linkid $class)
+<span class="submenuitem $!class"><a href="$actionurl" id="$linkid">$linktext</a></span>
+#end
+##
+##
 #if($context.getMode()==0)## Visible only in a page
-<div id="actionmenu" class="layoutsubsection">
+<div id="mainmenu" class="layoutsubsection actionmenu">
 <strong id="xwikimenutitle" class="hidden">$msg.get('menu')</strong>
 <div class="rightmenu">
 ##
-## User specific links
+## User
+##
 #if(!$context.action.startsWith('login'))
   #if($isGuest)
     #set($loginurl = $xwiki.getURL('XWiki.XWikiLogin', 'login', "xredirect=$util.encodeURI($xwiki.getRequestURL())"))
@@ -21,37 +34,60 @@
 ##
 #if (!$isGuest)
 #if ($context.user == 'XWiki.superadmin')
-      #xwikitopmenuentry('#' $!msg.get('superadmin') 'tmUser')
+  #xwikitopmenuentry('#' $!msg.get('superadmin') 'tmUser')
 #else
-      #xwikitopmenuentry($xwiki.getURL($context.user, 'view') $!xwiki.getUserName($context.user, false) 'tmUser')
+  #xwikitopmenuentrystart($xwiki.getURL($context.user, 'view') $!xwiki.getUserName($context.user, false) 'tmUser' 'hasIcon')
+  #submenuitem($xwiki.getURL('XWiki.WatchListManager', 'view') $msg.get('core.menu.watchlist.management') 'tmWatchlistManager', '')
+  #xwikitopmenuentryend()
 #end
 #end
+</div>
+<div class="leftmenu">
+#set ($adminapppresent = $xwiki.exists('XWiki.AdminSheet'))
 ##
-## Administration
-#set ($hasAdminSpaceRights = $xwiki.hasAccessLevel('admin', "${doc.space}.XWikiPreferences"))
+## Wiki
+##
+#xwikitopmenuentrystart($xwiki.getURL('Main.WebHome', 'view') $context.getDatabase() 'tmWiki' 'hasIcon')
+#if($hasEdit)
+  #submenuitem($xwiki.getURL('XWiki.CreatePage', 'view', "tocreate=space&parent=$doc.fullName") $msg.get('core.menu.create.space') 'tmCreateSpace', '')
+#end
+#set ($isWikiWatched = $xwiki.watchlist.isWikiWatched())
+#if (!$isWikiWatched)
+  #submenuitem("javascript:XWiki.watchlist.toggleWiki(true)" $msg.get('core.menu.watchlist.add.wiki', [$xwiki.getXMLEncoded($doc.wiki)]) 'tmWatchWiki', '')
+#else
+  #submenuitem("javascript:XWiki.watchlist.toggleWiki(false)" $msg.get('core.menu.watchlist.remove.wiki') 'tmWatchWiki', 'isWatched')
+#end
 #set ($hasAdminWikiRights = $xwiki.hasAccessLevel('admin', 'XWiki.XWikiPreferences'))
-#if($hasAdminWikiRights || $hasAdminSpaceRights)
+#if($hasAdminWikiRights)
   #set ($adminwikiaction = $!xwiki.getURL('XWiki.XWikiPreferences', 'admin'))
   #set ($importaction = $!xwiki.getURL('XWiki.XWikiPreferences', 'import'))
-  #set ($adminspaceaction = $!xwiki.getURL("${doc.space}.WebPreferences", 'admin'))
-  #set ($adminapppresent = $xwiki.exists('XWiki.AdminSheet'))
-  #if(!$hasAdminWikiRights && $adminapppresent)
-    #xwikitopmenuentrystart($adminspaceaction $msg.get('core.menu.admin') 'tmAdmin')
-    #submenuitem($adminspaceaction $msg.get('core.menu.admin.space', [$doc.space]) 'tmAdminspace')
-    #xwikitopmenuentryend()
+  #if($adminapppresent)
+    #submenuitem($adminwikiaction $msg.get('core.menu.admin.wiki') 'tmAdminWiki', '')
   #else
-    #if ($adminapppresent)
-      #xwikitopmenuentrystart($adminwikiaction $msg.get('core.menu.admin') 'tmAdmin')
-      #submenuitem($adminwikiaction $msg.get('core.menu.admin.wiki') 'tmAdminwiki')
-      #submenuitem($adminspaceaction $msg.get('core.menu.admin.space', [$xwiki.getXMLEncoded($doc.space)]) 'tmAdminspace')
-      #xwikitopmenuentryend()
-    #else
-      #xwikitopmenuentry($importaction $msg.get('core.menu.admin') 'tmAdmin')
-    #end
+    #xwikitopmenuentry($importaction $msg.get('core.menu.admin') 'tmAdmin')
   #end
 #end
-</div>
-<div class="leftmenu">
+#xwikitopmenuentryend()
+##
+## Space
+##
+#xwikitopmenuentrystart($xwiki.getURL("${doc.space}.WebHome", 'view') $doc.space 'tmSpace' 'hasIcon')
+#set ($hasAdminSpaceRights = $xwiki.hasAccessLevel('admin', "${doc.space}.XWikiPreferences"))
+#if($hasEdit)
+  #submenuitem($xwiki.getURL('XWiki.CreatePage', 'view', "tocreate=page&parent=$doc.fullName") $msg.get('core.menu.create.page') 'tmCreatePage', '')
+  #submenuitem($xwiki.getURL('XWiki.OfficeImporter', 'view', "&parent=$doc.fullName") $msg.get('core.menu.create.pageFromOffice') 'tmCreatePageFromOffice', '')
+#end
+#set ($isSpaceWatched = $xwiki.watchlist.isSpaceWatched())
+#if (!$isSpaceWatched)
+  #submenuitem("javascript:XWiki.watchlist.toggleSpace(true)" $msg.get('core.menu.watchlist.add.space', [$xwiki.getXMLEncoded($doc.space)]) 'tmWatchSpace', '')
+#else
+  #submenuitem("javascript:XWiki.watchlist.toggleSpace(false)" $msg.get('core.menu.watchlist.remove.space') 'tmWatchSpace', 'isWatched')
+#end
+#if($hasAdminSpaceRights && $adminapppresent)
+  #set ($adminspaceaction = $!xwiki.getURL("${doc.space}.WebPreferences", 'admin'))
+  #submenuitem($adminspaceaction $msg.get('core.menu.admin.space', [$xwiki.getXMLEncoded($doc.space)]) 'tmAdminSpace')
+#end
+#xwikitopmenuentryend()
 ##
 ## Edit mode
 ##
@@ -61,139 +97,22 @@
 ##
 ## Create menu
 ##
+#*
 #if($hasEdit)
-  #xwikitopmenuentrystart($xwiki.getURL('XWiki.CreatePage', 'view', "parent=${doc.fullName}") $msg.get('core.menu.create') 'tmCreate')
-  #submenuitem($xwiki.getURL('XWiki.CreatePage', 'view', "parent=${doc.fullName}") $msg.get('core.menu.create.page') 'tmCreatePage')
-  #submenuitem($xwiki.getURL('XWiki.CreatePage', 'view', 'tocreate=space') $msg.get('core.menu.create.space') 'tmCreateSpace')
+  #xwikitopmenuentrystart($xwiki.getURL('XWiki.CreatePage', 'view', "parent=${doc.fullName}") $msg.get('core.menu.create') 'tmCreate' 'hasIcon')
+  #submenuitem($xwiki.getURL('XWiki.CreatePage', 'view', "parent=${doc.fullName}") $msg.get('core.menu.create.page') 'tmCreatePage', '')
+  #submenuitem($xwiki.getURL('XWiki.CreatePage', 'view', 'tocreate=space') $msg.get('core.menu.create.space') 'tmCreateSpace', '')
   #set ($canImport = $xwiki.exists('XWiki.OfficeImporter') && $xwiki.checkAccess('XWiki.OfficeImporter', 'view') && !$isguest)
   #if($canImport)
     #submenuseparator()
-    #submenuitem($xwiki.getURL('XWiki.OfficeImporter') $msg.get('core.menu.create.importFromOffice') 'tmActionImport')
+    #submenuitem($xwiki.getURL('XWiki.OfficeImporter') $msg.get('core.menu.create.importFromOffice') 'tmActionImport', '')
   #end
   ## #submenuitem($xwiki.getURL('Blog.CreateBlogPost') $msg.get('core.menu.create.blogpost') 'tmCreateBlogPost')
-  ## #if($xwiki.hasAccessLevel('edit', 'Main.EventCalendar'))#submenuitem($xwiki.getURL('Main.EventCalendar') $msg.get('core.menu.create.event') 'tmCreateCalendarEvent')#end
-  ## #if($hasAdmin)#submenuitem($xwiki.getURL('Panels.WebHome') $msg.get('core.menu.create.panel') 'tmCreatePanel')#end
+  ## #if($xwiki.hasAccessLevel('edit', 'Main.EventCalendar'))#submenuitem($xwiki.getURL('Main.EventCalendar') $msg.get('core.menu.create.event') 'tmCreateCalendarEvent', '')#end
+  ## #if($hasAdmin)#submenuitem($xwiki.getURL('Panels.WebHome') $msg.get('core.menu.create.panel') 'tmCreatePanel', '')#end
   #xwikitopmenuentryend()
 #end
-##
-## Edit menu
-##
-#if($isAdvancedUser)
-#xwikitopmenuentrystart($doc.getURL($editaction, $!languageparams) $msg.get('core.menu.edit') 'tmEdit')
-#submenuitem($doc.getURL('edit', "$!{languageparams}&amp;editor=wiki") $msg.get('core.menu.edit.wiki') 'tmEditWiki')
-#submenuitem($doc.getURL('edit', "$!languageparams&amp;editor=wysiwyg") $msg.get('core.menu.edit.visual') 'tmEditVisual')
-#submenuitem($doc.getURL('inline', $!languageparams) $msg.get('core.menu.edit.form') 'tmEditForm')
-#submenuseparator()
-#submenuitem($doc.getURL('edit', 'editor=rights') $msg.get('core.menu.rights') 'tmEditRights')
-#submenuseparator()
-#submenuitem($doc.getURL('edit', 'editor=object') $msg.get('core.menu.edit.object') 'tmEditObjects')
-#if($hasAdmin)
-#submenuitem($doc.getURL('edit', 'editor=class') $msg.get('core.menu.edit.class') 'tmEditClass')
-#end
-#xwikitopmenuentryend()
-#else ## !isAdvanced
-#xwikitopmenuentry($doc.getURL($editaction, $!languageparams) $msg.get('core.menu.edit') 'tmEdit')
-#end
-#if($keyboardShortcutsEnabled)
-<script type="text/javascript">
-//<![CDATA[
-  shortcut.add("$msg.get('core.shortcuts.view.edit')",function() { location.href="$doc.getURL($editaction, $!languageparams)"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
-  shortcut.add("$msg.get('core.shortcuts.view.wiki')",function() { location.href="$doc.getURL('edit', "$!{languageparams}&editor=wiki")"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
-  shortcut.add("$msg.get('core.shortcuts.view.wysiwyg')",function() { location.href="$doc.getURL('edit', "$!{languageparams}&editor=wysiwyg")"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
-  shortcut.add("$msg.get('core.shortcuts.view.inline')",function() { location.href="$doc.getURL('inline', $!languageparams)"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
-  shortcut.add("$msg.get('core.shortcuts.view.rights')",function() { location.href="$doc.getURL('edit', 'editor=rights')"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
-  shortcut.add("$msg.get('core.shortcuts.view.objects')",function() { location.href="$doc.getURL('edit', 'editor=object')"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
-  shortcut.add("$msg.get('core.shortcuts.view.class')",function() { location.href="$doc.getURL('edit', 'editor=class')"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
-//]]>
-</script>
-#end
-#end
-##
-## Export menu
-##
-#xwikitopmenuentrystart($doc.getURL('export', "format=pdf&amp;$!docvariant") $msg.get('core.menu.export') 'tmPrint')
-#submenuitem($doc.getURL('export', "format=pdf&amp;$!docvariant") $msg.get('core.menu.export.pdf') 'tmExportPdf')
-#submenuitem($doc.getURL('export', "format=rtf&amp;$!docvariant") $msg.get('core.menu.export.rtf') 'tmExportRtf')
-#submenuitem($doc.getURL('export', "format=html&amp;$!docvariant") $msg.get('core.menu.export.html') 'tmExportHtml')
-#submenuitem($doc.getURL('export', "format=xar&amp;name=$util.encodeURI($doc.fullName)&amp;pages=$util.encodeURI($doc.fullName)&amp;$!docvariant") $msg.get('core.menu.export.xar') 'tmExportXar')
-#xwikitopmenuentryend()
-##
-## Actions menu
-##
-#xwikitopmenuentrystart('' $msg.get('core.menu.actions') 'tmFile')
-#submenuitem($doc.getURL('view', "xpage=print&amp;$!docvariant") $msg.get('core.menu.preview') 'tmPrintPreview')
-#set ($canDelete = !$doc.isNew() && $xwiki.checkAccess($doc.fullName, 'delete'))
-  #if($canDelete)
-    #submenuseparator()
-    #submenuitem($doc.getURL('delete', $!languageparams) $msg.get('core.menu.delete') 'tmActionDelete')
-    #submenuitem($doc.getURL('view', 'xpage=rename&amp;step=1') $msg.get('core.menu.rename') 'tmActionRename')
-    #if($xwiki.hasProgrammingRights())
-      #submenuitem($doc.getURL('view', 'xpage=copy') $msg.get('core.menu.copy') 'tmActionCopy')
-    #end
-  #end
-  #xwikitopmenuentryend()
-  #if($canDelete && $keyboardShortcutsEnabled)
-    <script type="text/javascript">
-      //<![CDATA[
-      shortcut.add("$msg.get('core.shortcuts.view.delete')",function() { location.href="$doc.getURL('delete', $!languageparams)"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
-      shortcut.add("$msg.get('core.shortcuts.view.rename')",function() { location.href="$doc.getURL('view', 'xpage=rename&amp;step=1')"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
-      //]]>
-    </script>
-  #end
-##
-## Watch menu
-##
-#if ($xwiki.watchlist && $context.user != 'XWiki.XWikiGuest' && !$doc.isNew() && $xwiki.exists('XWiki.WatchListManager'))
-<script type="text/javascript">
-//<![CDATA[
-function watchlist(action)
-{
-  var surl = "$doc.getURL('view', 'xpage=watch&do=')" + action;
-  var myAjax = new Ajax.Request(
-    surl,
-    {
-      method: 'get',
-      onComplete: function() {
-          new Ajax.Updater(
-          'menuview',
-          "$doc.getURL('view', 'xpage=xpart&vm=menuview.vm')",
-          {
-            method: 'get',
-            evalScripts: true
-          })
-        }
-    });
-}
-//]]>
-</script>
-  #set ($isDocWatched = $xwiki.watchlist.isDocumentWatched())
-  #set ($isSpaceWatched = $xwiki.watchlist.isSpaceWatched())
-  #set ($isWikiWatched = $xwiki.watchlist.isWikiWatched())
-  #if ($isDocWatched || $isSpaceWatched || $isWikiWatched)
-    #xwikitopmenuentrystart("javascript:watchlist('removedocument')" $msg.get('core.menu.watch') 'tmWatched')
-  #else
-    #xwikitopmenuentrystart("javascript:watchlist('adddocument')" $msg.get('core.menu.watch') 'tmWatch')
-  #end
-  #if (!$isDocWatched)
-    #submenuitem("javascript:watchlist('adddocument')" $msg.get('core.menu.watchlist.add.page') 'tmWatchPage')
-  #else
-    #submenuitem("javascript:watchlist('removedocument')" $msg.get('core.menu.watchlist.remove.page') 'tmUnwatchPage')
-  #end
-  #submenuseparator()
-  #if (!$isSpaceWatched)
-    #submenuitem("javascript:watchlist('addspace')" $msg.get('core.menu.watchlist.add.space', [$xwiki.getXMLEncoded($doc.space)]) 'tmWatchSpace')
-  #else
-    #submenuitem("javascript:watchlist('removespace')" $msg.get('core.menu.watchlist.remove.space') 'tmUnwatchSpace')
-  #end
-  #submenuseparator()
-  #if (!$isWikiWatched)
-    #submenuitem("javascript:watchlist('addwiki')" $msg.get('core.menu.watchlist.add.wiki', [$xwiki.getXMLEncoded($doc.wiki)]) 'tmWatchWiki')
-  #else
-    #submenuitem("javascript:watchlist('removewiki')" $msg.get('core.menu.watchlist.remove.wiki') 'tmUnwatchWiki')
-  #end
-  #submenuseparator()
-  #submenuitem($xwiki.getURL('XWiki.WatchListManager', 'view') $msg.get('core.menu.watchlist.management') 'tmWatchlistManager')
-  #xwikitopmenuentryend()
+*#
 #end
 </div>
 </div>
Index: src/main/resources/colibri/hierarchy.vm
===================================================================
--- src/main/resources/colibri/hierarchy.vm	(revision 25034)
+++ src/main/resources/colibri/hierarchy.vm	(working copy)
@@ -14,8 +14,7 @@
   #end
 #end
 #if($context.getMode()==0) ## Visible only in a page
-  <div id="hierarchy">
-    <span class="currentSpace"><a href="$spaceViewUrl">$xwiki.getXMLEncoded(${doc.space})</a>: </span>
-#computeHierarchy($doc "<a href='${doc.getURL('view')}'>$xwiki.getXMLEncoded($tdoc.getRenderedTitle('plain/1.0'))</a>" 0)
+  <div id="hierarchy">    
+    #computeHierarchy($doc "<a href='${doc.getURL('view')}'>$xwiki.getXMLEncoded($tdoc.getRenderedTitle('plain/1.0'))</a>" 0)
   </div>
 #end
Index: src/main/resources/colibri/view.vm
===================================================================
--- src/main/resources/colibri/view.vm	(revision 25034)
+++ src/main/resources/colibri/view.vm	(working copy)
@@ -14,7 +14,10 @@
     #set($viewer = 'content')
   #end
   <div class="main layoutsubsection">
-  <div id="mainContentArea">
+  <div id="contentmenu" class="actionmenu">
+  #template("contentmenu.vm")
+  </div>
+  <div id="mainContentArea">  
   #template("hierarchy.vm")
   #if($viewer == 'content')
     #template("contentview.vm")
Index: src/main/resources/colibri/contentmenu.vm
===================================================================
--- src/main/resources/colibri/contentmenu.vm	(revision 0)
+++ src/main/resources/colibri/contentmenu.vm	(revision 0)
@@ -0,0 +1,84 @@
+<div class="rightmenu">
+##
+## Watch menu
+##
+#if ($xwiki.watchlist && $context.user != 'XWiki.XWikiGuest' && !$doc.isNew() && $xwiki.exists('XWiki.WatchListManager'))
+  #set ($isDocWatched = $xwiki.watchlist.isDocumentWatched())
+  #if ($isDocWatched)
+    #xwikitopmenuentry("javascript:XWiki.watchlist.toggleDocument(false)" $msg.get('core.menu.watchlist.remove.page') 'tmWatchDocument' 'hasIcon isWatched')
+  #else
+    #xwikitopmenuentry("javascript:XWiki.watchlist.toggleDocument(true)" $msg.get('core.menu.watchlist.add.page') 'tmWatchDocument' 'hasIcon')
+  #end
+#end
+</div>
+<div class="leftmenu">
+#if($hasEdit && !$isReadOnly)
+## Compute the default edit mode
+#set($editaction = $doc.getDefaultEditMode())
+##
+## Edit menu
+##
+#if($isAdvancedUser)
+#xwikitopmenuentrystart($doc.getURL($editaction, $!languageparams) $msg.get('core.menu.edit') 'tmEdit' 'hasIcon')
+#submenuitem($doc.getURL('edit', "$!{languageparams}&amp;editor=wiki") $msg.get('core.menu.edit.wiki') 'tmEditWiki', '')
+#submenuitem($doc.getURL('edit', "$!languageparams&amp;editor=wysiwyg") $msg.get('core.menu.edit.visual') 'tmEditVisual', '')
+#submenuitem($doc.getURL('inline', $!languageparams) $msg.get('core.menu.edit.form') 'tmEditForm', '')
+#submenuseparator()
+#submenuitem($doc.getURL('edit', 'editor=rights') $msg.get('core.menu.rights') 'tmEditRights', '')
+#submenuseparator()
+#submenuitem($doc.getURL('edit', 'editor=object') $msg.get('core.menu.edit.object') 'tmEditObjects', '')
+#if($hasAdmin)
+#submenuitem($doc.getURL('edit', 'editor=class') $msg.get('core.menu.edit.class') 'tmEditClass', '')
+#end
+#xwikitopmenuentryend()
+#else ## !isAdvanced
+#xwikitopmenuentry($doc.getURL($editaction, $!languageparams) $msg.get('core.menu.edit') 'tmEdit')
+#end
+#if($keyboardShortcutsEnabled)
+<script type="text/javascript">
+//<![CDATA[
+  shortcut.add("$msg.get('core.shortcuts.view.edit')",function() { location.href="$doc.getURL($editaction, $!languageparams)"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
+  shortcut.add("$msg.get('core.shortcuts.view.wiki')",function() { location.href="$doc.getURL('edit', "$!{languageparams}&editor=wiki")"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
+  shortcut.add("$msg.get('core.shortcuts.view.wysiwyg')",function() { location.href="$doc.getURL('edit', "$!{languageparams}&editor=wysiwyg")"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
+  shortcut.add("$msg.get('core.shortcuts.view.inline')",function() { location.href="$doc.getURL('inline', $!languageparams)"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
+  shortcut.add("$msg.get('core.shortcuts.view.rights')",function() { location.href="$doc.getURL('edit', 'editor=rights')"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
+  shortcut.add("$msg.get('core.shortcuts.view.objects')",function() { location.href="$doc.getURL('edit', 'editor=object')"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
+  shortcut.add("$msg.get('core.shortcuts.view.class')",function() { location.href="$doc.getURL('edit', 'editor=class')"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
+//]]>
+</script>
+#end
+#end
+##
+## Export menu
+##
+#xwikitopmenuentrystart($doc.getURL('export', "format=pdf&amp;$!docvariant") $msg.get('core.menu.export') 'tmExport' 'hasIcon')
+#submenuitem($doc.getURL('export', "format=pdf&amp;$!docvariant") $msg.get('core.menu.export.pdf') 'tmExportPdf', '')
+#submenuitem($doc.getURL('export', "format=rtf&amp;$!docvariant") $msg.get('core.menu.export.rtf') 'tmExportRtf', '')
+#submenuitem($doc.getURL('export', "format=html&amp;$!docvariant") $msg.get('core.menu.export.html') 'tmExportHtml', '')
+#submenuitem($doc.getURL('export', "format=xar&amp;name=$util.encodeURI($doc.fullName)&amp;pages=$util.encodeURI($doc.fullName)&amp;$!docvariant") $msg.get('core.menu.export.xar') 'tmExportXar', '')
+#xwikitopmenuentryend()
+##
+## Actions menu
+##
+#xwikitopmenuentrystart('' $msg.get('core.menu.actions') 'tmMoreActions' '')
+#submenuitem($doc.getURL('view', "xpage=print&amp;$!docvariant") $msg.get('core.menu.preview') 'tmPrintPreview', '')
+#submenuitem($doc.getURL('view', "xpage=code") $msg.get('core.menu.view.source') 'tmViewSource', '')
+#set ($canDelete = !$doc.isNew() && $xwiki.checkAccess($doc.fullName, 'delete'))
+  #if($canDelete)
+    #submenuseparator()
+    #submenuitem($doc.getURL('delete', $!languageparams) $msg.get('core.menu.delete') 'tmActionDelete', '')
+    #submenuitem($doc.getURL('view', 'xpage=rename&amp;step=1') $msg.get('core.menu.rename') 'tmActionRename', '')
+    #if($xwiki.hasProgrammingRights())
+      #submenuitem($doc.getURL('view', 'xpage=copy') $msg.get('core.menu.copy') 'tmActionCopy', '')
+    #end
+  #end
+  #xwikitopmenuentryend()
+  #if($canDelete && $keyboardShortcutsEnabled)
+    <script type="text/javascript">
+      //<![CDATA[
+      shortcut.add("$msg.get('core.shortcuts.view.delete')",function() { location.href="$doc.getURL('delete', $!languageparams)"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
+      shortcut.add("$msg.get('core.shortcuts.view.rename')",function() { location.href="$doc.getURL('view', 'xpage=rename&amp;step=1')"; }, { 'type':'keypress', 'propagate':false, 'disable_in_input':true });
+      //]]>
+    </script>
+  #end
+</div>
\ No newline at end of file
Index: src/main/resources/colibri/colibri.css
===================================================================
--- src/main/resources/colibri/colibri.css	(revision 25034)
+++ src/main/resources/colibri/colibri.css	(working copy)
@@ -1,4411 +1,1702 @@
-#template('colorThemeInit.vm')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
 /* @group RESET */
 /* --------------------------------------------------------------
-
-  Reset.css
   * Resets default browser CSS styles.
-
-  Created by Erik Meyer:
   * meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/
 -------------------------------------------------------------- */
-
-* html {
-  overflow-y: auto;
-}
-html, body {
-    height: 100%;
-}
-
 html, body, div, span, applet, object, iframe,
-    h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-    a, abbr, acronym, address, big, cite, code,
-    del, dfn, em, font, img, ins, kbd, q, s, samp,
-    small, strike, strong, sub, sup, tt, var,
-    dl, dt, dd, ol, ul, li,
-    fieldset, form, label, legend,
-    table, caption, tbody, tfoot, thead, tr, th, td {
-    margin: 0;
-    padding: 0;
-    border: 0;
-    outline: 0;
-    font-weight: inherit;
-    font-style: inherit;
-    font-size: 100%;
-    font-family: sans-serif;
-}
-
-input {
+  h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+  a, abbr, acronym, address, big, cite, code,
+  del, dfn, em, font, img, ins, kbd, q, s, samp,
+  small, strike, strong, tt, var,
+  dl, dt, dd, ol, ul, li,
+  fieldset, form, label, legend,
+  table, caption, tbody, tfoot, thead, tr, th, td {
+  border: 0;
   font-family: sans-serif;
+  font-size: 100%;
+  font-style: inherit;
+  font-weight: inherit;
+  margin: 0;
+  outline: 0;
+  padding: 0;
+  vertical-align: baseline;
 }
 
-/* Empty lines between block elements. Generated by the new rendering */
-.wikimodel-emptyline {
-    height:1em;
+/* @group STANDARD */
+/* --------------------------------------------------------------
+  * Sets the styles for standard HTML elements
+-------------------------------------------------------------- */
+body {
+  background-color: #D6E1E7;
+  color: #4D4D4D;
+  font-size: 87.5%; /* 10px */
+  min-width: 970px;
+  width: 100%;
 }
 
 a, a:link, a:active, a:visited {
-  color: #39397f;
+  color: #4791BC;
   text-decoration: none;
-  background-color: transparent;
 }
 
 a:hover {
-    color: #00007e;
-    text-decoration: underline;
+  text-decoration: underline;
 }
 
-/* Remember to define focus styles! */
-:focus {
-    outline: 0;
+a img {
+  border: 0;
 }
 
-body {
-    line-height: 1em;
-    color: black;
-    background: white;
+h1, h2, h3, h4 , h5, h6{
+  color: #005A83;
+  display: block;
+  font-weight: normal;
+  line-height: 1.2em;
 }
 
-ol {
-    margin-left: 2em;
+/* Font size for Hn is 1.1^(7-n) */
+h1 {
+  font-size: 1.77em;
 }
 
-ul {
-    list-style: circle;
-    margin-left: 2em;
+h2 {
+  font-size: 1.61em;
 }
 
-/* Tables still need 'cellspacing="0"' in the markup. */
-caption, th, td {
-    text-align: left;
-    font-weight: normal;
-    border-width: 1px;
+h3 {
+  font-size: 1.46em;
 }
 
-blockquote {
-    padding: 0.3em 0 0 1em;
-    quotes: none;
-    background: #FAFAF6 none repeat scroll 0 0;
-    border-left:2px solid #DDDDCC;
-    display:block;
+h4 {
+  font-size: 1.33em;
 }
 
-.clearfloats {
-  clear: both;
-  height: 1px;
-  overflow: hidden;
-  margin: -1px 220px 0;
+h5 {
+  font-size: 1.21em;
 }
 
-body.editbody .clearfloats {
-  margin-right: 300px;
+h6 {
+  font-size: 1.1em;
 }
 
-.hidden {
-    display: none !important;
+h1 span, h2 span, h3 span, h4 span {
+  border-bottom: 1px dotted #D6E1E7;
+  display: block;
+  margin: 20px 0;
+  overflow: hidden;
 }
 
-.invisible {
-	visibility: hidden !important;
+p {
+  line-height: 1.4em;
+  margin: 0.5em 0;
+  text-align: justify;
 }
 
-.loading {
-    background-image: url($xwiki.getSkinFile('icons/xwiki/spinner.gif'));
-    background-position: center center;
-    background-repeat: no-repeat;
+ol {
+  margin: 0 0 0 2em;
 }
 
-a img {
-    border: none;
+ul {
+  list-style-type: circle;
+  margin: 0 0 0 2em;
 }
 
-/* Used to signify a rendering error in the rendered page. Valid only with new rendering */
-.xwikirenderingerror {
-  background-color: #eee;
-  background-image: url($xwiki.getSkinFile("icons/silk/exclamation.gif"));
-  background-position: 2px 50%;
-  background-repeat: no-repeat;
-  color: #e14726;
-  padding: 2px 2px 2px 20px;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-}
-.xwikirenderingerrordescription {
-  background-color: #eee;
-  clear: both;
-  display: block;
-  font-family: georgia,verdana,arial;
-  padding: 5px;
-  font-size: 80%;
-  -moz-border-radius: 15px;
-  -webkit-border-radius: 15px;
-  overflow:auto;
+strong{
+  font-weight: bold;
 }
 
-.main pre p {
-    margin: 0;
+em {
+  font-style: italic;
 }
 
-tt, tt *, tt tt.wikimodel-verbatim {
+tt {
   font-family: monospace;
 }
 
-tt.wikimodel-verbatim {
-  font-family: sans-serif;
-  white-space: pre;
+blockquote {
+  background: #EFEFEF none repeat scroll 0 0;
+  border-left: 2px solid #D6E1E7;
+  display: block;
+  padding: 0.3em 0 0 1em;
+  quotes: none;
 }
 
-em {
-    font-style: italic;
+dt {
+  font-style: normal;
+  font-weight: bold;
+  margin: 10px 0 0;
 }
 
-strong, .strong {
-    font-weight: bold;
+input[type="text"], input[type="password"], textarea, select {
+  background-color: #FFFFFF ;
+  border: 1px solid #D6E1E7;
+  color: #4D4D4D;
 }
 
-/* @end */
-
-/* @group XWIKI */
-#doctitle {
-    font-size: 2.8em;
-    line-height: 1.1em;
-    margin: 0 0 30px 0;
+/* -----------------------Tables-------------------------*/
+table {
+  border-collapse: collapse;
 }
 
-h1 span, h2 span, h3 span, h4 span {
-    overflow:hidden;
-    display: block;
-    position: relative;
-    background-color: inherit;
-    padding: 0;
-    margin: 20px 0;
+caption, th, td {
+  font-size: 1em;
+  text-align: left;
+  vertical-align: middle;
 }
 
-h1 span span, h2 span span, h3 span span, h4 span span {
-    display: inline;
-    margin: 0;
-    border-bottom: 0;
+th {
+  background-color: #EFEFEF;
+  font-weight: bold;
 }
 
-body#mceSpanFonts h1 span, body#mceSpanFonts h2 span,
-    body#mceSpanFonts h3 span, body#mceSpanFonts h4 span {
-    display: block;
-    background-color: inherit;
-    padding: 0;
-    margin: 20px 0;
-    border-bottom: 1px solid #ccc;
+table pre {
+  white-space: pre-wrap;
 }
 
-h1, h2, h3, h4, h5 {
-  display:block;
-  position:relative;
-  line-height: 1.2em;
-  font-weight: normal;
-  padding-top: 1px;
+/* @group XWIKI */
+/* --------------------------------------------------------------
+  * XWiki Specific classes
+-------------------------------------------------------------- */
+tt.wikimodel-verbatim {
+  font-family: sans-serif;
+  white-space: pre;
 }
 
-/* Font size for Hn is 1.1^(7-n) */
-h1 {
-  margin-top: 5px;
-  font-size: 1.77em;
+/* -----------------------Tables-------------------------*/
+.xwikidatatable {
+  width: 100%;
 }
 
-#document-title h1 {
-  font-size: 2.15em;
-  letter-spacing: -1px;
+.main table {
+  margin: 1em 1px;
 }
 
-h2 {
-  font-size: 1.61em;
+.main th, .main td,
+.wiki-table th, .wiki-table td {
+  border: 1px solid #D6E1E7;
+  padding: 3px 4px;
 }
 
-h3 {
-  font-size: 1.46em;
-  margin: 20px 0;
+/* -----------------Non Existing Links-------------------*/
+span.wikicreatelink a {
+  background: transparent url("/xwiki/resources/icons/xwiki/create%2Dlink.png") no-repeat scroll right center;
+  padding-right: 13px;
+  text-decoration: underline;
 }
 
-h4 {
-  font-size: 1.33em;
+.wikicreatelinktext {
+  text-decoration: underline;
 }
 
-h5 {
-  font-size: 1.21em;
+.wikicreatelinkqm {
+  background-color: #005A83;
+  color: #FFFFFF;
+  margin: 0 0 0 3px;
+  padding: 0 3px;
 }
 
-h6 {
-  font-size: 1.1em;
+/* ---------------------Lists----------------------------*/
+.main ol, .main ul {
+  line-height: 1.4em;
+  list-style-position: inside;
+  margin: 1em 0 1em 2em;
 }
 
-#xwikicontent h1, #xwikicontent h2, #xwikicontent h3, #xwikicontent h4, #xwikicontent h5 {
-  overflow: hidden;
+.main ol ol, .main ul ul {
+  margin-bottom: 0;
+  margin-top: 0;
 }
 
-span.edit_section {
-    position: relative;
-    display: block;
-    background: #ccc;
-    margin-top: -20px !important;
-    visibility: hidden;
-    overflow: hidden;
-    height: 24px;
-    line-height: 24px;
-    margin-bottom: -1em;
-    border: 1px solid red;
+/* ---------------------Headers--------------------------*/
+.edit_section {
+  display: block;
+  height: 24px;
+  line-height: 24px;
+  margin: -19px 0 -1em;
+  overflow: hidden;
+  position: relative;
+  visibility:hidden;
 }
 
 .edit_section a {
-    position: absolute;
-    top: 0;
-    right: 0;
-    margin: 0;
-    margin-right: -52px;
-    padding-left: 50px;
-    line-height: 24px;
-    visibility: visible;
-    background: transparent url( $xwiki.getSkinFile('icons/xwiki/edit-section.png') ) left top no-repeat;
-    overflow: hidden;
-    border: 0 solid blue;
+  background: transparent url( /xwiki/resources/icons/xwiki/edit%2Dsection.png ) left top no-repeat;
+  margin: 0 -52px 0 0;
+  overflow: hidden;
+  padding: 0 0 0 50px;
+  position: absolute;
+  right: 0;
+  top: 0;
+  visibility:visible;
 }
 
-.quote {
-    font-style: italic;
-    color: inherit;
-    background-color: inherit;
-    font-family: inherit;
-    font-size: inherit;
+/* -----------------General Elements---------------------*/
+.clearfloats {
+  clear: both;
+  height: 1px;
+  margin: -1px 220px 0;
+  overflow: hidden;
 }
 
-.rssfeed {
-  padding: 8px;
+.hidden {
+  display: none !important;
 }
 
-.code {
-  font-family: courier, courier new, monospace;
-  white-space: pre;
-  margin: 1em 0;
-  padding: 0 1px;
-  overflow: auto;
+.invisible {
+  visibility: hidden !important;
 }
 
-.code pre {
-    font-family: courier, courier new, monospace;
+.loading {
+  background: transparent url(/xwiki/resources/icons/xwiki/spinner.gif) no-repeat center center;
 }
 
-.code .java-keyword {
-    color: #0000aa;
-    background-color: inherit;
+.separator {
+  color: #888888;
 }
 
-.code .java-object {
-    color: #000088;
-    background-color: inherit;
+/* @group VIEW LAYOUT */
+/* --------------------------------------------------------------
+  * Layout elements for Colibri skin in view mode
+-------------------------------------------------------------- */
+/* ----------------------Header--------------------------*/
+#headerglobal {
+  background: #FFFFFF  ;
+  clear: both;
+  margin-bottom: 16px;
+  width: 100%;
 }
 
-.code .java-quote {
-    color: #00aa00;
-    background-color: inherit;
+#companylogo a img {
+  float: left;
 }
 
-.code .xml-keyword {
-    font-weight: bold;
+#globallinks {
+  float: right;
+  padding: 8px 20px;
+  width: 190px;
 }
 
-.code .xml-tag {
-    color: #0000aa;
-    background-color: inherit;
+#globalsearch {
+  text-align: right;
 }
 
-.code .sql-keyword {
-    color: #0000aa;
-    background-color: inherit;
+#globalsearch input {
+  display: inline;
+  vertical-align: middle;
 }
 
-/* Special case for code macro used inline */
-span.code {
-    display: inline-block;
-    vertical-align: top;
-    margin: 0 0;
+#globalsearchinput {
+  min-height: 16px;
+  padding: 0 18px 0 2px;
+  width: 168px;
 }
 
-table td {
-    border-collapse: separate;
-    border-spacing: 0;
-    clear: both;
-    text-align: left;
+#globalsearch input.button {
+  background-color: transparent;
+  border: 0;
+  height: 16px;
+  margin: 0 2px 0 -18px;
+  padding: 0;
+  width: 16px;
 }
 
-/* Special formatting for YUI trees */
-.ygtvitem table {
-  border: none !important;
-  margin: 0 !important;
-}
-.ygtvitem td {
-  border: none !important;
-  padding: 0 !important;
+#headerlanguages {
+  display: block;
+  padding-top: 4px;
+  text-align: right;
 }
 
-/* special formatting of a wiki table */
-.mceContentBody table,
-    .main table {
-    font-size: 1em;
-    border-color: #e5eff8;
-    margin: 1em 0;
+.language-current {
+  font-weight: bold;
 }
 
-.mceContentBody caption,
-    .main caption {
-    color: #4e6172;
-    font-size: .94em;
-    letter-spacing: .1em;
-    margin: 1em 0 0 0;
-    padding: 0;
-    caption-side: top;
+.language-default {
+  font-style: italic;
 }
 
-.mceContentBody table tr td,
-    .main table tr td {
-    vertical-align: middle;
+/* ----------------------Content-------------------------*/
+#xwikimaincontainer{
+  line-height: 1.2em;
 }
 
-.mceContentBody table tr td em,
-    .main table tr td em {
-    font-size: 0.9em;
-    font-style: italic;
+#xwikimaincontainerinner {
+  background: #D6E1E7  ;
+  clear: both;
+  height: 100%;
+  text-align: left;
 }
 
-.mceContentBody tr.odd td,
-    .main tr.odd td {
-    background: #f7fbff
+#contentcontainer {
+  clear: both;
 }
 
-.mceContentBody td,
-.main td {
-    color: #4e6172;
-    border-color: #e5eff8;
-    padding: 3px 4px;
-    border-width: 1px;
-    border-style: solid;
+.leftsidecolumns, #contentcolumn {
+  float: left;
+  width: 100%;
 }
 
-.mceContentBody tr.table-head td,
-.main th {
-    border-color: #e5eff8;
-    padding: 3px 4px;
-    background: #f4f9fe;
-    text-align: center;
-    font: bold 1.2em / 1.4em Arial, Helvetica, sans-serif;
-    color: #66a3d3;
-    border-width: 1px;
-    border-style: solid;
+.main {
+  margin: 0 200px;
+  padding: 0 25px 25px 25px;
 }
 
-table.xwikilogintable th {
-    background-color: transparent;
+body.hideleft #contentcolumn .main {
+  margin: 0 200px 0 0;
 }
 
-.main tfoot th {
-    text-align: center;
+body.hideright #contentcolumn .main {
+  margin: 0 0 0 200px;
 }
 
-.main tfoot th strong {
-    font: bold 1.2em "Century Gothic", "Trebuchet MS", Arial, Helvetica, sans-serif;
-    margin: .5em .5em .5em 0;
+body.hidelefthideright #contentcolumn .main {
+  margin: 0;
 }
 
-.main tfoot th em {
-    font-weight: bold;
-    font-size: 1.1em;
-    font-style: normal;
+body.content #contentcolumn .main {
+  margin: 0 200px;
 }
 
-.main table.sortable span.sortarrow {
-    padding-left: 5px;
+#mainContentArea, .alleditcontent  {
+  background: #FFFFFF;
+  padding: 10px 25px;
 }
 
-table#memberstable td {
-    border: none;
+#xwikicontent {
+  overflow: auto;
+  width: 100%;
 }
 
-.main img {
-    margin: 0
+/* -----------------Top Doc Information------------------*/
+#hierarchy {
+  font-size: 90%;
+  padding-top: 15px;
 }
 
-.main h1 img, .main h2 img, .main h3 img, .main h4 img, .main h5 img, .main h6 img {
-    margin: 0;
-    vertical-align: middle;
+#document-title h1 {
+  border-bottom: 1px dotted #D6E1E7;
+  font-size: 2.15em;
+  letter-spacing: -1px;
+  padding: 5px 0;
 }
 
-#xwikicontent .sortarrow img {
-    margin: 0;
+#document-info {
+  color: #4D4D4D;
+  font-size: 90%;
+  padding: 3px 0px 1em;
+  text-align: right;
 }
 
-.main p {
-    line-height: 1.4em;
-    margin: 1em 0;
+.xdocLastModification {
+  float: left;
+  text-align: left;
+  width: 48%;
 }
 
-.main ol, .main ul {
-    line-height: 1.4em;
-    margin-top: 1em;
-    margin-bottom: 1em;
-    list-style-position: inside;
+/* ---------------Bottom Doc Information------------------*/
+#xdocFooter {
+  background-color: #FFFFFF;
+  border-top: 1px solid #D6E1E7;
+  color: #4D4D4D;
+  font-size: 90%;
+  overflow: auto;
+  padding: 5px 25px 10px;
+  width: auto;
 }
 
-.main ol ol, .main ul ul {
-    margin-top: 0;
-    margin-bottom: 0;
+#xdocAuthors {
+  padding: 3px 0;
+  text-align: right;
 }
 
-.main dt {
-    font-weight: bold;
+/* --------------------Doc Extra Tabs--------------------*/
+#docextraanchors {
+  height: 2em;
 }
 
-.main dd {
-    font-style: italic;
-    padding-left: 1em;
+.active .itemcount , .itemcount, .itemCount { /* TODO keep just one*/
+  color: #888888;
 }
 
-.main dd p {
-    margin-top: 0;
+#docextrapanes {
+  background-color: #FFFFFF;
+  border: none;
+  overflow: auto;
+  padding: 20px 25px 10px;
 }
 
-.list {
+.xwikiintracontent fieldset {
+  margin: 10px 0 0;
+  padding: 8px 8px 8px 0;
 }
 
-.list-title {
-    font-weight: bold;
+.xwikiintracontent legend {
+  color: #005A83;
+  font: bold 1.2em / 1.4em sans-serif;
+  letter-spacing: 0.1em;
 }
 
-.list ul {
-    margin-top: 0;
-    margin-bottom: 0;
-    margin-left: 0;
-    padding-left: 0;
-    list-style-type: none;
+.noitems {
+  color: #888888;
+  font-size: 0.9em;
 }
 
-/* wiki lists */
-ul.minus {
-    list-style-type: square;
+/* -----------------Tabs------------------*/
+ul.xwikitabbar {
+  background-color: #005A83;
+  height: 20px;
+  line-height: 20px;
+  margin: 0 0 0 0;
+  overflow: hidden;
+  padding: 3px 0 0 15px;
 }
 
-ul.star {
-    list-style-type: circle;
+.xwikitabbar li {
+  display: inline-block;
+  float: left;
+  height: 20px;
+  line-height: 20px;
+  list-style-type: none;
+  margin-right: 5px;
 }
 
-ol.roman {
-    list-style-type: lower-roman;
+.xwikitabbar li a, .xwikitabbar li a:visited, .xwikitabbar li a:active{
+  color: #FFFFFF;
+  display: inline-block;
+  font-size: 0.8em;
+  font-weight: bold;
+  height: 20px;
+  line-height: 20px !important;
+  padding: 0 10px;
+  text-transform: uppercase;
 }
 
-ol.ROMAN {
-    list-style-type: upper-roman;
+.xwikitabbar li.active a, .xwikitabbar li.active a:active, .xwikitabbar li.active a:visited {
+  background: #FFFFFF;
+  color: #005A83;
+  cursor: default;
+  text-decoration: none;
 }
 
-ol.alpha {
-    list-style-type: lower-alpha;
+/* ---------------Comments----------------*/
+/* Overwrites comments.css - added form */
+form#AddComment, form#AddComment .commentcontainer textarea {
+  border-color: #D6E1E7;
 }
 
-ol.ALPHA {
-    list-style-type: upper-alpha;
+/* Overwrites comments.css - added .xwikicomment */
+.xwikicomment .commentheader {
+  border-bottom: 1px dotted #D6E1E7;
+  color: #888888;
 }
 
-ol.greek { list-style-type: lower-greek; }
-ol.GREEK { list-style-type: upper-greek; }
-/* Disabled until they become valid CSS (in 3.0)
-ol.hiragana { list-style-type: hiragana; }
-ol.HIRAGANA { list-style-type: hiragana-iroha; }
-ol.katakana { list-style-type: katakana; }
-ol.KATAKANA { list-style-type: katakana-iroha; }
-ol.HEBREW { list-style-type: hebrew; }
-*/
-
-.wikicreatelink {
-    text-decoration: none;
+.xwikicomment .commentheader:hover {
+  background-color: #FFFFDD;
 }
 
-.wikicreatelinktext {
-    text-decoration: underline;
+.xwikicomment .commentauthor {
+  font-size: 0.9em;
 }
 
-.wikicreatelinkqm {
-    text-decoration: none;
-    font-size: 90%;
-    color: white;
-    border: 0 solid black;
-    padding: 0 3px;
-    margin: 0;
-    margin-left: 3px;
+.xwikicomment .commentcontent {
+  font-style: normal;
 }
 
-/* Needed for the new rendering with XWiki Syntax 2.0 since we're now using CSS for
-   displaying the question mark for unknown links */
-span.wikicreatelink a {
-  text-decoration: underline;
-  color: black;
-  background:transparent url("$xwiki.getSkinFile('icons/xwiki/create-link.png')") no-repeat scroll right center;
-  padding-right:13px;
+/* Overwrites comments.css - added #commentform */
+#AddComment #commentform label {
+  color: #888888;
+  font-size: 0.9em;
+  font-weight: normal;
 }
 
-.wiki-calendar-table * {
-    text-align: center;
-    border-collapse: collapse;
-    border-spacing: 0;
+/* Overwrites comments.css - added #commentscontent */
+#commentscontent #AddComment .commentcontainer, #commentscontent #AddComment .commentcontainer label  {
+  background-image: none;
+  padding: 4px 0;
 }
 
-.wiki-calendar-table div {
-    font-size: 90%;
-    margin: 2px 0;
+/* --------------Attachments--------------*/
+/* Should be in attachments.css */
+.attachment {
+  font-size: 85%;
+  padding: 10px 0px;
 }
 
-* html .wiki-calendar-table div {
-    font-size: 80%;
-}
-
-.wiki-calendar-table {
-    border: 4px solid #C0D4E7;
-    font-size: 100%;
-    margin: auto;
+.attachment .information {
+  color: #4D4D4D;
+  overflow: hidden;
 }
 
-.wiki-calendar-table td {
-    vertical-align: top;
+.attachment .mime, .attachment .name, .attachment .version {
+  float: left;
+  padding: 0 8px 0 0;
 }
 
-.wiki-calendar-table th {
-    background-color: #FFF;
+.attachment .name {
+  font-size: 1.35em;
 }
 
-.wiki-calendar-table td, .wiki-calendar-table th {
-    text-align: center;
-    border: 1px #C0D4E7 solid;
-    height: 60px;
-    width: 90px;
-    padding-top: 0 !important;
+.attachment .meta {
+  clear: left;
 }
 
-.wiki-calendar-daynotinmonth {
-    color: #BBBBBB;
-    background-color: #E5E5E5;
+.attachment .size {
+  color: #888888;
 }
 
-.wiki-calendar-today {
-    background-color: #C0D4E7;
+.attachment .xwikibuttonlinks {
+  float: right;
+  width: 40px;
 }
 
-.wiki-calendar-today-notinmonth {
-    background-color: #D9E0E7;
-    color: #BBBBBB;
+.add-file-input{
+  color: #4791BC;
 }
 
-.wiki-calendar-daynamerow {
-    background-color: #C0D4E7 !important;
+/* Overwrites attachments.css - added form */
+form#AddAttachment{
+  border-color: #D6E1E7;
 }
 
-.wiki-calendar-daynamerow th {
-    background-color: #C0D4E7 !important;
-    color: #fff;
-    font-weight: 900;
-    height: 1.8em;
+/* ----------------History----------------*/
+#historyform .currentversion td {
+  background-color: #FFFFDD;
 }
 
-.wiki-calendar-daytitle {
-    background-color: #E8EEF7;
-    font-size: 75% !important;
-    padding: 0 5px;
-    margin: 0 !important;
+#historyform  th {
+  border: 0;
+  border-bottom: 1px solid #D6E1E7;
+  font-size: 0.8em;
+  padding: 3px 4px;
+  text-transform: uppercase;
 }
 
-.wiki-calendar-daynotinmonth .wiki-calendar-daytitle {
-    background-color: transparent !important;
+#historyform td{
+  border: 0;
+  border-bottom: 1px solid #D6E1E7;
+  color: #4D4D4D;
+  font-size: 0.85em;
+  padding: 3px 4px;
 }
 
-.wiki-calendar-today-notinmonth .wiki-calendar-daytitle {
-    background-color: transparent !important;
+div.buttonwrapper {
+  display: inline;
 }
 
-.wiki-calendar-today .wiki-calendar-daytitle {
-    background-color: transparent !important;
+/* ----------------Changes----------------*/
+#changes-info {
+  background: #EFEFEF url( /xwiki/resources/icons/xwiki/diff%2Dheader.png ) no-repeat 50% -30px;
+  color: #4D4D4D;
+  font-size: 0.9em;
+  text-align: center;
 }
 
-.wiki-calendar-today-notinmonth a, .wiki-calendar-daynotinmonth a {
-    color: #BBB !important;
+#changes-info-boxes {
+  line-height: 1.4em;
+  padding: 1.5em 0 0;
 }
 
-.wiki-calendar-monthyearrow {
-    font-size: 140%;
-    font-weight: 100;
-    font-variant: small-caps;
-    color: #C0D4E7;
-    border: none !important;
-    width: auto !important;
+#changes-info-box-from {
+  float: left;
+  width: 49%;
 }
 
-.wiki-calendar-month-nav {
-    border: none !important;
+#changes-info-box-to {
+  margin-left: 51%;
 }
 
-.wiki-calendar-month-nav * {
-    font-size: 140%;
-    font-weight: bold;
-    color: #C0D4E7 !important;
-    text-decoration: none;
+.changes-info-title {
+  font-size: 1.4em;
+  font-weight: bold;
 }
 
-.wiki-calendar-month-nav .disabled {
-    color: #aaa !important;
+#changes-info-comment {
+  padding: 1.5em 0 1em;
 }
 
-.wiki-calendar-month-nav a:hover {
-    text-decoration: none !important;
-    color: #38c !important;
+#changescontent table {
+  margin-bottom: 0;
+  width: 100%;
 }
 
-#body .prev-month {
-    text-align: left;
-    padding-left: 8px;
+#changescontent th, #changescontent td {
+  border: 1px solid #D6E1E7;
+  padding: 3px 4px;
 }
 
-#body .next-month {
-    text-align: right;
-    padding-right: 8px;
+#changescontent th {
+  font-size: 0.85em;
 }
 
-.underline {
-    text-decoration: underline;
+#changescontent  .changes-table-title th {
+  font-size: 0.9em;
+  text-transform: uppercase;
 }
 
-.event .username {
-    font-size: 80%;
+#changescontent table tr.changes-table-title + tr.changes-table-title th {
+  border-bottom-width: 4px;
+  font-size: 0.8em;
 }
 
-.article_title {
-    font-size: 120%;
-    border-bottom: 1px;
+.diff {
+  overflow: auto;
+  white-space: normal;
 }
 
-.article_content {
-    padding: 10px 0;
+.diffaddword {
+  color: #287f00;
 }
 
-.article_date {
-    font-size: 120%;
+.diffremoveword {
+  color: #ca9a9b;
+  text-decoration: line-through;
 }
 
-.article_footer {
-    border-top: 1px dotted;
-    font-size: 75%;
-    font-weight: normal;
-    margin: 0 0 2em 0;
+/* --------------Information--------------*/
+#informationcontent dd {
+  padding: 0 1em 1em;
 }
 
-#webhomeNewsdisplay ul {
-    margin-left: 0;
+#informationcontent dt {
+  font-size: 0.8em;
+  text-transform: uppercase;
 }
 
-#webhomeNewsdisplay ul li {
-    margin-bottom: 0.5em;
+/* ----------------------Footer--------------------------*/
+#footerglobal hr {
+  display: none;
 }
 
-/* Footnotes */
-.footnotes {
-  font-size: 80%;
-  margin: 10px 0;
-  border-top: 1px solid #888;
-  padding: 1em;
-}
-.footnotes li {
-  padding: 0 4px;
-  margin: 0;
-  list-style-position: inside;
-}
-.footnoteRef a, .footnoteBackRef {
-  text-decoration: none;
-}
-.footnoteRef:target, .footnotes *:target {
-  border: 1px dotted;
+#footerglobal {
+  clear: both;
+  color: #4D4D4D;
+  font-size: 0.7em;
+  margin: 0 220px;
+  padding: 0 0 25px;
+  text-align: center;
+  text-transform: uppercase;
 }
 
-/* Pagination (deprecated) */
-.pagedNavigation {
-    text-align: center;
-    padding: 8px 0;
-    margin: auto;
+/* @group EDIT LAYOUT  */
+/* --------------------------------------------------------------
+  *  Layout elements for Colibri skin in edit mode
+-------------------------------------------------------------- */
+.alleditcontent {
+  margin: 0 225px 25px 20px;
 }
 
-.pagedNavigation span {
-    padding: 0 8px;
+.alleditcontent label, .metamodifs {
+  display: block;
+  font-size: 0.85em;
+  font-weight: bold;
+  margin: 10px 0;
+  text-transform: uppercase;
 }
 
-.pagedNavigation .pagedLink {
-    background-color: #E5F0FE;
+#xwikidoctitleinput, .metamodifs input[type="text"] {
+  width: 99.8%;
 }
 
-.pagedNavigation .inactive {
-    color: #CCC;
+.inlinebody dt {
+  font-size: 0.85em;
+  text-transform: uppercase;
 }
 
-.pagedNavigation .pagedLink a {
-    text-decoration: none;
-    color: #2E5A87 !important;
+/* @group EDITORS  */
+/* --------------------------------------------------------------
+  * These classes should be moved in proper editor css files
+-------------------------------------------------------------- */
+/* --------------------Wiki Editor-----------------------*/
+.leftmenu2 { /* TODO rename */
+  background-color: #f0f0ee;
+  padding: 2px;
 }
 
-.pagedNavigation .pagedLink a:hover {
-    color: #D70 !important;
+.leftmenu2 a img {
+  margin: 2px;
 }
 
-/* @end */
-
-/* @wysiwyg */
+#xwikieditcontentinner {
+  border: 1px solid #D6E1E7;
+}
 
-.vcomment {
-    background-color: #F9F9F9;
-    font-style: italic;
-    margin-left: 5px;
-    margin-right: 10px;
+#xwikieditcontent textarea#content {
+  border: 0;
+  padding: 0;
+  width: 100%;
 }
 
-/* @end */
+/* --------------Old WYSYWYG Editor----------------------*/
+/* Should be in editor_ui.css */
+iframe.mceEditorIframe, .mceEditor {
+  width: 100% !important;
+}
 
-/* @group Layout */
-body {
-    font-size: 87.5%; /* 10px */
-    font-family: sans-serif;
-    width: 100%;
-    padding: 0;
-    margin: 0;
-    min-width: 970px;
+.mceEditorContainer {
+  display: block;
+  height: 100% !important;
+  position: relative;
+  width: 100%;
 }
 
 body.mceContentBody {
-    background-image: none;
-    font-size: 90%;
-    line-height: 1.4em;
+  background: #FFFFFF;
+  min-width: 100px;
 }
 
-#xwikimaincontainer, body.hideright #xwikimaincontainer {
-  line-height: 1.2em;
-  margin: 0;
-  padding-top: 20px;
-  text-align: center;
-  border: none;
+/* ----------------New WYSYWYG Editor--------------------*/
+/* Should be in Wysiwyg.css */
+table.xRichTextEditorTabPanel td {
+  background-color: #FFFFFF;
 }
 
-#xwikimaincontainerinner {
-    height: 100%;
-    border: none;
-    text-align: left;
-    clear: both;
+/* Should be in RichTextArea.css - for table resizing */
+body.main table {
+  margin: 0;
 }
 
-body.hideleft #xwikimaincontainerinner {
-    margin-left: 30px;
+.wikimodel-emptyline {
+  height: 1em;
 }
 
-body.hideright #xwikimaincontainerinner {
-    padding-right: 30px;
+.xwikirenderingerror {
+  background: #EFEFEF url(/xwiki/resources/icons/silk/exclamation.gif) 8px 50% no-repeat;
+  border: 1px dotted #D6E1E7;
+  color: #e14726;
+  display: block;
+  padding: 2px 28px;
 }
 
-body.importbody #xwikimaincontainerinner,
-    body.exportbody #xwikimaincontainerinner,
-    body.adminbody #xwikimaincontainerinner,
-    body.hidelefthideright #xwikimaincontainerinner {
-    margin-left: 30px;
-    padding-right: 30px;
+.xwikirenderingerrordescription {
+  border: 1px dotted #D6E1E7;
+  border-width: 0px 1px 1px;
+  clear: both;
+  display: block;
+  font-size: 90%;
+  margin: 0 0 4px;
+  overflow: auto;
+  padding: 4px 28px;
 }
 
-body#body.editbody #xwikimaincontainerinner {
-    padding-right: 0;
-    margin-left: 30px;
+/* ----------------Objects Editor------------------------*/
+/* Should be in dataeditors.css - added dt, div */
+#body #xwikiobjects dt label, #body #xwikiclassproperties dt label {
+  color: #005A83;
+  font-size: 1.1em;
+  font-weight: normal;
 }
 
-body#body.editbody #globallinks,
-    #globallinks {
-    position: relative;
-    float: right;
-    font-size: 1em;
-    line-height: 1.2em;
-    width: 220px;
-    margin-left: -220px;
+div.xobject-content dt, div.xproperty-content dt{
+  margin: 0;
 }
 
-body.editbody #globallinks {
-    width: 220px;
-    margin-left: -220px;
+/* For TagClass */
+div#xwikiobjects input[type="checkbox"], div#xwikiclassproperties input[type="checkbox"] {
+  width: auto;
 }
 
-body#body.exportbody #companylogo,
-    body#body.importbody #companylogo,
-    body#body.adminbody #companylogo {
-    margin-right: 30px;
-    padding-right: 220px;
-    margin-left: 0;
+.xwiki-form-listclass {
+  display: block;
 }
 
-body.hideright #globallinks,
-    body.hidelefthideright #globallinks,
-    body.exportbody #globallinks,
-    body.importbody #globallinks,
-    body.adminbody #globallinks {
-    margin-left: -220px;
-    background-image: none;
-}
+/* @group MENU */
+/* --------------------------------------------------------------
+  * Action Menu elements
+-------------------------------------------------------------- */
 
-body.hideright #globallinks a,
-    body.hidelefthideright #globallinks a,
-    body.exportbody #globallinks a,
-    body.importbody #globallinks a,
-    body.adminbody #globallinks a {
-    font-size: 0.9em;
-    font-weight: normal;
-    padding-right: 10px;
+#mainmenu {
+  min-width: 970px;
+  overflow: visible;
+  text-align: center;  
+  z-index: 10000;
 }
 
-#companylogo {
-    margin: 0 220px;
+#mainmenu .submenu {
+	z-index: 10000;
 }
 
-body.hidelefthideright #companylogo {
-    margin: 0;
+#contentmenu {
+	z-index: 9999;
 }
 
-body.hideleft #companylogo {
-    margin: 0 0 0 0;
+#contentmenu .submenu {
+  z-index: 9999;
 }
 
-body.hideright #companylogo {
-    margin: 0 0 0 220px;
+.actionmenu {
+  background-color: #005A83;
+  height: 22px !important;  
+  width: 100%;
 }
 
-#body.editbody #companylogo {
-    margin: 0;
+.actionmenu a {
+  color: #FFFFFF;
+  cursor: pointer;
+  display: block;
+  float: left;
+  font: normal normal bold 0.8em/20px sans-serif;
+  margin-right: -1px;
+  padding: 2px 10px 0 0px;
+  width: auto;
+  white-space: nowrap;
+  text-transform: uppercase;
 }
 
-body#body.adminbody #companylogo {
-    margin: 0;
+.actionmenu .editinfo a {
+  display: inline;
+  float: none;  
 }
 
-body#body.editbody #headerspace {
-    margin: 0 220px 0 0;
+.actionmenu .hasIcon {
+  padding-left: 20px;
 }
 
-body.hideleft #headerspace {
-    margin: 0 220px 0 0;
+.rightmenu {
+  position: relative;
+  right: 0;
 }
 
-body#body.exportbody #headerspace,
-    body#body.importbody #headerspace,
-    body#body.adminbody #headerspace {
-    margin: 0;
+.leftmenu {
+  left: 15px;
+  position: relative;
 }
 
-#body.hidelefthideright #headerspace {
-    margin: 0;
+.topmenuentry {
+  display: block;
+  float: left;
 }
 
-#body.hideright #headerspace {
-    margin: 0 0 0 220px;
+.actionmenu .submenu {
+  background: #005A83;
+  display: block;
+  padding: 5px 5px 5px 10px;
+  position: absolute;
+  width: auto;
+  border: solid #FFFFFF;
+  border-width:0 1px 1px;
 }
 
-#footerglobal {
-    margin: 0 220px;
+.submenu .submenuseparator {
+  display: none;
 }
 
-#body.hidelefthideright #footerglobal {
-    margin: 0;
+.submenuitem a {
+  background: no-repeat 0px 0px;
+  height: 16px;
+  line-height: 20px;
+  margin-bottom: 4px;  
 }
 
-body#body.editbody #footerglobal {
-    margin: 0 220px 0 0;
+.actionmenu .submenuitem a, .actionmenu .submenuitem a:link, .actionmenu .submenuitem a:visited, .actionmenu .submenuitem a:active {
+  float: none;
+  height: auto;
+  line-height: 1.2em;
+  padding: 2px 20px 0;
+  text-align: left;
 }
 
-#body.hideleft #footerglobal {
-    margin: 0 220px 0 0;
+.actionmenu .dropdownmenuentry a.tme {
+  background-image: url(/xwiki/resources/icons/silk/bullet_arrow_down.gif);
+  background-position: right;
+  background-repeat: no-repeat;
+  padding-right: 16px;
+  margin-right: 6px;
 }
 
-#body.hideright #footerglobal {
-    margin: 0 0 0 220px;
+.actionmenu div {
+  background: no-repeat 0px 3px;    
 }
 
-body#body.exportbody #footerglobal,
-    body#body.importbody #footerglobal,
-    body#body.adminbody #footerglobal {
-    margin-right: 0;
+.actionmenu #tmWiki {
+  background-image: url(/xwiki/resources/icons/silk/world.gif);
 }
 
-.leftsidecolumns {
-    position: relative;
-    float: left;
-    width: 100%;
+.actionmenu #tmAdminWiki {
+  background-image: url(/xwiki/resources/icons/silk/wrench.gif);
 }
 
-#contentcolumn {
-    position: relative;
-    float: left;
-    width: 100%;
+.actionmenu #tmWatchWiki {
+  background-image: url(/xwiki/resources/icons/xwiki/star%2Dgray.png);
 }
 
-.main {
-    position: relative;
-    margin: 0 220px;
-    padding: 0 25px 25px 25px;
+.actionmenu #tmCreateSpace {
+	background-image: url(/xwiki/resources/icons/silk/folder_add.gif);
 }
 
-div#panelwizardcontainer {
-    padding: -30px -250px;
+.actionmenu #tmSpace {
+  background-image: url(/xwiki/resources/icons/silk/folder.gif);
 }
 
-body.hideleft #contentcolumn .main {
-    margin: 0 220px 0 0;
+.actionmenu #tmAdminSpace {
+  background-image: url(/xwiki/resources/icons/silk/wrench.gif);
 }
 
-body.hideright #contentcolumn .main {
-    margin: 0 0 0 220px;
-
+.actionmenu #tmWatchSpace {
+  background-image: url(/xwiki/resources/icons/xwiki/star%2Dgray.png);
 }
 
-body.hidelefthideright #contentcolumn .main {
-    margin: 0;
+.actionmenu #tmCreatePage, .actionmenu #tmCreatePageFromOffice {
+  background-image: url(/xwiki/resources/icons/silk/page_white_add.gif);
 }
 
-body.content #contentcolumn .main {
-    margin: 0 220px;
+.actionmenu #tmEdit {
+  background-image: url(/xwiki/resources/icons/silk/page_white_edit.gif);
 }
 
-#mainContentArea {
-    position: relative;
-}
-html>body #mainContentArea {
-  border: 1px solid transparent;
+.actionmenu #tmEditWiki, .actionmenu #tmViewSource {
+  background-image: url(/xwiki/resources/icons/silk/page_white_code.gif);
 }
 
-html > body .minwidth, html > body .minwidthb, html > body .minwidthc {
-    display: none;
+.actionmenu #tmEditVisual {
+  background-image: url(/xwiki/resources/icons/silk/page_white_edit.gif);
 }
 
-.minwidth, .minwidthb, .minwidthc, .minwidthd {
-    display: none;
-    height: 0;
-    font: normal 1px / 1px sans-serif;
+.actionmenu #tmEditForm {
+  background-image: url(/xwiki/resources/icons/silk/application_form.gif);
 }
 
-.minwidthb {
+.actionmenu #tmEditRights {
+  background-image: url(/xwiki/resources/icons/silk/lock.gif);
 }
 
-.minwidthc {
+.actionmenu #tmEditObjects {
+  background-image: url(/xwiki/resources/icons/silk/brick.gif);
 }
 
-.layoutsection {
-    clear: both;
+.actionmenu #tmEditClass {
+  background-image: url(/xwiki/resources/icons/silk/box.gif);
 }
 
-#contentcontainer {
-  clear: both;
+.actionmenu #tmExport {
+  background-image: url(/xwiki/resources/icons/silk/page_white_go.gif);
 }
 
-#rightPanels {
-    position: relative;
-    float: right;
-    width: 220px;
-    margin-top: -25px;
-    margin-left: -220px;
-    height: auto !important;
-    height: 400px;
-    min-height: 400px;
+.actionmenu #tmExportPdf {
+  background-image: url(/xwiki/resources/icons/silk/page_white_acrobat.gif);
 }
 
-#leftPanels {
-    position: relative;
-    float: left;
-    width: 220px;
-    margin-left: -100%;
+.actionmenu #tmExportRtf {
+  background-image: url(/xwiki/resources/icons/silk/page_white_word.gif);
 }
 
-body.exportbody #editPanels.panels,
-    body.importbody #editPanels.panels,
-    body.adminbody #editPanels.panels {
-    display: none;
+.actionmenu #tmExportHtml {
+  background-image: url(/xwiki/resources/icons/silk/page_white_world.gif);
 }
 
-#editPanels.panels {
-    position: relative;
-    float: left;
-    width: 220px;
-    margin-left: -220px;
-    margin-top: -26px;
-    padding-top: 25px;
-    height: auto !important;
-    min-height: 600px;
+.actionmenu #tmExportXar {
+  background-image: url(/xwiki/resources/icons/silk/page_white_compressed.gif);
 }
 
-#editPanels.panels .panel {
-    margin: 0;
-    width: 210px;
-    padding: 0;
+.actionmenu #tmPrintPreview {
+  background-image: url(/xwiki/resources/icons/silk/page_white_magnify.gif);
 }
 
-.editbody .leftsidecolumns {
-    position: relative;
-    float: left;
-    width: 100%;
-    padding-bottom: 20px;
+.actionmenu #tmActionDelete {
+  background-image: url(/xwiki/resources/icons/silk/cross.gif);
 }
 
-#xwikieditcontent textarea#content {
-  width: 100%;
-  border: 0;
-  padding: 0;
+.actionmenu #tmActionRename {
+  background-image: url(/xwiki/resources/icons/silk/textfield_rename.gif);
 }
 
-#xwikieditor {
-    z-index: 1;
+.actionmenu #tmActionCopy {
+  background-image: url(/xwiki/resources/icons/silk/page_white_copy.gif);
 }
 
-/* @end */
-/* @group Header */
-/*
----------------------------------------
-Global header
----------------------------------------
-*/
-#headerglobal {
-    position: relative;
-    float: left;
-    width: 100%;
-    z-index: 1;
+.actionmenu #tmUser {
+  background-image: url(/xwiki/resources/icons/silk/user.gif);
 }
 
-#globallinks {
+.actionmenu #tmWatchWiki, .actionmenu #tmWatchSpace, .actionmenu #tmWatchDocument {
+  background-image: url(/xwiki/resources/icons/xwiki/star%2Dgray.png);
 }
 
-#globalmenu {
-    padding: 0.5em;
-    text-align: right;
-    font-size: 1em;
-    line-height: 1.1em;
+.actionmenu #tmWatchlistManager {
+  background-image: url(/xwiki/resources/icons/silk/wrench.gif);
 }
 
-body#body.editbody #globallinks #globalmenu .glink,
-    #globalmenu .glink {
-    display: block;
-    background-color: transparent;
-    font-size: 1em;
-    line-height: 1.4em;
-    font-weight: bold;
-    padding: 0px 5px;
-    text-decoration: none;
+#contentmenu .isWatched, #mainmenu .isWatched a {
+  background-image: url(/xwiki/resources/icons/xwiki/star%2Dyellow.png) !important;  
 }
 
-#globalmenu #headerlanguages a {
-    text-transform: capitalize;
+.actionmenu .editinfo {
+  color: #FFFFFF;
+  font-size: 1em;
+  height: 22px;
+  letter-spacing: 2px;
+  line-height: 22px;
 }
 
-#globalmenu span {
-    display: none;
+#actionmenu .editinfo a {
+  display: inline;
+  float: none;
+  font-size: 0.9em;
+  height: 20px;
+  text-align: center;
 }
 
-#company {
-    position: relative;
-    float: left;
-    width: 100%;
+.rightmenu .topmenuentry {
+  float: right;
 }
 
-/*IE*/
-#companylogo {
-    padding: 0;
-    margin-right: 220px;
+#actionmenu .rightmenu .submenuitem a {
+  text-align: right;
+  width: auto;
 }
 
-#companylogo a {
-    display: block;
-    text-decoration: none;
+/* @group BUTTONS */
+/* --------------------------------------------------------------
+  * Button elements different containers
+-------------------------------------------------------------- */
+input.button, .buttonwrapper  a:visited,.buttonwrapper  a:link, .buttonwrapper  a:active {
+  background-color: #005A83;
+  background-image: none;
+  border: 1px solid #005A83;
+  color: #FFFFFF;
+  font: normal normal bold 0.8em/140% "Helvetica",sans-serif;
+  margin: 5px 5px 5px 0;
+  padding: 2px 3px;
+  text-transform: uppercase;
 }
 
-#globalmenu a:hover,
-    #companylogo a:hover {
-    border: none;
+input.button:hover , .buttonwrapper  a:hover{
+  background-color: #FFFFFF;
+  color: #005A83;
+  text-decoration: none;
 }
 
-#companylogo a img {
-    position: relative;
-    float: left;
+/* @group PANELS */
+/* --------------------------------------------------------------
+  * Panel elements
+-------------------------------------------------------------- */
+#rightPanels {
+  float: right;
+  margin: 0 0 0 -220px;
+  width: 220px;
 }
 
-#globaldoctitle {
-  display: none;
+#leftPanels {
+  float: left;
+  margin: 0 0 0 -100%;
+  width: 220px;
 }
 
-/* @end */
-/* @group footer */
-/*
----------------------------------------
-Footer
----------------------------------------
-*/
-#footerglobal hr {
-    display: none;
+#editPanels {
+  float: left;
+  margin: 0 0 0 -220px;
+  width: 220px;
 }
 
-#footerglobal a, #headerspace a {
-    text-decoration: none;
+.panel {
+  display: block;
+  width: 190px;
 }
 
-#footerglobal {
-    clear: both;
-    text-align: center;
-    background-color: transparent;
-    padding: 25px 0;
-    font-size: 0.7em;
-    text-transform: uppercase;
-    border-top: 1px dotted #CCC;
+#leftPanels .panel {
+  margin: 0px 0px 10px 20px;
 }
 
-#footerglobal a {
-    text-decoration: none;
+#rightPanels .panel, #editPanels .panel {
+  margin: 0px 0px 10px 10px;
 }
 
-#xdocFooter {
-  margin: 1em 0 0;
-  padding-top: 0.5em;
-  font-size: 90%;
-  border-top: 1px solid;
-}
-#xdocAuthors {
-  text-align: right;
+h5.xwikipaneltitle {
+  background-color: #005A83;
+  border-bottom: 1px dotted #D6E1E7;
+  color: #FFFFFF;
+  cursor: pointer;
+  font-size: 0.8em;
+  font-weight: bold;
+  letter-spacing: 0;
+  padding: 6px 20px 6px 15px;
+  text-align: left;
+  text-transform: uppercase;
 }
 
-#xwikilicence {
+.xwikipanelcontents {
+  background-color: #FFFFFF;
+  color: #4D4D4D;
+  font-size: 0.85em;
+  line-height: 1.6em;
+  overflow: hidden;
+  padding: 10px 15px;
 }
 
-#xwikidocinfo {
+.collapsed h5.xwikipaneltitle {
+  background-color: #EBF2F3;
+  border: 0;
+  color: #005A83;
 }
 
-#xwikiplatformversion {
+.collapsed .xwikipanelcontents {
+  display: none;
 }
 
-/* @end */
-/* @group Message Boxes */
-
-#loginForm div.centered fieldset.xwikimessage table.xwikilogintable tbody tr th,
-    #loginForm div.centered fieldset.xwikimessage table.xwikilogintable tbody tr td {
-    border: none;
+.panelitem {
+  display: block;
+  overflow: hidden;
 }
 
-/*
----------------------------------------------
-"Message Boxes"
----------------------------------------------
-*/
-
-div.centered {
-    text-align: center;
+.pitemseparator {
+  display: none;
 }
 
-fieldset.xwikimessage, div.xwikimessage {
-    display: block;
-    float: none;
-    width: 400px;
-    margin: 65px auto;
-    border: 0 solid;
-    border-top-width: 4em;
-    padding: 0 20px 16px;
-    text-align: left;
+.panel ul {
+  list-style-type: none;
+  margin: 0;
 }
 
-fieldset.xwikimessage legend,
-    div.xwikimessage h3 {
-    display: block;
-    width: 100%;
-    text-align: left;
-    font: bold 1.4em sans-serif;
-    letter-spacing: 0.4em;
-    padding: 1em 0 0;
-    margin: 0;
-    height: 1.8em; /* For Opera */
+.panel ul li.active {
+  line-height: 1.7em;
+  font-size: 1.2em;
+  font-weight: bold;
+  text-transform: uppercase;
 }
 
-div.errormessage {
-    color: red;
+.panel input, .panel select , .panel dt , .panel table, .padded label{
+  font-size: 0.95em;
+  margin: 0;
+  padding: 0;
+  width: 100%;
 }
 
-fieldset.xwikimessage .xwikimessage {
-    text-align: left;
-    font-weight: bold;
-    font-size: 110%;
+.panel dd, .panel .padded{
+  padding: 0 0 0.5em 0;
 }
 
-fieldset.xwikimessage .buttons {
-    text-align: left;
+.panel dt, .padded label {
+  font-weight: bold;
+  text-transform: uppercase;
 }
 
-fieldset.xwikimessage .buttons a {
-    text-decoration: none;
-    margin: 8px;
+.DocumentInformation table td {
+  border-top: 1px dotted #D6E1E7;
 }
 
-.button {
-    font-family: Helvetica, sans-serif;
-    font-weight: bold;
-    text-align: center;
+/* @group COMPONENTS*/
+/* --------------------------------------------------------------
+  * Different classes with specific use
+-------------------------------------------------------------- */
+/* --------------XWiki items types list -----------------*/
+ul.xlist {
+  margin: 0 0 0 0.5em !important;
+  padding: 0 !important;
 }
 
-/* @end */
-/* @group Comments, attachments, History...  */
-/*
----------------------------------------
-Zone for Comments, attachments, History...
----------------------------------------
-*/
-#xwikidata {
-    padding: 0;
-    border: none;
+ul.xlist li.xunderline {
+  border-bottom: solid 1px #D6E1E7 !important;
 }
 
-.xwikiintratitle {
+ul.xlist li.xhighlight:hover {
+  background-color: #FFFFDD;
 }
 
-.xwikiintracontent {
-    margin: 0;
+ul.xlist li {
+  height: 100%;
+  list-style-type: none;
+  padding-top: 0.2em;
+  width: 100% !important;
 }
 
-/* @end */
-/* @group Comments */
-/*
-----------------------------------------------
-Comments
-----------------------------------------------
-*/
-.xwikicomment {
-	border-bottom:2px solid white;
-	overflow:hidden;
-	padding:10px 0px;
-	position:relative;
+ul.xlist li.space, ul.xlist li.page, ul.xlist li.comment, ul.xlist li.attachment {
+  background-position: 2px 3px;
+  background-repeat: no-repeat;
 }
 
-#comments, #attachments {
-	padding:0pt 10px 20px;
+ul.xlist li.space {
+  background-image: url( /xwiki/resources/icons/silk/folder.gif );
 }
 
-#xwikidata .xwikititlewrapper {
-    cursor: pointer;
+ul.xlist li.page {
+  background-image: url( /xwiki/resources/icons/silk/page_white_text.gif );
 }
 
-#xwikidata #commentscontent .xwikititlewrapper {
+ul.xlist li.comment {
+  background-image: url( /xwiki/resources/icons/silk/comment.gif );
 }
 
-#xwikidata #attw {
+ul.xlist li.attachment {
+  background-image: url( /xwiki/resources/icons/silk/attach.gif );
+  padding-bottom: 0;
 }
 
-h3.xwikiintratitle {
-    font: normal 1.2em / 1.4em sans-serif;
-    text-transform: uppercase;
-    letter-spacing: 0.1em;
-    text-align: left;
-    margin: 0;
-    padding: 5px 10px;
+ul.xlist li.xitem div.xitemcontainer {
+  text-indent: 1.5em;
 }
 
-.xwikiintratitle span.hidden {
-    display: inline;
+ul.xlist li.xitem div.xitemcontainer ul.xlist {
+  text-indent: 0em;
 }
 
-#attachmentscontent table {
-    border: none;
+.xspacer {
+  clear: both !important;
+  height: 0 !important;
+  line-height: 0 !important;
+  margin: 0 !important;
+  padding: 0 !important;
+  width: 0 !important;
 }
 
-.mime {
-    text-align: center;
+/* -----------------------Boxes--------------------------*/
+.box {
+  margin: 1em 0;
+  overflow: auto;
+  padding: 0 1px;
 }
 
-.xwikicomment {
-    padding: 10px 0px;
-    position: relative;
-    overflow: hidden;
+.code, .box {
+  background-color: #EFEFEF;
+  border: 1px dotted #D6E1E7;
 }
 
-.commentspacer {
-    display: none;
+.code, .code pre  {
+  font-family: courier, "courier new", monospace;
+  white-space: pre;
 }
 
-.commentavatar {
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 54px;
+/* ----------------------Messages------------------------*/
+.errormessage, .warningmessage, .infomessage, .plainmessage {
+  background: #EFEFEF 6px 8px no-repeat;
+  border: 1px dotted #D6E1E7;
+  margin: 4px 0;
+  overflow: auto;
+  padding: 8px 28px;
+  text-align: justify;
 }
 
-.commentavatar img {
-    width: 3.5em;
-    display: block;
-    margin: auto;
+.infomessage {
+  background-image: url( /xwiki/resources/icons/silk/information.gif );
+  color: #369;
 }
 
-.commentheader {
-    padding: 6px 0;
+.warningmessage {
+  background-image: url( /xwiki/resources/icons/silk/error.gif );
+  color: #D5A13D;
 }
 
-.commentauthor {
-    font-size: 130%;
-    font-weight: 900;
+.errormessage {
+  background-image: url( /xwiki/resources/icons/silk/exclamation.gif );
+  color: #e14726;
 }
 
-.commentcontent {
-  border-left:5px solid #CCCCCC;
-  padding:3px 0px 0px 6px;
-}
-
-table.xwikidatatable {
-    margin: 8px auto; /* width: 100%; */
-}
-
-table.xwikidatatable, table.xwikidatatable th {
-    border: 1px solid #DDD;
-}
-
-table.xwikidatatable td {
-    padding: 2px 8px;
-}
-
-.xwikiintracontent legend {
-}
-
-.xwikiintracontent fieldset {
-	background-color:#F9F9F9;
-	margin-top:10px;
-	padding:8px;
-}
-
-.xwikiintracontent legend {
-    font: bold 1.2em / 1.4em sans-serif;
-    cursor: pointer;
-    letter-spacing: 0.1em;
-    color: #39397f;
-}
-
-html > body .xwikiintracontent legend {
-    margin-bottom: 0;
-}
-
-#xwikiuploadfile {
-    margin: 10px;
-}
-
-.xwikiintracontent fieldset.collapsed {
-    border: none;
-    margin: 0;
-    padding: 0;
-    background-color: transparent;
-}
-
-.xwikiintracontent fieldset.collapsed legend {
-    margin-left: 2px;
-}
-
-.xwikiintracontent fieldset.collapsed div {
-    display: none;
-}
-
-.xwikiintracontent fieldset.expanded .expands {
-    display: none;
-}
-
-.commentsno, .attachmentsno {
-}
-
-.attachmentsno {
-}
-
-/* @end */
-/* @group ActionMenu */
-/*
----------------------------------------
-Menu
----------------------------------------
-*/
-#actionmenu {
-    position: absolute;
-    width: 100%;
-    height: 20px !important;
-    top: 0;
-    left: 0;
-    right: 0;
-    z-index: 1000;
-    overflow: visible;
-    text-align: center;
-}
-
-html > body #actionmenu {
-    position: fixed;
-}
-
-#actionmenu a {
-    text-decoration: none;
-    cursor: default;
-    text-decoration: none;
-    display: block;
-    height: 20px;
-    float: left;
-    margin-right: -1px;
-    text-align: center;
-    line-height: 20px;
-    font-size: 0.9em;
-    font-weight: bold;
-}
-#actionmenu a:link, #actionmenu a:visited {
-  cursor: pointer;
-}
-
-#actionmenu .editinfo a {
-    text-decoration: none;
-    display: inline;
-    height: 20px;
-    float: none;
-    text-align: center;
-    line-height: 20px;
-    font-size: 0.9em;
-    font-weight: bold;
-}
-
-.rightmenu {
-    position: absolute;
-    right: 0;
-    margin-right: 25px;
-}
-
-#actionmenu .leftmenu #tmDoc {
-    width: 20px;
-}
-
-.leftmenu {
-    position: absolute;
-    left: 25px;
-}
-
-.topmenuentry {
-    display: block;
-    float: left;
-}
-
-.rightmenu .topmenuentry {
-    float: right;
-}
-
-.submenu {
-    display: block;
-    width: 12em;
-    position: absolute;
-    margin-top: 0;
-    margin-left: 0 !important;
-    padding: 5px;
-}
-
-.submenu.hidden, .submenu .submenuseparator {
-    display: none;
-}
-
-#actionmenu .submenuitem a, #actionmenu .submenuitem a:link, #actionmenu .submenuitem a:visited, #actionmenu .submenuitem a:active {
-    display: block;
-    float: none;
-    width: 100%;
-    font-size: 0.8em;
-    font-weight: bold;
-    text-decoration: none;
-    height: auto;
-    padding: 2px 0 0 0;
-    line-height: 1.2em;
-    border: 0;
-    text-align: left;
-}
-
-#actionmenu .submenuitem a:hover {
-    text-decoration: underline;
-    background-image: none;
-}
-
-/* @end */
-/*
----------------------------------------
-Editors
----------------------------------------
-*/
-#xwikiviewerstitles {
-    display: none;
-}
-
-/* @group tabs */
-/*
----------------------------------------
-Tabs
----------------------------------------
-*/
-
-ul.xwikitabbar {
-    padding: 0 0 0 3px;
-    margin: 0 0 0 0;
-    height: 30px;
-    border-bottom: none;
-}
-
-#xwikieditor ul.xwikitabbar {
-    overflow: hidden;
-}
-
-#xwikicontent ul.xwikitabbar {
-    overflow: hidden;
-    margin: 0;
-    border-bottom: 0 solid #555;
-}
-
-.xwikitabbar li {
-    position: relative;
-    display: inline;
-    list-style-type: none;
-    margin-right: 2px;
-    text-align: center;
-    display: block;
-    float: left;
-    border: none;
-}
-
-.xwikitabbar li a {
-  display:block;
-  font-size:0.85em;
-  font-weight:normal;
-  letter-spacing:-0.5px;
-  margin-top:0px;
-  padding:0pt 3px;
-  text-decoration:none;
-}
-
-.xwikitabbar li a:hover {
-    text-decoration: none;
-}
-
-.xwikitabbar li.active a,
-    .xwikitabbar li.active a:hover {
-    cursor: default;
-}
-
-.xwikitabbar li.active a {
-    font-weight: bold;
-}
-
-.xwikitabbar li {
-}
-
-.xwikitabbar li.active {
-    background-position: top right;
-    border: none;
-}
-
-#xwikichangespace {
-    padding: 10px 5px;
-}
-
-/* @end */
-/*
---
-*/
-#xwikicontentedit {
-    border: 1px solid;
-}
-
-/* --------------------------------------- */
-/* --------------------------------------- */
-/* @group Panels */
-/* --------------------------------------- */
-/* --------------------------------------- */
-.Search #globalsearch {
-    text-align: center;
-    padding: 15px 15px 0;
-    line-height: 12px;
-    height: 50px;
-    margin: 0;
-}
-
-.Search .xwikipanelcontents,
-    .Search .xwikipaneltitle {
-    background-image: none;
-    padding: 0;
-}
-
-#globallinks form {
-  margin: 0;
-  padding: 0;
-}
-#globalsearch {
-    margin: 0 0 0 10px;
-}
-#globalsearch * {
-  vertical-align: middle;
-}
-
-.xwikipanelcontents form {
-    margin: 0;
-    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%;
-}
-
-.panels {
-}
-
-html > body .panels {
-    margin-top: 0;
-}
-
-.panels.left {
-    position: relative;
-    float: left;
-    margin-left: 0;
-}
-
-.panels.right {
-    position: relative;
-    float: right;
-}
-
-.panel, .fakepanel {
-    width: 190px;
-    display: block;
-    padding: 0;
-}
-
-#leftPanels .panel, #leftPanels .fakepanel {
-    margin: 0px 0px 10px 20px;
-}
-
-#rightPanels .panel, #rightPanels .fakepanel {
-    margin: 0px 0px 10px 10px;
-}
-
-.fakepanel {
-    display: none;
-    height: 320px;
-}
-
-.xwikipanelcontents {
-    background-color: transparent;
-    font-size: 0.85em;
-    line-height: 1.6em;
-    font-weight: normal;
-    padding: 0 15px 20px 15px;
-}
-
-div.xwikipanelcontents div.warningmessage,
-div.xwikipanelcontents div.infomessage,
-div.xwikipanelcontents div.errormessage,
-div.xwikipanelcontents div.plainmessage,
-div.xwikipanelcontents table {
-  margin-top: 0;
-}
-
-div.xwikipanelcontents ul.minus {
-    margin: 0;
-    padding: 0;
-}
-
-h1.xwikipaneltitle {
-    margin: 0;
-    font-size: 1.1em;
-    letter-spacing: -1px;
-    line-height: 1.2em;
-    padding: 8px 20px 8px 15px;
-    text-align: center;
-    cursor: pointer;
-}
-
-#globalsearch h1.xwikipaneltitle.hidden {
-    display: none;
-}
-
-h1.xwikipaneltitle.hidden {
-    display: block;
-    height: 10px;
-    line-height: 200px;
-    overflow: hidden;
-}
-
-/* For new rendering, in order to display orange question marks for unknown links in panels */
-div.xwikipanelcontents span.wikicreatelink a {
-     background-image: url("$xwiki.getSkinFile('qm-orange.png')")
-}
-
-div.xwikipanelcontents ul.star {
-    list-style-type: none;
-    list-style-position: outside; /* Outside, otherwise IE6 adds some padding */
-    padding: 0;
-    margin: 0;
-}
-
-div.xwikipanelcontents ul.star li ul {
-    margin-left: 2em;
-}
-
-.xwikipanelcontents p {
-    margin-top: 0;
-}
-
-.collapsed .xwikipanelcontents {
-    display: none;
-}
-
-span.panelitem {
-    display: block;
-}
-
-/*  edit panels */
-#editPanels .expanded h1.xwikipaneltitle {
-    height: auto;
-    font-size: 1em;
-    text-align: center;
-    letter-spacing: -1px;
-}
-
-#editPanels .editmodes h2 {
-    height: auto;
-    font-size: 1em;
-    text-align: center;
-    letter-spacing: -1px;
-}
-
-#editPanels .collapsed h1.xwikipaneltitle {
-    text-align: center;
-    letter-spacing: -1px;
-}
-
-#editPanels .xwikipanelcontents {
-    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;
-}
-
-#editPanels form {
-    font-size: 0.9em;
-}
-
-#editPanels form input,
-    #editPanels form select {
-    width: 100%;
-    margin-bottom: 0.5em;
-    font-size: 1em;
-}
-
-.collapsed h1.xwikipaneltitle {
-    background-position: top right;
-}
-
-#editPanels .EditModes .xwikipanelcontents ul {
-    padding-top: 1em;
-    margin-left: -15px;
-}
-
-#editPanels .EditModes .xwikipanelcontents ul li {
-    display: block;
-    height: 20px;
-    font-size: 1.1em;
-    line-height: 20px;
-    letter-spacing: 1px;
-    font-weight: normal;
-    padding: 0 15px;
-    text-align: left;
-}
-
-#editPanels .EditModes .xwikipanelcontents ul li.active {
-    line-height: 30px;
-    font-size: 1.2em;
-    font-weight: bold;
-    text-transform: uppercase;
-    height: 30px;
-    text-align: left;
-}
-
-#editPanels .SyntaxHelp h1.xwikipaneltitle {
-    display: none;
-}
-
-#editPanels .SyntaxHelp div.xwikipanelcontents {
-    height: 40px;
-    text-align: center;
-    line-height: 20px;
-    letter-spacing: -1px;
-    padding: 5px 25px 5px 10px;
-}
-
-#xwikihelpsyntax div.panel.expanded h1.xwikipaneltitle.hidden {
-    display: none;
-}
-
-#xwikihelpsyntax div.panel.expanded div.xwikipanelcontents {
-    background-image: none;
-    margin: 0;
-    padding: 0;
-}
-
-.placeholder {
-    width: 170px;
-    margin-left: 10px;
-    background-color: #fff;
-    opacity: .1;
-}
-
-html > body #dragbox {
-    width: 198px !important;
-}
-
-#xwikinavcontainer {
-    margin: 0 0 0;
-    border: 1px solid #999;
-    border-width: 0 0 1px 0;
-}
-
-span.pitemseparator {
-    display: none;
-}
-
-.panelcontainer {
-    height: 200px;
-    overflow: hidden;
-    border: 1px solid #fff;
-    padding: 3px;
-}
-
-.panelitemc {
-    height: 256px;
-    margin: 0 4px;
-    width: 210px;
-    position: relative;
-    float: left;
-}
-
-.panelitemc .label {
-    text-align: center;
-    background-color: transparent;
-    padding: 2px 0;
-    font-weight: bold;
-}
-
-.accordionTabContentBox .panelitemc .label {
-    color: #fff;
-}
-
-.panelitemc .xwikibuttonlink {
-    text-align: center;
-    background-color: transparent;
-    border: 1px solid #fff;
-    border-top: 0;
-    color: #eee;
-}
-
-.panelitemc .xwikibuttonlink a {
-    color: #eee;
-    padding: 0 5px;
-}
-
-.xwikipanelcontents dl dd {
-    margin-bottom: 2em;
-}
-
-.xwikipanelcontents dl dt {
-    font-size: 1.3em;
-    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;
-    position: relative;
-    overflow: hidden;
-}
-
-.xwikipanelcontents dl dd table#xwikiincludeddocuments td a:hover {
-    overflow: visible;
-}
-
-.xwikipanelcontents dl dd table#xwikiincludeddocuments td a span {
-    display: inline;
-}
-
-.xwikipanelcontents dl dd table#xwikiincludeddocuments td a:hover span {
-    display: block;
-    position: absolute;
-    min-width: 155px;
-    right: 0;
-    padding: 0 5px;
-    top: -1em;
-}
-
-/* @end */
-/* @group Rico Acordeon */
-/*
-----------------------------------
-Rico Acordeon
-----------------------------------
-*/
-#xwikisyntaxhelp {
-    margin-top: 0;
-    border: none;
-    font-size: 0.9em;
-}
-
-.accordionTabTitleBar h6 {
-    margin: 0;
-    padding: 4px;
-    font: bold 1em / 1.1em sans-serif;
-    color: #FFF;
-    background-color: #8799b3;
-}
-
-#panellistaccordion #xwikinav .accordionTabTitleBar h6,
-    #xwikinav .accordionTabTitleBar h6 {
-    background-color: #fff;
-    color: #333;
-    border: 1px solid #999;
-    margin-top: 0;
-    border-width: 1px 0 0 0;
-}
-
-#xwikinav .accordionTabContentBox {
-    background-color: #fff;
-    border-top: 1px solid #999;
-}
-
-#xwikinavcontainer #xwikinav .tbexpanded h6 {
-    border-width: 1px 0;
-}
-
-#xwikieditcontent .accordionTabTitleBar h6 {
-    margin: 0;
-    padding: 4px 21px;
-    height: 20px;
-    font-weight: normal;
-    letter-spacing: -1px;
-    border-top: 1px solid #fff;
-    border-bottom: 1px solid #ccc;
-    color: #333;
-    background-color: #f0f0ee;
-    background-image: url( $xwiki.getSkinFile('icons/xwiki/accordion.png') );
-    background-repeat: no-repeat;
-    background-position: 0% 50%;
-}
-
-#panellistaccordion #xwikinav .accordionTabTitleBar h6 {
-    background-image: none;
-    height: auto;
-    padding: 2px 3px;
-    font-weight: bold;
-}
-
-#editPanels .accordionTabContentBox {
-    border: none;
-    overflow: auto !important;
-}
-
-#editPanels .accordionTabContentBox table {
-    border: none;
-    background-color: transparent;
-}
-
-.accordionTabContentBox table th {
-    text-align: center;
-}
-
-#xwikihelptitlesContent h1, #xwikihelptitlesContent h2, #xwikihelptitlesContent h3, #xwikihelptitlesContent h4, #xwikihelptitlesContent h5, #xwikihelptitlesContent h6 {
-    margin: 0;
-    text-align: right;
-}
-
-.accordionTabTitleBar {
-    margin: 0;
-    cursor: default;
-}
-
-.accordionTabContentBox {
-    position: relative;
-    padding: 5px;
-    overflow: hidden;
-}
-
-#allviewpanels .accordionTabContentBox {
-    padding: 5px;
-    overflow: auto !important;
-}
-
-#panellistaccordion #xwikinav .accordionTabContentBox {
-    background-image: none;
-    overflow: auto !important;
-}
-
-#xwikinav .accordionTabContentBox {
-    overflow: auto !important;
-}
-
-#xwikinav ul.minus {
-    margin: 0;
-    padding: 0 5px;
-    list-style-type: none;
-}
-
-#xwikisyntaxhelp table tbody tr {
-    display: block;
-    width: 175px;
-    border-top: 1px dashed red;
-}
-
-#xwikisyntaxhelp table tbody tr td {
-    display: block;
-    width: 175px;
-    padding: 2px 1px;
-}
-
-#xwikisyntaxhelp table tbody tr td tt {
-    background-color: #ccc;
-}
-
-#xwikisyntaxhelp table tbody tr td {
-    display: block;
-    width: 175px;
-    border: 0 solid red;
-}
-
-#xwikisyntaxhelp .accordionTabContentBox {
-    padding: 0;
-    margin: 0;
-}
-
-#xwikisyntaxhelp table tbody tr th {
-    display: block;
-    width: 100%;
-}
-
-/*
------------------------------
-Misc
------------------------------
-*/
-/* @end */
-#xwikihelplistsContent ul, #xwikihelplistsContent ol {
-    margin: 0;
-}
-
-#contentcolumn .panel.large {
-}
-
-.accordionTabTitleBar tt {
-    font-style: normal;
-    font-size: 100%;
-    padding: 0 4px;
-}
-
-/*.accordionTabContentBox div{
-  padding: 0px;
-}*/
-td.label {
-    text-align: right;
-    padding-right: 4px;
-}
-
-.center {
-    text-align: center;
-}
-
-.padded {
-    padding: 4px;
-}
-
-.editactions {
-    border: none !important;
-    margin-top: 10px;
-    padding: 0;
-}
-
-#historycontent td {
-    padding: 2px;
-}
-
-#xwikiuserprofile th {
-    background-color: transparent;
-    text-align: right;
-}
-
-#xwikiuserprofile td, #xwikiuserprofile th {
-    padding: 4px;
-}
-
-#xwikiobjects td {
-    vertical-align: top;
-}
-
-html > body .xwikidatatable {
-    width: 100%;
-}
-
-/* @group Page Layout */
-/*
-------------------------
-Page Layout Selection
-------------------------
-*/
-td div.pagelayoutoption {
-    margin: 0 auto;
-    width: 106px;
-}
-
-div.layoutmaquette {
-    width: 100px;
-    height: 100px;
-    border: 1px solid #ddd;
-    background-color: #fff;
-    padding: 2px;
-}
-
-div.lmleftcolumn, div.lmrightcolumn {
-    width: 20px;
-    height: 60px;
-    border: 1px solid #aaa;
-    background-color: #ddd;
-    position: relative;
-    float: left;
-}
-
-div.lmrightcolumn {
-    position: relative;
-    float: right;
-}
-
-div.lmcontentcolumn {
-    border: 1px solid #aaa;
-    background-color: #eee;
-    height: 90px;
-}
-
-#leftcolumn div.lmcontentcolumn {
-    margin-left: 24px;
-}
-
-#rightcolumn div.lmcontentcolumn {
-    margin-right: 24px;
-}
-
-#bothcolumns div.lmcontentcolumn {
-    margin-left: 24px;
-    margin-right: 24px;
-}
-
-div.pagelayoutoption:hover .layoutmaquette {
-    background-color: #ffd;
-}
-
-div.pagelayoutoption:hover .lmcontentcolumn {
-    background-color: #ddd;
-}
-
-div.pagelayoutoption:hover .lmleftcolumn,
-    div.pagelayoutoption:hover .lmrightcolumn {
-    background-color: #acf;
-}
-
-div.pagelayoutoptions > table {
-    width: 100%;
-    text-align: center;
-}
-
-div.pagelayoutoptions td {
-    padding: 2px;
-    vertical-align: bottom;
-}
-
-#selectedoption {
-}
-
-#selectedoption .lmcontentcolumn {
-    background-color: #acf;
-}
-
-#selectedoption .lmleftcolumn,
-    #selectedoption .lmrightcolumn {
-    background-color: #369;
-}
-
-.pagelayoutoption label {
-    color: #aaa;
-}
-
-#selectedoption label, .pagelayoutoption:hover label {
-    color: #000;
-}
-
-.hastooltip {
-    border-bottom: 1px dotted #000;
-    cursor: help;
-}
-
-#dhtmltooltip {
-    border: 1px solid #aaa;
-    padding: 2px 4px;
-    background-color: #ffd;
-    text-align: justify;
-    position: absolute;
-}
-
-#panelwizardbuttons {
-    padding: 8px 0px;
-    margin: 1em 0px;
-    text-align: center;
-}
-
-.alleditcontent {
-    margin: 10px 240px 20px 20px;
-}
-
-.alladmincontent {
-    border: 1px solid #ddd;
-}
-
-body.importbody .alleditcontent,
-    body.exportbody .alleditcontent,
-    body.adminbody .alleditcontent {
-    margin: 30px 50px 20px 20px;
-    border: none;
-}
-
-.alleditcontent label {
-    position: relative;
-    display: block;
-    text-align: center;
-    padding: 5px;
-    font-weight: bold;
-    font-size: 1em;
-    margin: 0px 0px 1em;
-}
-
-#xwikidoctitleinput {
-    margin-top: 1em;
-    width: 70%;
-}
-
-#xwikicontent .floatcontainer {
-    overflow: hidden;
-    width: auto;
-/*     border-bottom: 2px solid #333; */
-}
-
-html>body #xwikieditcontent {
-    padding: 20px 5px 5px 5px;
-    padding: 0;
-}
-
-#xwikieditcontentinner {
-}
-
-.editinfo {
-    height: 22px;
-    letter-spacing: 2px;
-    font-size: 1em;
-    line-height: 22px;
-}
-
-#edit {
-    padding: 0px;
-    margin: 0px;
-    border: none;
-    height: 1%;
-}
-
-#xwikitext {
-    clear: both;
-}
-
-#panelsBackground {
-    height: 20px;
-}
-
-* html form {
-    margin-top: 0px;
-}
-
-.xwiki-form-listclass input[type="checkbox"] {
-    float: none;
-    display: inline;
-    margin-right: 2px;
-}
-
-.xwiki-form-listclass {
-    margin-right: 10px;
-}
-
-/**
-Attachments
-*/
-div.attachment {
-    overflow: hidden;
-    clear: both;
-    padding: 10px 0px;
-    font-size: 85%;
-    border-bottom: solid 2px white;
-}
-
-.attachment .mime {
-    display: block;
-    position: relative;
-    float: left;
-    padding-right: 8px;
-    padding-bottom: 4px;
-}
-
-.attachment .information {
-    position: relative;
-    overflow: hidden;
-}
-
-.attachment .name {
-    display: block;
-    position: relative;
-    float: left;
-    font-size: 1.35em;
-    padding: 0px 6px 4px 0px;
-}
-
-.attachment .version {
-    display: block;
-}
-
-.attachment .meta {
-    clear: left;
-}
-
-.attachment .xwikibuttonlinks {
-    position: relative;
-    float: right;
-    font-size: 130%;
-    padding: 4px 10px;
-}
-
-/* @end */
-
-/* @group EDITION */
-#xwikieditorinner {
-    /*float: left;
-     width: 100%;*/
-
-}
-
-.editbody #globallinks {
-    width: 200px;
-}
-
-#editcolumn div.alleditcontent label {
-    display: block;
-    text-transform: uppercase;
-    padding: 0;
-    text-align: center;
-    margin-bottom: 20px;
-}
-
-#editcolumn div.alleditcontent #pagetitle label {
-    margin-bottom: 0;
-    padding: 10px;
-    border-bottom: 1px solid #ccc;
-}
-
-#editcolumn div.alleditcontent #pagetitle label input {
-    width: 100%;
-}
-
-div#xwikiclassproperties.accordion dt label,
-    div#xwikiobjects.accordion label {
-    display: block;
-    font: normal 0.8em sans-serif;
-    text-transform: uppercase;
-    width: 100%;
-    padding: 10px 0 0 0;
-    text-align: left;
-    margin: 0 0 2px 0;
-}
-
-#field_name_content div dl dd {
-    padding-bottom: 0.5em;
-    border-bottom: 1px dashed #ccc;
-}
-
-#editcolumn div.alleditcontent div#xwikiclassproperties.accordion dd label {
-    text-align: left;
-    margin: 0;
-    font-size: 0.8em;
-    font-weight: normal;
-}
-
-div#xwikiclassproperties.accordion textarea,
-    div#xwikiobjects.accordion textarea,
-    div#xwikiclassproperties.accordion input[type=text],
-    div#xwikiobjects.accordion input[type=text] {
-    width: 98%;
-}
-
-#xwikidoctitleinput {
-    width: 40%;
-    font-size: 1em;
-}
-
-.topbuttons, .bottombuttons {
-    text-align: center;
-    font-size: 1em;
-    font-weight: bold;
-    padding: 10px;
-}
-
-.topbuttons {
-    margin-bottom: 1em;
-}
-
-.bottombuttons input[type=text] {
-    width: 100%;
-    margin-bottom: 1em;
-}
-
-.leftmenu2 {
-    text-align: left;
-    font-size: 1.4em;
-    font-weight: bold;
-    background-color: #f0f0ee;
-    padding: 2px;
-    border-top: 1px solid #fff;
-}
-
-#body #fullscreen-dlg .leftmenu2 {
-    padding: 0px;
-}
-
-#xwikieditcontent div div.leftmenu2 a img {
-    margin: 2px;
-}
-
-.bottombuttons input.button {
-    margin-top: 1.5em;
-}
-
-#editcolumn {
-    width: 100%;
-}
-
-#historycontent .centered {
-    margin: 0;
-}
-
-#historycontent table {
-    margin: 0 0 1em 0;
-    border-top: none;
-    border-collapse: collapse;
-    width: 100%;
-}
-
-#historycontent table th {
-    padding: 5px;
-    font-weight: bold;
-}
-
-#historycontent table td {
-    padding: 5px;
-    border: 1px solid #ccc;
-    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,
-    #rightPanels .xwikipanelcontents ul.minus {
-    margin-left: 1em;
-}
-
-#leftPanels .xwikipanelcontents ul.star,
-    #rightPanels .xwikipanelcontents ul.star {
-    margin-left: 0em;
-    margin-bottom: 1em;
-}
-
-#leftPanels .xwikipanelcontents ul.star ul,
-    #rightPanels .xwikipanelcontents ul.star ul {
-    margin-left: 2em;
-}
-
-#leftPanels .xwikipanelcontents ul ul,
-    #rightPanels .xwikipanelcontents ul ul {
-    list-style-type: none;
-    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;
-    margin: 10px 0px 10px 10px;
-    padding-top: 10px;
-}
-
-#body .buttonwrapper * {
-    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;
-    margin: 1em 0;
-    border-bottom: 1px solid #ccc;
-}
-
-body.importbody #editcolumn .alleditcontent .padded fieldset,
-body.exportbody #editcolumn .alleditcontent .padded fieldset {
-    background-color: #eaeaf3;
-    border: 5px solid #eaeaf3;
-    border-width: 25px 5px 5px;
-}
-
-body.importbody #editcolumn .alleditcontent .padded label,
-    body.exportbody #editcolumn .alleditcontent .padded label {
-    text-align: left;
-    margin: 0;
-}
-
-/* @end */
-
-/* @group tablesearch */
-
-table#searchTableUnique {
-    width: 99.8%;
-}
-
-table#searchTableUnique td span.wikilink {
-
-}
-
-table#searchTableUnique td.actions a {
-    position: relative;
-    float: left;
-    width: 16px;
-    height: 16px;
-    margin: 8px 6px 0 0;
-    overflow: hidden;
-    background-color: transparent;
-    border: 1px solid #FFF;
-}
-
-table#searchTableUnique tr.sortHeader {
-    background-color: #eaf2fa;
-    border-collapse: collapse;
-}
-
-table#searchTableUnique tr.sortHeader th {
-}
-
-table#searchTableUnique th a {
-    color: #74abd7;
-}
-
-table#searchTableUnique td.actions a:hover {
-    border-color: #ccc;
-}
-
-table#searchTableUnique td.actions a.copyaction {
-    background-image: url( images/editcopy.png );
-}
-
-table#searchTableUnique td.actions a.deleteaction {
-    background-image: url( images/edittrash.png );
-}
-
-table#searchTableUnique td.actions a.renameaction {
-    background-image: url( images/filesaveas.png );
-}
-
-table#searchTableUnique td.actions a.rightaction {
-    background-image: url( images/lock.png );
-}
-
-table#searchTableUnique td.actions a span {
-    position: relative;
-    float: left;
-    padding: 16px 0 0 0;
-}
-
-table#referenceTable,
-    table#referenceTable input,
-    table#referenceTableselect {
-    width: 98%;
-}
-
-table#referenceTable input#flt3_referenceTable {
-    width: 59%;
-    margin-right: 1%;
-}
-
-table#referenceTable input#btn3_referenceTable {
-    width: 39%;
-}
-
-/* @end */
-/*
----------------------------------------
-Messages
----------------------------------------
-*/
-.error {
-    color: #F00;
-}
-
-.fatalerror {
-    background-color: #F00;
-    color: #FFF;
-    font-weight: bold;
-    font-size: 120%;
-}
-
-.warning {
-    color: #c82;
-}
-
-
-span.messagetype {
-    display: none;
-}
-
-div.floatinginfobox, fieldset.floatinginfobox {
-    float: right;
-    border-left: 20px solid #FFF;
-    border-bottom: 40px solid #FFF;
-    border: 1px solid;
-    padding: 10px;
-    margin: 1em 0 1em 1em;
-}
-
-div.floatinginfobox .strong, fieldset.floatinginfobox .strong {
-    display: block;
-    text-align: center;
-    font-weight: normal;
-    font-size: 1.2em;
-    letter-spacing: -1px;
-    margin-bottom: 0.5em;
-}
-
-li.tocEntry,
-div.floatinginfobox li,
-fieldset.floatinginfobox li,
-div.floatinginfobox ul,
-fieldset.floatinginfobox ul {
-  margin: 0 0 0 1em;
-  padding: 0;
-  line-height: 1.4em;
-}
-
-div.floatinginfobox ul,
-    fieldset.floatinginfobox ul {
-    background-image: none;
-}
-
-/*
----------------------------------------
-  Images
----------------------------------------
-*/
-.imgfloatleft {
-    float: left;
-    margin-right: 1em;
-}
-
-.imgfloatright {
-    float: right;
-    margin-left: 1em;
-}
-
-.imgleft {
-    text-align: left;
-}
-
-.imgcenter {
-    text-align: center;
-}
-
-.imgright {
-    text-align: right;
-}
-
-/* @group 2-COL */
-.my-col-right, .my-col-left {
-    float: left;
-    width: 50%;
-    padding: 0px;
-}
-
-.my-col-right div, .my-col-left div {
-    padding: 20px 20px 20px 50px;
-    clear: none;
-}
-
-.my-col-right  img, .my-col-left img {
-    float: left;
-    padding-top: 20px;
-}
-
-/* @end */
-table.mceEditor {
-    width: 100%;
-}
-
-table.mceEditor textarea {
-    width: 100%;
-    height: 100%;
-}
-
-.mceEditorContainer {
-    display: block;
-    height: 100% !important;
-    position: relative;
-    width: 100%;
-}
-
-.mceToolbar {
-    z-index: 30002;
-}
-
-.mceEditor td {
-    padding: 0px;
-}
-
-form#inline textarea {
-    width: 100%;
-}
-
-body.mceContentBody {
-    min-width: 100px;
-}
-
-#treeview table {
-    margin: 0px;
-}
-
-#treeview table td {
-    text-align: left;
-    padding: 0px;
-    border: 0px;
-}
-
-/*
----------------------------------------
-  Changes
----------------------------------------
-*/
-div#changes-info {
-  background: $theme.backgroundSecondaryColor url( $xwiki.getSkinFile('icons/xwiki/diff-header.png') ) no-repeat 50% -35px;
-  color: $theme.textPrimaryColor;
-}
-
-div#changes-info-boxes {
-  margin-top: 0em;
-  line-height: 1.4em;
-  border: 0px solid #f4f9fe;
-  background-color: transparent;
-  text-align: center;
-  padding-top: 1em;
-}
-
-div#changes-info-box-from {
-  float: left;
-  width: 49%;
-}
-
-#changes-info-box-to {
-  margin-left: 51%;
-}
-
-div.changes-info-title {
-  font-weight: bold;
-  font-size: 1.4em;
-}
-
-#changes-info-comment {
-  text-align: center;
-  padding: 1em 0;
-}
-
-#changescontent table {
-  width: 100%;
-  margin: 1em 0 0;
-}
-
-#changescontent .changes-table-title th {
-  text-align: center;
-  font-size: 1.1em;
-  padding: 3px 5px;
-  border-bottom: 1px solid $theme.borderColor;
-  background-color: $theme.backgroundSecondaryColor;
-  color: $theme.textPrimaryColor;
-}
-
-#changescontent table tr.changes-table-title + tr.changes-table-title th {
-  font-size: 0.75em;
-  text-align: left;
-  border-bottom-width: 4px;
-}
-
-#changescontent table td {
-  border-bottom: 1px solid $theme.borderColor;
-}
-
-div.diff {
-    padding: 0 0 5px 0;
-    margin-bottom: -5px;
-    white-space: normal;
-    overflow: auto;
-}
-
-span.diffremoveword {
-    color: #ca9a9b;
-    text-decoration: line-through;
-}
-
-div.diffmodifiedline {
-    margin: 0.8em 0;
-}
-
-span.diffaddword {
-    color: #287f00;
-}
-
-/* profil */
-.specialmenu {
-    border: 1px solid;
-    border-top-width: 0px;
-    text-align: center;
-    margin-top: -1.3em;
-    padding: 3px;
-}
-
-.specialmenu img {
-    vertical-align: middle;
-}
-
-.specialmenu ul {
-    margin: 0;
-    padding: 5px 0;
-    display: inline;
-}
-
-.specialmenu ul li {
-    list-style-type: none;
-    list-style-image: none;
-    display: inline;
-}
-
-.xwikiuserblog {
-    float: right;
-    clear: both;
-    padding: 5px;
-}
-
-#lb-content h3,
-    div.vcard h3 {
-    clear: both;
-    padding-top: 1em;
-}
-
-form#inline div.clear h3 {
-    clear: both;
-}
-
-#lb-content #XWiki.XWikiUsers_0_blog {
-    width: 200px;
-}
-
-img#xwikiuseravatar.photo {
-
-    float: none;
-    margin: 0 1em 1em 0;
-}
-
-#lb-content img#xwikiuseravatar.photo {
-    width: 200px;
-    float: right;
-    margin: 0 1em 1em 0;
-}
-
-#xwikiuserprofile dl {
-    font-size: 0.9em;
-}
-
-#xwikiuserprofile dd.given-name, #xwikiuserprofile dd.family-name {
-    font-size: 1.6em;
-    letter-spacing: 2px;
-}
-
-#xwikiuserprofile {
-}
-
-form#inline #xwikiuserprofile {
-}
-
-form#inline #xwikiuserprofile,
-    #lb-content #xwikiuserprofile {
-    padding-bottom: 2em;
-}
-
-form#inline #xwikiuserprofile input,
-    #lb-content #xwikiuserprofile input {
-    width: 350px;
-}
-
-form#inline #xwikiuserprofile label,
-    #lb-content #xwikiuserprofile label {
-    font-size: 1.4em;
-    line-height: 1.2em;
-}
-
-/* @group contentPanels */
-
-div.panellayoutcontainer-1col .panellayoutcol {
-    width: 100%;
-}
-
-div.panellayoutcontainer-2col .panellayoutcol {
-    width: 50%;
-}
-
-div.panellayoutcontainer-3col .panellayoutcol {
-    width: 33%;
-}
-
-div.panellayoutcontainer-4col .panellayoutcol {
-    width: 25%;
-}
-
-div.panellayoutcontainer-5col .panellayoutcol {
-    width: 20%;
-}
-
-div.panellayoutcontainer-1col, div.panellayoutcontainer-2col, div.panellayoutcontainer-3col, div.panellayoutcontainer-4col, div.panellayoutcontainer-5col {
-    overflow: auto;
-    clear: left;
-}
-
-.panellayoutcol {
-    overflow: auto;
-    float: left;
-    height: 1%;
-}
-
-.panellayoutcol .panel {
-    width: 90%;
-    margin: 0 0 20px 5%;
-    border: 1px solid #ddd;
-}
-
-#xwikicontent .panel ul {
-    margin: 0 5px;
-    padding: 0;
-    list-style-position: inside;
-}
-
-#xwikicontent .panellayoutcol .panel .xwikipanelcontents {
-    background-color: transparent;
-    background-image: none;
-    padding: 10px;
-}
-/* @end */
-
-/* IE */
-* html div {
-    display: inline-block;
-}
-
-* html a {
-    position: relative;
-    z-index: 1;
-}
-
-* html #rightPanels, #editPanels {
-    margin-top: -27px;
-    height: 400px;
-}
-
-* html #globalsearch {
-    margin-bottom: 1em
-}
-
-* html #editPanels .EditModes .xwikipanelcontents ul li.active {
-    background-image: none;
-}
-
-* html #mainContentArea {
-    overflow-y: hidden;
-    width: 100%;
-}
-
-* html .minwidthd {
-    display: none;
-}
-
-* html .minwidth, * html  .minwidthb, * html  .minwidthc {
-}
-
-* html #contentcolumn .minwidthb,
-    * html #contentcolumn .minwidthd {
-    display: block;
-    width: 740px;
-    margin-right: 220px;
-}
-
-* html #headerspace .minwidth {
-    display: block;
-    width: 710px;
-}
-
-/* 740 - 30 padding */
-* html .minwidthc {
-}
-
-* html .minwidthd {
-}
-
-* html body  #show-dialog-btn {
-    right: 1px;
-    top: 1px;
-}
-
-* html ul.xwikitabbar {
-    margin: 0;
-}
-
-* html ul.xwikitabbar li a {
-    line-height: 1em;
-}
-
-* html #lb #lb-content img#xwikiuseravatar.photo {
-    float: left;
-    width: 50px;
-}
-
-* html pre {
-    word-wrap: break-word
-}
-
-* html div.floatinginfobox,
-    * html fieldset.floatinginfobox,
-    * html fieldset.floatinginfobox *,
-    * html div.floatingboxinner,
-    * html fieldset.floatingboxinner,
-    * html div.floatingboxinner *,
-    * html fieldset.floatingboxinner * {
-    zoom: normal;
-}
-
-#lb-close {
-    height: 15px;
-}
-
-* html #lb-content {
-    margin-top: -1px;
-}
-
-* html #webhomeblogdisplay, * html #webhomeNewsdisplay {
-    width: 48% !important;
-}
-
-.main p {
-    position: static;
-    border-collapse: collapse;
-}
-
-/*
-** Doc extra
-*/
-
-#docExtraTabs {
-  border: 0px !important;
-}
-
-#docextrapanes {
-  padding: 10px;
-  clear: both;
-}
-
-#docextraanchors {
-  height: 2em;
-}
-
-#informationcontent dd, #informationcontent dt {
-  padding-top: 4px;
-  padding-bottom: 4px;
-  background: none;
-}
-
-input#tags {
-	width: 80%;
-}
-
-#tageditsavesuccess {
-	color: green;
-	margin-left: 6px;
-}
-
-#tageditsaveerror {
-	color: red;
-	margin-left: 6px;
-}
-
-.xspacer {
-  clear:both !important;
-  height: 0 !important;
-  width: 0 !important;
-  line-height: 0 !important;
-  padding: 0 !important;
-  margin: 0 !important;
-}
-
-/*
-** Wiki items lists (spaces, pages, comments, attachments)
-*/
-
-ul.xlist {
-  margin: 0 0 0 0.5em !important;
-  padding: 0 !important;
-}
-
-ul.xlist li.xunderline {
-  border-bottom: solid 1px #efefef !important;
-}
-
-ul.xlist li.xhighlight:hover {
-  background-color: lemonChiffon;
-}
-
-ul.xlist li {
-  width: 100% !important;
-  padding-top: 0.2em;
-  list-style-type: none;
-}
-
-ul.xlist li.space, ul.xlist li.page, ul.xlist li.comment, ul.xlist li.attachment {
-  background-repeat: no-repeat;
-  background-position: 2px 3px;
-}
-
-ul.xlist li.space {
-  background-image: url( $xwiki.getSkinFile('icons/silk/folder.gif') );
-}
-
-ul.xlist li.page {
-  background-image: url( $xwiki.getSkinFile('icons/silk/page_white_text.gif') );
-}
-
-ul.xlist li.comment {
-  background-image: url( $xwiki.getSkinFile('icons/silk/comment.gif') );
-}
-
-ul.xlist li.attachment {
-  background-image: url( $xwiki.getSkinFile('icons/silk/attach.gif') );
-}
-
-ul.xlist li.xitem div.xitemcontainer {
-  text-indent: 1.5em;
-}
-
-ul.xlist li.xitem div.xitemcontainer ul.xlist {
-  text-indent: 0em;
-}
-
-.rssfeed .rssitem .rsschanneltitle,
- .rssitemdescription .rssitemtitle .rsschanneltitle {
- 	background-color: white;
-}
-.box {
-  margin: 1em 0;
-  padding: 0 1px;
-  overflow: auto;
-}
-
-.rssfeed {
-  clear: both;
-  position: relative;
-  width: 300px;
-}
-
-.rssfeed div.rsschanneltitle {
-  margin-bottom: 10px;
-  border-bottom: 1px solid;
-  padding: 5px;
-  text-align: center;
-  font-size: 14px;
-  font-weight: bold;
-}
-
-.rssfeed .rssitem {
-  padding: 5px;
-}
-
-.errormessage, .warningmessage, .infomessage, .plainmessage {
-  margin: 4px 0;
-  border: 1px solid;
-  padding: 8px 28px;
-  background: transparent 6px 8px no-repeat;
-  text-align: justify;
-  color: #555;
-  overflow: auto; /* Prevents the box from going under floating elements */
-}
-.infomessage {
-  background-image: url( $xwiki.getSkinFile('icons/silk/information.gif') );
-  color: #369;
-}
-.warningmessage {
-  background-image: url( $xwiki.getSkinFile('icons/silk/error.gif') );
-  color: #D5A13D;
-}
-.errormessage {
-  background-image: url( $xwiki.getSkinFile('icons/silk/exclamation.gif') );
-  color: #e14726;
-}
-
-span.errormessage, span.warningmessage, span.infomessage, span.plainmessage {
-  background-position: 2px center;
-  overflow:visible;
-  padding:0 2px 0 22px;
-}
-
-/* Start Colibri.css */
-
-/**********************************************************************************************/
-/** Text Colors **/
-body {
-  color: $theme.textColor;
-}
-
-.active .itemcount {
-  color: $theme.textSecondaryColor;
-}
-
-.itemcount {
-  color: $theme.textSecondaryColor;
-}
-
-.layoutsubsection .about {
-  color: $theme.textPrimaryColor;
-}
-
-/**********************************************************************************************/
-/** 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,
-body.importbody #globallinks a,
-body.adminbody #globallinks a {
-  color: $theme.linkColor;
-}
-
-body#body.editbody #globallinks #globalmenu .glink, #globalmenu .glink {
-  color: $theme.linkColor;
-  font-weight: normal;
-}
-
-body#body.editbody #globallinks #globalmenu a.glink:hover, #globalmenu a.glink:hover {
-  text-decoration: underline;
-}
-
-#actionmenu .editinfo a:hover {
-  text-decoration: underline;
-}
-
-/**********************************************************************************************/
-/** Headers **/
-
-h1, h2, h3, h4 {
-  color: $theme.titleColor;
-}
-h1 span, h2 span, h3 span, h4 span {
-  border-bottom: 1px dotted $theme.borderColor;
-}
-
-h1 span span, h2 span span, h3 span span, h4 span span {
-  color: $theme.titleColor;
-}
-
-/**********************************************************************************************/
-/** Backgrounds Colors **/
-
-body {
-  background: $theme.pageBackgroundColor;
-}
-body.mceContentBody {
-  background: $theme.pageContentBackgroundColor;
-}
-
-#xwikimaincontainer, body.hideright #xwikimaincontainer {
-  background: $theme.pageBackgroundColor;
-}
-
-body#body.exportbody #xwikimaincontainer,
-body#body.importbody #xwikimaincontainer,
-body#body.adminbody #xwikimaincontainer,
-body.hidelefthideright #xwikimaincontainer,
-body.hideleft #xwikimaincontainer,
-body.editbody #xwikimaincontainer {
-  background: $theme.pageBackgroundColor;
-}
-
-#xwikimaincontainerinner {
-  background: $theme.pageBackgroundColor $!{theme.pageBackgroundImage} $!{theme.pageBackgroundPosition};
-}
-
-body.importbody #xwikimaincontainerinner,
-body.exportbody #xwikimaincontainerinner,
-body.adminbody #xwikimaincontainerinner,
-body.hidelefthideright #xwikimaincontainerinner {
-  margin-left: 0px;
-  padding-right: 0px;
-}
-
-body#body.editbody #globallinks, #globallinks {
-  background: transparent;
-  width: 220px;
-}
-
-.main {
-  background: transparent;
-  margin:0 200px;
-}
-
-body.hideleft #contentcolumn .main {
-  margin:0 200px 0 0;
-}
-
-body.hideright #contentcolumn .main {
-  margin:0 0 0 200px;
-}
-
-#mainContentArea {
-  background: $theme.pageContentBackgroundColor;
-  padding: 25px 25px 5px;
-}
-
-
-#headerglobal {
-  margin-bottom: 16px;
-}
-#company {
-  background: transparent;
-}
-#headerglobal {
-  background: $theme.pageHeaderBackgroundColor $!{theme.headerBackgroundImage} $!{theme.headerBackgroundPosition};
-}
-
-#companylogo {
-  background: transparent;
-  margin: 0px;
-}
-
-body.hideright #companylogo {
-  margin: 0px;
-}
-#hierarchy {
-  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;
-}
-
-body.hideleft #xwikimaincontainerinner {
-  margin-left: 0px;
-}
-
-#headerspace {
-  background: transparent;
-  border: none;
-}
-
-/**********************************************************************************************/
-/** Panels **/
-
-#rightPanels {
-  background: none;
-  margin-top:0px;
-}
-
-/*** IE6 restore - this should be removed from toucan.css - we don't need special margin for IE6 anymore ***/
-* html #rightPanels, #editPanels {
-    margin-top: 0px;
-}
-
-/* Overridden with .panel for IE6 */
-.panel h1.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 h1.xwikipaneltitle {
-  background-color: $theme.panelCollapsedBackgroundColor;
-  border: none;
-  color: $theme.panelCollapsedTextColor;
-}
-
-/* Overridden with .div for IE6 */
-div.xwikipanelcontents {
-  background: $theme.panelBackgroundColor;
-  background-image: none;
-  padding: 10px 15px;
-  color: $theme.panelTextColor;
-}
-
-.xwikipanelcontents a {
-  color: $theme.linkColor;
-}
-
-/**********************************************************************************************/
-/** Menu **/
-
-#actionmenu div.leftmenu div:hover a,
-    #actionmenu a:hover {
-  background: none;
-}
-
-.submenu {
-  background: $theme.menuBackgroundColor;
-  border: 0;
-}
-
-#actionmenu {
-  background: $theme.menuBackgroundColor;
-  border: 0;
-  min-width: 970px;
-}
-
-#actionmenu .editinfo, #actionmenu .editinfo * {
-  color: $theme.menuLinkColor;
-}
-
-#actionmenu a {
-  border: 0;
-  color: $theme.menuLinkColor;
-  width: auto;
-}
-
-#actionmenu .submenuitem a, #actionmenu .submenuitem a:link, #actionmenu .submenuitem a:visited, #actionmenu .submenuitem a:active {
-  padding-left: 10px;
-  padding-right: 10px;
-  color: $theme.menuLinkColor;
-}
-
-#actionmenu div.leftmenu div:hover a.tme, #actionmenu a.tme:hover {
-  text-decoration: underline;
-  color: $theme.menuLinkColor;
-}
-
-#actionmenu #tmWatched a.tme {
-  background-color: $theme.menuSelectedEntryBackgroundColor;
-  color: $theme.menuSelectedEntryLinkColor;
-}
-
-.leftmenu {
-  left:5px;
-  margin-left:10px;
-}
-
-.rightmenu {
-  margin-right: 0px;
-}
-
-#actionmenu .leftmenu a {
-  padding:0 20px 0 5px;
-  color: $theme.menuLinkColor;
-}
-
-#actionmenu .rightmenu a {
-  width: auto;
-  padding:0 20px 0 5px;
-}
-
-#actionmenu .rightmenu .submenuitem a {
-  text-align: right;
-}
-
-/**********************************************************************************************/
-/** Data Content **/
-
-#docextrapanes {
-  background: $theme.pageContentBackgroundColor;
-  border: none;
-  padding:20px 25px 10px;
-}
-
-ul.xwikitabbar {
-  height: 21px;
-  padding-left: 15px;
-  padding-top: 3px;
-  background: $theme.menuBackgroundColor;
-}
-
-.xwikitabbar li {
-  height: 20px;
-  line-height: 20px;
-  margin-right: 5px;
-  width:auto;
-  display: inline-block;
-}
-
-.xwikitabbar li a {
-  color: $theme.menuLinkColor;
-  letter-spacing:0;
-  height: 20px;
-  line-height: 20px !important;
-  padding: 0 10px;
-  display: inline-block;
-}
-
-.xwikitabbar li a, .xwikitabbar li a:visited, .xwikitabbar li a:active {
-  color: $theme.menuLinkColor;
-}
-.xwikitabbar li a:hover {
-  text-decoration: underline;
-}
-
-/* Used pageContentBackgroundColor instead of menuSelectedEntryBackgroundColor, for the Tab look*/
-.xwikitabbar li.active a, .xwikitabbar li.active a:visited, .xwikitabbar li.active a:hover {
-  background: $theme.pageContentBackgroundColor;
-  color: $theme.textPrimaryColor;
-  text-decoration: none;
-}
-
-ul.xwikitabbar li.active a {
-  color: $theme.menuSelectedEntryLinkColor;
-  height: 21px; /* Because of IE7 */
-}
-
-/** Attachments **/
-
-/* Overwrites attachments.css */
-p.noitems {
-  color: $theme.textSecondaryColor;
-  font-size: 0.9em;
-}
-
-.attachment .information {
-  color: $theme.textPrimaryColor;
-}
-
-.attachment .information .size {
-  color: $theme.textSecondaryColor;
-}
-
-.attachment .name, .attachment .name a, .attachment .version , .attachment .version a {
-  display:inline-block;
-  position: relative;
-}
-
-.attachment .version , .attachment .version a {
-  float: none;
-}
-
-.add-file-input, .add-file-input:hover {
-  color: $theme.linkColor;
-}
-
-/* Overwrites attachments.css */
-/* I can't put text-decoration because it's a button. Putting border is not that nice. Another solution were to replace in the code from input to link*/
-#attachform .add-file-input:hover {
-  color: $theme.textPrimaryColor;
-}
-
-/** Comments **/
-
-/* Overwrites comments.css and toucan.css */
-#docextrapanes .commentauthor {
-  font-size:0.9em;
-  font-weight:normal;
-}
-
-/* Overwrites comments.css */
-#docextrapanes .commentauthor a {
-  color: $theme.linkColor !important;
-}
-
-/* Overwrites comments.css */
-#docextrapanes .commentheader {
-  border-bottom: 1px dotted $theme.borderColor;
-  color: $theme.textSecondaryColor;
-}
-
-/* Overwrites comments.css */
-div.commentheader:hover {
-  background-color: $theme.highlightColor;
-}
-
-/* Overwrites comments.css */
-#docextrapanes .commentcontent {
-  font-style: normal;
-}
-
-/* Overwrites comments.css */
-#docextrapanes #AddComment label {
-  font-weight: normal;
-  color: $theme.textSecondaryColor;
-  font-size: 0.9em;
-}
-
-/* Overwrites comments.css */
-#docextrapanes #AddComment {
-  margin-top:10px;
-}
-
-/* Overwrites comments.css and toucan.css */
-#commentscontent .xwikicomment {
-  padding: 0px;
-  margin:0;
-}
-
-/* Overwrites comments.css */
-div#commentscontent form#AddComment div.commentcontainer label {
-  background-image: none;
-}
-
-/* Overwrites comments.css */
-/* Needs testing on IE6 */
-#commentscontent #AddComment .commentcontainer {
-  padding:4px 0px;
-  background-image: none;
-}
-
-/* Overwrites comments.css */
-#AddComment div.commentcontainer textarea {
-  background-color:$theme.pageContentBackgroundColor ;
-  border:1px solid $theme.borderColor;
-}
-
-
-/* Overwrites comments.css. Added li.reply for overriding */
-li.reply div.notification {
-  background-color:$theme.highlightColor;
-  color: $theme.textPrimaryColor;
-  border:1px dotted $theme.borderColor;
-}
-
-/** Information **/
-
-#informationcontent dt {
-  color: $theme.textPrimaryColor;
-}
-
-#informationcontent dd {
-  color: $theme.textPrimaryColor;
-  font-style: normal;
-}
-
-/**********************************************************************************************/
-/** Footer **/
-
-#footerglobal {
-  color: $theme.textPrimaryColor;
-  border: none;
-  padding-top: 0px;
-}
-
-#footerglobal a {
-  color: $theme.linkColor;
-}
-
-/**********************************************************************************************/
-/** Table **/
-
-.mceContentBody table, .main table {
-  margin:1em 0 1em 1px;
-  border-collapse:collapse;
-}
-
-.mceContentBody tr.odd td, .main tr.odd td {
-  background: transparent;
-  border-bottom: 1px solid $theme.borderColor;
-}
-
-.mceContentBody td, .main td {
-  border: none;
-  color: $theme.textColor;
-}
-
-.main th {
-  text-align: left;
-}
-
-.mceContentBody table tr td,
-     .main table tr td {
-  border: 1px solid $theme.borderColor;
-}
-
-table.xwikidatatable tr {
-  border-bottom: 1px solid $theme.borderColor;
-}
-
-table.xwikidatatable td, #historycontent table td  {
-  border: 0px;
-  text-align: left;
-  color: $theme.textPrimaryColor;
-}
-.listGrid table, .listGrid table tr, .listGrid table tr td {
-  border: none;
-}
-
-#historycontent table tr.row.even,
-#historycontent table tr.row.odd {
-    background-color: $theme.pageContentBackgroundColor ;
-}
-
-#historyform .currentversion, #historyform .currentversion td {
-  background-color: $theme.highlightColor;
-  font-weight: normal;
-}
-
-/** Remove div class=center **/
-#historycontent .centered {
-  text-align: left;
-}
-
-/** Remove Navigation from History **/
-.pagedNavigation {
-  text-align: right;
-  color: $theme.textPrimaryColor;
-}
-
-.pagedNavigation .pagedLink {
-  background: none;
-}
-
-.pagedNavigation .inactive {
-  color: $theme.textSecondaryColor;
-}
-
-.pagedNavigation .pagedLink a, .pagedNavigation .pagedLink a:hover {
-  color: $theme.linkColor !important;
-}
-
-.pagedNavigation .pagedLink a:hover {
-  text-decoration: underline;
-}
-
-/**********************************************************************************************/
-/** Buttons **/
-
-input.button {
-  background: $theme.buttonPrimaryBackgroundColor;
-  color: $theme.buttonPrimaryTextColor;
-  border: 1px solid $theme.buttonPrimaryBackgroundColor;
-  text-transform: uppercase;
-  font-size: 0.85em;
-}
-
-input.button:hover {
-  background: $theme.buttonSecondaryBackgroundColor;
-  color: $theme.buttonSecondaryTextColor;
-}
-
-#body .buttonwrapper * {
-  background: $theme.buttonPrimaryBackgroundColor;
-  color: $theme.buttonPrimaryTextColor;
-  border: 1px solid $theme.buttonPrimaryBackgroundColor;
-  cursor: pointer;
-}
-
-.buttonwrapper {
-  display:inline;
-  margin:5px;
-  margin-left: 0px;
-  margin-right: 10px;
-  padding: 0px;
-}
-
-#body .buttonwrapper a:hover, #body .buttonwrapper button:hover, #body .buttonwrapper input.button:hover {
-  background: $theme.buttonSecondaryBackgroundColor;
-  color: $theme.buttonSecondaryTextColor;
-  text-decoration: none;
-  border: 1px solid $theme.buttonPrimaryBackgroundColor;
+.messagetype {
+  display: none;
 }
 
-/**********************************************************************************************/
-/** Other elements **/
-
-.editinfo {
-  color: $theme.textPrimaryColor;
+/* -----------------Message Boxes------------------------*/
+div.floatinginfobox {
+  background-color: #EFEFEF;
+  float: right;
+  margin: 0.66em 0 1em 1em;
+  padding: 10px;
 }
 
-.clearfloats {
-  background-color: transparent;
+#mainContentArea .centered {
+  text-align: center;
 }
 
-.alleditcontent {
-  background: $theme.pageContentBackgroundColor;
+fieldset.xwikimessage {
+  background-color: #EFEFEF;
+  border-top: 4em solid #EFEFEF;
+  display: inline-block;
+  margin: 5em auto;
+  padding: 0 2em 1.5em;
+  text-align: left;
+  width: auto;
 }
 
-.xwikiintracontent fieldset {
-  background: $theme.pageContentBackgroundColor;
+fieldset.xwikimessage legend{
+  background-color: #EFEFEF; /* Opera */
+  color: #005A83;
+  display: inline;
+  font: bold 1.4em sans-serif;
+  height: 1.8em; /* Opera */
+  letter-spacing: 0.4em;
+  margin: 0;
+  padding: 1em 0 0;
+  text-align: left;
+  width: 100%;
 }
 
-.xwikiintracontent legend {
-  color: $theme.titleColor;
-  cursor: default;
+table.xwikilogintable td, table.xwikilogintable th {
+  border: 0;
+  padding: 3px 4px;
 }
 
-#xdocAuthors {
-  padding: 3px 0;
+.xwikimessage table th, .xwikimessage table td {
+  padding: 3px 4px;
+  white-space: nowrap;
 }
 
-.separator {
-  color: $theme.textSecondaryColor;
+.xwikimessage th {
+  border-bottom: 1px solid #D6E1E7;
+  font-size: 0.85em;
+  text-transform: uppercase;
 }
 
-.topbuttons, .bottombuttons {
-  background: $theme.pageContentBackgroundColor;
+fieldset.xwikimessage .xwikimessage {
+  font-size: 110%;
+  font-weight: bold;
   text-align: left;
-  padding:10px 0;
-}
-
-.main p {
-  margin:0.5em 0;
-}
-
-#dhtmltooltip {
-  background-color: $theme.highlightColor;
-  border:1px solid $theme.borderColor;
-  z-index: 500;
 }
 
-/* dataeditors.css - added  dt. */
-#body #xwikiobjects dt label, #body #xwikiclassproperties dt label, #xwikiobjects, #xwikiclassproperties  {
-  color: $theme.textPrimaryColor;
+/* -----------------Rico Accordeon-----------------------*/
+.accordionTabTitleBar h6 {
+  background: #005A83 url( /xwiki/resources/icons/xwiki/accordion.png) 0 50% no-repeat;
+  border-bottom: 1px solid #D6E1E7;
+  border-top: 1px solid #FFFFFF;
+  color: #FFFFFF;
+  font: bold 0.8em / 20px sans-serif;
+  margin: 0;
+  padding: 4px 21px;
+  text-transform: uppercase;
 }
 
-/* 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;
+.accordionTabContentBox {
+  background: #EFEFEF;
+  overflow: hidden;
+  padding: 5px;
 }
 
-.panel input, .panel select, #editPanels dl dd input {
-  background-color:$theme.pageContentBackgroundColor ;
-  color: $theme.textColor;
-  border:1px solid $theme.borderColor;
+#allviewpanels .accordionTabContentBox, #editPanels .accordionTabContentBox {
+  overflow: auto !important;
 }
 
-.bottombuttons input[type="text"] {
-  background-color:$theme.pageContentBackgroundColor ;
-  border:1px solid $theme.borderColor;
-}
+/* @group MACROS */
+/* --------------------------------------------------------------
+  * Different classes for specific macro usage
+-------------------------------------------------------------- */
 
-input[type="text"], input[type="password"], select, textarea {
-  background-color: $theme.pageContentBackgroundColor ;
-  border: 1px solid $theme.borderColor;
-  color: $theme.textColor;
+/* ----------------Message Macro-------------------------*/
+span.errormessage, span.warningmessage, span.infomessage, span.plainmessage {
+  background-position: 2px center;
+  overflow: visible;
+  padding: 0 2px 0 22px;
 }
 
-/**********************************************************************************************/
-/** EDIT MODE **/
-
-body#body.editbody #xwikimaincontainerinner {
-/*   background: $theme.pageBackgroundColor; */
-  margin: 0px;
+/* -----------------Footnote Macro-----------------------*/
+ol.footnotes {
+  border-top: 1px solid #D6E1E7;
+  font-size: 80%;
+  margin: 10px 0;
+  padding: 1em;
 }
 
-/** Edit Panels **/
-
-#editPanels .expanded h1.xwikipaneltitle {
-  background-color: $theme.panelHeaderBackgroundColor;
-  border-bottom: 1px dotted $theme.borderColor;
-  color: $theme.panelHeaderTextColor;
-  text-align: left;
+.footnotes li {
+  padding: 0 4px;
 }
 
-#editPanels .collapsed h1.xwikipaneltitle {
-  background-color: $theme.panelCollapsedBackgroundColor;
-  border: none;
-  color: $theme.panelCollapsedTextColor;
-  text-align: left;
+.footnoteRef:target, .footnotes *:target {
+  background-color: #FFFFDD;
+  border: 1px dotted;
 }
 
-#editPanels .xwikipanelcontents {
-  background: $theme.panelBackgroundColor;
-  padding: 10px 15px;
-  color: $theme.panelTextColor;
+/* --------------Code Macro syntax 1.0-------------------*/
+.java-keyword, .java-object, .xml-tag, .sql-keyword {
+  color: #0000AA;
 }
 
-#editPanels.panels .panel {
-  margin-bottom:10px;
+.java-quote {
+  color: #00AA00;
 }
 
-#editPanels .EditModes .xwikipanelcontents {
-  padding-bottom: 10px;
+/* ------------------Image Macro-------------------------*/
+.imgfloatleft {
+  float: left;
+  margin-right: 1em;
 }
 
-#editPanels .EditModes .xwikipanelcontents ul {
-  padding-top: 0px;
+.imgfloatright {
+  float: right;
+  margin-left: 1em;
 }
 
-#editPanels .EditModes .xwikipanelcontents ul li.active {
-  height: 20px;
-  line-height: 20px;
+.imgleft {
+  text-align: left;
 }
 
-#editPanels .EditModes .xwikipanelcontents ul li a:hover ,
-#editPanels .EditModes .xwikipanelcontents ul li a ,
-#editPanels .EditModes .xwikipanelcontents ul li.active a {
-  color: $theme.linkColor;
+.imgcenter {
+  text-align: center;
 }
 
-#editPanels.panels a {
-  color: $theme.linkColor;
+.imgright {
+  text-align: right;
 }
 
-#editPanels .SyntaxHelp div.xwikipanelcontents {
-  line-height:30px;
-  padding:0 25px 0 10px;
-  height:30px;
+/* --------------------RSS Macro-------------------------*/
+.rssfeed {
+  background-color: #fff;
+  border: 1px dotted #D6E1E7;
+  padding: 8px;
+  width: 300px;
 }
 
-.alleditcontent {
-  padding:0 25px 5px;
+.rssfeed .rsschanneltitle {
+  background-color: #FFFFDD;
+  font-weight: bold;
+  margin-bottom: 10px;
+  padding: 5px;
+  text-align: center;
 }
 
-#admin-page-content p.legend { /* These legends should be standardized */
-  margin-left: 20px;
-  margin-top: 10px;
+.rssfeed .rssitem {
+  padding: 5px;
 }
 
-div#admin-page-content fieldset legend { /* These legends should be standardized */
-  padding-left: 20px;
-  padding-top: 20px;
-  padding-bottom: 20px;
+/* @group PROFILE */
+/* --------------------------------------------------------------
+  * These classes should be moved in XWikiUserSheet ssx
+-------------------------------------------------------------- */
+.specialmenu {
+  background-color: #EFEFEF;
+  padding: 3px;
+  text-align: center;
 }
 
-#panelwizardbuttons, .bottombuttons {
-  text-align: left;
-  padding-left: 20px;
+.specialmenu img {
+  vertical-align: middle;
 }
 
-#xwikieditcontent  {
-  background: $theme.pageContentBackgroundColor;
+.specialmenu ul {
+  display: inline;
+  margin: 0;
+  padding: 5px 0;
 }
 
-ul#panelEditorSteps{ /* Styling for Panel Wizard */
-  border-bottom: 1px solid $theme.borderColor;
-  width: 95%;
+.specialmenu ul li {
+  display: inline;
+  list-style-type: none;
 }
 
-#xwikieditcontentinner {
-  border: 1px solid $theme.borderColor;
+.xwikiuserblog {
+  float: right;
+  padding: 5px;
 }
 
-#editcolumn div.alleditcontent label {
+/* @group ADMINISTRATION */
+/* --------------------------------------------------------------
+  * These classes should be moved in AdminSheet ssx
+-------------------------------------------------------------- */
+/* Overwrites AdminSheet ssx */
+#admin-page-content fieldset p label {
   text-align: left;
 }
 
-/**********************************************************************************************/
-/** ADMIN**/
-
+/* Overwrites AdminSheet ssx */
 #contentcolumn #admin-page-header {
-  background-color: $theme.panelCollapsedBackgroundColor ;
+  background-color: #EBF2F3 ;
 }
 
+/* Overwrites AdminSheet ssx */
 #contentcolumn #admin-page-content {
-  background-color: $theme.pageContentBackgroundColor ;
-}
-
-#contentcolumn #admin-page-content #xwikieditcontent {
-  padding-right: 20px;
-  padding-left: 20px;
-}
-
-.accordionTabContentBox .panelitemc .label {
-  color: $theme.textPrimaryColor;
-}
-
-.placeholder {
-  opacity:0.4;
+  background-color: #FFFFFF;
+  padding: 0;
 }
 
-#panelEditorSteps .active {
-  border: 1px solid $theme.borderColor;
-  border-bottom: 0; /*Some problems in IE6 because of  */
+/* Overwrites usersandgroups.css */
+#tdAddNewUserOrGroup .buttonwrapper  a{
+  background-image: none;
+  display: inline;
+  font-size: 0.8em;
+  height: auto;
+  width: auto;
 }
 
-#xwikieditcontent .accordionTabTitleBar h6 {
-  background-color: $theme.panelCollapsedBackgroundColor;
-  line-height:20px;
-  color: $theme.panelHeaderBackgroundColor;
-  border-top: 1px solid $theme.pageContentBackgroundColor;
-  border-bottom: 1px solid $theme.borderColor;
+/* Overwrites usersandgroups.css */
+#tdAddNewUserOrGroup .buttonwrapper  a:hover {
+  color: #005A83;
 }
 
+/* ------------------Panel Wizard------------------------*/
 .panelcontainer {
-  border: 1px solid $theme.borderColor;
-  background-color: $theme.pageBackgroundColor;
+  background-color: #D6E1E7;
+  border: 1px solid #D6E1E7;
+  height: 200px;
+  overflow: hidden;
+  padding: 3px;
 }
 
 .panelitemc .xwikibuttonlink {
-  border-color: $theme.borderColor;
+  border: 1px solid #D6E1E7;
+  border-top: 0;
+  text-align: center;
 }
 
 .panelitemc .xwikibuttonlink a {
-  color: $theme.linkColor;
+  padding: 0 5px;
 }
 
-.panel, .fakepanel {
-  margin: auto;
+.panelitemc {
+  float: left;
+  height: 256px;
+  margin: 0 4px;
+  width: 210px;
 }
 
-#PanelListSection, #panellistaccordion, #PageLayoutSection {
-  margin-top: 10px;
-  color: $theme.textPrimaryColor ;
+.panelitemc .label {
+  color: #4D4D4D;
+  font-weight: bold;
+  padding: 2px 0;
+  text-align: center;
 }
 
-#userstable, #groupstable, #usersandgroupstable, #alldocstable,
-#userstable td, #groupstable td, #usersandgroupstable td, #alldocstable td {
-  border: 0;
+.placeholder {
+  background-color: #EFEFEF;
+  margin-left: 10px;
+  width: 170px;
 }
 
-/**********************************************************************************************/
-/** SEARCH **/
-#body #globalsearch input {
-  background-color:$theme.pageContentBackgroundColor ;
-  border:1px solid $theme.borderColor;
-  padding:0 2px;
+#dhtmltooltip {
+  background-color: #FFFFDD;
+  border: 1px solid #D6E1E7;
+  padding: 2px 4px;
+  position: absolute;
+  text-align: justify;
+  z-index: 500;
 }
 
-#body #globalsearch input.button {
-  background: transparent;
-  color: $theme.buttonPrimaryTextColor;
+#panelwizardbuttons {
+  margin: 15px 0 10px;
 }
 
-/**********************************************************************************************/
-/** NEW ELEMENTS introduced just for this skin **/
-
-.submenu {
-  width: auto !important;
-}
-#actionmenu .submenuitem a, #actionmenu .submenuitem a:link, #actionmenu .submenuitem a:visited, #actionmenu .submenuitem a:active {
-  width: auto;
-}
-.alleditcontent {
-  margin-top: 0;
-}
-#editPanels.panels {
-  margin-top: 0;
-  padding-top: 0;
-}
-.language-current {
-  font-weight: bold;
-}
-.language-default {
-  text-decoration: underline;
-}
-#headerlanguages {
-  padding-top: 8px;
-  display: block;
-  text-align: right;
-}
-#globallinks {
-  padding: 8px 20px;
-}
-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;
-  padding: 0px 0px 5px;
-}
-#document-info {
-  text-align:right;
-  color: $theme.textPrimaryColor;
-  font-size: 90%;
-  padding: 3px 0px;
-  margin-bottom: 1em;
+#PanelListSection, #PageLayoutSection {
+  margin: 15px 0 0;
 }
 
-.xdocLastModification {
-  float: left;
-  width:48%;
-  text-align: left;
+/* ----------------Page Layout Selection-----------------*/
+.pagelayoutoption {
+  text-align: center;
+  width: 106px;
 }
 
-
-/**********************************************************************************************/
-/**********************************************************************************************/
-/**********************************************************************************************/
-/** MODIFIED PROPERTIES**/
-
-.itemCount {
-  color: $theme.textPrimaryColor;
+.pagelayoutoptions  table {
+  margin: 1em 0 0;
+  width: 100%;
 }
 
-.code, .box {
-  background-color: $theme.backgroundSecondaryColor;
-  border: 1px dotted $theme.borderColor;
-}
-.rssfeed {
-  background-color: $theme.pageContentBackgroundColor;
-  border: 1px dotted $theme.borderColor;
-}
-.rssfeed div.rsschanneltitle {
-  background-color: $theme.highlightColor;
-  border-color: $theme.borderColor;
+.pagelayoutoptions  table td {
+  border: 0;
 }
 
-.wikicreatelinktext {
-  color: $theme.textPrimaryColor;
-}
-.wikicreatelinkqm {
-  background-color: $theme.buttonPrimaryBackgroundColor;
+.pagelayoutoption label {
+  color: #888888;
 }
 
-.footnoteRef:target, .footnotes *:target {
-  border-color: $theme.borderColor;
-  background: $theme.highlightColor;
+div.layoutmaquette {
+  height: 100px;
+  padding: 5px;
+  width: 100px;
 }
 
-.errormessage, .warningmessage, .infomessage, .plainmessage {
-  background-color: $theme.backgroundSecondaryColor;
-  border: 1px dotted $theme.borderColor;
-}
-.floatinginfobox {
-  background-color: $theme.backgroundSecondaryColor;
-  border-color: $theme.pageContentBackgroundColor;
-}
-.specialmenu {
-  background-color: $theme.backgroundSecondaryColor;
-  border-color: $theme.borderColor;
-}
-span.wikicreatelink a {
-  color: $theme.linkColor;
+div.lmcontentcolumn {
+  background-color: #eee;
+  border: 1px solid #aaa;
+  height: 90px;
 }
 
-/* Changed the bg-color */
-.mceContentBody tr.table-head td, .main th {
-  background: $theme.backgroundSecondaryColor;
-  border: 1px solid $theme.borderColor;
-  color: $theme.textColor;
-  font-size: 1em;
-  line-height:1em;
+div.lmleftcolumn, div.lmrightcolumn {
+  background-color: #ddd;
+  border: 1px solid #aaa;
+  float: left;
+  height: 60px;
+  width: 20px;
 }
 
-/* Changed the bg-color */
-table.xwikidatatable, table.xwikidatatable th {
-  border: 0px;
-  background-color: $theme.backgroundSecondaryColor;
-  color: $theme.textPrimaryColor;
-  font-size: 0.9em;
-  text-align: left;
+div.lmrightcolumn {
+  float: right;
 }
 
-/* Changed the bg-color */
-#historycontent table th {
-  text-align: left;
-  background-color: $theme.backgroundSecondaryColor;
+#leftcolumn div.lmcontentcolumn {
+  margin-left: 24px;
 }
 
-/* Changed the bg-color */
-#allviewpanels .accordionTabContentBox {
-  background: $theme.backgroundSecondaryColor;
-  color: $theme.textPrimaryColor;
+#rightcolumn div.lmcontentcolumn {
+  margin-right: 24px;
 }
 
-/*Wysiwyg.css*/
-table.xRichTextEditorTabPanel td {
-  background-color:$theme.pageContentBackgroundColor;
+#bothcolumns div.lmcontentcolumn {
+  margin-left: 24px;
+  margin-right: 24px;
 }
 
-/* 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,
-h1.xwikipaneltitle,
-#editPanels .expanded h1.xwikipaneltitle ,
-#editPanels .collapsed h1.xwikipaneltitle,
-table.xwikidatatable th,
-#actionmenu a,
-#informationcontent 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 */  {
-  font-style: normal;
-  font-size: 0.8em;
-  font-weight: bold;
-  text-transform: uppercase;
-}
-#body .buttonwrapper *, #actionmenu a {
-  white-space: nowrap;
+div.pagelayoutoption:hover .layoutmaquette {
+  background-color: #FFFFDD;
 }
 
-.xwikipanelcontents dl dd {
-  margin-bottom:1em;
+div.pagelayoutoption:hover .lmcontentcolumn {
+  background-color: #ddd;
 }
 
-.xwikipanelcontents dl dt{
-  font-size:1em;
+div.pagelayoutoption:hover .lmleftcolumn,
+  div.pagelayoutoption:hover .lmrightcolumn {
+  background-color: #acf;
 }
 
-/* The font-size is messed up all over */
-.xwikipanelcontents label {
-   font-size:1.1em;
+#selectedoption .lmcontentcolumn {
+  background-color: #acf;
 }
 
-#editPanels form input, #editPanels form select {
-  font-size: 1.3em;
+#selectedoption .lmleftcolumn,
+  #selectedoption .lmrightcolumn {
+  background-color: #369;
 }
 
-#editPanels .xwikipanelcontents .buttonwrapper input.button {
-  font-size: 1em;
+#selectedoption label, .pagelayoutoption:hover label {
+  color: #005A83;
 }
 
-/* class padded should be removed from "Add Property" Panel */
-.xwikipanelcontents div.padded {
-  font-size: 1em;
+/* @group BLOG  */
+/* --------------------------------------------------------------
+  * These classes should be moved in BlogStyle ssx file
+-------------------------------------------------------------- */
+input#tags {
+  width: 99.8%;
 }
 
-.xwikipanelcontents dt label{
-  font-size: 1em;
-}
+/* @group OTHER  */
+/* --------------------------------------------------------------
+  * These classes should be moved in their specific files
+-------------------------------------------------------------- */
 
-#editPanels .expanded h1.xwikipaneltitle {
-  letter-spacing: 0;
+/* -------------SmartClient tree overrides---------------*/
+body .listGrid {
+  border: none;
 }
 
-/* Should have the same styling as #xwikieditcontent .accordionTabTitleBar h6 */
-/* This is found in Rights Editor Help Panel */
-.accordionTabTitleBar h6 {
-  background-color: $theme.panelCollapsedBackgroundColor;
-  line-height:20px;
-  color: $theme.panelHeaderBackgroundColor;
-  background-image: url( $xwiki.getSkinFile('icons/xwiki/accordion.png') );
-  background-position:0 50%;
-  background-repeat:no-repeat;
-  padding:4px 21px;
-  border-top: 1px solid $theme.pageContentBackgroundColor;
-  border-bottom: 1px solid $theme.borderColor;
+#XWEWrapper {
+  margin: 0 !important;
 }
 
-.accordionTabContentBox {
-  background: $theme.backgroundSecondaryColor;
+/* -----------------------YUI Trees----------------------*/
+.ygtvitem table {
+  border: none !important;
+  margin: 0 !important;
 }
-
-/* SmartClient tree overrides */
-body .listGrid {
-  border: none;
+.ygtvitem td {
+  border: none !important;
+  padding: 0 !important;
 }
-#XWEWrapper {
-  margin: 0 !important;
+
+/* ------------------------Dif---------------------------*/
+/* Should be in microformats.css - Recent Members */
+h1 span span, h2 span span, h3 span span, h4 span span {
+  border-bottom: 0;
+  margin-bottom: 0;
 }
 
-/* Hide the Search panel since this functionality is included in the header */
-.panels .Search {
-  display: none;
+/* Should be in RecentChanges ssx*/
+table.recentChanges {
+  border-collapse: separate;
 }
 
-fieldset.xwikimessage, div.xwikimessage {
-  background-color: $theme.backgroundSecondaryColor;
-  border-top-color: $theme.backgroundSecondaryColor;
+/* Overwrites RecentChanges ssx - added td*/
+td.recentChangesLeft {
+  background-color: #EFEFEF;
+  text-align: center;
 }
 
-fieldset.xwikimessage legend, div.xwikimessage h3 {
-  color: $theme.titleColor;
-  background: $theme.backgroundSecondaryColor; /* For Opera */
+/* Overwrites pagination.css - added div */
+div.paginationFilter {
+  border-color: #D6E1E7;
 }
 
 /* Style used to improve Accessibility but for elements that shouldn't be displayed visually.
Index: src/main/resources/colibri/edit.vm
===================================================================
--- src/main/resources/colibri/edit.vm	(revision 25034)
+++ src/main/resources/colibri/edit.vm	(working copy)
@@ -28,8 +28,8 @@
 #template("xwikivars.vm")
 #template("layoutvars.vm")
 #template("htmlheader.vm")
-#template("header.vm")
 #template("menuedit.vm")
+#template("header.vm")
 #if($editor == 'wiki' || $editor == 'wysiwyg')
   <form id="edit" method="post" action="$doc.getURL('preview')" >
   ## Pass the section number when the form is submitted in order to affect only the specified section.
Index: src/main/resources/colibri/menuedit.vm
===================================================================
--- src/main/resources/colibri/menuedit.vm	(revision 0)
+++ src/main/resources/colibri/menuedit.vm	(revision 0)
@@ -0,0 +1,9 @@
+#if($context.getMode()==0)## Visible only in a page
+<div id="mainmenu" class="actionmenu layoutsubsection">
+<div class="centered">
+<div class="editinfo">
+$msg.get("editing"): <a href="$doc.getURL()">$doc.name</a>
+</div>
+</div>
+</div>
+#end
\ No newline at end of file
Index: src/main/resources/colibri/startpage.vm
===================================================================
--- src/main/resources/colibri/startpage.vm	(revision 0)
+++ src/main/resources/colibri/startpage.vm	(revision 0)
@@ -0,0 +1,15 @@
+#template("xwikivars.vm")
+#template("layoutvars.vm")
+#template("htmlheader.vm")
+<div id="menuview">
+  #template("menuview.vm")
+</div>
+#template("header.vm")
+<div class="content#if($showLeftPanels == "0")hideleft#end#if($showRightPanels == "0")hideright#end" id="contentcontainer">
+<div id="contentcontainerinner">
+<div class="leftsidecolumns">
+#if($hidecolumns && ($!hidecolumns == 1))
+  <div id="contentcolumn" class="contenthidelefthideright">
+#else
+  <div id="contentcolumn"> ## class="content#if($showLeftPanels == "0")hideleft#end#if($showRightPanels == "0")hideright#end">
+#end
\ No newline at end of file