From 468073b1315804f5157655362149f284647a7f76 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 4 Nov 2009 22:13:20 +0000
Subject: [PATCH] Major refresh of CSS stylesheets.

Monotone-Parent: 508bbe52515b0ad7119c755b4cc91d17e313c06b
Monotone-Revision: d09001490c2d88332ef3ec446bfd0aa488d0de8c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-11-04T22:13:20
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                     |  16 +
 SoObjects/SOGo/SOGoUser.h                     |   1 +
 UI/Common/UIxPageFrame.m                      |   5 +
 .../AdministrationUI/UIxAdministration.wox    |   2 +-
 UI/Templates/ContactsUI/UIxContactEditor.wox  |  58 +-
 .../ContactsUI/UIxContactFoldersView.wox      |  99 +--
 .../ContactsUI/UIxContactsMailerSelection.wox |  18 +-
 .../ContactsUI/UIxContactsUserFolders.wox     |   3 +-
 .../UIxContactsUserRightsEditor.wox           |   9 +-
 UI/Templates/ContactsUI/UIxListEditor.wox     |  48 +-
 .../MailPartViewers/UIxMailPartICalViewer.wox |  58 +-
 UI/Templates/MailerUI/UIxMailEditor.wox       |   4 +-
 UI/Templates/MailerUI/UIxMailListView.wox     |   2 +-
 .../MailerUI/UIxMailUserRightsEditor.wox      |   9 +-
 UI/Templates/MainUI/SOGoRootPage.wox          |   6 +-
 UI/Templates/PreferencesUI/UIxPreferences.wox |  63 +-
 .../SchedulerUI/UIxAttendeesEditor.wox        |  28 +-
 .../SchedulerUI/UIxCalDateSelector.wox        |   5 +-
 UI/Templates/SchedulerUI/UIxCalDayView.wox    |   4 +-
 UI/Templates/SchedulerUI/UIxCalMainView.wox   |  34 +-
 UI/Templates/SchedulerUI/UIxCalMonthView.wox  |   4 +-
 .../SchedulerUI/UIxCalMulticolumnDayView.wox  |   4 +-
 .../SchedulerUI/UIxCalUserRightsEditor.wox    |   9 +-
 UI/Templates/SchedulerUI/UIxCalWeekView.wox   |   4 +-
 .../SchedulerUI/UIxCalendarProperties.wox     |  19 +-
 .../SchedulerUI/UIxCalendarSelector.wox       |  63 +-
 UI/Templates/SchedulerUI/UIxDatePicker.wox    |   6 +-
 .../SchedulerUI/UIxOccurenceDialog.wox        |   9 +-
 .../SchedulerUI/UIxRecurrenceEditor.wox       |  10 +-
 .../SchedulerUI/UIxReminderEditor.wox         |   8 +-
 UI/Templates/SchedulerUI/UIxTaskEditor.wox    |   4 +-
 UI/Templates/UIxAclEditor.wox                 |  18 +-
 UI/Templates/UIxPageFrame.wox                 |   5 +-
 UI/Templates/UIxToolbar.wox                   |  14 +-
 UI/WebServerResources/AdministrationUI.css    |  25 +-
 UI/WebServerResources/ContactsUI.css          |  42 +-
 UI/WebServerResources/ContactsUI.js           |  57 +-
 UI/WebServerResources/MailerUI.css            |  63 +-
 UI/WebServerResources/MailerUI.js             |  33 +-
 UI/WebServerResources/SOGoAutoCompletion.js   |   5 +-
 UI/WebServerResources/SOGoRootPage.css        |  24 +-
 UI/WebServerResources/SOGoRootPage.js         | 215 +++---
 UI/WebServerResources/SchedulerUI.css         |  90 +--
 UI/WebServerResources/SchedulerUI.js          |  76 +-
 UI/WebServerResources/UIxAclEditor.css        |  23 +-
 UI/WebServerResources/UIxAclEditor.js         | 196 +++---
 .../UIxAppointmentEditor.css                  |   2 +-
 UI/WebServerResources/UIxAttendeesEditor.css  |  50 +-
 UI/WebServerResources/UIxAttendeesEditor.js   |  10 +-
 .../UIxCalUserRightsEditor.css                |   3 +-
 .../UIxCalUserRightsEditor.js                 |  14 +-
 .../UIxCalendarProperties.css                 |  23 +-
 .../UIxCalendarProperties.js                  |  26 +-
 UI/WebServerResources/UIxComponentEditor.css  |  11 +
 UI/WebServerResources/UIxComponentEditor.js   |   4 +-
 UI/WebServerResources/UIxContactEditor.css    |  42 +-
 UI/WebServerResources/UIxContactEditor.js     |  12 +-
 .../UIxContactsUserFolders.css                |  15 +-
 .../UIxContactsUserFolders.js                 |  96 +--
 .../UIxContactsUserRightsEditor.js            |  15 +-
 UI/WebServerResources/UIxListEditor.css       |  66 +-
 UI/WebServerResources/UIxListEditor.js        |  14 +-
 UI/WebServerResources/UIxMailEditor.css       |  15 +-
 UI/WebServerResources/UIxMailEditor.js        |  11 +-
 UI/WebServerResources/UIxMailPopupView.js     |   1 -
 .../UIxMailUserRightsEditor.js                |  14 +-
 UI/WebServerResources/UIxOccurenceDialog.css  |   3 +
 UI/WebServerResources/UIxPreferences.css      |  41 +-
 UI/WebServerResources/UIxRecurrenceEditor.css |  27 +-
 UI/WebServerResources/UIxReminderEditor.css   |  23 -
 UI/WebServerResources/add-icon.png            | Bin 0 -> 1133 bytes
 UI/WebServerResources/arrow-down.png          | Bin 0 -> 283 bytes
 UI/WebServerResources/arrow-left.png          | Bin 0 -> 261 bytes
 UI/WebServerResources/arrow-right.png         | Bin 0 -> 279 bytes
 UI/WebServerResources/arrow-up.png            | Bin 0 -> 203 bytes
 UI/WebServerResources/btn_a_bg.png            | Bin 0 -> 1019 bytes
 UI/WebServerResources/btn_span_bg.png         | Bin 0 -> 3939 bytes
 UI/WebServerResources/generic.css             | 655 ++++++++++--------
 UI/WebServerResources/generic.js              |  80 +--
 UI/WebServerResources/iefixes.css             |  78 ++-
 UI/WebServerResources/input_bg.gif            | Bin 0 -> 2492 bytes
 UI/WebServerResources/remove-icon.png         | Bin 0 -> 1011 bytes
 .../smalltoolbarbtn_a_bg.png                  | Bin 0 -> 1047 bytes
 .../smalltoolbarbtn_span_bg.png               | Bin 0 -> 4912 bytes
 UI/WebServerResources/tab_a_active_bg.png     | Bin 0 -> 977 bytes
 UI/WebServerResources/tab_a_inactive_bg.png   | Bin 0 -> 961 bytes
 UI/WebServerResources/tab_span_active_bg.png  | Bin 0 -> 1408 bytes
 .../tab_span_inactive_bg.png                  | Bin 0 -> 1222 bytes
 UI/WebServerResources/tbtv_junction_17x17.gif | Bin 82 -> 4483 bytes
 UI/WebServerResources/thead_bg.png            | Bin 0 -> 951 bytes
 UI/WebServerResources/toolbarbtn_a_bg.png     | Bin 0 -> 1030 bytes
 UI/WebServerResources/toolbarbtn_span_bg.png  | Bin 0 -> 4405 bytes
 92 files changed, 1538 insertions(+), 1311 deletions(-)
 create mode 100644 UI/WebServerResources/add-icon.png
 create mode 100644 UI/WebServerResources/arrow-down.png
 create mode 100644 UI/WebServerResources/arrow-left.png
 create mode 100644 UI/WebServerResources/arrow-right.png
 create mode 100644 UI/WebServerResources/arrow-up.png
 create mode 100644 UI/WebServerResources/btn_a_bg.png
 create mode 100644 UI/WebServerResources/btn_span_bg.png
 create mode 100644 UI/WebServerResources/input_bg.gif
 create mode 100644 UI/WebServerResources/remove-icon.png
 create mode 100644 UI/WebServerResources/smalltoolbarbtn_a_bg.png
 create mode 100644 UI/WebServerResources/smalltoolbarbtn_span_bg.png
 create mode 100644 UI/WebServerResources/tab_a_active_bg.png
 create mode 100644 UI/WebServerResources/tab_a_inactive_bg.png
 create mode 100644 UI/WebServerResources/tab_span_active_bg.png
 create mode 100644 UI/WebServerResources/tab_span_inactive_bg.png
 create mode 100644 UI/WebServerResources/thead_bg.png
 create mode 100644 UI/WebServerResources/toolbarbtn_a_bg.png
 create mode 100644 UI/WebServerResources/toolbarbtn_span_bg.png

diff --git a/ChangeLog b/ChangeLog
index 46aac0a9f..c0e49e7c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-04  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* Major refresh of CSS stylesheets.
+	* UI/WebServerResources/SOGoAutoCompletion.js
+	(performSearchCallback): fixed position of popup menu when used in
+	the contacts list editor.
+
 2009-11-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/NSDictionary+Utilities.m
@@ -57,6 +64,15 @@
 	when clicking on Accept/Decline/Delegate into
 	the user's calendar if it's not in there already.
 
+2009-10-27  Cyril Robert <crobert@inverse.ca>
+
+	* UI/Common/UIxPageFrame.m (userEmail): Added to display the user's email
+	address in the linkBanner.
+	* UI/Contacts/UIxListView.m 
+	(itemHref, itemName, itemEmail): Added to allow clickable email addresses in
+	UIxListView.
+	(itemText): Removed, no longer needed.
+
 2009-10-27  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
         * SoObjects/SOGo/SOGoGCSFolder.m (create)
diff --git a/SoObjects/SOGo/SOGoUser.h b/SoObjects/SOGo/SOGoUser.h
index 80da3c315..a1f1adf28 100644
--- a/SoObjects/SOGo/SOGoUser.h
+++ b/SoObjects/SOGo/SOGoUser.h
@@ -96,6 +96,7 @@ extern NSString *SOGoWeekStartFirstFullWeek;
 /* properties */
 - (NSArray *) allEmails;
 - (BOOL) hasEmail: (NSString *) email;
+- (NSString *) systemEmail;
 - (NSString *) cn;
 - (NSURL *) freeBusyURL;
 
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index 346612382..ca65b128f 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -399,6 +399,11 @@ static NSString *siteFavicon = nil;
 	  && [user isSuperUser]);
 }
 
+- (NSString *) userEmail
+{
+  return [[context activeUser] systemEmail];
+}
+
 - (BOOL) canLogoff
 {
   BOOL canLogoff;
diff --git a/UI/Templates/AdministrationUI/UIxAdministration.wox b/UI/Templates/AdministrationUI/UIxAdministration.wox
index 6e08dba8f..887efd5b6 100644
--- a/UI/Templates/AdministrationUI/UIxAdministration.wox
+++ b/UI/Templates/AdministrationUI/UIxAdministration.wox
@@ -14,7 +14,7 @@
     <div>
       <h3><!-- module title --></h3>
       <div><!-- module description --></div>
-      <p class="button"><a href="#" class="button" id="helpDialogClose"><var:string label:value="Close"/></a></p>
+      <a href="#" class="button" id="helpDialogClose"><span><var:string label:value="Close"/></span></a>
     </div>
   </div>
 
diff --git a/UI/Templates/ContactsUI/UIxContactEditor.wox b/UI/Templates/ContactsUI/UIxContactEditor.wox
index 5aae443a6..67531112a 100644
--- a/UI/Templates/ContactsUI/UIxContactEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditor.wox
@@ -9,11 +9,10 @@
     title="name"
     const:popup="YES"
     >
-    <form var:href="saveURL" name="editform"
-      onsubmit="return validateContactEditor()">
+    <form var:href="saveURL" name="editform" id="mainForm">
 
-      <var:if condition="isNew"><div id="addressBookSelector">
-	<style type="text/css">DIV#editorTabs { top: 3.0em; };</style>
+  <var:if condition="isNew"><div id="addressBookSelector">
+	<style type="text/css">DIV#editorTabs { top: 4.5em; };</style>
 	<var:string label:value="Add to:" />
 	<var:popup const:id="addressBooksList"
 		   list="addressBooksList" item="addressBookItem"
@@ -24,14 +23,18 @@
 
       <div class="tabsContainer" id="editorTabs">
         <ul>
-          <li target="baseInfos"><var:string label:value="Contact" /></li>
-          <li target="addressesInfos"><var:string label:value="Address" /></li>
-          <li target="otherInfos"><var:string label:value="Other" /></li>
+          <li target="baseInfos">
+            <span><var:string label:value="Contact" /></span>
+          </li>
+          <li target="addressesInfos">
+            <span><var:string label:value="Address" /></span></li>
+          <li target="otherInfos">
+            <span><var:string label:value="Other" /></span></li>
         </ul>
 
         <div id="baseInfos" class="tab">
-	  <span class="caption"><var:string label:value="Name" /></span>
-          <table>
+          <span class="caption"><var:string label:value="Name" /></span>
+          <table class="frame">
             <tr>
               <td>
                 <label><var:string label:value="First:" />
@@ -66,8 +69,8 @@
               </td>
             </tr>
           </table>
-	  <span class="caption"><var:string label:value="Internet" /></span>
-          <table id="emailInfos">
+          <span class="caption"><var:string label:value="Internet" /></span>
+          <table class="frame" id="emailInfos">
             <tr>
               <td>
                 <label><var:string label:value="Email:" />
@@ -106,8 +109,8 @@
               </td>
             </tr>
 	  </table>
-	  <span class="caption"><var:string label:value="Phones" /></span>
-          <table>
+    <span class="caption"><var:string label:value="Phones" /></span>
+          <table class="frame">
             <tr>
               <td>
                 <label><var:string label:value="Work:" />
@@ -167,7 +170,7 @@
 
         <div id="addressesInfos" class="tab">
 	  <span class="caption"><var:string label:value="Home" /></span>
-          <table>
+          <table class="frame">
             <tr>
               <td colspan="2">
                 <label><var:string label:value="Address:" />
@@ -223,8 +226,8 @@
               </td>
             </tr>
           </table> 
-	  <span class="caption"><var:string label:value="Work" /></span>
-	  <table>
+          <span class="caption"><var:string label:value="Work" /></span>
+          <table class="frame">
             <tr>
               <td colspan="2">
                 <label>
@@ -234,8 +237,8 @@
                     var:value="snapshot.title" />
                 </label>
               </td>
-	    </tr>
-	    <tr>
+            </tr>
+            <tr>
               <td colspan="2">
                 <label>
                   <var:string label:value="Department:" />
@@ -311,7 +314,7 @@
         </div>
 
         <div id="otherInfos" class="tab">
-          <table>
+          <table class="framenocaption">
             <tr>
               <td class="firstColumn">
                 <label><var:string label:value="Birthday:" />
@@ -345,18 +348,13 @@
         </div>
       </div>
       <div id="buttons">
-        <input
-	  id="cancelButton"
-          type="button"
-          class="button"
-          label:value="Cancel"
-          name="cancel"/>
         <var:if condition="canCreateOrModify"
-	><input
-	    type="submit"
-	    class="button"
-	    label:value="Save"
-	    name="submit" /></var:if>
+          ><a class="button actionButton" name="submit" id="submitButton"> 
+            <span><var:string label:value="Save" /></span>
+          </a></var:if>
+        <a id="cancelButton" class="button" name="cancel">
+          <span><var:string label:value="Cancel"/></span>
+        </a>
       </div>
     </form>
   </var:component>
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index ceda245fa..01513ff06 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -22,6 +22,7 @@
     </var:if><var:if condition="contactsListContentStyle">
       DIV#contactsListContent
        { height: <var:string value="contactsListContentStyle" />; }
+    </var:if><var:if condition="isPopup">
     </var:if>
     </style>
 
@@ -34,8 +35,11 @@
         onsubmit="return AIM.submit(this, {'onStart' : validateUploadForm, 
         'onComplete' : uploadCompleted})">
         <p><input type="file" name="contactsFile" id="contactsFile" /></p>
-        <p class="buttons"><input class="button" type="submit" const:id="uploadSubmit" label:value="Upload"/>
-          <input class="button" type="button" const:id="uploadCancel" label:value="Cancel"/></p>
+        <p><a href="#" class="button actionButton" id="uploadSubmit"
+            onclick="if($('uploadForm').onsubmit()) $('uploadForm').submit()">
+            <span><var:string label:value="Upload" /></span></a>
+          <a href="#" class="button" const:id="uploadCancel">
+            <span><var:string label:value="Cancel" /></span></a></p>
       </form>
     </div>
   </div>
@@ -44,8 +48,8 @@
     <div>
       <h3><var:string label:value="Import Cards"/></h3>
       <p id="uploadResultsContent"><!-- empty --></p>
-      <p class="buttons"><input class="button" type="button" const:id="uploadOK" 
-          label:value="Done"/></p>
+      <p><a href="#" class="button" const:id="uploadOK">
+          <span><var:string label:value="Done" /></span></a></p>
     </div>
   </div>
     
@@ -78,50 +82,55 @@
       </ul>
     </div>
 
-      <!--	var:if condition="isPopup" const:negate="YES" -->
-      <!--          <var:if condition="hideFolderTree" const:negate="YES" -->
-      <div class="contactFoldersList" id="contactFoldersList">
-	<div class="titlediv"
-	  ><var:string label:value="Address Books"
-	    /></div>
-	<!-- var:if var:condition="isPopup" const:negate="YES" -->
-	<div class="toolbar" id="abToolbar">
-	  <a href="#" class="toolbarButton"
-	    ><span class="toolbarButton"
-	      ><img rsrc:src="add-addressbook.png" label:title="New Addressbook..."
-		/></span></a
-	    ><a href="#" class="toolbarButton"
-	    ><span class="toolbarButton"
-	      ><img rsrc:src="add-user-addressbook.png" label:title="Subscribe to an Addressbook..."
-		/></span></a
-	    ><a href="#" class="toolbarButton"
-	    ><span class="toolbarButton"
-	      ><img rsrc:src="remove-addressbook.png" label:title="Remove the selected Addressbook"
-		/></span></a
-	    ></div><!-- var:if -->
-
-	<ul id="contactFolders">
-	  <var:foreach list="contactFolders" item="currentFolder"
-	    ><li var:id="currentContactFolderId"
-	      var:owner="currentContactFolderOwner"
-	      var:class="currentContactFolderClass"
-	      ><var:string value="currentContactFolderName" /></li
-	      ></var:foreach
-	    >
-	</ul>
-
-	<var:if condition="hasContactSelectionButtons">
-	  <div class="contactSelection">
-	    <var:component value="selectorComponent" />
-	  </div>
-	</var:if>
+    <div class="contactFoldersList" id="contactFoldersList">
+      <div class="tabsContainer" id="smallToolbarContainer">
+        <ul>
+          <li target="abToolbar">
+            <span><var:string label:value="Address Books" /></span>
+          </li>
+        </ul>
+        <div id="abToolbar" class="tab">
+          <a href="#" class="smallToolbarButton">
+            <span><img rsrc:src="add-addressbook.png" 
+                label:title="New Addressbook..."/>
+            </span>
+          </a>
+          <a href="#" class="smallToolbarButton">
+            <span>
+              <img rsrc:src="add-user-addressbook.png" 
+                label:title="Subscribe to an Addressbook..." />
+            </span>
+          </a>
+          <a href="#" class="smallToolbarButton">
+            <span>
+              <img rsrc:src="remove-addressbook.png" 
+                label:title="Remove the selected Addressbook"/>
+            </span>
+          </a>
+        </div>
       </div>
 
-      <div class="dragHandle" id="dragHandle"><!-- space --></div>
-      <!-- var:if -->
+      <ul id="contactFolders">
+        <var:foreach list="contactFolders" item="currentFolder"
+          ><li var:id="currentContactFolderId"
+            var:owner="currentContactFolderOwner"
+            var:class="currentContactFolderClass"
+            ><var:string value="currentContactFolderName" /></li
+          ></var:foreach
+        >
+      </ul>
 
-      <div id="rightPanel">
-	<var:component className="UIxContactsFilterPanel" qualifier="qualifier" />
+      <var:if condition="hasContactSelectionButtons">
+        <div class="contactSelection">
+          <var:component value="selectorComponent" />
+        </div>
+      </var:if>
+    </div>
+
+    <div class="dragHandle" id="dragHandle"><!-- space --></div>
+
+    <div id="rightPanel">
+      <var:component className="UIxContactsFilterPanel" qualifier="qualifier" />
 
 	<div id="contactsListContent"><!-- space --></div>
 
diff --git a/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox b/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox
index 7b391ccba..ab7b86883 100644
--- a/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox
+++ b/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox
@@ -9,16 +9,10 @@
   xmlns:rsrc="OGo:url"
   id="contactSelectionButtons">
   <span id="selectionLabel"><var:string label:value="Add as..."/></span><br/>
-  <input type="submit"
-    class="button"
-    label:value="Recipient"
-    name="to"/><br/>
-  <input type="submit"
-      class="button"
-    label:value="Carbon Copy"
-    name="cc"/><br/>
-  <input type="submit"
-    class="button"
-    label:value="Blind Carbon Copy"
-    name="bcc"/>
+  <p id="mailerSelectionContainer"><a href="#" class="button" name="to">
+      <span><var:string label:value="Recipient" /></span></a>
+    <br/><a href="#" class="button" name="cc">
+      <span><var:string label:value="Carbon Copy" /></span></a>
+  <br/><a href="#" class="button" name="bcc">
+      <span><var:string label:value="Blind Carbon Copy" /></span></a></p>
 </span>
diff --git a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
index c7afc736e..fe5bb2dc2 100644
--- a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
+++ b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
@@ -15,6 +15,7 @@
   <var:component className="UIxContactsFilterPanel" qualifier="qualifier" />
   <div id="folders"><!-- space --></div>
   <div id="buttons">
-    <input type="submit" id="addButton" class="button" label:value="Add..." const:disabled="YES" />
+    <a id="addButton" class="button actionButton disabled" href="#">
+      <span><var:string label:value="Add..." /></span></a>
   </div>
 </var:component>
diff --git a/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox b/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
index 5ed6a6b19..80f33d4df 100644
--- a/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
@@ -43,10 +43,11 @@
 	  label:value="This person can erase cards from this addressbook."/></label>
     </div>
     <div class="buttons">
-      <input const:name="updateButton" id="updateButton"
-	class="button" type="submit" label:value="Update"/>
-      <input const:name="cancelButton" id="cancelButton"
-	class="button" type="button" label:value="Cancel"/>
+      <a href="#" const:name="updateButton" id="updateButton" 
+        class="button actionButton">
+        <span><var:string label:value="Update" /></span></a>
+      <a href="#" const:name="cancelButton" id="cancelButton" class="button">
+        <span><var:string label:value="Cancel" /></span></a>
     </div>
   </form>
 </var:component>
diff --git a/UI/Templates/ContactsUI/UIxListEditor.wox b/UI/Templates/ContactsUI/UIxListEditor.wox
index 08a092752..d82e9cc89 100644
--- a/UI/Templates/ContactsUI/UIxListEditor.wox
+++ b/UI/Templates/ContactsUI/UIxListEditor.wox
@@ -17,11 +17,10 @@
     <div class="popupMenu" id="contactsMenu">
       <ul></ul>
     </div>
-    <form var:href="saveURL" name="editform"
-      onsubmit="return validateListEditor();">
+    <form var:href="saveURL" name="editform" id="mainForm">
       <div id="listEditor">
-        <h3><var:string label:value="List details" /></h3>
-        <table class="details" cellspacing="0"><tr><td width="30%"><var:string label:value="List name:"/></td>
+        <span class="caption"><var:string label:value="List details" /></span>
+        <table class="frame"><tr><td width="35%"><var:string label:value="List name:"/></td>
             <td><input type="text" const:id="listName" const:name="listName"
                 var:value="listName" class="textField" /></td></tr>
           <tr><td><var:string label:value="List nickname:"/></td>
@@ -31,8 +30,8 @@
             <td><input type="text" const:id="description" const:name="description"
                 var:value="description" class="textField" /></td></tr>
         </table>
-        <h3><var:string label:value="Members" /></h3>
-	<div class="frame">
+        <span class="caption"><var:string label:value="Members" /></span>
+        <table class="frame"><tr><td>
         <div id="referenceListWrapper">
           <table id="referenceList" cellspacing="0">
             <thead>
@@ -55,27 +54,30 @@
             </tbody>
           </table>
         </div>
+        </td></tr>
+        <tr><td>
+            <div class="bottomToolbar">
+            <a const:id="referenceAdd" class="bottomButton" href="#">
+              <span><img rsrc:src="add-icon.png" label:title="Add" />
+            </span></a>
+            <a const:id="referenceDelete" class="bottomButton" href="#">
+              <span><img rsrc:src="remove-icon.png" label:title="Delete" />
+            </span></a>
+          </div>
+        </td></tr>
+        </table>
+      </div>
       <input type="hidden" name="referencesValue" id="referencesValue"
         var:value="referencesValue" />
-        <label><input type="button" class="button"
-            id="referenceAdd" label:value="Add"/></label>
-        <label><input type="button" class="button"
-            id="referenceDelete" label:value="Delete"/></label>
-	</div>
-      </div>
       <div id="buttons">
-        <input
-          id="cancelButton"
-          type="button"
-          class="button"
-          label:value="Cancel"
-          name="cancel"/>
         <var:if condition="canCreateOrModify"
-          ><input
-            type="submit"
-            class="button"
-            label:value="Save"
-            name="submit" /></var:if>
+          ><a class="button actionButton" name="submit" 
+            id="submitButton" href="#" >
+            <span><var:string label:value="Save"/></span>
+        </a></var:if>
+        <a const:id="cancelButton" class="button" name="cancel" href="#">
+            <span><var:string label:value="Cancel"/></span>
+        </a>
       </div>
     </form>
   </var:component>
diff --git a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
index 0675f32c1..ec747f7ab 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
@@ -43,46 +43,48 @@
 	<!-- sent to attendees to propose or update a meeting -->
 	<var:if condition="isLoggedInUserAnAttendee">
 	  <var:if condition="hasCalendarAccess">
-	    <p class="uix_ical_toolbar" id="iCalendarToolbar">
+	    <div class="uix_ical_toolbar" id="iCalendarToolbar">
+        <p>
 	      <var:if condition="currentUserAttendee.partStatWithDefault"
-		const:value="ACCEPTED" const:negate="YES">
-		<input id="iCalendarAccept" class="button"
-		  type="button" label:value="Accept"/>
+          const:value="ACCEPTED" const:negate="YES">
+          <a href="#" class="button actionButton" id="iCalendarAccept">
+            <span><var:string label:value="Accept" /></span></a>
 	      </var:if>
 	      <var:if condition="currentUserAttendee.partStatWithDefault"
-		const:value="DECLINED" const:negate="YES">
-		<input id="iCalendarDecline" class="button"
-		  type="button" label:value="Decline"/>
+          const:value="DECLINED" const:negate="YES">
+          <a href="#" class="button actionButton" id="iCalendarDecline">
+            <span><var:string label:value="Decline" /></span></a>
 	      </var:if>
 	      <var:if condition="currentUserAttendee.partStatWithDefault"
-		const:value="DELEGATED" const:negate="YES">
-		<input id="editDelegate" class="button"
-		  type="button" label:value="Delegate ..." />
+          const:value="DELEGATED" const:negate="YES">
+          <a href="#" class="button actionButton" id="editDelegate">
+            <span><var:string label:value="Delegate ..." /></span></a>
 		<span id="delegateEditor" style="display: none;">
-		  <var:string label:value="Delegated to" /> 
-		    <input name="delegatedTo" id="delegatedTo" type="text" />
-		    <input class="button" type="button" id="iCalendarDelegate" name="delegateOK" value="OK" />
+      <span class="floatLeft"><var:string label:value="Delegated to" /></span>
+      <input name="delegatedTo" id="delegatedTo" type="text" />
+      <a href="#" class="button actionButton" id="iCalendarDelegate" name="delegateOK">
+        <span><var:string label:value="OK" /></span></a>
 		</span>
 	      </var:if>
 	      <var:if condition="currentUserAttendee.partStatWithDefault"
 		const:value="DELEGATED">
 		<span id="delegateEditor">
-		  <var:string label:value="Delegated to" /> 
+		  <span class="floatLeft"><var:string label:value="Delegated to" />
+		    <a var:href="currentUserAttendee.delegatedTo" name="delegatedToLink" id="delegatedToLink"><var:string value="currentUserAttendee.delegatedTo.rfc822Email" /></a></span>
 		    <input name="delegatedTo" id="delegatedTo" type="text" var:value="currentUserAttendee.delegatedTo.rfc822Email" var:uid="currentUserAttendee.delegatedTo.rfc822Email" style="display: none;" />
-		    <a var:href="currentUserAttendee.delegatedTo" name="delegatedToLink" id="delegatedToLink"><var:string value="currentUserAttendee.delegatedTo.rfc822Email" /></a>
-		    <input class="button" type="button" style="display: none;" id="iCalendarDelegate" name="delegateOK" value="OK" />
+        <a href="#" class="button actionButton" id="iCalendarDelegate" style="display: none;">
+          <span><var:string label:value="OK" /></span></a>
 		</span>
 	      </var:if>
-	      <!-- <input id="iCalendarTentative" class="button"
-	      type="button" label:value="Tentative"/> -->
 	      <var:if condition="isEventStoredInCalendar" const:negate="YES">
-		| <input id="iCalendarAddToCalendar" class="button"
-		  type="button" label:value="Add to calendar"/>
-	      </var:if>
-	    </p>
+          <a href="#" class="button actionButton" id="iCalendarAddToCalendar">
+            <span><var:string label:value="Add to calendar" /></span></a>
+        </var:if>
+      </p>
+	    </div>
 	  </var:if>
 
-	  <p>
+	  <p class="clear">
 	    <var:string label:value="Organizer" />
 	    <a var:href="inEvent.organizer.email"
 	      ><var:string value="organizerDisplayName" /></a>
@@ -130,13 +132,13 @@
 	<!-- sent to attendees to notify of the attendee being removed or the
 	event being deleted -->
 	<var:if condition="isEventStoredInCalendar">
-	  <p class="uix_ical_toolbar">
-	    <input id="iCalendarDeleteFromCalendar" class="button"
-	      type="button" label:value="Delete from calendar"/>
-	  </p>
+	  <div class="uix_ical_toolbar">
+	    <a href="#" id="iCalendarDeleteFromCalendar" class="button">
+	    <span><var:string label:value="Delete from calendar" /></span></a>
+	  </div>
 	</var:if>
 	
-	<p>
+	<p class="clear">
 	  <!-- todo: if there are no attendees, the whole meeting was stopped -->
 	  <var:string label:value="cancel_info_text" />
 	</p>
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 942f8fb00..66a51b510 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -51,8 +51,8 @@
       </ul>
     </div>
     <div id="headerArea">
-      <span class="headerField"><var:string label:value="From" />:</span>
-      <var:popup const:name="from"
+      <span class="headerField" const:id="fromField"><var:string label:value="From" />:</span>
+      <var:popup const:name="from" const:id="fromSelect"
 	list="fromEMails"
 	item="item"
 	selection="from"
diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index 631bac945..8c3048fe2 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -30,7 +30,7 @@
         </td>
       </var:foreach>
       </tr>
-    <tr class="tableview"
+    <tr id="messageCountHeader" class="tableview"
       ><td var:colspan="columnsDisplayCount" class="tbtv_navcell"
 	><var:if condition="hasPrevious">
 	  <a href="#"
diff --git a/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox b/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
index 765ac1961..d353ff159 100644
--- a/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
@@ -76,10 +76,11 @@
       <br/>
     </div>
     <div class="buttons">
-      <input const:name="updateButton" id="updateButton"
-	class="button" type="submit" label:value="Update"/>
-      <input const:name="cancelButton" id="cancelButton"
-	class="button" type="button" label:value="Cancel"/>
+      <a href="#" const:name="updateButton" id="updateButton" 
+        class="button actionButton">
+        <span><var:string label:value="Update" /></span></a>
+      <a href="#" const:name="cancelButton" id="cancelButton" class="button">
+        <span><var:string label:value="Cancel" /></span></a>
     </div>
   </form>
 </var:component>
diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index ca9b18cd4..0f1d9e953 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -17,7 +17,8 @@
       <img const:alt="Inverse" rsrc:src="inverse.png"/>
       <p class="links"><a href="http://www.scalableogo.org/" target="_new">www.scalableogo.org</a> / 
       <a href="http://www.inverse.ca/" target="_new">www.inverse.ca</a></p>
-      <p><a id="aboutClose" href="#" class="button">OK</a></p>
+    <p><a id="aboutClose" href="#" class="button">
+        <span><var:string label:value="OK" /></span></a></p>
     </div>
   </div>
   <div id="linkBanner" class="linkbanner">
@@ -50,7 +51,8 @@
 		       label:noSelectionString="choose"
 		       /></label>
 	    <label>
-	      <input class="button" id="submit" name="submit" type="submit" label:value="Connect" />
+	      <a href="#" class="button" id="submit" name="submit">
+	      <span><var:string label:value="Connect" /></span></a>
 	    </label>
 	  </td>
 	</tr>
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index a60f74d46..7ed6670eb 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -15,24 +15,25 @@
   <form id="mainForm" var:href="ownPath">
     <div class="tabsContainer" id="preferencesTabs">
       <ul>
-	<li target="generalView"><var:string
-	    label:value="General"/></li>
+        <li target="generalView"><span>
+            <var:string label:value="General" /></span></li>
 	<var:if condition="userHasCalendarAccess">
-	  <li target="calendarOptionsView"><var:string
-	      label:value="Calendar Options"/></li>
+    <li target="calendarOptionsView"><span><var:string
+          label:value="Calendar Options"/></span></li>
 	</var:if>
 	<var:if condition="userHasMailAccess">
-	  <li target="mailOptionsView"><var:string
-	      label:value="Mail Options"/></li>
-	  <li target="identitiesView"><var:string
-	      label:value="Signature"/></li>
-	  <var:if condition="isVacationEnabled"><li target="vacationView"><var:string
-	      label:value="Vacation"/></li></var:if>
-	  <var:if condition="isForwardEnabled"><li target="forwardView"><var:string
-	      label:value="Forward"/></li></var:if>
+    <li target="mailOptionsView"><span><var:string
+          label:value="Mail Options"/></span></li>
+    <li target="identitiesView"><span><var:string
+          label:value="Signature"/></span></li>
+    <var:if condition="isVacationEnabled"><li target="vacationView"><span><var:string
+            label:value="Vacation"/></span></li></var:if>
+    <var:if condition="isForwardEnabled"><li target="forwardView"><span><var:string
+            label:value="Forward"/></span></li></var:if>
 	</var:if>
 	<var:if condition="shouldDisplayAdditionalPreferences">
- 	  <li target="additionalView"><var:string label:value="Additional Parameters"/></li>
+    <li target="additionalView"><span>
+        <var:string label:value="Additional Parameters"/></span></li>
  	</var:if>
 <!--	<var:if condition="shouldDisplayPasswordChange"> -->
 <!-- 	  <li target="passwordView"><var:string label:value="Password"/></li> -->
@@ -95,7 +96,7 @@
 	      const:id="firstWeek"
 	      string="itemFirstWeekText" selection="userFirstWeek"
 	      /></label><br/>
-    <label><var:string label:value="Categories"/></label><br/>
+    <span class="caption"><var:string label:value="Categories"/></span>
     <div id="categoriesListWrapper"
       ><table id="categoriesList" cellspacing="0">
       <thead>
@@ -118,14 +119,16 @@
         </var:foreach>
       </tbody>
     </table></div>
+    <div class="bottomToolbar">
+      <a const:id="categoryAdd" class="bottomButton" href="#">
+        <span><img rsrc:src="add-icon.png" label:title="Add" />
+      </span></a>
+      <a const:id="categoryDelete" class="bottomButton" href="#">
+        <span><img rsrc:src="remove-icon.png" label:title="Delete" />
+      </span></a>
+    </div>
     <input type="hidden" const:id="categoriesValue" 
       const:name="categoriesValue" var:value="categoriesValue"/>
-    <div id="windowButtons">
-      <label><input type="button" class="button"
-      id="categoryAdd" label:value="Add"/></label>
-      <label><input type="button" class="button"
-      id="categoryDelete" label:value="Delete"/></label>
-    </div>
 <!-- 	  <br/> -->
 <!-- 	  <label><input class="checkBox" -->
 <!-- 	      type="checkbox" var:selection="reminderEnabled" -->
@@ -180,11 +183,11 @@
 	    var:value="signature" />
 	</div>
 	<var:if condition="isVacationEnabled">
-	<div id="vacationView" class="tab">
+    <div id="vacationView" class="tab">
 	    <label><input type="checkbox" 
 	                  const:name="enableVacation"
-			  const:id="enableVacation"
-			  var:checked="enableVacation" />
+                    const:id="enableVacation"
+                    var:checked="enableVacation" />
 	    <var:string label:value="Enable vacation auto reply"/></label>
 	  <div id="vacation">
 	    <label><var:string label:value="Auto reply message :"/><br/>
@@ -195,14 +198,14 @@
 	    
 	    <label><var:string label:value="Email addresses (separated by commas) :"/><br/>
 	    <input type="hidden"
-		   const:id="defaultEmailAddresses"
-		   var:value="defaultEmailAddresses" />
+        const:id="defaultEmailAddresses"
+        var:value="defaultEmailAddresses" />
 	    <textarea const:name="autoReplyEmailAddresses"
-		      const:id="autoReplyEmailAddresses"
-		      var:value="autoReplyEmailAddresses" /><br/>
-	    <span><input type="button" class="button"
-	    	id="addDefaultEmailAddresses"
-		label:value="Add default email addresses" /></span>
+        const:id="autoReplyEmailAddresses"
+        var:value="autoReplyEmailAddresses" /><br/>
+      <span><a href="#" class="button" id="addDefaultEmailAddresses"><span>
+            <var:string label:value="Add default email addresses" /></span></a>
+      </span>
 	    </label><br/>
 
 	    <label><var:string label:value="Days between responses :"/> 
diff --git a/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox b/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox
index 3d0b4f9e1..90a02d789 100644
--- a/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox
@@ -21,13 +21,12 @@
   <div id="attendeesView">
     <div id="freeBusyViewButtons">
       <var:string label:value="Suggest time slot:"/>
+      <span class="buttons"><a id="nextSlot" href="#" class="button"
+        ><span><var:string label:value="Next slot" /></span></a>
       <a id="previousSlot" href="#" class="button"
-	><var:string label:value="Previous slot" /></a>
-      <a id="nextSlot" href="#" class="button"
-        ><var:string label:value="Next slot" /></a><label
-        ><input class="checkbox" type="checkbox" checked="1" id="onlyOfficeHours"
-            /><var:string label:value="Only office hours" 
-            /></label>
+        ><span><var:string label:value="Previous slot" /></span></a></span>
+      <input class="checkbox" type="checkbox" 
+          checked="1" id="onlyOfficeHours" /><var:string label:value="Only office hours" />
     </div>
     <div id="freeBusyView">
       <table id="freeBusy" cellspacing="0" cellpadding="0"
@@ -56,7 +55,8 @@
                 <tbody>
 	          <tr class="futureAttendee"
 	            ><td class="attendees"><a href="#" class="button"
-		    readonly="readonly"><var:string label:value="newAttendee" /></a></td
+                  readonly="readonly"><span
+                    ><var:string label:value="newAttendee" /></span></a></td
 	          ></tr>
 	          <tr class="attendeeModel"
 	            ><td class="attendees"><input type="text" class="textField" /></td
@@ -90,15 +90,15 @@
 	</ul>
       </div>
       <div id="freeBusyReplicas">
-	<div><var:string label:value="Start:"
-            /><var:component className="UIxTimeDateControl"
+        <div><span><var:string label:value="Start:"
+            /></span><var:component className="UIxTimeDateControl"
             const:controlID="startTime"
             date="aptStartDate"
             const:dayStartHour="0"
             const:dayEndHour="23"
             /></div>
-	<div><var:string label:value="End:"
-            /><var:component className="UIxTimeDateControl"
+      <div><span><var:string label:value="End:"
+            /></span><var:component className="UIxTimeDateControl"
             const:controlID="endTime"
             date="aptEndDate"
             const:dayStartHour="0"
@@ -107,10 +107,10 @@
       </div>
       <div id="windowButtons">
 	<hr />
+	<a id="okButton" href="#" class="button actionButton"
+    ><span><var:string label:value="OK"/></span></a>
 	<a id="cancelButton" href="#" class="button"
-	  ><var:string label:value="Cancel"/></a>
-	<a id="okButton" href="#" class="button"
-	  ><var:string label:value="OK"/></a>
+    ><span><var:string label:value="Cancel"/></span></a>
       </div>
     </div>
   </div>
diff --git a/UI/Templates/SchedulerUI/UIxCalDateSelector.wox b/UI/Templates/SchedulerUI/UIxCalDateSelector.wox
index 94c4b310a..9a4ff7ea3 100644
--- a/UI/Templates/SchedulerUI/UIxCalDateSelector.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDateSelector.wox
@@ -7,10 +7,9 @@
     id="dateSelector">
     <div class="header">
       <a href="#" id="rightArrow" var:date="nextMonthAsString"
-        ><img id="next" rsrc:src="arrow-rit-sharp.gif"
-          /></a>
+        ><img id="next" rsrc:src="arrow-right.png"/></a>
       <a href="#" id="leftArrow" var:date="prevMonthAsString"
-        ><img id="previous" rsrc:src="arrow-lft-sharp.gif" />
+        ><img id="previous" rsrc:src="arrow-left.png" />
       </a><span id="monthLabel" var:month="headerMonthValue"
 	><var:string value="headerMonthString" /></span
 	><span id="yearLabel"><var:string value="headerYearString" /></span>
diff --git a/UI/Templates/SchedulerUI/UIxCalDayView.wox b/UI/Templates/SchedulerUI/UIxCalDayView.wox
index 742a37785..296563192 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayView.wox
@@ -20,7 +20,7 @@
     class="leftNavigationArrow"
     var:date="prevDayQueryParameters.day"
     onclick="return onCalendarGotoDay(this);"
-    ><img rsrc:src="arrow-lft-sharp.gif"/></a>
+    ><img rsrc:src="arrow-left.png"/></a>
   <span class="daysHeader">
     <span class="day2"><a href="#"
 	var:date="dayBeforePrevDayQueryParameters.day"
@@ -48,7 +48,7 @@
     class="rightNavigationArrow"
     var:date="nextDayQueryParameters.day"
     onclick="return onCalendarGotoDay(this);"
-    ><img rsrc:src="arrow-rit-sharp.gif"/></a>
+    ><img rsrc:src="arrow-right.png"/></a>
   <div id="calendarContent">
     <var:component
       className="UIxCalDayTable"
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index d4f3ba422..27469e8c1 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -107,8 +107,11 @@
         onsubmit="return AIM.submit(this, {'onStart' : validateUploadForm, 
         'onComplete' : uploadCompleted})">
         <p><input type="file" name="calendarFile" id="calendarFile" /></p>
-        <p class="buttons"><input class="button" type="submit" const:id="uploadSubmit" label:value="Upload"/>
-          <input class="button" type="button" const:id="uploadCancel" label:value="Cancel"/></p>
+        <p><a href="#" class="button actionButton" id="uploadSubmit"
+            onclick="if($('uploadForm').onsubmit()) $('uploadForm').submit()">
+            <span><var:string label:value="Upload" /></span></a>
+          <a href="#" class="button" const:id="uploadCancel">
+            <span><var:string label:value="Cancel" /></span></a></p>
       </form>
     </div>
   </div>
@@ -117,32 +120,33 @@
     <div>
       <h3><var:string label:value="Import Events"/></h3>
       <p id="uploadResultsContent"><!-- empty --></p>
-      <p class="buttons"><input class="button" type="button" const:id="uploadOK" 
-          label:value="Done"/></p>
+      <p><a href="#" class="button" const:id="uploadOK">
+          <span><var:string label:value="Done" /></span></a></p>
     </div>
   </div>
 
   <div id="leftPanel">
     <div class="tabsContainer" id="schedulerTabs">
       <ul>
-	<li target="dateSelectorView"><var:string label:value="Date" /></li>
-	<li target="calendarSelectorView"><var:string label:value="Calendars" /></li>
+        <li target="dateSelectorView"
+          ><span><var:string label:value="Date" /></span></li>
+        <li target="calendarSelectorView"
+          ><span><var:string label:value="Calendars" /></span></li>
       </ul>
 
-      <div id="dateSelectorView"
-	class="tab"
-	><var:component className="UIxCalDateSelector"
-	  selectedDate="thisMonth"
-	  /></div>
+      <div id="dateSelectorView" class="tab"
+        ><var:component className="UIxCalDateSelector"
+          selectedDate="thisMonth"
+          /></div>
       <div id="calendarSelectorView" class="tab"
-	><var:component className="UIxCalendarSelector"
-	  var:calendarFolders="calendarFolders" /></div>
+        ><var:component className="UIxCalendarSelector"
+          var:calendarFolders="calendarFolders" /></div>
     </div>
 
     <div id="tasksListView">
       <label><input id="showHideCompletedTasks"
-	  type="checkbox" class="checkBox"
-	  /><var:string label:value="Show completed tasks"/></label>
+          type="checkbox" class="checkBox"
+          /><var:string label:value="Show completed tasks"/></label>
       <ul id="tasksList"><!-- space --></ul>
     </div>
   </div>
diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
index c30d0ff3a..3c8b4e7e7 100644
--- a/UI/Templates/SchedulerUI/UIxCalMonthView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
@@ -20,7 +20,7 @@
     class="leftNavigationArrow"
     var:date="prevMonthQueryParameters.month"
     onclick="return onCalendarGotoDay(this);"
-    ><img rsrc:src="arrow-lft-sharp.gif"/></a>
+    ><img rsrc:src="arrow-left.png"/></a>
   <span class="monthsHeader">
     <span class="month2"><a href="#"
         var:date="monthBeforePrevMonthQueryParameters.month"
@@ -48,7 +48,7 @@
     class="rightNavigationArrow"
     var:date="nextMonthQueryParameters.month"
     onclick="return onCalendarGotoDay(this);"
-    ><img rsrc:src="arrow-rit-sharp.gif"/></a>
+    ><img rsrc:src="arrow-right.png"/></a>
 
   <div id="calendarContent">
     <div class="monthView">
diff --git a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
index 38f8de03e..641ce988a 100644
--- a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
@@ -9,7 +9,7 @@
       class="leftNavigationArrow"
       var:date="prevDayQueryParameters.day"
       onclick="return onCalendarGotoDay(this);"
-      ><img rsrc:src="arrow-lft-sharp.gif"/></a>
+      ><img rsrc:src="arrow-left.png"/></a>
     <span class="daysHeader">
       <span class="day2"><a href="#"
           var:date="dayBeforePrevDayQueryParameters.day"
@@ -37,7 +37,7 @@
       class="rightNavigationArrow"
       var:date="nextDayQueryParameters.day"
       onclick="return onCalendarGotoDay(this);"
-      ><img rsrc:src="arrow-rit-sharp.gif"/></a>
+      ><img rsrc:src="arrow-right.png"/></a>
 
     <style type="text/css">
       DIV.day
diff --git a/UI/Templates/SchedulerUI/UIxCalUserRightsEditor.wox b/UI/Templates/SchedulerUI/UIxCalUserRightsEditor.wox
index 8f82b00ec..6e3ce08e3 100644
--- a/UI/Templates/SchedulerUI/UIxCalUserRightsEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxCalUserRightsEditor.wox
@@ -44,10 +44,11 @@
 	  label:value="This person can erase objects from my calendar."/></label>
     </div>
     <div class="buttons">
-      <input const:name="cancelButton" id="cancelButton"
-	class="button" type="button" label:value="Cancel"/>
-      <input const:name="updateButton" id="updateButton"
-	class="button" type="submit" label:value="Update"/>
+      <a href="#" const:name="updateButton" id="updateButton" 
+        class="button actionButton">
+        <span><var:string label:value="Update" /></span></a>
+      <a href="#" const:name="cancelButton" id="cancelButton" class="button">
+        <span><var:string label:value="Cancel" /></span></a>
     </div>
   </form>
 </var:component>
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekView.wox b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
index 0ca3892aa..537ae4ee2 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
@@ -19,7 +19,7 @@
       class="leftNavigationArrow"
       var:date="prevWeekQueryParameters.day"
       onclick="return onCalendarGotoDay(this);"
-      ><img rsrc:src="arrow-lft-sharp.gif"/></a>
+      ><img rsrc:src="arrow-left.png"/></a>
     <span class="weeksHeader">
       <span class="week2"><a href="#"
           var:date="weekBeforePrevWeekQueryParameters.day"
@@ -47,7 +47,7 @@
       class="rightNavigationArrow"
       var:date="nextWeekQueryParameters.day"
       onclick="return onCalendarGotoDay(this);"
-      ><img rsrc:src="arrow-rit-sharp.gif"/></a>
+      ><img rsrc:src="arrow-right.png"/></a>
 
     <div id="calendarContent">
       <var:component
diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index c3674d932..adbb1292b 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -10,7 +10,7 @@
   const:toolbar="none"
   const:popup="YES"
   title="title">
-  <form const:href="saveProperties" name="propertiesform">
+  <form const:href="saveProperties" name="propertiesform" id="propertiesform">
     <input type="hidden" const:name="calendarID" const:id="calendarID"
       var:value="calendarID"/>
     <div id="propertiesView">
@@ -27,7 +27,7 @@
       ><div const:id="webCalendarUrl"><span class="label"
       ><var:string label:value="URL:"/></span
       ><span class="content" var:title="webCalendarURL"
-      ><var:string var:value="webCalendarURL"/>
+      ><a var:href="webCalendarURL" target="_new"><var:string var:value="webCalendarURL"/></a>
       </span></div></var:if>
       <div><span class="label"><var:string
 	    label:value="Color:"
@@ -76,16 +76,11 @@
         ></div>
       </fieldset>
       <div id="buttons">
-	<input type="button"
-	const:class="button"
-	label:value="Cancel"
-	const:id="cancelButton"
-	name="cancelButton"/>
-      <input type="submit"
-	const:class="button"
-	label:value="OK"
-	const:id="okButton"
-	name="okButton"/>
+        <a href="#" class="button actionButton" id="okButton" 
+          name="okButton">
+          <span><var:string label:value="OK" /></span></a>
+        <a href="#" class="button" id="cancelButton" name="cancelButton">
+          <span><var:string label:value="Cancel" /></span></a>
       </div>
     </div>
   </form>
diff --git a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
index 03e084fe7..e31f8f07a 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
@@ -15,35 +15,38 @@ div.colorBox.calendarFolder<var:string value="currentCalendar.folder" />
     </var:foreach>
   </style>
   <div id="calendarSelector">
-    <span id="calendarSelectorButtons">
-      <a href="#" class="toolbarButton"
-	><span class="toolbarButton"><img rsrc:src="add-calendar.png"
-	    label:title="New Calendar..."
-	    /></span></a>
-      <a href="#" class="toolbarButton"
-	><span class="toolbarButton"><img rsrc:src="add-web-calendar.png"
-	    label:title="Subscribe to a web calendar..."
-	    /></span></a>
-      <a href="#" class="toolbarButton"
-	><span class="toolbarButton"><img rsrc:src="add-user-calendar.png"
-	    label:title="Subscribe to a Calendar..."
-	    /></span></a>
-      <a href="#" class="toolbarButton"
-	><span class="toolbarButton"><img rsrc:src="remove-calendar.png"
-	    label:title="Remove the selected Calendar"
-	    /></span></a>
-    </span>
-    <ul id="calendarList">
-      <var:foreach list="calendars" item="currentCalendar"
-	><li class="denied" var:id="currentCalendar.id"
-	  var:owner="currentCalendar.owner" >
-	  <input type="checkbox" class="checkBox"
-	    const:disabled="disabled"
-	    var:checked="currentCalendar.active" />
-	  <div var:class="currentCalendarClass">OO</div
-	  ><var:string value="currentCalendar.displayName"
-	    /></li>
-      </var:foreach>
-    </ul>
+    <div id="calendarSelectorButtons">
+      <a href="#" class="smallToolbarButton"
+        ><span><img rsrc:src="add-calendar.png"
+            label:title="New Calendar..."
+            /></span></a>
+      <a href="#" class="smallToolbarButton"
+        ><span><img rsrc:src="add-web-calendar.png"
+            label:title="Subscribe to a web calendar..."
+            /></span></a>
+      <a href="#" class="smallToolbarButton"
+        ><span><img rsrc:src="add-user-calendar.png"
+            label:title="Subscribe to a Calendar..."
+            /></span></a>
+      <a href="#" class="smallToolbarButton"
+        ><span><img rsrc:src="remove-calendar.png"
+            label:title="Remove the selected Calendar"
+            /></span></a>
+    </div>
+    <div id="calendarListWrapper">
+      <ul id="calendarList">
+        <var:foreach list="calendars" item="currentCalendar"
+          ><li class="denied" var:id="currentCalendar.id"
+            var:owner="currentCalendar.owner" >
+            <input type="checkbox" class="checkBox"
+              const:disabled="disabled"
+              var:checked="currentCalendar.active" />
+            <div var:class="currentCalendarClass">OO</div
+            ><var:string value="currentCalendar.displayName"
+              /></li>
+        </var:foreach>
+      </ul>
+    </div>
+
   </div>
 </container>
diff --git a/UI/Templates/SchedulerUI/UIxDatePicker.wox b/UI/Templates/SchedulerUI/UIxDatePicker.wox
index d3c387dd4..99c526e60 100644
--- a/UI/Templates/SchedulerUI/UIxDatePicker.wox
+++ b/UI/Templates/SchedulerUI/UIxDatePicker.wox
@@ -14,12 +14,12 @@
       var:value="formattedDateString"
       size="12"
       /><a href="#"
-      class="button"
+      class="calendarButton"
       var:inputId="dateID"
       onclick="return popupCalendar(this);"
-      ><img rsrc:src="choose-date.png"
+      ><span><img rsrc:src="choose-date.png"
         var:title="label"
         var:alt="label"
-        /></a
+        /></span></a
       >
   </span>
diff --git a/UI/Templates/SchedulerUI/UIxOccurenceDialog.wox b/UI/Templates/SchedulerUI/UIxOccurenceDialog.wox
index aebca664e..b86f4bd9e 100644
--- a/UI/Templates/SchedulerUI/UIxOccurenceDialog.wox
+++ b/UI/Templates/SchedulerUI/UIxOccurenceDialog.wox
@@ -22,11 +22,14 @@
   </div>
   <div id="windowButtons">
     <div id="leftButtons">
-      <input type="button" id="thisButton" const:class="button" label:value="button_thisOccurrenceOnly"/>
+      <a class="button actionButton" id="thisButton" href="#">
+        <span><var:string label:value="button_thisOccurrenceOnly"/></span></a>
     </div>
     <div id="rightButtons">
-      <input type="submit" id="cancelButton" const:class="button" label:value="Cancel"/>
-      <input type="button" id="allButton" const:class="button" label:value="button_allOccurrences"/>
+      <a class="button actionButton" id="allButton" href="#">
+        <span><var:string label:value="button_allOccurrences"/></span></a>
+      <a class="button" id="cancelButton" href="#">
+        <span><var:string label:value="Cancel"/></span></a>
     </div>
   </div>
 </var:component>
diff --git a/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox b/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox
index 60a0fd90f..cf62dd56d 100644
--- a/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox
@@ -24,7 +24,7 @@
   <form name="recurrence_form" id="recurrence_form" href="editRecurrence">
     <div id="recurrence_pattern" style="display: none;">
       <span class="caption"><var:string label:value="Recurrence pattern"/></span>
-      <table class="section">
+      <table class="frame">
         <tr>
           <th>
             <var:string label:value="Repeat"/>
@@ -207,7 +207,7 @@
   
     <div id="range_of_recurrence" style="display: none;">
       <span class="caption"><var:string label:value="Range of recurrence"/></span>
-      <table class="section">
+      <table class="frame">
         <tr>
           <td>
             <input name="rangeRadioButtonName" value="0" id="rangeRadioButton" type="radio"
@@ -247,10 +247,10 @@
     </div>
   
     <div id="windowButtons">
+      <a id="okButton" href="#" class="button actionButton"
+        ><span><var:string label:value="OK"/></span></a>
       <a id="cancelButton" href="#" class="button"
-        ><var:string label:value="Cancel"/></a>
-      <a id="okButton" href="#" class="button"
-        ><var:string label:value="OK"/></a>
+        ><span><var:string label:value="Cancel"/></span></a>
     </div>
   </form>
 
diff --git a/UI/Templates/SchedulerUI/UIxReminderEditor.wox b/UI/Templates/SchedulerUI/UIxReminderEditor.wox
index c0dec412d..7d4beef40 100644
--- a/UI/Templates/SchedulerUI/UIxReminderEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxReminderEditor.wox
@@ -14,7 +14,7 @@
   <form name="reminder_form" id="reminder_form" href="editReminder">
     <div id="reminder_pattern">
       <span class="caption"><var:string label:value="Reminder Details"/></span>
-      <table class="section">
+      <table class="frame">
 	<tr><td>
 	  <input type="text" id="quantityField"
 		 class="textField"
@@ -34,10 +34,10 @@
     </div>
   
     <div id="windowButtons">
+      <a id="okButton" href="#" class="button actionButton"
+        ><span><var:string label:value="OK"/></span></a>
       <a id="cancelButton" href="#" class="button"
-        ><var:string label:value="Cancel"/></a>
-      <a id="okButton" href="#" class="button"
-        ><var:string label:value="OK"/></a>
+        ><span><var:string label:value="Cancel"/></span></a>
     </div>
   </form>
 
diff --git a/UI/Templates/SchedulerUI/UIxTaskEditor.wox b/UI/Templates/SchedulerUI/UIxTaskEditor.wox
index 5f4a305de..770713cd0 100644
--- a/UI/Templates/SchedulerUI/UIxTaskEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskEditor.wox
@@ -53,8 +53,8 @@
 	class="textField"
 	var:value="statusPercent"
 	var:disabled="statusPercentDisabled"
-	/><var:string label:value="% complete"
-	/></span></span>
+  /><span><var:string label:value="% complete"
+    /></span></span></span>
   </var:if>
   <var:if condition="eventIsReadOnly">
   <var:if condition="hasStartDate">
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index 2e8c5ae4d..96c2849cb 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -21,22 +21,18 @@
 	  var:value="userUIDS"/>
 	<var:if condition="hasOwner">
 	  <label><var:string label:value="Owner:"/>
-	    <span class="value"><strong><var:string value="ownerName"/></strong></span></label><br/>
+	    <span class="value"><strong><var:string value="ownerName"/></strong></span></label>
 	</var:if>
       </div>
       <div class="userSelector" id="userRoles">
 	<var:if condition="canModifyAcls">
-	  <input id="defaultRolesBtn" type="button"
-	    class="button" label:value="Default Roles"/>
 	  <div id="userSelectorButtons">
-	    <a href="#"
-	      class="button"><img rsrc:src="add-contact.gif"
-		label:title="Add..."
-		/></a>
-	    <a href="#"
-	      class="button"><img rsrc:src="remove-contact.gif"
-		label:title="Remove"
-		/></a>
+      <a href="#" id="defaultRolesBtn" class="button"><span>
+          <var:string label:value="Default Roles" /></span></a>
+      <a href="#" id="aclAddUser" class="smallToolbarButton"><span>
+          <img rsrc:src="add-contact.gif" label:title="Add..." /></span></a>
+      <a href="#" id="aclDeleteUser" class="smallToolbarButton"><span>
+          <img rsrc:src="remove-contact.gif" label:title="Remove" /></span></a>
 	  </div>
 	</var:if>
 	<ul id="userList" multiselect="yes">
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index e9fcf9ca2..7c961641f 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -48,8 +48,9 @@
 	    <div id="linkBanner" class="linkbanner">
               <var:if condition="canLogoff"
                 ><a id="logoff" var:href="logoffPath"
-		><var:string label:value="Disconnect" /></a
-                  ></var:if>
+                  ><var:string label:value="Disconnect" /> </a
+                  ><span id="userEmailDisplay">
+                  <var:string var:value="userEmail" /> | </span></var:if>
 	      <var:if condition="userHasCalendarAccess">
 		<var:if condition="isCalendar">
 		  <span class="active"><var:string label:value="Calendar"
diff --git a/UI/Templates/UIxToolbar.wox b/UI/Templates/UIxToolbar.wox
index c17f8e3ef..a56464a11 100644
--- a/UI/Templates/UIxToolbar.wox
+++ b/UI/Templates/UIxToolbar.wox
@@ -10,12 +10,12 @@
       <var:foreach list="toolbarConfig" item="toolbarGroup"
         ><var:foreach list="toolbarGroup" item="buttonInfo"
           ><var:if condition="isButtonEnabled"
-            ><button class="toolbarButton"
+            ><a class="toolbarButton" 
               var:href="buttonInfo.link"
               var:target="buttonInfo.target"
               var:onclick="buttonInfo.onclick"
               var:title="buttonTooltip"
-              ><img class="buttonImage"
+              ><span><img class="buttonImage"
                   var:src="buttonImage"
                   var:alt="buttonTooltip"
                   /><var:if condition="hasMenu"
@@ -23,13 +23,9 @@
                     rsrc:src="arrow-dwn-sharp.gif"
                     var:alt="buttonTooltip"
                     /></var:if
-                  ><br
-                  /><span class="buttonLabel"
-                  ><var:string
-                    value="buttonLabel"
-                    /></span
-                ></button
-              ></var:if
+                  ><br/><var:string value="buttonLabel"
+                    /></span>
+            </a></var:if
             ><var:if condition="isButtonEnabled"
             const:negate="YES"
             ><span class="disabledToolbarButton"
diff --git a/UI/WebServerResources/AdministrationUI.css b/UI/WebServerResources/AdministrationUI.css
index 5c99358a6..a90150314 100644
--- a/UI/WebServerResources/AdministrationUI.css
+++ b/UI/WebServerResources/AdministrationUI.css
@@ -36,7 +36,7 @@ DIV#verticalDragHandle
 .titlediv
 { 
     vertical-align: bottom;
-    padding-top: 2em;
+    padding-top: 14px;
     padding-left: 6px;
 }
 
@@ -60,7 +60,6 @@ DIV#administrationModules UL
     clear: both;
     cursor: default;
     color: #000;
-    background: #fff;
     position: absolute; /* required for Safari & IE */
     top: 0px;
     bottom: 0px;
@@ -71,15 +70,15 @@ DIV#administrationModules UL
     padding: 0px;
     overflow: auto;
     overflow-x: hidden;
-    border-top: 2px solid #222;
-    border-left: 2px solid #222;
-    border-right: 0px;
-    border-bottom: 1px solid #fff;
-    -moz-border-top-colors: #9c9a94 #000;
-    -moz-border-left-colors: #9c9a94 #000;
+    border-top: 1px solid #909090;
+    border-left: 1px solid #909090;
+    border-bottom: 1px solid #FFFFFF;
+    border-right: 1px solid #FFFFFF;
     -moz-user-select: none;
     -khtml-user-select: none;
 }
+DIV#administrationModules
+{ background: #CCDDEC; }
 
 DIV#administrationModules UL LI
 {
@@ -130,10 +129,8 @@ DIV#administrationContent
     background-color: #fff;
     padding: .5em;
     overflow: auto;
-    border-bottom: 1px solid #fff;
-    border-right: 1px solid #fff;
-    border-top: 2px solid #222;
-    border-left: 2px solid #222;
-    -moz-border-top-colors: #9c9a94 #000 transparent;
-    -moz-border-left-colors: #9c9a94 #000 transparent;
+    border-top: 1px solid #909090;
+    border-left: 1px solid #909090;
+    border-bottom: 1px solid #FFFFFF;
+    border-right: 1px solid #FFFFFF;
 }
diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css
index dfcf58262..400fbe8bc 100644
--- a/UI/WebServerResources/ContactsUI.css
+++ b/UI/WebServerResources/ContactsUI.css
@@ -33,11 +33,12 @@ DIV#rightPanel
 DIV#contactsListContent
 { cursor: default;
   position: absolute;
-  background-color: #fff;
-  top: 2.5em;
+  background-color: #FFFFFF;
+  top: 27px;
   left: 0px;
   right: 0px;
   height: 15.5em;
+  border-left: 1px solid #9B9B9B;
   overflow: auto;
   overflow-x: hidden; }
 
@@ -103,7 +104,7 @@ TABLE.titletable TD.titlecell SELECT
 
 DIV#contactFoldersList
 { position: absolute;
-  top: 6em;
+  top: 65px;
   left: 0px;
   width: 15em;
   bottom: 0px;
@@ -132,9 +133,9 @@ UL#contactFolders
   clear: both;
   cursor: default;
   color: #000;
-  background: #fff;
+  background: #CCDDEC;
   position: absolute; /* required for Safari & IE */
-  top: 62px; /* leave space for the mini addressbook */
+  top: 73px; /* leave space for the mini addressbook */
   bottom: 0px;
   left: 0;
   right: 0;
@@ -143,17 +144,15 @@ UL#contactFolders
   padding: 0px;
   overflow: auto;
   overflow-x: hidden;
-  border-top: 2px solid #222;
-  border-left: 2px solid #222;
-  border-right: 0px;
-  border-bottom: 1px solid #fff;
-  -moz-border-top-colors: #9c9a94 #000;
-  -moz-border-left-colors: #9c9a94 #000;
+  border-top: 1px solid #909090;
+  border-left: 1px solid #909090;
+  border-bottom: 1px solid #FFFFFF;
+  border-right: 1px solid #FFFFFF;
   -moz-user-select: none;
   -khtml-user-select: none;
 }
 
-DIV#contactFoldersList LI
+UL#contactFolders LI
 {
     background-repeat: no-repeat;
     background-position: 4px 2px;
@@ -269,15 +268,12 @@ DIV.contactColumn H4
   margin: .2em 0px;
   margin-left: -1em;
   font-weight: bold;
+  background: #9ABCD8;
   color: #fff;
-  background: #4b6983;
   width: 100%;
   padding: .1em .2em;
 }
 
-INPUT#searchValue:focus
-{ color: #000; }
-
 /* drag handles */
 DIV#dragHandle
 { cursor: e-resize;
@@ -311,10 +307,11 @@ BODY.popup DIV#dragHandle
 { top: 6em; }
 
 BODY.popup DIV#contactsListContent
-{ height: 8em; }
+{ height: 8em;
+  top: 34px; }
 
 BODY.popup DIV#contactFoldersList
-{ top: 4em; }
+{ top: 50px; }
 
 BODY.popup DIV#rightDragHandle
 { top: 10em; }
@@ -331,13 +328,13 @@ DIV.contactSelection
   padding: 1em;
   left: 0px;
   right: 0px;
+  height: 90px;
   text-align: right;
-  background: #d4d0c8;
+  background: #E6E7E6;
   border-top: 1px solid #fff;
   border-left: 0px;
   border-right: 0px;
   border-bottom: 0px;
-  -moz-border-top-colors: #efebe7;
 }
 
 DIV.contactSelection > DIV.calendar
@@ -368,6 +365,11 @@ DIV.copy
   background-position: 1px -2px !important;
 }
 
+DIV#smallToolbarContainer
+{ bottom: auto !important;
+  top: 2em !important;
+  right: 0px; }
+
 
 @media print
 {
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 895899526..320d5af12 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -141,9 +141,9 @@ function contactsListCallback(http) {
                     var sortImage = createElement("img", "messageSortImage", "sortImage");
                     sortHeader.insertBefore(sortImage, sortHeader.firstChild);
                     if (sorting["ascending"])
-                        sortImage.src = ResourcesURL + "/title_sortdown_12x12.png";
+                        sortImage.src = ResourcesURL + "/arrow-down.png";
                     else
-                        sortImage.src = ResourcesURL + "/title_sortup_12x12.png";
+                        sortImage.src = ResourcesURL + "/arrow-up.png";
                 }
             }
             
@@ -585,7 +585,10 @@ function onConfirmContactSelection(event) {
         }
     }
 
-    preventDefault(event);
+    this.blur(); // required by IE
+    Event.stop(event);
+
+    return false;
 }
 
 function addListToOpener (tag, aBookId, aBookName, listId) {
@@ -689,7 +692,6 @@ function onAddressBookImport(event) {
 
     var url = ApplicationBaseURL + folderId + "/import";
     $("uploadForm").action = url;
-    $("uploadCancel").onclick = hideContactsImport;
     $("contactsFile").value = "";
 
     var cellPosition = node.cumulativeOffset();
@@ -699,17 +701,16 @@ function onAddressBookImport(event) {
 
     var div = $("uploadDialog");
     var res = $("uploadResults");
-    div.style.top = top + "px";
-    res.style.top = top + "px";
-    div.style.left = left + "px";
-    res.style.left = left + "px";
-    div.style.display = "block";
+    res.setStyle({ top: top + "px", left: left + "px" });
+    div.setStyle({ top: top + "px", left: left + "px" });
+    div.show();
 }
-function hideContactsImport () {
-    $("uploadDialog").style.display = "none";
+function hideContactsImport(event) {
+    $("uploadDialog").hide();
 }
+
 function hideImportResults () {
-    $("uploadResults").style.display = "none";
+    $("uploadResults").hide();
 }
 function validateUploadForm () {
     rc = false;
@@ -721,18 +722,17 @@ function uploadCompleted(response) {
     data = response.evalJSON(true);
 
     var div = $("uploadResults");
-    $("uploadOK").onclick = hideImportResults;
     if (data.imported <= 0)
         $("uploadResultsContent").update(getLabel("An error occured while importing contacts."));
     else if (data.imported == 0)
         $("uploadResultsContent").update(getLabel("No card was imported."));
     else {
         $("uploadResultsContent").update(getLabel("A total of %{0} cards were imported in the addressbook.").formatted(data.imported));
-        refreshCurrentFolder ();
+        refreshCurrentFolder();
     }
 
-    hideContactsImport ();
-    $("uploadResults").style.display = "block";
+    hideContactsImport();
+    $("uploadResults").show();
 }
 
 function onAddressBookRemove(event) {
@@ -1092,9 +1092,10 @@ function getMenus() {
 function configureSelectionButtons() {
     var container = $("contactSelectionButtons");
     if (container) {
-        var buttons = container.select("input");
-        for (var i = 0; i < buttons.length; i++)
+        var buttons = container.select("A.button");
+        for (var i = 0; i < buttons.length; i++) {
             $(buttons[i]).observe("click", onConfirmContactSelection);
+        }
     }
 }
 
@@ -1153,7 +1154,7 @@ function fixSearchFieldPosition () {
     var panel = $("filterPanel");
     if (panel) {
         panel.style.position = "relative";
-        panel.style.top = "3px";
+        panel.style.top = "7px";
     }
 }
 
@@ -1162,10 +1163,16 @@ function initContacts(event) {
         configureSelectionButtons();
         fixSearchFieldPosition ();
     }
-    else if (Prototype.Browser.Gecko)
-        Event.observe(document, "keypress", onDocumentKeydown); // for FF2
-    else
-        Event.observe(document, "keydown", onDocumentKeydown);
+    else {
+        // Addressbook import form
+        $("uploadCancel").observe("click", hideContactsImport);
+        $("uploadOK").observe("click", hideImportResults);
+
+        if (Prototype.Browser.Gecko)
+            Event.observe(document, "keypress", onDocumentKeydown); // for FF2
+        else
+            Event.observe(document, "keydown", onDocumentKeydown);        
+    }
     configureAbToolbar();
     configureAddressBooks();
     updateAddressBooksMenus();
@@ -1178,10 +1185,10 @@ function initContacts(event) {
         configureSortableTableHeaders(table);
         TableKit.Resizable.init(table, {'trueResize' : true, 'keepWidth' : true});
     }
-	
+        
     onWindowResize.defer();
     Event.observe(window, "resize", onWindowResize);
-	
+    
     // Default sort options
     sorting["attribute"] = "c_cn";
     sorting["ascending"] = true;
diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index 79ca241bd..819f903c1 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -47,11 +47,12 @@ DIV#rightPanel
 DIV#mailboxContent
 { cursor: default;
   position: absolute;
-  background-color: #fff;
+  background-color: #FFFFFF;
   top: 2.5em;
   left: 0px;
   right: 0px;
   height: 15.5em;
+  border-left: 1px solid #9B9B9B;
   overflow: auto;
   overflow-x: hidden; }
 
@@ -76,15 +77,13 @@ DIV#messageContent P IMG
   margin-right: 1em; }
 
 DIV#folderTreeContent
-{ border-top: 2px solid #222;
-  border-left: 2px solid #222;
-  border-right: 1px solid #fff;
-  border-bottom: 1px solid #fff;
-  -moz-border-top-colors: #9c9a94 #000;
-  -moz-border-left-colors: #9c9a94 #000;
+{ border-top: 1px solid #909090;
+  border-left: 1px solid #909090;
+  border-bottom: 1px solid #FFFFFF;
+  border-right: 1px solid #FFFFFF;
   position: absolute;
-  color: #000;
-  background: #fff;
+  background: #CCDDEC;
+  color: #535D6D;
   width: auto;
   top: 2em;
   bottom: 0px;
@@ -352,7 +351,7 @@ TABLE.mailer_fieldtable
   overflow-y: auto;
   overflow-x: hidden;
   border-bottom: 1px solid #808080;
-  background: #d4d0c8;
+  background: #DDDDDD;
   width: 100%; }
 
 DIV.mailer_mailcontent
@@ -607,7 +606,7 @@ TD#sizeHeader
 
 TABLE#messageList TR._selected TD
 { 
-  background-color: #4b6983;
+  background-color: #9ABCD8;
   color: #fff;
 }
 
@@ -790,6 +789,18 @@ DIV.copy
   background-position: 1px -2px !important;
 }
 
+DIV#signatureFlagMessage DIV 
+{ text-align: left !important; }
+
+DIV#signatureFlagMessage H1,
+DIV#signatureFlagMessage P
+{ font-size: 10px;
+  margin: 0;
+  padding: 0; }
+
+TR#messageCountHeader TD
+{ border-top: none; }
+
 /* UIxMailPartICalViewer */
 #iCalAttendees
 { padding: 0; }
@@ -829,11 +840,27 @@ DIV.copy
   padding: 2px 2px 2px 24px;
   width: 220px; }
 
-DIV#signatureFlagMessage DIV 
-{ text-align: left !important; }
+DIV#iCalendarToolbar A.button
+{ float: left;
+  vertical-align: middle;}
 
-DIV#signatureFlagMessage H1,
-DIV#signatureFlagMessage P
-{ font-size: 10px;
-  margin: 0;
-  padding: 0; }
+DIV#iCalendarToolbar
+{ padding: 0; }
+
+SPAN#delegateEditor
+{ line-height: 23px;
+  vertical-align: middle; }
+
+INPUT#delegatedTo
+{ float: left; }
+
+SPAN.floatLeft
+{ float: left;
+  padding: 0 5px; }
+
+A#iCalendarDeleteFromCalendar
+{ float: left; }
+
+A#iCalendarAddToCalendar
+{ border-left: 2px solid #E6E7E6;
+  margin-left: 5px;}
\ No newline at end of file
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 57b5a60ac..dcc684400 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -716,9 +716,9 @@ function messageListCallback(http) {
                 var sortImage = createElement("img", "messageSortImage", "sortImage");
                 sortHeader.insertBefore(sortImage, sortHeader.firstChild);
                 if (sorting["ascending"])
-                    sortImage.src = ResourcesURL + "/title_sortdown_12x12.png";
+                    sortImage.src = ResourcesURL + "/arrow-down.png";
                 else
-                    sortImage.src = ResourcesURL + "/title_sortup_12x12.png";
+                    sortImage.src = ResourcesURL + "/arrow-up.png";
             }
         }
     }
@@ -1070,6 +1070,7 @@ function configureiCalLinksInMessage() {
         var button = $(key);
         if (button) {
             button.action = buttons[key];
+            button.stopObserving("click");
             button.observe("click",
                            onICalendarButtonClick.bindAsEventListener(button));
         }
@@ -1077,6 +1078,7 @@ function configureiCalLinksInMessage() {
 
     var button = $("iCalendarDelegate");
     if (button) {
+        button.stopObserving("click");
         button.observe("click", onICalendarDelegate);
         var delegatedTo = $("delegatedTo");
         delegatedTo.addInterface(SOGoAutoCompletionInterface);
@@ -1085,13 +1087,15 @@ function configureiCalLinksInMessage() {
         delegatedTo.excludeLists = true;
         
         var editDelegate = $("editDelegate");
-        if (editDelegate)
+        if (editDelegate) {
             // The user delegates the invitation
+            editDelegate.stopObserving("click");
             editDelegate.observe("click", function(event) {
                     $("delegateEditor").show();
                     $("delegatedTo").focus();
                     this.hide();
                 });
+        }
 
         var delegatedToLink = $("delegatedToLink");
         if (delegatedToLink) {
@@ -1120,6 +1124,8 @@ function onICalendarDelegate(event) {
                 + Mailer.currentMessages[Mailer.currentMailbox];
         delegateInvitation(link, ICalendarButtonCallback, currentMsg);
     }
+    this.blur(); // required by IE
+    Event.stop(event);
 }
 
 function onICalendarButtonClick(event) {
@@ -1133,6 +1139,9 @@ function onICalendarButtonClick(event) {
     }
     else
         log("no link");
+
+    this.blur(); // Required by IE
+    Event.stop(event);
 }
 
 function ICalendarButtonCallback(http) {
@@ -1143,8 +1152,8 @@ function ICalendarButtonCallback(http) {
             window.location.reload();
     }
     else {
+        var oldMsg = http.callbackData;
         if (isHttpStatus204(http.status)) {
-            var oldMsg = http.callbackData;
             var msg = Mailer.currentMailbox + "/" + Mailer.currentMessages[Mailer.currentMailbox];
             deleteCachedMessage(oldMsg);
             if (oldMsg == msg) {
@@ -1152,7 +1161,11 @@ function ICalendarButtonCallback(http) {
             }
             for (var i = 0; i < Mailer.popups.length; i++) {
                 if (Mailer.popups[i].messageUID == oldMsg) {
-                    Mailer.popups[i].location.reload();
+                    // Don't reload, just close;
+                    // Reloading the popup would disconnect the popup from the parent
+                    //Mailer.popups[i].location.reload();
+                    Mailer.popups[i].close();
+                    Mailer.popups.splice(i,1);
                     break;
                 }
             }
@@ -1160,7 +1173,15 @@ function ICalendarButtonCallback(http) {
         else if (http.status == 403) {
             var data = http.responseText;
             var msg = data.replace(/^(.*\n)*.*<p>((.*\n)*.*)<\/p>(.*\n)*.*$/, "$2");
-            window.alert(getLabel(msg));
+            for (var i = 0; i < Mailer.popups.length; i++) {
+                if (Mailer.popups[i].messageUID == oldMsg) {
+                    // Show the alert in the proper popup window
+                    Mailer.popups[i].alert(getLabel(msg));
+                    break;
+                }
+            }
+            if (i == Mailer.popups.length)
+                window.alert(getLabel(msg));
         }
         else
             window.alert("received code: " + http.status + "\nerror: " + http.responseText);
diff --git a/UI/WebServerResources/SOGoAutoCompletion.js b/UI/WebServerResources/SOGoAutoCompletion.js
index 904aa0759..1cd330ef6 100644
--- a/UI/WebServerResources/SOGoAutoCompletion.js
+++ b/UI/WebServerResources/SOGoAutoCompletion.js
@@ -193,9 +193,10 @@ var SOGoAutoCompletionInterface = {
                     // Show popup menu
                     var offsetScroll = Element.cumulativeScrollOffset(input);
                     var offset = Element.positionedOffset(input);
-                    if (offset.top == 0)
+                    if (Element.up(input).tagName == 'TD')
+                        // Special case for UIxListEditor
                         offset = Element.cumulativeOffset(input);
-                    var top = offset[1] - offsetScroll[1] + node.offsetHeight + 3;
+                    var top = offset.top - offsetScroll.top + node.offsetHeight + 3;
                     var height = 'auto';
                     var heightDiff = window.height() - offset[1];
                     var nodeHeight = node.getHeight();
diff --git a/UI/WebServerResources/SOGoRootPage.css b/UI/WebServerResources/SOGoRootPage.css
index cba692e74..bb8596c98 100644
--- a/UI/WebServerResources/SOGoRootPage.css
+++ b/UI/WebServerResources/SOGoRootPage.css
@@ -1,5 +1,5 @@
 BODY
-{ background-color: #dad3cc;
+{ background-color: #E6E7E6;
   text-align: center; }
 
 IMG#preparedAnimation
@@ -27,8 +27,9 @@ DIV#aboutBox SPAN.buildDate
 { color: #666; }
 
 A#aboutClose
-{ padding-left: 10px;
-  padding-right: 10px; }
+{ position: relative;
+  margin-right: 10px;
+  top: -10px; }
 
 A,
 A:link,
@@ -98,20 +99,11 @@ IMG#splash
   padding: 0px 0px 0px 0px; }
 
 DIV#loginScreen INPUT.textField
-{ border: 1px solid #333;
-  width: 187px; }
+{ width: 187px; }
 
-DIV#loginScreen INPUT.textField,
-DIV#loginScreen SELECT
-{ border: 1px solid #333;
-  -moz-border-top-colors: #333;
-  -moz-border-left-colors: #333;
-  -moz-border-right-colors: #333;
-  -moz-border-bottom-colors: #333;
-}
-
-DIV#loginScreen INPUT#submit
-{ margin-top: 10px; }
+DIV#loginScreen A#submit,
+DIV#loginScreen A#submit SPAN
+{ color: #535D6D; }
 
 IMG#progressIndicator
 { width: 16px;
diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index 7960a3fe0..535ea302a 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -1,128 +1,137 @@
 /* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 function initLogin() {
-	var date = new Date();
-	date.setTime(date.getTime() - 86400000);
-	document.cookie = ("0xHIGHFLYxSOGo=discarded"
-                           + "; expires=" + date.toGMTString()
-		           + "; path=/");
+    var date = new Date();
+    date.setTime(date.getTime() - 86400000);
+    document.cookie = ("0xHIGHFLYxSOGo=discarded"
+                       + "; expires=" + date.toGMTString()
+                       + "; path=/");
 
-	var about = $("about");
-	if (about) {
-		about.observe("click", function(event) { $("aboutBox").show(); });
+    var about = $("about");
+    if (about) {
+        about.observe("click", function(event) { $("aboutBox").show(); });
 
-		var aboutClose = $("aboutClose");
-		aboutClose.observe("click", function(event) { $("aboutBox").hide(); });
-	}
+        var aboutClose = $("aboutClose");
+        aboutClose.observe("click", function(event) { $("aboutBox").hide(); });
+    }
 
-	var submit = $("submit");
-	submit.observe("click", onLoginClick);
+    var submit = $("submit");
+    submit.observe("click", onLoginClick);
 
-	var userName = $("userName");
-	userName.focus();
+    var userName = $("userName");
+    userName.focus();
+    userName.observe("keydown", onFieldKeyDown);
 
-	var image = $("preparedAnimation");
-	image.parentNode.removeChild(image);
+    var passw = $("password");
+    passw.observe("keydown", onFieldKeyDown);
 
-	var submitBtn = $("submit");
-	submitBtn.disabled = false;
+    var image = $("preparedAnimation");
+    image.parentNode.removeChild(image);
+
+    var submitBtn = $("submit");
+    submitBtn.disabled = false;
+}
+
+function onFieldKeyDown (event) {
+    if (event.keyCode == Event.KEY_RETURN)
+        return onLoginClick (event);
 }
 
 function onLoginClick(event) {
-	var userNameField = $("userName");
-	var userName = userNameField.value;
-	var password = $("password").value;
-	var language = $("language");
-	
-	if (userName.length > 0) {
-		$("loginErrorMessage").hide();
-		$("noCookiesErrorMessage").hide();
-		this.disabled = true;
-		startAnimation($("animation"));
+    var userNameField = $("userName");
+    var userName = userNameField.value;
+    var password = $("password").value;
+    var language = $("language");
 
-		if (typeof(loginSuffix) != "undefined"
-				&& loginSuffix.length > 0
-				&& !userName.endsWith(loginSuffix))
-			userName += loginSuffix;
-		var url = $("connectForm").getAttribute("action");
-		var parameters = "userName=" + encodeURIComponent(userName) + 
-											"&password=" + encodeURIComponent(password);
-		if (language)
-			parameters += (language.value == "WONoSelectionString")?"":("&language=" + language.value);
+    if (userName.length > 0) {
+        $("loginErrorMessage").hide();
+        $("noCookiesErrorMessage").hide();
+        this.disabled = true;
+        startAnimation($("animation"));
+
+        if (typeof(loginSuffix) != "undefined"
+            && loginSuffix.length > 0
+            && !userName.endsWith(loginSuffix))
+            userName += loginSuffix;
+        var url = $("connectForm").getAttribute("action");
+        var parameters = "userName=" + encodeURIComponent(userName) + 
+            "&password=" + encodeURIComponent(password);
+        if (language)
+            parameters += (language.value == "WONoSelectionString")?"":("&language=" + language.value);
         /// Discarded as it seems to create a cookie for nothing. To discard
         //  a cookie in JS, have a look here: http://www.quirksmode.org/js/cookies.html
-	//	document.cookie = "";
-		triggerAjaxRequest(url, onLoginCallback, null, (parameters),
-											 { "Content-type": "application/x-www-form-urlencoded",
-													 "Content-length": parameters.length,
-													 "Connection": "close" });
-	}
-	else
-		userNameField.focus();
+        //document.cookie = "";
+        triggerAjaxRequest(url, onLoginCallback, null, (parameters),
+                           { "Content-type": "application/x-www-form-urlencoded",
+                                   "Content-length": parameters.length,
+                                   "Connection": "close" });
+    }
+    else
+        userNameField.focus();
 
-	preventDefault(event);
+    preventDefault(event);
 }
 
 function onLoginCallback(http) {
-	if (http.readyState == 4) {
-		var noCookiesErrorMessage = $("noCookiesErrorMessage");
-		var loginErrorMessage = $("loginErrorMessage");
-		var submitBtn = $("submit");
+    if (http.readyState == 4) {
+        var noCookiesErrorMessage = $("noCookiesErrorMessage");
+        var loginErrorMessage = $("loginErrorMessage");
+        var submitBtn = $("submit");
 
-		if (isHttpStatus204(http.status)) {
-			// Make sure browser's cookies are enabled
-			var cookieExists = 0;
-			var ca = document.cookie.split(';');
-			for (var i = 0; i < ca.length; i++) {
-				var c = ca[i];
-				while (c.charAt(0) == ' ') c = c.substring(1, c.length);
-				if (c.indexOf("0xHIGHFLYxSOGo=") == 0) {
-					cookieExists = 1;
-					break;
-				}
-			}
-			if (cookieExists === 0) {
-				loginErrorMessage.hide();
-				noCookiesErrorMessage.show();
-				submitBtn.disabled = false;
-				return false;
-			}
+        if (isHttpStatus204(http.status)) {
+            // Make sure browser's cookies are enabled
+            var cookieExists = 0;
+            var ca = document.cookie.split(';');
+            for (var i = 0; i < ca.length; i++) {
+                var c = ca[i];
+                while (c.charAt(0) == ' ') c = c.substring(1, c.length);
+                if (c.indexOf("0xHIGHFLYxSOGo=") == 0) {
+                    cookieExists = 1;
+                    break;
+                }
+            }
+            if (cookieExists === 0) {
+                loginErrorMessage.hide();
+                noCookiesErrorMessage.show();
+                submitBtn.disabled = false;
+                return false;
+            }
       
-			// Redirect to proper page
-			var userName = $("userName").value;
-			if (typeof(loginSuffix) != "undefined"
-					&& loginSuffix.length > 0
-					&& !userName.endsWith(loginSuffix))
-				userName += loginSuffix;
-			var address = "" + window.location.href;
-			var baseAddress = ApplicationBaseURL + encodeURIComponent(userName);
-			var altBaseAddress;
-			if (baseAddress[0] == "/") {
-				var parts = address.split("/");
-				var hostpart = parts[2];
-				var protocol = parts[0];
-				baseAddress = protocol + "//" + hostpart + baseAddress;
-			}
-			var altBaseAddress;
-			var parts = baseAddress.split("/");
-			parts.splice(3, 0);
-			altBaseAddress = parts.join("/");
+            // Redirect to proper page
+            var userName = $("userName").value;
+            if (typeof(loginSuffix) != "undefined"
+                && loginSuffix.length > 0
+                && !userName.endsWith(loginSuffix))
+                userName += loginSuffix;
+            var address = "" + window.location.href;
+            var baseAddress = ApplicationBaseURL + encodeURIComponent(userName);
+            var altBaseAddress;
+            if (baseAddress[0] == "/") {
+                var parts = address.split("/");
+                var hostpart = parts[2];
+                var protocol = parts[0];
+                baseAddress = protocol + "//" + hostpart + baseAddress;
+            }
+            var altBaseAddress;
+            var parts = baseAddress.split("/");
+            parts.splice(3, 0);
+            altBaseAddress = parts.join("/");
 
-			var newAddress;
-			if ((address.startsWith(baseAddress)
-					 || address.startsWith(altBaseAddress))
-					&& !address.endsWith("/logoff"))
-				newAddress = address;
-			else
-				newAddress = baseAddress;
-			window.location.href = newAddress;
-		}
-		else {
-			loginErrorMessage.show();
-			noCookiesErrorMessage.hide();
-			submitBtn.disabled = false;
-		}
-	}
+            var newAddress;
+            if ((address.startsWith(baseAddress)
+                 || address.startsWith(altBaseAddress))
+                && !address.endsWith("/logoff"))
+                newAddress = address;
+            else
+                newAddress = baseAddress;
+            window.location.href = newAddress;
+        }
+        else {
+            loginErrorMessage.show();
+            noCookiesErrorMessage.hide();
+            submitBtn.disabled = false;
+        }
+    }
 }
 
 document.observe("dom:loaded", initLogin);
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index e742c55b5..c3b125971 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -8,7 +8,7 @@ DIV#leftPanel
 
 DIV#schedulerTabs
 { position: absolute;
-  top: 0.5em;
+  top: 22px;
   left: .2em;
   right: .2em;
   height: 14em; }
@@ -56,14 +56,11 @@ UL#tasksList, UL#calendarList
 { cursor: default;
   margin: 0px;
   padding: 0px;
-  border-bottom: 1px solid #fff;
-  border-right: 1px solid #fff;
-  border-top: 2px solid #222;
-  border-left: 2px solid #222;
-  background-color: #fff;
-  -khtml-user-select: none;
-  -moz-border-top-colors: #9c9a94 #000 transparent;
-  -moz-border-left-colors: #9c9a94 #000 transparent;
+  border-top: 1px solid #909090;
+  border-left: 1px solid #909090;
+  border-bottom: 1px solid #FFFFFF;
+  border-right: 1px solid #FFFFFF;
+  background-color: #CCDDEC;
   list-style-type: none;
   list-style-image: none;
   overflow: auto;
@@ -71,7 +68,7 @@ UL#tasksList, UL#calendarList
 
 UL#calendarList
 { clear: left;
-  height: 10.5em; }
+  height: 10em; }
 
 UL#calendarList LI
 { cursor: pointer;
@@ -123,7 +120,7 @@ UL#tasksList LI[class~="_selected"].duetoday
 UL#tasksList LI[class~="_selected"].duelater,
 UL#tasksList LI[class~="_selected"].completed
 { color: #fff !important;
-  background-color: #999 !important; }
+  background-color: #9ABCD8 !important; }
 
 DIV#rightPanel
 { position: absolute;
@@ -140,12 +137,13 @@ DIV#rightPanel
 DIV#eventsListView
 { cursor: default;
   position: absolute;
-  background-color: #fff;
+  background-color: #FFFFFF;
   top: 2.5em;
   left: 0px;
   right: 0px;
   height: 15.5em;
   overflow: hidden;
+  border-left: 1px solid #9B9B9B;
   overflow-y: auto; }
 
 DIV#calendarView
@@ -185,11 +183,12 @@ DIV#dateSelectorView
 
 #dateSelector
 { margin: 0px auto;
+  height: 13.5em;
   background-color: #fff;
-  border-top: 1px solid #fff; 
-  border-left: 1px solid #fff;
-  border-right: 1px solid #aaa;
-  border-bottom: 1px solid #aaa; }
+  border-top: 1px solid #FFFFFF !important;
+  border-left: 1px solid #FFFFFF !important;
+  border-bottom: 1px solid #909090 !important;
+  border-right: 1px solid #909090 !important; }
 
 #dateSelector > .header
 { background-color: #efefef;
@@ -202,10 +201,12 @@ DIV#dateSelectorView
   border: 0px; }
 
 #dateSelector > .header #leftArrow
-{ float: left; }
+{ float: left;
+  margin-top: 3px; }
 
 #dateSelector > .header #rightArrow
 { float: right;
+  margin-top: 3px;
   margin-right: 2px; }
 
 #dateSelector > .header SPAN
@@ -252,7 +253,7 @@ TABLE#dateSelectorTable TD TABLE TD.dayOfToday
 
 #dateSelectorTable TABLE TD.activeDay:hover,
 #dateSelectorTable TABLE TD.inactiveDay:hover
-{ border: 1px solid #deebf7; }
+{ border: 1px solid #CCDDEC; }
 
 #dateSelectorTable TABLE TD.activeDay:active,
 #dateSelectorTable TABLE TD.inactiveDay:active
@@ -267,11 +268,8 @@ TABLE#dateSelectorTable TD TABLE TD.dayOfToday
 { color: #dedfde; }
 
 #dateSelector TD.dayOfToday
-{ background-color: #deebf7;
-  border: 1px solid #deebf7; }
-
-#dateSelector TD.dayOfToday._selected
-{ background-color: #4b6983; }
+{ background-color: #CCDDEC;
+  border: 1px solid #CCDDEC; }
 
 #dateSelectorTable TABLE TD._selected SPAN
 { color: #fff; }
@@ -308,7 +306,7 @@ DIV#eventDialog p#description
 ._unfocused#dateSelector TD._selected,
 UL._unfocused > LI._selected,
 TABLE._unfocused#eventsList TR._selected TD
-{ background-color: #d4d0c8 !important;
+{ background-color: #B3CCE2 !important;
   color: #fff !important; }
 
 SPAN.dayCellLabel
@@ -320,7 +318,7 @@ SPAN.weeksHeader,
 SPAN.monthsHeader
 { display: block;
   white-space: nowrap;
-  background-color: #d4d0c8;
+  background-color: #DFDFDF;
   overflow: hidden;
   width: 100%;
   margin: 0px;
@@ -389,10 +387,10 @@ SPAN.day0
 { font-size: x-large; }
 
 SPAN.day0, SPAN.week0, SPAN.month0
-{ border-top: 1px solid #828482 !important;
-  border-left: 1px solid #828482 !important;
-  border-bottom: 1px solid #fff !important;
-  border-right: 1px solid #fff !important;
+{ border-top: 1px solid #909090 !important;
+  border-left: 1px solid #909090 !important;
+  border-bottom: 1px solid #FFFFFF !important;
+  border-right: 1px solid #FFFFFF !important;
   background-color: #ddd; }
 
 A.leftNavigationArrow
@@ -452,7 +450,7 @@ DIV#calendarHeader DIV.dayLabels
 DIV#calendarHeader DIV.dayLabels DIV.day
 { text-align: center;
   color: #666;
-  background-color: #f0f0f0; }
+  background-color: #E7E7E7; }
 
 DIV#calendarHeader SPAN.dayOfWeek
 { font-size: medium; }
@@ -533,30 +531,30 @@ DIV.monthView > DIV.headerDay
 { text-align: center;
   cursor: default;
   padding-top: .5em;
-  border-left: 2px solid #ccc !important;
-  border-top: 2px solid #ccc !important;
+  border-left: 1px solid #909090 !important;
+  border-top: 1px solid #909090 !important;
   top: 0px;
   color: #666;
   height: 1.5em;
   font-weight: bold;
-  background-color: #f0f0f0; }
+  background-color: #E7E7E7; }
 
 DIV.dayOfToday
-{ background-color: #deebf7; }
+{ background-color: #CCDDEC; }
 
 DIV.dayOfToday DIV.outOfDay
 { background-color: #d6dfe9; }
 
 DIV.outOfDay, DIV.weekEndDay,
 DIV.weekEndDay DIV.outOfDay
-{ background-color: #f4f4f4; }
+{ background-color: #E6E7E6; }
 
 DIV.dayOfAnotherMonth
 { background-color: #e7efef; }
 
 DIV.monthView DIV.dayHeader
-{ background-color: #f0f0f0;
-  margin-right: 2px;
+{ margin-right: 0px;
+  padding-right: 2px;
   text-align: right;
   cursor: pointer;
   color: #666;
@@ -571,8 +569,8 @@ DIV.monthView DIV.days
 
 DIV.monthView DIV.day
 { position: absolute;
-  border-left: 2px solid #ccc;
-  border-top: 2px solid #ccc;
+  border-left: 1px solid #909090;
+  border-top: 1px solid #909090;
   min-height: 4em;
   overflow: auto;
   overflow-x: hidden; }
@@ -684,8 +682,7 @@ DIV.daysViewFor1Days DIV.day
 DIV.monthView DIV.headerDay,
 DIV.monthView DIV.day,
 DIV.daysViewFor7Days DIV.day
-{ width: 14.2857%;
-  width: 14.1%; }
+{ width: 14.2%; }
 
 DIV.monthView DIV.day0,
 DIV.daysViewFor7Days DIV.day0
@@ -869,7 +866,7 @@ DIV.event > DIV.eventInside
   top: 2px;
   bottom: 2px;
   left: 1px;
-  right: 2px; }
+  right: 1px; }
 
 DIV.event._selected > DIV.eventInside
 { -moz-opacity: 0.7;
@@ -1526,3 +1523,12 @@ DIV#nowLineDisplay
   background: red;
   z-index: 49;
 }
+
+DIV#freeBusyReplicas INPUT.textField
+{ width: 7em; }
+DIV#freeBusyReplicas a.calendarButton {
+ right: 0px; }
+DIV#freeBusyReplicas DIV
+{ display: inline-block; height: 2em; }
+TD.attendees A.button
+{ float: left; left: 19px; margin-top: 5px; }
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 1a7759042..715b459cd 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -648,9 +648,9 @@ function eventsListCallback(http) {
                     var sortImage = createElement("img", "messageSortImage", "sortImage");
                     sortHeader.insertBefore(sortImage, sortHeader.firstChild);
                     if (sorting["ascending"])
-                        sortImage.src = ResourcesURL + "/title_sortdown_12x12.png";
+                        sortImage.src = ResourcesURL + "/arrow-down.png";
                     else
-                        sortImage.src = ResourcesURL + "/title_sortup_12x12.png";
+                        sortImage.src = ResourcesURL + "/arrow-up.png";
                 }
             }
         }
@@ -1711,26 +1711,26 @@ function updateCalendarsList(method) {
     }
 }
 
-function validateBrowseURL(input) {
-    var button = $("browseURLBtn");
+//function validateBrowseURL(input) {
+//    var button = $("browseURLBtn");
+//
+//    if (input.value.length) {
+//        if (!button.enabled)
+//            enableAnchor(button);
+//    } else if (!button.disabled)
+//        disableAnchor(button);
+//}
 
-    if (input.value.length) {
-        if (!button.enabled)
-            enableAnchor(button);
-    } else if (!button.disabled)
-        disableAnchor(button);
-}
-
-function browseURL(anchor, event) {
-    if (event.button == 0) {
-        var input = $("url");
-        var url = input.value;
-        if (url.length)
-            window.open(url, '_blank');
-    }
-
-    return false;
-}
+//function browseURL(anchor, event) {
+//    if (event.button == 0) {
+//        var input = $("url");
+//        var url = input.value;
+//        if (url.length)
+//            window.open(url, '_blank');
+//    }
+//
+//    return false;
+//}
 
 function onCalendarsMenuPrepareVisibility() {
     var folders = $("calendarList");
@@ -1797,7 +1797,6 @@ function marksTasksAsCompleted () {
 }
 
 function _updateTaskCompletion (task, value) {
-    var checkBox = task.down ("INPUT");
     url = (ApplicationBaseURL + task.calendar
            + "/" + task.cname + "/changeStatus?status=" + value);
 
@@ -1878,10 +1877,8 @@ function onCalendarModify(event) {
         && UserSettings['Calendar']['WebCalendars']) {
         var webCalendars = UserSettings['Calendar']['WebCalendars'];
         var realID = calendarID.substr (1, calendarID.length - 1);
-        if (webCalendars[realID]) {
-            width = 500;
-            height = 360;
-        }
+        if (webCalendars[realID])
+            height = 290;
     }
     if (calendarID == "/personal")
       height = 250;
@@ -1963,7 +1960,6 @@ function onCalendarImport(event) {
 
     var url = ApplicationBaseURL + folderId + "/import";
     $("uploadForm").action = url;
-    $("uploadCancel").onclick = hideCalendarImport;
     $("calendarFile").value = "";
 
     var cellPosition = node.cumulativeOffset();
@@ -1973,19 +1969,17 @@ function onCalendarImport(event) {
 
     var div = $("uploadDialog");
     var res = $("uploadResults");
-    div.style.top = top + "px";
-    res.style.top = top + "px";
-    div.style.left = left + "px";
-    res.style.left = left + "px";
-    div.style.display = "block";
+    res.setStyle({ top: top + "px", left: left + "px" });
+    div.setStyle({ top: top + "px", left: left + "px" });
+    div.show();
 }
-function hideCalendarImport () {
-    $("uploadDialog").style.display = "none";
+function hideCalendarImport(event) {
+    $("uploadDialog").hide();
 }
-function hideImportResults () {
-    $("uploadResults").style.display = "none";
+function hideImportResults(event) {
+    $("uploadResults").hide();
 }
-function validateUploadForm () {
+function validateUploadForm() {
     rc = false;
     if ($("calendarFile").value.length)
       rc = true;
@@ -1995,7 +1989,6 @@ function uploadCompleted(response) {
     data = response.evalJSON(true);
 
     var div = $("uploadResults");
-    $("uploadOK").onclick = hideImportResults;
     if (data.imported < 0)
         $("uploadResultsContent").update(getLabel("An error occured while importing calendar."));
     else if (data.imported == 0)
@@ -2005,8 +1998,8 @@ function uploadCompleted(response) {
         refreshEventsAndDisplay();
     }
     
-    hideCalendarImport ();
-    $("uploadResults").style.display = "block";
+    hideCalendarImport();
+    $("uploadResults").show();
 }
 
 function setEventsOnCalendar(checkBox, li) {
@@ -2294,6 +2287,9 @@ function initCalendars() {
         configureLists();
         $("calendarList").attachMenu("calendarsMenu");
         $(document.body).observe("click", onBodyClickHandler);
+        // Calendar import form
+        $("uploadCancel").observe("click", hideCalendarImport);
+        $("uploadOK").observe("click", hideImportResults);
     }
 
     onWindowResize.defer();
diff --git a/UI/WebServerResources/UIxAclEditor.css b/UI/WebServerResources/UIxAclEditor.css
index 37e6caaa2..cdd15ede4 100644
--- a/UI/WebServerResources/UIxAclEditor.css
+++ b/UI/WebServerResources/UIxAclEditor.css
@@ -26,23 +26,23 @@ DIV#userSelectorHeader
 DIV#userSelector SPAN
 { display: block; }
 
-INPUT#defaultRolesBtn
+A#defaultRolesBtn
 { float: right;
-  margin-right: 1em; }
+  margin-right: 1em;
+  margin-top: 5px;}
 
 DIV#userRoles
 { height: 100%; }
 
 #userSelectorButtons
 { margin-left: 1em;
-  padding-top: 2px;
   padding-bottom: 2px; }
 
 UL#userList
 { position: absolute;
   left: 0px;
   right: 0px;
-  top: 30px;
+  top: 40px;
   bottom: 33px;
   padding: 0px;
   margin: 0px;
@@ -50,18 +50,15 @@ UL#userList
   overflow: auto;
   border-bottom: 1px solid #fff;
   border-right: 1px solid #fff;
-  border-top: 2px solid #222;
-  border-left: 2px solid #222;
-  background-color: #fff;
-  -moz-border-top-colors: #9c9a94 #000 transparent;
-  -moz-border-left-colors: #9c9a94 #000 transparent;
+  border-top: 1px solid #909090;
+  border-left: 1px solid #909090;
+  background-color: #CCDDEC;
   list-style-type: none;
   list-style-image: none; }
 
 UL#userList LI
 { cursor: pointer;
-  margin-left: 3px; }
+  padding-left: 3px; }
 
-UL#userList > LI._selected
-{ background: #4b6983 !important;
-  color: #fff !important; }
+DIV#userSelectorButtons A.smallToolbarButton
+{ float: left; }
diff --git a/UI/WebServerResources/UIxAclEditor.js b/UI/WebServerResources/UIxAclEditor.js
index 3f21294cc..475e28f21 100644
--- a/UI/WebServerResources/UIxAclEditor.js
+++ b/UI/WebServerResources/UIxAclEditor.js
@@ -1,159 +1,161 @@
 /* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
-/* test */
-
 var contactSelectorAction = 'acls-contacts';
 var defaultUserID = '';
 var AclEditor = {
- userRightsHeight: null,
- userRightsWidth: null
+    userRightsHeight: null,
+    userRightsWidth: null
 };
 
 function addUser(userName, userID) {
-	var result = false;
-	if (!$(userID)) {
-		var ul = $("userList");
-		ul.appendChild(nodeForUser(userName, userID));
-		var url = window.location.href;
-		var elements = url.split("/");
-		elements[elements.length-1] = ("addUserInAcls?uid="
-																	 + userID);
-		triggerAjaxRequest(elements.join("/"), addUserCallback);
-		result = true;
-	}
-	return result;
+    var result = false;
+    if (!$(userID)) {
+        var ul = $("userList");
+        ul.appendChild(nodeForUser(userName, userID));
+        var url = window.location.href;
+        var elements = url.split("/");
+        elements[elements.length-1] = ("addUserInAcls?uid="
+                                       + userID);
+        triggerAjaxRequest(elements.join("/"), addUserCallback);
+        result = true;
+    }
+    return result;
 }
 
 function addUserCallback(http) {
-	// Ignore response
+    // Ignore response
 }
 
 function setEventsOnUserNode(node) {
-  var n = $(node);
-  n.observe("mousedown", listRowMouseDownHandler);
-  n.observe("selectstart", listRowMouseDownHandler);
-  n.observe("dblclick", onOpenUserRights);
-  n.observe("click", onRowClick);
+    var n = $(node);
+    n.observe("mousedown", listRowMouseDownHandler);
+    n.observe("selectstart", listRowMouseDownHandler);
+    n.observe("dblclick", onOpenUserRights);
+    n.observe("click", onRowClick);
 }
 
 function nodeForUser(userName, userId) {
-	var node = document.createElement("li");
-	node.setAttribute("id", userId);
-	node.setAttribute("class", "");
-	setEventsOnUserNode(node);
+    var node = document.createElement("li");
+    node.setAttribute("id", userId);
+    node.setAttribute("class", "");
+    setEventsOnUserNode(node);
 
-	var image = document.createElement("img");
-	image.setAttribute("src", ResourcesURL + "/abcard.gif");
+    var image = document.createElement("img");
+    image.setAttribute("src", ResourcesURL + "/abcard.gif");
 
-	node.appendChild(image);
-	node.appendChild(document.createTextNode(" " + userName));
+    node.appendChild(image);
+    node.appendChild(document.createTextNode(" " + userName));
 
-	return node;
+    return node;
 }
 
 function saveAcls() {
-	var uidList = new Array();
-	var users = $("userList").childNodesWithTag("li");
-	for (var i = 0; i < users.length; i++)
-		uidList.push(users[i].getAttribute("id"));
-	$("userUIDS").value = uidList.join(",");
-	$("aclForm").submit();
+    var uidList = new Array();
+    var users = $("userList").childNodesWithTag("li");
+    for (var i = 0; i < users.length; i++)
+        uidList.push(users[i].getAttribute("id"));
+    $("userUIDS").value = uidList.join(",");
+    $("aclForm").submit();
 
-	return false;
+    return false;
 }
 
 function onUserAdd(event) {
-	openUserFolderSelector(null, "user");
+    openUserFolderSelector(null, "user");
 
-	preventDefault(event);
+    preventDefault(event);
 }
 
 function removeUserCallback(http) {
-	var node = http.callbackData;
+    var node = http.callbackData;
 
-  if (http.readyState == 4
-      && isHttpStatus204(http.status))
-		node.parentNode.removeChild(node);
-  else
-		log("error deleting user: " + node.getAttribute("id"));
+    if (http.readyState == 4
+        && isHttpStatus204(http.status))
+        node.parentNode.removeChild(node);
+    else
+        log("error deleting user: " + node.getAttribute("id"));
 }
 
 function onUserRemove(event) {
-	var userList = $("userList");
-	var nodes = userList.getSelectedRows();
+    var userList = $("userList");
+    var nodes = userList.getSelectedRows();
 
-	var url = window.location.href;
-	var elements = url.split("/");
-	elements[elements.length-1] = "removeUserFromAcls?uid=";
-	var baseURL = elements.join("/");
+    var url = window.location.href;
+    var elements = url.split("/");
+    elements[elements.length-1] = "removeUserFromAcls?uid=";
+    var baseURL = elements.join("/");
 
-	for (var i = 0; i < nodes.length; i++) {
-		var userId = nodes[i].getAttribute("id");
-		triggerAjaxRequest(baseURL + userId, removeUserCallback, nodes[i]);
-	}
-	preventDefault(event);
+    for (var i = 0; i < nodes.length; i++) {
+        var userId = nodes[i].getAttribute("id");
+        triggerAjaxRequest(baseURL + userId, removeUserCallback, nodes[i]);
+    }
+    preventDefault(event);
 }
 
 function subscribeToFolder(refreshCallback, refreshCallbackData) {
-	var result = true;
-	if (UserLogin != refreshCallbackData["folder"]) {
-		result = addUser(refreshCallbackData["folderName"],
-										 refreshCallbackData["folder"]);
-	}
-	else
-		refreshCallbackData["window"].alert(getLabel("You cannot subscribe to a folder that you own!"));
-	return result;
+    var result = true;
+    if (UserLogin != refreshCallbackData["folder"]) {
+        result = addUser(refreshCallbackData["folderName"],
+                         refreshCallbackData["folder"]);
+    }
+    else
+        refreshCallbackData["window"].alert(getLabel("You cannot subscribe to a folder that you own!"));
+    return result;
 }
 
 function openRightsForUserID(userID) {
-	var url = window.location.href;
-	var elements = url.split("/");
-	elements[elements.length-1] = "userRights?uid=" + userID;
+    var url = window.location.href;
+    var elements = url.split("/");
+    elements[elements.length-1] = "userRights?uid=" + userID;
 
-	window.open(elements.join("/"), "",
-							"width=" + AclEditor.userRightsWidth
-							+ ",height=" + AclEditor.userRightsHeight
-							+ ",resizable=0,scrollbars=0,toolbar=0,"
-							+ "location=0,directories=0,status=0,menubar=0,copyhistory=0");
+    window.open(elements.join("/"), "",
+                "width=" + AclEditor.userRightsWidth
+                + ",height=" + AclEditor.userRightsHeight
+                + ",resizable=0,scrollbars=0,toolbar=0,"
+                + "location=0,directories=0,status=0,menubar=0,copyhistory=0");
 }
 
 function openRightsForUser(button) {
-  var nodes = $("userList").getSelectedRows();
-  if (nodes.length > 0)
-		openRightsForUserID(nodes[0].getAttribute("id"));
+    var nodes = $("userList").getSelectedRows();
+    if (nodes.length > 0)
+        openRightsForUserID(nodes[0].getAttribute("id"));
 
-  return false;
+    return false;
 }
 
 function openRightsForDefaultUser(event) {
-	openRightsForUserID(defaultUserID);
-	preventDefault(event);
+    this.blur(); // required by IE
+    openRightsForUserID(defaultUserID);
+    Event.stop(event);
 }
 
 function onOpenUserRights(event) {
-	openRightsForUser();
-	preventDefault(event);
+    openRightsForUser();
+    preventDefault(event);
 }
 
 function onAclLoadHandler() {
-	defaultUserID = $("defaultUserID").value;
-	var defaultRolesBtn = $("defaultRolesBtn");
-	if (defaultRolesBtn)
-		defaultRolesBtn.observe("click", openRightsForDefaultUser);
-	var ul = $("userList");
-	var lis = ul.childNodesWithTag("li");
-	for (var i = 0; i < lis.length; i++)
-		setEventsOnUserNode(lis[i]);
+    defaultUserID = $("defaultUserID").value;
+    var defaultRolesBtn = $("defaultRolesBtn");
+    if (defaultRolesBtn) {
+        defaultRolesBtn.observe("click", openRightsForDefaultUser);
+    }
+    var ul = $("userList");
+    var lis = ul.childNodesWithTag("li");
+    for (var i = 0; i < lis.length; i++)
+        setEventsOnUserNode(lis[i]);
 
-	var buttonArea = $("userSelectorButtons");
-	if (buttonArea) {
-		var buttons = buttonArea.childNodesWithTag("a");
-		buttons[0].observe("click", onUserAdd);
-		buttons[1].observe("click", onUserRemove);
-	}
+    var buttonArea = $("userSelectorButtons");
+    if (buttonArea) {
+        var buttons = buttonArea.childNodesWithTag("a");
+        $("aclAddUser").stopObserving ("click");
+        $("aclDeleteUser").stopObserving ("click");
+        $("aclAddUser").observe("mousedown", onUserAdd);
+        $("aclDeleteUser").observe("mousedown", onUserRemove);
+    }
 
-	AclEditor['userRightsHeight'] = window.opener.getUsersRightsWindowHeight();
-	AclEditor['userRightsWidth'] = window.opener.getUsersRightsWindowWidth();
+    AclEditor['userRightsHeight'] = window.opener.getUsersRightsWindowHeight();
+    AclEditor['userRightsWidth'] = window.opener.getUsersRightsWindowWidth();
 }
 
 document.observe("dom:loaded", onAclLoadHandler);
diff --git a/UI/WebServerResources/UIxAppointmentEditor.css b/UI/WebServerResources/UIxAppointmentEditor.css
index fe7e047f9..a240052ca 100644
--- a/UI/WebServerResources/UIxAppointmentEditor.css
+++ b/UI/WebServerResources/UIxAppointmentEditor.css
@@ -71,7 +71,7 @@ DIV#participants UL.contactList
 SPAN.checkBoxList SPAN.content LABEL
 { display: inline; }
 
-n0SPAN.content
+SPAN.content
 { position: absolute;
   line-height: 2em;
   top: -.25em;
diff --git a/UI/WebServerResources/UIxAttendeesEditor.css b/UI/WebServerResources/UIxAttendeesEditor.css
index 514de7103..8b853d9eb 100644
--- a/UI/WebServerResources/UIxAttendeesEditor.css
+++ b/UI/WebServerResources/UIxAttendeesEditor.css
@@ -21,12 +21,10 @@ DIV#freeBusyView
   left: 0px;
   right: 0px;
   overflow: hidden;
-  border-top: 2px solid #222;
-  border-left: 2px solid #222;
+  border-top: 1px solid #909090;
+  border-left: 1px solid #909090;
   border-right: 1px solid #fff;
-  border-bottom: 1px solid #fff;
-  -moz-border-top-colors: #9c9a94 #000;
-  -moz-border-left-colors: #9c9a94 #000; }
+  border-bottom: 1px solid #fff; }
 
 TABLE
 { border-collapse: separated;
@@ -127,7 +125,7 @@ TABLE#freeBusyData TR.futureData TD
   line-height: 3em; }
 
 TABLE#freeBusyAttendees TR.futureAttendee TD A
-{ margin-left: 24px; }
+{ margin-left: 20px; }
 
 SPAN.freeBusyZoneElement
 { display: block;
@@ -210,10 +208,22 @@ DIV#freeBusyViewButtons
 { position: absolute;
   margin: 0px;
   border: 0px;
-  padding: 3px;
-  height: 2em;
+  padding: 0px 3px 3px 3px;
+  line-height: 2em;
   top: 0px;
-  left: 16em; }
+  right: 0;
+  padding-right: 16em; /* leave space for the next/previous buttons */
+  text-align: right;
+  left: auto; }
+
+DIV#freeBusyViewButtons SPAN.buttons
+{ position: absolute;
+  top: 0px;
+  left: auto;
+  right: 0px; }
+
+DIV#freeBusyViewButtons INPUT
+{ clear: none; }
 
 DIV#freeBusyZoomButtons
 { position: absolute;
@@ -224,20 +234,9 @@ DIV#freeBusyZoomButtons
   top: 0px;
   right: 0px; }
 
-DIV#freeBusyButtons
-{ position: absolute;
-  top: 7em;
-  left: 0px;
-  text-align: left;
-  width: 20em;
-  height: 2em; }
-
-DIV#freeBusyButtons A.button
-{ width: 5em; }
-
 DIV#freeBusyReplicas
 { position: absolute;
-  top: 6em;
+  top: 5em;
   right: 0px;
   width: 30em;
   height: 4em; }
@@ -256,3 +255,12 @@ DIV#windowButtons
 .officeHour
 { color: #666 !important;
   font-weight: bold !important; }
+
+SPAN.content INPUT,
+SPAN.content SELECT,
+SPAN.content SPAN,
+SPAN.timeDateControl INPUT,
+SPAN.timeDateControl SELECT,
+SPAN.timeDateControl SPAN,
+DIV#freeBusyReplicas SPAN
+{ vertical-align: top; }
diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js
index 36a897f0a..1bc940d39 100644
--- a/UI/WebServerResources/UIxAttendeesEditor.js
+++ b/UI/WebServerResources/UIxAttendeesEditor.js
@@ -551,12 +551,14 @@ function updateSlotDisplayCallback(http) {
     cb();
 }
 
-function onPreviousSlotClick (event) {
-    findSlot (-1);
+function onPreviousSlotClick(event) {
+    findSlot(-1);
+    this.blur(); // required by IE
 }
 
-function onNextSlotClick (event) {
-    findSlot (1);
+function onNextSlotClick(event) {
+    findSlot(1);
+    this.blur(); // required by IE
 }
 
 function onEditorOkClick(event) {
diff --git a/UI/WebServerResources/UIxCalUserRightsEditor.css b/UI/WebServerResources/UIxCalUserRightsEditor.css
index 737d941ac..38986fe34 100644
--- a/UI/WebServerResources/UIxCalUserRightsEditor.css
+++ b/UI/WebServerResources/UIxCalUserRightsEditor.css
@@ -21,10 +21,11 @@ DIV.calendarUserRights SPAN
   line-height: 2em;
   margin-right: 1em;
   text-align: right;
-  width: 200px; }
+  width: 220px; }
 
 DIV.calendarUserRights HR
 { border: 0; }
+
 DIV.buttons
 { text-align: right;
   margin: 1em;
diff --git a/UI/WebServerResources/UIxCalUserRightsEditor.js b/UI/WebServerResources/UIxCalUserRightsEditor.js
index f3aeece76..17fc991fb 100644
--- a/UI/WebServerResources/UIxCalUserRightsEditor.js
+++ b/UI/WebServerResources/UIxCalUserRightsEditor.js
@@ -1,11 +1,19 @@
 /* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
-function onCancelClick(event) {
-  window.close();
+function onUpdateACL(event) {
+    $('userRightsForm').submit();
+    Event.stop(event);
+    
+    return false;
+}
+
+function onCancelACL(event) {
+    window.close();
 }
 
 function initACLButtons() {
-  $("cancelButton").observe("click", onCancelClick);
+    $("updateButton").observe("click", onUpdateACL);
+    $("cancelButton").observe("click", onCancelACL);
 }
 
 document.observe("dom:loaded", initACLButtons);
diff --git a/UI/WebServerResources/UIxCalendarProperties.css b/UI/WebServerResources/UIxCalendarProperties.css
index 651d8cb2f..c620352d5 100644
--- a/UI/WebServerResources/UIxCalendarProperties.css
+++ b/UI/WebServerResources/UIxCalendarProperties.css
@@ -6,7 +6,11 @@ DIV
 { clear: both; }
 
 FIELDSET
-{ margin-bottom: 5px; }
+{ margin-bottom: 5px;
+  border: 1px solid #FFFFFF;
+  border-top: 1px solid #909090;
+  border-left: 1px solid #909090; }
+
 
 SPAN.label
 { cursor: default;
@@ -22,15 +26,14 @@ SPAN.content
   line-height: 1.5em;
   vertical-align: middle; }
 
+SPAN.content INPUT.textField
+{ width: 50%; }
+
 BUTTON#colorButton
 { display: none;
-  margin: 1px 0 0 1px;
-  border-bottom: 1px solid #fff;
-  border-right: 1px solid #fff;
-  border-top: 2px solid #222;
-  border-left: 2px solid #222;
-  -moz-border-top-colors: #9c9a94 #000 transparent;
-  -moz-border-left-colors: #9c9a94 #000 transparent;
+  border: 1px solid #FFFFFF;
+  border-top: 1px solid #909090;
+  border-left: 1px solid #909090;
   width: 3em;
   height: 18px; }
 
@@ -42,6 +45,6 @@ DIV#buttons
 INPUT#calendarSyncTag
 { width: 7em; }
 
-#webCalendarUrl span.content
-{ white-space:nowrap; 
+#webCalendarUrl SPAN.content
+{ white-space: nowrap;
   overflow: hidden; }
diff --git a/UI/WebServerResources/UIxCalendarProperties.js b/UI/WebServerResources/UIxCalendarProperties.js
index cd681ab97..e0450ac41 100644
--- a/UI/WebServerResources/UIxCalendarProperties.js
+++ b/UI/WebServerResources/UIxCalendarProperties.js
@@ -1,20 +1,20 @@
 /* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 function onLoadCalendarProperties() {
-  var colorButton = $("colorButton");
-  var calendarColor = $("calendarColor");
-  colorButton.setStyle({ "backgroundColor": calendarColor.value, display: "inline" });
-  colorButton.observe("click", onColorClick);
-
-  var cancelButton = $("cancelButton");
-  cancelButton.observe("click", onCancelClick);
-
-  var okButton = $("okButton");
-  okButton.observe("click", onOKClick);
+    var colorButton = $("colorButton");
+    var calendarColor = $("calendarColor");
+    colorButton.setStyle({ "backgroundColor": calendarColor.value, display: "inline" });
+    colorButton.observe("click", onColorClick);
+    
+    var cancelButton = $("cancelButton");
+    cancelButton.observe("click", onCancelClick);
+    
+    var okButton = $("okButton");
+    okButton.observe("click", onOKClick);
 }
 
 function onCancelClick(event) {
-  window.close();
+    window.close();
 }
 
 function onOKClick(event) {
@@ -52,10 +52,12 @@ function onOKClick(event) {
            && !originalTag.value.blank())
       save = confirm(getLabel("tagWasRemoved"));
   
-  if (save)
+  if (save) {
       window.opener.updateCalendarProperties(calendarID.value,
                                              calendarName.value,
                                              calendarColor.value);
+      $("propertiesform").submit();
+  }
   else
       Event.stop(event);
 }
diff --git a/UI/WebServerResources/UIxComponentEditor.css b/UI/WebServerResources/UIxComponentEditor.css
index 22c1a3bbd..a3cf6fa89 100644
--- a/UI/WebServerResources/UIxComponentEditor.css
+++ b/UI/WebServerResources/UIxComponentEditor.css
@@ -13,6 +13,9 @@ SPAN.datePicker INPUT.textField
 SPAN.timeDateControl A.button
 { border: 0; }
 
+SPAN.timeDateControl A:hover
+{ text-decoration: none; }
+
 SPAN.content
 { position: absolute;
   line-height: 2em;
@@ -111,3 +114,11 @@ IMG#progressIndicator
   position: absolute;
   right: 1em;
   margin: 0 5px; }
+
+SPAN.content INPUT,
+SPAN.content SELECT,
+SPAN.content SPAN,
+SPAN.timeDateControl INPUT,
+SPAN.timeDateControl SELECT,
+SPAN.timeDateControl SPAN
+{ vertical-align: top; }
diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js
index 2bace05c0..e8e24e864 100644
--- a/UI/WebServerResources/UIxComponentEditor.js
+++ b/UI/WebServerResources/UIxComponentEditor.js
@@ -22,8 +22,8 @@ function onPopupAttendeesWindow(event) {
 function onSelectPrivacy(event) {
     if (event.button == 0 || (isSafari() && event.button == 1)) {
         var node = getTarget(event);
-        if (node.tagName != 'BUTTON')
-            node = $(node).up("button");
+        if (node.tagName != 'A')
+            node = $(node).up("A");
         popupToolbarMenu(node, "privacy-menu");
         Event.stop(event);
         //       preventDefault(event);
diff --git a/UI/WebServerResources/UIxContactEditor.css b/UI/WebServerResources/UIxContactEditor.css
index afe19f15b..645cdfe49 100644
--- a/UI/WebServerResources/UIxContactEditor.css
+++ b/UI/WebServerResources/UIxContactEditor.css
@@ -4,46 +4,12 @@ DIV#addressBookSelector
 DIV#addressBookSelector SELECT
 { width: 32em; }
 
-DIV#editorTabs
-{ position: absolute;
-  top: .5em;
-  left: .5em;
-  right: .5em;
-  bottom: 2.5em;
-  margin-bottom: 1em; }
-
-DIV#editorTabs DIV.tab
-{ padding: .5em;
-  overflow: hidden; }
-
 SELECT
 { width: 8em; }
 
-DIV.tab TABLE
-{ border: 1px solid #aaa;
-  margin-top: -.5em;
-  margin-left: auto;
-  margin-right: auto;
-  margin-bottom: 1em;
-  padding: 1em;
-  -moz-border-radius: 6px;
-  display: table;
-  text-align: right;
-  width: 100%; }
-
-SPAN.caption
-{ display: inline-block;
-  position: relative;
-  text-align: center;
-  cursor: default;
-  background-color: #d4d0c8;
-  width: auto;
-  padding: .25em;
-  margin-left: 7px;
-  border: 0px; }
-
 DIV#buttons
-{ visibility: visible;
+{ color: #535D6D;
+  visibility: visible;
   position: absolute;
   right: 1em;
   bottom: 1em; }
@@ -75,10 +41,6 @@ TABLE#emailInfos TD.preferred
   overflow: visible;
   text-align: center; }
 
-DIV.tab TD INPUT.textField
-{ width: 60%;
-  margin-left: .5em; }
-
 DIV.tab TD.firstColumn INPUT.textField,
 DIV.tab TD.secondColumn INPUT.textField
 { width: 35%; }
diff --git a/UI/WebServerResources/UIxContactEditor.js b/UI/WebServerResources/UIxContactEditor.js
index 3f281f3d6..584e28450 100644
--- a/UI/WebServerResources/UIxContactEditor.js
+++ b/UI/WebServerResources/UIxContactEditor.js
@@ -134,8 +134,15 @@ function onFnNewValue(event) {
 }
 
 function onEditorCancelClick(event) {
-	preventDefault(event);
-	window.close();
+    this.blur();
+    preventDefault(event);
+    window.close();
+}
+
+function onEditorSubmitClick(event) {
+  if (validateContactEditor())
+      $('mainForm').submit();
+  this.blur();
 }
 
 function initEditorForm() {
@@ -145,6 +152,7 @@ function initEditorForm() {
   $("givenName").onkeyup = onFnNewValue;
 
   $("cancelButton").observe("click", onEditorCancelClick);
+  $("submitButton").observe("click", onEditorSubmitClick);
 }
 
 document.observe("dom:loaded", initEditorForm);
diff --git a/UI/WebServerResources/UIxContactsUserFolders.css b/UI/WebServerResources/UIxContactsUserFolders.css
index 8622f5484..2a53faa2c 100644
--- a/UI/WebServerResources/UIxContactsUserFolders.css
+++ b/UI/WebServerResources/UIxContactsUserFolders.css
@@ -1,8 +1,7 @@
 DIV#filterPanel
-{ position: absolute; n0border: 1px dotted blue;
+{ position: absolute;
   text-align: center;
   width: auto;
-  n0line-height: 3em;
   top: 0;
   left: 0;
   padding: 3px 1em 0; }
@@ -25,16 +24,14 @@ DIV#folders
   right: 1em;
   top: 3em;
   bottom: 3em;
-  background-color: #fff;
+  background-color: #CCDDEC;
   padding: .5em;
   padding-top: 0px;
   overflow: auto;
-  border-bottom: 1px solid #fff;
-  border-right: 1px solid #fff;
-  border-top: 2px solid #222;
-  border-left: 2px solid #222;
-  -moz-border-top-colors: #9c9a94 #000 transparent;
-  -moz-border-left-colors: #9c9a94 #000 transparent; }
+  border-top: 1px solid #909090;
+  border-left: 1px solid #909090;
+  border-bottom: 1px solid #FFFFFF;
+  border-right: 1px solid #FFFFFF; }
 
 DIV#folders DIV
 { width: auto; }
diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js
index 4c18fa666..3d1c37d95 100644
--- a/UI/WebServerResources/UIxContactsUserFolders.js
+++ b/UI/WebServerResources/UIxContactsUserFolders.js
@@ -108,22 +108,25 @@ function onUserNodeToggle(event) {
 }
 
 function onTreeItemClick(event) {
-	preventDefault(event);
-
-	var topNode = $("d");
-	if (topNode.selectedEntry)
-		topNode.selectedEntry.deselect();
-	this.selectElement();
-	topNode.selectedEntry = this;
-
-	if (window.opener.userFolderType == "user")
-		$("addButton").disabled = false;
-	else {
-		var dataname = this.parentNode.getAttribute("dataname");
-		if (!dataname)
-			dataname = "";
-		$("addButton").disabled = (dataname.indexOf(":") == -1);
-	};
+    preventDefault(event);
+    
+    var topNode = $("d");
+    if (topNode.selectedEntry)
+        topNode.selectedEntry.deselect();
+    this.selectElement();
+    topNode.selectedEntry = this;
+    
+    if (window.opener.userFolderType == "user")
+        $("addButton").removeClassName("disabled");
+    else {
+        var dataname = this.parentNode.getAttribute("dataname");
+        if (!dataname)
+            dataname = "";
+        if (dataname.indexOf(":") == -1)
+            $("addButton").addClassName("disabled");
+        else
+            $("addButton").removeClassName("disabled");
+    };
 }
 
 function foldersSearchCallback(http) {
@@ -191,35 +194,38 @@ function addFolderNotFoundNode (tree, nodeId) {
 }
 
 function onConfirmFolderSelection(event) {
-  var topNode = $("d");
-  if (topNode && topNode.selectedEntry) {
-    var node = topNode.selectedEntry.parentNode;
-    var folder = node.getAttribute("dataname");
-
-    var folderName;
-    if (window.opener.userFolderType == "user") {
-			var span = $(topNode.selectedEntry).down("SPAN.nodeName");
-			var email = (span.innerHTML
-									 .replace("&lt;", "<", "g")
-									 .replace("&gt;", ">", "g"));
-      folderName = email;
+    if (!this.hasClassName("disabled")) {
+        var topNode = $("d");
+        if (topNode && topNode.selectedEntry) {
+            var node = topNode.selectedEntry.parentNode;
+            var folder = node.getAttribute("dataname");
+            
+            var folderName;
+            if (window.opener.userFolderType == "user") {
+                var span = $(topNode.selectedEntry).down("SPAN.nodeName");
+                var email = (span.innerHTML
+                             .replace("&lt;", "<", "g")
+                             .replace("&gt;", ">", "g"));
+                folderName = email;
+            }
+            else {
+                var resource = $(topNode.selectedEntry).down("SPAN.nodeName");
+                var user = $(node.parentNode.previousSibling).down("SPAN.nodeName");
+                var email = (user.innerHTML
+                             .replace("&lt;", "<", "g")
+                             .replace("&gt;", ">", "g"));
+                folderName = resource.innerHTML + ' (' + email + ')';
+            }
+            folderName = folderName.replace(/>,.*(\))?$/, ">)$1", "g");
+            
+            var data = { folderName: folderName, folder: folder, window: window };
+            if (parent$(accessToSubscribedFolder(folder)))
+                window.alert(getLabel("You have already subscribed to that folder!"));
+            else
+                window.opener.subscribeToFolder(window.opener.userFolderCallback, data);
+            this.blur(); // required by IE
+        }
     }
-    else {
-			var resource = $(topNode.selectedEntry).down("SPAN.nodeName");
-			var user = $(node.parentNode.previousSibling).down("SPAN.nodeName");
-			var email = (user.innerHTML
-									 .replace("&lt;", "<", "g")
-									 .replace("&gt;", ">", "g"));
-			folderName = resource.innerHTML + ' (' + email + ')';
-		}
-		folderName = folderName.replace(/>,.*(\))?$/, ">)$1", "g");
-
-    var data = { folderName: folderName, folder: folder, window: window };
-    if (parent$(accessToSubscribedFolder(folder)))
-      window.alert(getLabel("You have already subscribed to that folder!"));
-    else
-      window.opener.subscribeToFolder(window.opener.userFolderCallback, data);
-  }
 }
 
 function onFolderSearchKeyDown(event) {
@@ -237,7 +243,7 @@ function onFolderSearchKeyDown(event) {
           delete d;
       }
       div.clean = true;
-      $("addButton").disabled = true;
+      $("addButton").addClassName("disabled");
   }
   
   if (this.timer)
diff --git a/UI/WebServerResources/UIxContactsUserRightsEditor.js b/UI/WebServerResources/UIxContactsUserRightsEditor.js
index 056035a21..17fc991fb 100644
--- a/UI/WebServerResources/UIxContactsUserRightsEditor.js
+++ b/UI/WebServerResources/UIxContactsUserRightsEditor.js
@@ -1,12 +1,19 @@
 /* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
-function onCancelClick(event) {
-	window.close();
+function onUpdateACL(event) {
+    $('userRightsForm').submit();
+    Event.stop(event);
+    
+    return false;
+}
+
+function onCancelACL(event) {
+    window.close();
 }
 
 function initACLButtons() {
-  var button = $("cancelButton");
-  button.observe("click", onCancelClick);
+    $("updateButton").observe("click", onUpdateACL);
+    $("cancelButton").observe("click", onCancelACL);
 }
 
 document.observe("dom:loaded", initACLButtons);
diff --git a/UI/WebServerResources/UIxListEditor.css b/UI/WebServerResources/UIxListEditor.css
index 4befbb580..d4cfc4269 100644
--- a/UI/WebServerResources/UIxListEditor.css
+++ b/UI/WebServerResources/UIxListEditor.css
@@ -9,47 +9,56 @@ TABLE.details TD
 TABLE#referenceList
 { width: 100%; }
 
-DIV.frame
-{ border-top: 1px solid #909090;
-  border-left: 1px solid #909090;
-  border-bottom: 1px solid #FFFFFF;
-  border-right: 1px solid #FFFFFF;
-  margin: 5px 15px;
-  padding: 5px; }
+TABLE#referenceList THEAD TD
+{ padding-right: 2px; }
 
-DIV.frame INPUT.button
-{ margin-top: 5px; }
-
-TR.tableview TD
-{ text-align: right; }
+TABLE#referenceList TBODY TD TR
+{ background: #CCDDEC;
+  text-align: left;}
 
 TD.referenceListCell
-{ background: white;
-  text-align: left; }
+{ padding-left: 2em;
+  background: #CCDDEC;
+  text-align: left;}
 
 TABLE#referenceList TD INPUT
-{ width: 98%; }
+{ width: 97%; }
 
 DIV#referenceListWrapper
-{ background: white;
+{ background: #CCDDEC;
   overflow: auto;
   position: relative;
   right: 0;
   top: 0;
   left: 0;
-  height: 33em;
+  height: 300px;
+  border-left: 1px solid #9B9B9B;
   margin: 2px; }
 
 DIV#referenceListWrapper TR,
 TR.referenceListRow
-{ background: #FFFFFF;
+{ background: #CCDDEC;
   line-height: 2em; }
-TR._selected
-{ background: #333333; }
 
 TD.referenceListCell
 { -moz-user-select: none; }
 
+TD.referenceListCell SPAN,
+TD.referenceListCell INPUT
+{ margin-left: 3px; }
+
+DIV#windowButtons
+{ position: fixed;
+  top: auto;
+  bottom: 5em;
+  left: 0px;
+  right: 25px;
+  height: 3.5em;
+  line-height: 2em;
+  vertical-align: middle;
+  text-align: right; }
+
+
 DIV#buttons
 { position: fixed;
   top: auto;
@@ -58,17 +67,14 @@ DIV#buttons
   right: 25px;
   height: 3.5em;
   line-height: 2em;
+  color: #535D6D;
   vertical-align: middle;
   text-align: right; }
 
-H3 {
-  clear: both;
-  margin-bottom: 2px !important;
-  margin-left: 5px !important;
-}
+td {color: #535D6D;}
 
-INPUT.textField {
-  width: 250px;
-  position: relative;
-  right: 0px;
-}
+DIV#listEditor
+{ padding: 5px; }
+
+TD.editing
+{ text-align: left; }
diff --git a/UI/WebServerResources/UIxListEditor.js b/UI/WebServerResources/UIxListEditor.js
index 3a6048dca..3613bae10 100644
--- a/UI/WebServerResources/UIxListEditor.js
+++ b/UI/WebServerResources/UIxListEditor.js
@@ -78,12 +78,13 @@ function onReferenceAdd (e) {
     textField.addressBook = activeAddressBook;
     textField.excludeLists = true;
     textField.observe("autocompletion:changed", endEditable);
+    textField.addClassName("textField");
 
     td.appendChild(textField);
     td.appendChild(span);
     row.appendChild (td);
     tablebody.appendChild(row);
-    tablebody.deselectAll();
+    $(tablebody).deselectAll();
     row.selectElement();
 
     makeEditable(td);
@@ -97,6 +98,7 @@ function onReferenceDelete(e) {
     for (var i = 0; i < count; i++) {
         rows[i].remove();
     }
+    return false;
 }
 
 function serializeReferences(e) {
@@ -129,8 +131,13 @@ function resetTableActions() {
 }
 
 function onEditorCancelClick(event) {
-    preventDefault(event);
-    window.close();
+	preventDefault(event);
+	window.close();
+}
+
+function onEditorSubmitClick(event) {
+  if (validateListEditor())
+    $("mainForm").submit();
 }
 
 function initListEditor() {
@@ -140,6 +147,7 @@ function initListEditor() {
     $("referenceAdd").observe("click", onReferenceAdd);
     $("referenceDelete").observe("click", onReferenceDelete);
     $("cancelButton").observe("click", onEditorCancelClick);
+    $("submitButton").observe("click", onEditorSubmitClick);
 }
 
 document.observe("dom:loaded", initListEditor);
diff --git a/UI/WebServerResources/UIxMailEditor.css b/UI/WebServerResources/UIxMailEditor.css
index f08471460..f9dafb6f7 100644
--- a/UI/WebServerResources/UIxMailEditor.css
+++ b/UI/WebServerResources/UIxMailEditor.css
@@ -23,8 +23,8 @@ DIV.addressList
 TABLE#addressList
 { border-bottom: 1px solid #fff;
   border-right: 1px solid #fff;
-  border-top: 1px solid #444;
-  border-left: 1px solid #444;
+  border-top: 1px solid #909090;
+  border-left: 1px solid #909090;
   border-spacing: 0px;
   margin: 0px;
   padding: 0px;
@@ -52,7 +52,8 @@ TABLE#addressList TD.headerInput
   padding-right: 4px; }
 
 TABLE#addressList TD.headerInput INPUT
-{ border: 0px;
+{ background: #fff !important;
+  border: 0px;
   margin: 0px;
   padding: 0px;
   width: 100%; }
@@ -68,8 +69,9 @@ DIV#subjectRow SPAN.headerField
 { float: left; }
 
 DIV#subjectRow INPUT
-{ background-image: none;
-  padding: 0px 2px 0px 4px; }
+{ background: #fff;
+  margin-left: 2px;
+  padding: 0px 2px 0px 2px; }
 
 div#compose_internetmarker
 { padding:          8px;
@@ -163,4 +165,5 @@ UL#attachments LI IMG
 { width: 99%; }
 
 TEXTAREA#text
-{ display: none; }
+{ display: none;
+  background: #fff; }
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index 11ed7b154..7b40e17de 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -499,8 +499,8 @@ function onSelectAllAttachments() {
 function onSelectPriority(event) {
     if (event.button == 0 || (isSafari() && event.button == 1)) {
         var node = getTarget(event);
-        if (node.tagName != 'BUTTON')
-            node = $(node).up("button");
+        if (node.tagName != 'A')
+            node = $(node).up("A");
         popupToolbarMenu(node, "priority-menu");
         Event.stop(event);
     }
@@ -532,7 +532,12 @@ function onWindowResize(event) {
     subjectinput.setStyle({ width: (window.width()
                                     - $(subjectfield).getWidth()
                                     - attachmentswidth
-                                    - 16) + 'px' });
+                                    - 12) + 'px' });
+    // Resize from field
+    $("fromSelect").setStyle({ width: (window.width()
+                                       - $("fromField").getWidth()
+                                       - attachmentswidth
+                                       - 10) + 'px' });
 
     // Resize address fields
     var addresslist = $('addressList');
diff --git a/UI/WebServerResources/UIxMailPopupView.js b/UI/WebServerResources/UIxMailPopupView.js
index f7e4b06b1..1e12fc5a8 100644
--- a/UI/WebServerResources/UIxMailPopupView.js
+++ b/UI/WebServerResources/UIxMailPopupView.js
@@ -18,7 +18,6 @@ function onICalendarButtonClick(event) {
     var link = $("iCalendarAttachment").value;
     if (link) {
         var urlstr = link + "/" + this.action;
-        var currentMsg;
         if (window.opener && window.opener.open && !window.opener.closed && window.messageUID) {
             var c = window.opener;
             window.opener.triggerAjaxRequest(urlstr,
diff --git a/UI/WebServerResources/UIxMailUserRightsEditor.js b/UI/WebServerResources/UIxMailUserRightsEditor.js
index 381c9fd68..17fc991fb 100644
--- a/UI/WebServerResources/UIxMailUserRightsEditor.js
+++ b/UI/WebServerResources/UIxMailUserRightsEditor.js
@@ -1,11 +1,19 @@
 /* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
-function onCancelClick(event) {
-	window.close();
+function onUpdateACL(event) {
+    $('userRightsForm').submit();
+    Event.stop(event);
+    
+    return false;
+}
+
+function onCancelACL(event) {
+    window.close();
 }
 
 function initACLButtons() {
-	$("cancelButton").observe("click", onCancelClick);
+    $("updateButton").observe("click", onUpdateACL);
+    $("cancelButton").observe("click", onCancelACL);
 }
 
 document.observe("dom:loaded", initACLButtons);
diff --git a/UI/WebServerResources/UIxOccurenceDialog.css b/UI/WebServerResources/UIxOccurenceDialog.css
index 2a5a4b658..84b13e4db 100644
--- a/UI/WebServerResources/UIxOccurenceDialog.css
+++ b/UI/WebServerResources/UIxOccurenceDialog.css
@@ -11,3 +11,6 @@ DIV#leftButtons
 
 DIV#rightButtons
 { text-align: right; }
+
+A#thisButton
+{ float: left !important; }
diff --git a/UI/WebServerResources/UIxPreferences.css b/UI/WebServerResources/UIxPreferences.css
index 2be1638de..d3966d32d 100644
--- a/UI/WebServerResources/UIxPreferences.css
+++ b/UI/WebServerResources/UIxPreferences.css
@@ -1,6 +1,6 @@
 DIV#preferencesTabs
 { position: absolute;
-  top: 5em;
+  top: 6.5em;
   left: .5em;
   right: .5em;
   bottom: .5em; }
@@ -25,8 +25,14 @@ DIV#vacationView
   overflow: hidden; }
 
 TEXTAREA#signature
-{ height: 100%;
-  width: 100%; }
+{ position: absolute;
+  top: 5px;
+  bottom: 5px;
+  right: 5px;
+  left: 5px;
+  display: block;
+  height: 345px;
+  width: 415px;}
 
 TABLE#categoriesList
 { width: 100%; }
@@ -35,10 +41,13 @@ DIV#categoriesListWrapper
 { overflow: auto;
   position: absolute;
   bottom: 30px;
-  right: 0;
-  top: 8em;
-  left: 0;
-  padding: 2px; }
+  right: 2em;
+  top: 88px;
+  left: 2em;
+  padding: 0px;
+  margin-top: 2px;
+  border-left: 1px solid #9B9B9B;
+  background: #CCDDEC; }
 
 DIV.colorBox
 { border: 1px solid #333333;
@@ -49,21 +58,16 @@ DIV.colorBox
   width: 1em; }
 
 TR.categoryListRow
-{ background: #FFFFFF; }
-TR._selected
-{ background: #333333; }
+{ background: #CCDDEC; }
 
 TD.categoryListCell
 { -moz-user-select: none; }
 
 DIV#windowButtons
 { position: fixed;
-  top: auto;
-  bottom: 0px;
+  bottom: 20px;
   left: 0px;
   right: 25px;
-  height: 3.5em;
-  line-height: 2em;
   vertical-align: middle;
   text-align: right; }
 
@@ -80,4 +84,11 @@ DIV#windowButtons
 #vacation SPAN
 { float: right; }
 #vacation BR
-{ clear: both; }
\ No newline at end of file
+{ clear: both; }
+
+DIV.bottomToolbar
+{ position: absolute;
+  bottom: 9px;
+  left: 2em;
+  right: 2em; 
+  margin: 0px; }
diff --git a/UI/WebServerResources/UIxRecurrenceEditor.css b/UI/WebServerResources/UIxRecurrenceEditor.css
index 2e2e9d700..f121a9abe 100644
--- a/UI/WebServerResources/UIxRecurrenceEditor.css
+++ b/UI/WebServerResources/UIxRecurrenceEditor.css
@@ -20,18 +20,6 @@ DIV#windowButtons
 DIV#pageContent
 { padding: 1em; }
 
-TABLE.section
-{ border: 1px solid #aaa;
-  margin-top: -.5em;
-  margin-left: auto;
-  margin-right: auto;
-  margin-bottom: 1em;
-  padding: 1em;
-  -moz-border-radius: 6px;
-  table-layout: auto;
-  text-align: right;
-  width: 100%; }
-
 TABLE TH
 { font-weight: normal;
   text-align: right;
@@ -43,17 +31,6 @@ TABLE TD
 TABLE TD.label
 { width: 11em; }
 
-SPAN.caption
-{ display: inline-block;
-  position: relative;
-  text-align: center;
-  cursor: default;
-  background-color: #d4d0c8;
-  width: auto;
-  padding: .25em;
-  margin-left: 7px;
-  border: 0px; }
-
 INPUT.textField
 { margin: 0px 0.7em;
   width: 2em; }
@@ -106,3 +83,7 @@ DIV#month SPAN.week DIV P
 
 SPAN.week DIV:hover
 { border: 1px solid #4b6983; }
+
+a.calendarButton
+{ right:240px; }
+
diff --git a/UI/WebServerResources/UIxReminderEditor.css b/UI/WebServerResources/UIxReminderEditor.css
index 3eff67bcd..4ceb1323e 100644
--- a/UI/WebServerResources/UIxReminderEditor.css
+++ b/UI/WebServerResources/UIxReminderEditor.css
@@ -11,18 +11,6 @@ DIV#windowButtons
 DIV#pageContent
 { padding: 1em; }
 
-TABLE.section
-{ border: 1px solid #aaa;
-  margin-top: -.5em;
-  margin-left: auto;
-  margin-right: auto;
-  margin-bottom: 1em;
-  padding: 1em;
-  -moz-border-radius: 6px;
-  table-layout: auto;
-  text-align: right;
-  width: 100%; }
-
 TABLE TH
 { font-weight: normal;
   text-align: right;
@@ -34,17 +22,6 @@ TABLE TD
 TABLE TD.label
 { width: 11em; }
 
-SPAN.caption
-{ display: inline-block;
-  position: relative;
-  text-align: center;
-  cursor: default;
-  background-color: #d4d0c8;
-  width: auto;
-  padding: .25em;
-  margin-left: 7px;
-  border: 0px; }
-
 INPUT.textField
 { margin: 0 0.7em 0 0;
   width: 2em; }
diff --git a/UI/WebServerResources/add-icon.png b/UI/WebServerResources/add-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f49cde3e70717d323542f2ec46dda76f551ae8c8
GIT binary patch
literal 1133
zcmV-z1d{uSP)<h;3K|Lk000e1NJLTq000vJ000yS1^@s6Z&e0#0009!X+uL$Nkc;*
zP;zf(X>4Tx0C)j~luKyTP!xv$j46V&f~d6?l;A>(v?V^!ics5Wwbqew82iv7$TV|j
z8cj1XnHe95NI~5BT8bMVh>I%XLb_0Jr3;Zl>uXU2ait=NLN`*z|0eBBDpoHf`Et&G
z&+CQ&RS#2+V?{Jz*v`AjuBdkC@PM{>0#&F%HMmlS=d>ph`+cTXKIgCLw@{>IvPs5@
z^&Ob_v~BhMOOImj>z?-dp85KDZ#6Cx0*XfKifq7JB@YI?SMtfclc(m0WMe3mCOhOt
zw<p;_zCm7^4e?-z)50@=sy1qJhT}3$WCgjUXk=x~QL=8QO`AL=?P<>#riT4Se#lwS
z#+8o&t!scqFDteI4;Z}*tXf~OHPits`+>1772D6GKOd!b+{<j)?1xjTqpayesq}L_
zu=pA<bG20Zb*ogGxy>A`<C$d?+@h~#Vah8Ys5jWn_{lk1h=ZPdRSR&FbL?LN#4Z5W
zKLQ&b0Lvc(i5j412O{U$ZgAzrDb5Ax$T_E7Gdq;mHtYI!t(`|Jv~JsIZq!nirTH#T
zbA>0|qDVJm*eY<&{#wR+wXk~+^2z=p=Y+R=mX(oos*|%sGu!%-7M;7vjpTb7b5A$9
zf!9>V-P0SeveC?U_XHg2v#mJKMQS2-_F((~nei3X$w%cpB#(H-gEFRXKbG2;AlK8L
zJf4e5O)dAfof+!k8A(>GGeaHmS$^#nk}~f)YVJ6e|IM?u$a5Tq1pyN_?>00f(S<0Q
z;J`%=8G1}AOj@O1&}zcN@xLl9B+9!iD!TBQdp`SnPN2ZuGJYSTaf~#UBWU_N{hR(q
zzp3BRzh0>?G*mnz?orbizx<tXWoB88j2qM_<I9?Y_y((Or`JN3)?r>jPhMHy6s|5~
zU#Ty9G?_zOj8BKU6roH_7-T%zwd}q~w)iIed~?|rnjW<;&OWKD<a(oy9ht0taW-5H
zYyY#WVA8Uy@Z^n<E<9_Yu2naw-D-=v1Dd)^ZBtv-PQL9__m_9{a#kizvTm2vr`Usy
z)AUwOx-we?{}z5R{4aG0Tezm7$$x0V&1FnW_>SQAA9qOkFZ>Mwg%u5aOFKIN000Sa
zNLh0L01FcU01FcV0GgZ_0002kNkl<ZI1yuD7zG0w0*r)g4~of4`OExAf#o;jv9-&l
zZo{XZ37;fbj)@_b<sWl30~50gA+>}JBV+=SJXH<D2(!?L^pO8-Y|{`H{uB8BpNW<6
zALDlh=Ko({;%t9DTQ6I-;5Lj8qFInRAofotMt0W!45A2eh~xh={pV!(&%g;2|NdP7
zLobE^4+rP*-~aw6!ZiK={jUOOkU9e+!!9N!=H)PPCQ<fhFgA?F@Fq+GMhC^^9c29f
z-;UuwWB=MElZs&C*l4Oo096gc=Gsv)I)(rM^XD|Ms*<{400000NkvXXu0mjf8KW5e

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/arrow-down.png b/UI/WebServerResources/arrow-down.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f0ed1c2c883073a383b96c6e7700aac10672f42
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^+(691!3HGtEm%8%6kC$Fy9>j6h7Sy%4{f(*2a0eO
zctjQhRSJPH<E6WGe}IDQC7!;n>{r=21x%!*6J?`;LMuF7978y+*Pb~m*kmBl^6>lb
z9=5$%?0vogPFxRM_^&zf&(Tm&z0oTBqGt|6XD565jF0T!cb#ANW0lgo=>`5PwB~mj
z9`d^Ix#Qu4je*>4`(N@iA4_6f;jei1ppkjf#upCUyOx~kJ>$5@;KHJFvM&!meZJsK
z?*gauywCf5mVOtVdDBs5rN5%D!5)PJw<muWE!*fCq|ljI5u^U2m2uXx#J&42l}2|h
cs(3xG?U`k5h3l?Vpqm*yUHx3vIVCg!0GS4DhX4Qo

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/arrow-left.png b/UI/WebServerResources/arrow-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..32f22f15def742c79ac2c089c872892f2ab5fbee
GIT binary patch
literal 261
zcmeAS@N?(olHy`uVBq!ia0vp^96-#?!3HFqW}i_7Qfx`y?k)`P89p$4KD6DM9Vo(C
z;1O92R3!w$jF;}#{Q(NHmw5WRvR`HA6fhA^+Pm~WP-v2;i(?4K_0|g;c@G%~xIHXy
zS5+7FFyK{AX$X09K<ACaQ$`~uZv$tQRVsYPmN6)GC>Or{zV2u1P1CcSr=|MaUpJh&
zAeQ#Lvz%eqg@yO$%iF{|F(vq{f6)6!VZkbi=Q3rcX%?=jH<dJXlp4PMou<-u_}+=6
zfa|9JE;gM?TEY-on!>SNr^_(SI$#5%?`6JE`6ty`KY9ty4&=E5bRC1ItDnm{r-UW|
D>{DGX

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/arrow-right.png b/UI/WebServerResources/arrow-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef4378f4261aebb0ed8cc0381db86f8e6c38534a
GIT binary patch
literal 279
zcmeAS@N?(olHy`uVBq!ia0vp^96-#?!3HFqW}i_7Qfx`y?k)`P89p$4KD6DM9Vo(C
z;1O92R3!w$jF;}#{Q(NHmw5WRvR`HA6fohPv1!H}pwJRe7sn8e>$w*;3N|^2v^@N8
z>(8I`;=o2u?*$A>RU5>r3>GzLAJo%1DA~huu-r|fWA@uO;%i%WwK+E(zg)ar!|%-E
zZTBawa2FApF6{JHydj<CL5-xc*@PW?_!s_T3jI4pGRf(bzuFUXN#DzB4z{TDEqVFY
zenp?(A`7|x9Ntxng+pG%o1fa`ayG}bEcy4(!y6~R&u~hA`$*^NYln2(iwhRV+Wusl
XrspnY@Qzs<=w1d-S3j3^P6<r_{|{)o

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/arrow-up.png b/UI/WebServerResources/arrow-up.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a98b18e90a6c569c367feb17b2af4ddf10eb3ef
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^+(691!3HGtEm%8%6kC$Fy9>j6h7Sy%4{f(*2a0eO
zctjQhRSJVJBg3pY5<o%r5>H=O_N(li0wx?UZsY*v7-UOaBTAg}b8}PkN*J7rQWHy3
zQxwWGOEMHfGEx=XJ$(b-r>N!u73zDsIEHXsPfkz}&$(?jac+vQXKC@jWa0E9%M0Ry
qxs?5m-tcj`cEICAR*qSKJOhK?ae-#@V%GaWtqh*7elF{r5}E+M`#28(

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/btn_a_bg.png b/UI/WebServerResources/btn_a_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ab9e725f6beb30e5f85627d6c3df79c8367c0c5
GIT binary patch
literal 1019
zcmV<X0|fkuP)<h;3K|Lk000e1NJLTq00093000*V1^@s6&TsWH0009!X+uL$Nkc;*
zP;zf(X>4Tx0C)j~luKyTP!xv$j46V&f~d6?l;A>(v?V^!ics5Wwbqew82iv7$TV|j
z8cj1XnHe95NI~5BT8bMVh>I%XLb_0Jr3;Zl>uXU2ait=NLN`*z|0eBBDpoHf`Et&G
z&+CQ&RS#2+V?{Jz*v`AjuBdkC@PM{>0#&F%HMmlS=d>ph`+cTXKIgCLw@{>IvPs5@
z^&Ob_v~BhMOOImj>z?-dp85KDZ#6Cx0*XfKifq7JB@YI?SMtfclc(m0WMe3mCOhOt
zw<p;_zCm7^4e?-z)50@=sy1qJhT}3$WCgjUXk=x~QL=8QO`AL=?P<>#riT4Se#lwS
z#+8o&t!scqFDteI4;Z}*tXf~OHPits`+>1772D6GKOd!b+{<j)?1xjTqpayesq}L_
zu=pA<bG20Zb*ogGxy>A`<C$d?+@h~#Vah8Ys5jWn_{lk1h=ZPdRSR&FbL?LN#4Z5W
zKLQ&b0Lvc(i5j412O{U$ZgAzrDb5Ax$T_E7Gdq;mHtYI!t(`|Jv~JsIZq!nirTH#T
zbA>0|qDVJm*eY<&{#wR+wXk~+^2z=p=Y+R=mX(oos*|%sGu!%-7M;7vjpTb7b5A$9
zf!9>V-P0SeveC?U_XHg2v#mJKMQS2-_F((~nei3X$w%cpB#(H-gEFRXKbG2;AlK8L
zJf4e5O)dAfof+!k8A(>GGeaHmS$^#nk}~f)YVJ6e|IM?u$a5Tq1pyN_?>00f(S<0Q
z;J`%=8G1}AOj@O1&}zcN@xLl9B+9!iD!TBQdp`SnPN2ZuGJYSTaf~#UBWU_N{hR(q
zzp3BRzh0>?G*mnz?orbizx<tXWoB88j2qM_<I9?Y_y((Or`JN3)?r>jPhMHy6s|5~
zU#Ty9G?_zOj8BKU6roH_7-T%zwd}q~w)iIed~?|rnjW<;&OWKD<a(oy9ht0taW-5H
zYyY#WVA8Uy@Z^n<E<9_Yu2naw-D-=v1Dd)^ZBtv-PQL9__m_9{a#kizvTm2vr`Usy
z)AUwOx-we?{}z5R{4aG0Tezm7$$x0V&1FnW_>SQAA9qOkFZ>Mwg%u5aOFKIN000Sa
zNLh0L01FcU01FcV0GgZ_0001HNkl<Z7#V$#F%rNa2n0_jz4?UnzE__SpBE4cM@W&Y
zV1PX!_1>jY1rZ^MYK(!_8nOsuD>KWE5tC1wn+cUO4n@DNjd5yf>XKmkLt{_#iw0T%
pI8VLDUpk)&dx+_>N0`c8umDtuKS|;%#vlLy002ovPDHLkV1h4u+jIZ`

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/btn_span_bg.png b/UI/WebServerResources/btn_span_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cca1c873cd82c45c7c82f51e0a45ee759cf5061
GIT binary patch
literal 3939
zcmV-p51jCcP)<h;3K|Lk000e1NJLTq0077U001rs1^@s6ZADfA0009!X+uL$Nkc;*
zP;zf(X>4Tx0C)j~luKyTP!xv$j46V&f~d6?l;A>(v?V^!ics5Wwbqew82iv7$TV|j
z8cj1XnHe95NI~5BT8bMVh>I%XLb_0Jr3;Zl>uXU2ait=NLN`*z|0eBBDpoHf`Et&G
z&+CQ&RS#2+V?{Jz*v`AjuBdkC@PM{>0#&F%HMmlS=d>ph`+cTXKIgCLw@{>IvPs5@
z^&Ob_v~BhMOOImj>z?-dp85KDZ#6Cx0*XfKifq7JB@YI?SMtfclc(m0WMe3mCOhOt
zw<p;_zCm7^4e?-z)50@=sy1qJhT}3$WCgjUXk=x~QL=8QO`AL=?P<>#riT4Se#lwS
z#+8o&t!scqFDteI4;Z}*tXf~OHPits`+>1772D6GKOd!b+{<j)?1xjTqpayesq}L_
zu=pA<bG20Zb*ogGxy>A`<C$d?+@h~#Vah8Ys5jWn_{lk1h=ZPdRSR&FbL?LN#4Z5W
zKLQ&b0Lvc(i5j412O{U$ZgAzrDb5Ax$T_E7Gdq;mHtYI!t(`|Jv~JsIZq!nirTH#T
zbA>0|qDVJm*eY<&{#wR+wXk~+^2z=p=Y+R=mX(oos*|%sGu!%-7M;7vjpTb7b5A$9
zf!9>V-P0SeveC?U_XHg2v#mJKMQS2-_F((~nei3X$w%cpB#(H-gEFRXKbG2;AlK8L
zJf4e5O)dAfof+!k8A(>GGeaHmS$^#nk}~f)YVJ6e|IM?u$a5Tq1pyN_?>00f(S<0Q
z;J`%=8G1}AOj@O1&}zcN@xLl9B+9!iD!TBQdp`SnPN2ZuGJYSTaf~#UBWU_N{hR(q
zzp3BRzh0>?G*mnz?orbizx<tXWoB88j2qM_<I9?Y_y((Or`JN3)?r>jPhMHy6s|5~
zU#Ty9G?_zOj8BKU6roH_7-T%zwd}q~w)iIed~?|rnjW<;&OWKD<a(oy9ht0taW-5H
zYyY#WVA8Uy@Z^n<E<9_Yu2naw-D-=v1Dd)^ZBtv-PQL9__m_9{a#kizvTm2vr`Usy
z)AUwOx-we?{}z5R{4aG0Tezm7$$x0V&1FnW_>SQAA9qOkFZ>Mwg%u5aOFKIN000Sa
zNLh0L01FcU01FcV0GgZ_000ZlNkl<ZcmeHQTXq{a47Gjy*Q_I(Ntcm@rrU7VQmX{X
zix)u-Iil<&9ks^<@wm7ENzII+IL|-+`EmRC_Vej_T^+bO(01UJ4#)TJ-&@P2xjJxl
z;OUim@P4~JJwM%~9ZG~UP{HKJXE%R(dS+EZ34j7sgHaR=lrZ;UAsO+!rC#)2Qit}S
zAU$_7@x)7s0~Jhel-gksJ_$I)mYD6eeQI6kz|pAd@AYVmkq^l2_MSGz*m2(40zCrz
ze#}LlbPjX~%Phn#IxxpUk+uage4-F_YKFdNYHR6)433p8(2(mfpz;vxvzX<8yx&qQ
z1*~L{)2A|uSTjD$+nCsl1YEjCiELc_WCD99R!KkR7B?6%=_;B2i(bML*4PhLoWdP_
zl}z9%8qSx5GqrtYU7CBAAGlx2E!KOwg7D_0l(gJvYD32;Mz<uzk#J~XC_|BVVDH58
zJj;CTr|qA_TK&iNRaQ{eK$y)-wuTaCbst+-kNIdX7QX8|>jC+<ISvH1=Y?gGE65IP
zEYJ=tEO{As)eThC5A<F5z@6!<_!buT|3v?R^oVspjvd%%vD7UVN=;*0LjXb>FRRsJ
z84#04zJ6EhE^NZxg+)Zc)0SjPA)k>M&S4+O_z1puYYVW;l{@8qbZtTIxKCCa_6b}E
zby*a2-D(?b!c8u#`??$u<iOaV6R>+_K1s_3iQW1Vt3vA~f0QDAkgR{wPGIMEl_v0h
zo~VbO0Rs3?=d)(|C{7=#0I*R_)Lx)x`ubj36yLqIsVbWyd`ITibiS@y7KVwQo!u|x
z7At*<)meE^VD8+Opefo}%vDMQeVp8VCEyk8(fuX?tzZ>S;7MaT906Ct<O(=}t*H2j
zkv<_jd?j~|-~@4$n5&eAZeKlUu4zwgpIR5SX0d0{dUA&cSoIbwT14(H<IwJq1rqg)
zMAr~O6p3S(vB6{q7PCk!D^G$&ifT4fGtu!RYonIQ_8`6l?Xg|zy|p=TpPT3;7w<*t
znHO`-&O3SrCTm#bfYf&uOB{e!dv-<z%L4Ai-ibvEYMJJGx2D(%=Gcz0A6wfv_v*f}
ztFRM$4XfT_9R>C6!Fe>j(2-ger&vq&5w^Y_-HS!>mPJ~go6l}NBxjMlH|#M_u|o1=
z4-bBtjh11jihyD5dukJO$taS|DEjf5lAn&$vS7qovZG${6)EO>j8$*3lB53WfZ!fV
z{S;B?PVb#q!nM3}m3i~=BBkuCLZ40FB3WB$Eh_f*+P$@T^tOgbvlg|}`y5s|AoOmd
z-Z9spd>i`FwBh<zj}y%$dM8$tiFA5H(VWgk^X#6LWQ||?kO}+PcdYG4_j}Qgxwp2@
zt!vyVu}b~@9*K7(@iR#Hl+W*$l!zx0PSt@>>}ztc%Q@_wSf-#v2UU>1&@39(XJsvb
zl?H_;h9|Ul)(#kqCdUXnan*E-YtgViD=P>qkx53A6Y5cJ_?Qt1IM7=4yAiuk3{Q-|
zomgzcm&1>-)H4VGQyPdEbLMoFVPH!Ivr<oT>fWv;Kwx4#jlB~K6{OMdD%0k=mwlY0
zS~O$Py?_DZ>Dm?Fiov`!wqGx8tEHZ<?KA62#jfwgR6Od(IMM&{Gl&67_;v2d@xkzm
z<rjz<*44@W<;Oa<BBw+`TgTEwl+2<_z<Mp<ro|T>#5&bod@}_FsKnfEO-I|9dZ=V;
z5u)0HIH!78U5V5>wj!rQs&9l<4@mlR5Z%bqmF`afS_hYvjDgC=w6mSqyRg>EaNcg(
zRxFxbd==v18Z6LDu*zGBk}sC_*Cly&Vn<l{fRuDnapWkJv=p5x!O@;1)0Jlz_D(Fz
zv(%KYk^$MaI`VI|z|>dU01j?$d{kfe)%I)EMeQ5+?CgH2&mfauHF3*0+8B*%Qp|4<
zitcZ^Y#p1)MZH#>i|;(wG4?!;qI*!g_9S^e$G+O;b85EZUTM#@y0W(qH}f^V!t?q1
zr46Q!*W~Je>A>sPuV0_O{Po2sugTScs{^G2uWxT}PuH*gxwgaAfw%+t*ZzF_`&(?i
zv{wiI=N-ro>CewEstxjhqLhu;ekw5j6rll7iWW;5vv?mi(E1N*gm3GPGSbIzf?@rU
zLyw<d7qQt{Thx`~K4catRC)(qH0sw`ER8|(eLNX0ef_E)5LR`-wOwS|0OQx81BV}D
zv1=9Pu@O1WF^4A@tNvhdG|u5_6yc<`TAsrcoH_rJVcu8pH8(Bq#L~DV&tvPzdO*@w
zxm>(G?J7k3sV_K+NBcE^DJ)+=_-1kzyRtKU6PA!3N};C?&Ri8?ZSz@_n<U*?7omoX
zC7qH&PtAWPU(<h(I9t0WnM($s8qZ=^2wXv4UR<(d$AKAcZgwI-kU5FvHxgj#<}0b7
ztOd;SWcL!UfBIW1b~Qqq*U%+%w2^X{i^cQ-brIzPZ<3fw+6jD>MXMn1;QPDnm&7-C
z22qVlVyTI`Q#++M0-Be<xJDBwECyy%Sa8O;0~=WSQ46|;b1G2RnEd=#rE`_ORISwU
z-Vb>nUKb_u$xqgnp{OXr^O$6m*VG#CsJ%yH2R6z{ISvm9e0i+IXuwz4W*W!wS_rYU
z1Igr69ldEZSJ-e9zR=W>e0fu+N%>z?$z0)Fpq{GJSDk6-=KP4dh+ZL4iKa>Uf3Y?I
z5!m9ZhR`6rpxG`g&*y$@AQIo;Asy!9QU9fxWACxYPOM(0VGh4u>A;kCLqU@Trseek
z;-{rqKOM6wALj5>H`TVC=K|ni%?nsPSNcnY`GDl#SCzc@O*D+~U8YUakLX(nyv5Sl
zBdeygj$NW7zFjOP!9rziBVa9B%wo2YHTKk6$o=T3E{d{Dfs;mtVqsXDiZo&uKYIx_
zf_gm3zKW$I+Dyn;#&zr(pKjO8E!I&Yo0ew%h`yyoAq^EV`>wExEg9R$RwLdlDW~$w
z9O$zjrOe#f+X$ak7m=_G4K0}{r(SL1Y$X+H4c%EkqHl@8KBlky4047Z5nqjqipBY+
zEw=+t=KwZzcjBjTLYP||<o*rnqV_D+hJMbD(u>)MzMo)y#C|EaSi#4<L@-kUAH%qA
zwAxf->P(KXGGc`VgquR$j7QiAkbhD@KTW_|$67Dt?v-A+I(Ch7u@_&P!$n%7nyuGG
z!TW35#y0`&!pb-f%uQ7%tvK6PB3o~<Dm0!->tbi^AS;$4bXmkI|H@S=B*)2a+kq|Z
zDY(NMB$ZH!8G`2JFaKAI;wpzvvXS(Wby2=Y)JC|z7o_7)G5*;7!UsfsL`m<Pt{bvl
zb6d&}ax>rIYQmD=JQhAE$lwl_bdJ&zcE-#<3W}~)Y*xxO<B%&89|ZgfDsv6GlvE#C
z7twr7ZPI{y*5P;CFI20&g5*B5E%2Ir<w(lodq5xAZgh)<P1eTA5<zNxyaw13;XPn!
z$3stcfPk@JA$RG~uTvMXvrOCC#o^F1MDtO$7ePK&`N)>5#d>sK>j8OrnR(ygD(Je9
zUhTzPJm#eqi!^Pc<`Kmc*w7pwXn4+!eXhtYIs3k|+299k%q0gjJI4Kdcko2*g0-I~
zx<@(cLwY$N{L8h1TMGoySU%6D@cu?VhlOJMxRietn_}n{@y+i@#hg7@tU{lO<ysa_
zqHT|?uXtH$XI+H6t2WD0W~+Ro{sZkC*5mtXZn60O8mzlxf7>AB9M&-|;h)0>Gdnhm
z<|+7{&*9e5&d5n?w9EjFu(Phhz~yz*dMnWIu-pT4Rqf<^4$Bu5b3KQhuoApEATfNW
zT`Ac92K4SuGO%GuSy?Q2_BBEMl{9XB?CKVN-8$KFV9P&q2|-gxy2@&<;hz%c*aDz^
zg>;)!Y$Amew6a$hL1e!+&q{5=q{R`NNSYdJlk#`lFZ2*$Zn3zSNx|NUg>9Kc5;uzp
z{T}SHS%B%sHb=}w;;g-m7f(7+dImXE!Z<%3!n6)CA4wV8TO5fvmMrFdSjc8ESqtH=
xkr-aT_UEn^UcrBQ2d-cH^QW)yRo`75_zy2(&&&7<b^!nY002ovPDHLkV1oV#vuOYT

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index c5617f883..00d2729e4 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -9,10 +9,10 @@ BODY
   left: 0px;
   right: 0px;
   bottom: 0px;
-  color: #000000;
+  color: #535D6D;
   font-family: Lucida Grande, Bitstream VeraSans, Tahoma;
   font-size: 8pt;
-  background-color: #d4d0c8;
+  background-color: #E6E7E6;
   border: 0px;
   margin: 0px;
   padding: 0px;
@@ -39,12 +39,17 @@ DIV#toolbar IMG#progressIndicator
 DIV#pageContent
 { clear: both; }
 
+.clear
+{ clear: both;
+  padding-top: 1em; }
+
 A
 { text-decoration: none;
   -moz-outline: 0px; }
 
 LABEL
-{ white-space: nowrap;
+{ color: #535D6D;
+  white-space: nowrap;
   margin-left: .5em; }
 
 TABLE
@@ -70,7 +75,7 @@ a:hover
 
 .defaultfont
 { text-decoration: none;
-  color: #000000; }
+  color: #535D6D; }
 
 .window_label
 { color: #06348b;
@@ -78,7 +83,7 @@ a:hover
 
 .homepagefont
 { text-decoration: none;
-  color: #000000; }
+  color: #535D6D; }
 
 /* header */
 
@@ -94,7 +99,7 @@ div#header img.headerlogo
   height: 30px; }
 
 div#header div#headerhistory
-{ color: #000000;
+{ color: #535D6D;
   margin: 0px;
   padding-top: 18px;
   height: 12px; }
@@ -152,12 +157,15 @@ DIV.linkbanner SPAN
 DIV.linkbanner A:hover
 { color: #dd5; }
 
-DIV.linkbanner A#logoff
+DIV.linkbanner A#logoff, DIV.linkbanner SPAN#userEmailDisplay
 { float: right;
   margin: 0px;
   padding: 0px;
   padding-right: .5em; }
 
+DIV.linkbanner SPAN#userEmailDisplay
+{ color: #DDDDDD; }
+
 .linkbannerlinks
 { vertical-align: bottom;
   text-align: left; }
@@ -172,13 +180,7 @@ DIV.contactSelector UL.contactList IMG
 { margin: 0px .5em; }
 
 SELECT
-{ border-bottom: 1px solid #fff;
-  border-right: 1px solid #fff;
-  border-top: 2px solid #222;
-  border-left: 2px solid #222;
-  vertical-align: middle;
-  -moz-border-top-colors: #9c9a94 #000 transparent;
-  -moz-border-left-colors: #9c9a94 #000 transparent;
+{ vertical-align: middle;
   margin: 2px;
   padding-right: 1px; }
 
@@ -192,108 +194,6 @@ DIV.contactSelector DIV.contactList
   background-color: #eee;
   text-align: left; }
 
-TEXTAREA
-{ vertical-align: top; }
-
-DIV, TEXTAREA, INPUT, SELECT
-{ font-family: inherit;
-  font-size: 8pt;
-  font-size: inherit; }
-
-TEXTAREA, INPUT.textField
-{ margin: 1px;
-  border-bottom: 1px solid #fff;
-  border-right: 1px solid #fff;
-  border-top: 2px solid #222;
-  border-left: 2px solid #222;
-  -moz-border-top-colors: #9c9a94 #000 transparent;
-  -moz-border-left-colors: #9c9a94 #000 transparent; }
-
-TEXTAREA
-{ padding: 0px;
-  padding-left: 2px; }
-
-INPUT.textField
-{ padding: 2px;
-  vertical-align: middle; }
-
-DIV#toolbar
-{ left: 0px;
-  border-top: 1px solid #fff;
-  border-bottom: 1px solid #848284;
-  margin: 0px;
-  padding: 0px;
-  white-space: nowrap;
-  overflow: auto; }
-
-BODY.popup DIV#toolbar
-{ border-top: 0px; }
-
-SPAN.toolbarSeparator
-{ display: block;
-  float: left;
-  height: 3.8em;
-  vertical-align: middle;
-  border-right : 1px solid #fff;
-  border-left : 1px solid #9c9a94;
-  margin: 0px .25em;
-  margin-top: 0.125em;
-  width: 0px;
-  padding: 0px; }
-
-BUTTON.toolbarButton,
-SPAN.toolbarButton,
-SPAN.disabledToolbarButton
-{ color: #000;
-  font-family: Lucida Grande, Bitstream VeraSans, Tahoma;
-  font-size: 8pt;
-  text-decoration: none;
-  cursor: default;
-  display: inline;
-  float: left;
-  text-align: center;
-  -moz-box-align: center;
-  -moz-box-pack: center;
-  border-left: 1px solid transparent;
-  border-top: 1px solid transparent;
-  border-right: 1px solid transparent;
-  border-bottom: 1px solid transparent;
-  padding: 1px 2px;
-  background-color: transparent;
-  color: -moz-DialogText;
-  overflow: visible;
-  margin: 0px; }
-
-SPAN.disabledToolbarButton
-{ -moz-opacity: 0.4;
-  opacity: 0.4;
-  padding-top: 2px; }
-
-BUTTON.toolbarButton:hover,
-SPAN.toolbarButton:hover
-{ color: -moz-buttonhovertext;
-  border-top: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-bottom: 1px solid #828482;
-  border-right: 1px solid #828482; }
-
-BUTTON.toolbarButton:active,
-SPAN.toolbarButton:active
-{ color: -moz-buttonhovertext;
-  border-top: 1px solid #828482;
-  border-left: 1px solid #828482;
-  border-bottom: 1px solid #fff;
-  border-right: 1px solid #fff; }
-
-.toolbarButton IMG.buttonImage
-{ border: 0px;
-  width: 24px;
-  height: 24px;
-  margin: auto; }
-
-.toolbarButton .buttonLabel
-{ margin: auto; }
-
 /* contextual menus & popups */
 
 .menu,
@@ -302,14 +202,14 @@ SPAN.toolbarButton:active
   position: absolute;
   z-index: 1000;
   top: -1000px;
-  background-color: #d6cfc6;
-  color: #000;
+  background-color: #E6E7E6;
+  color: #535D6D;
   margin: 0px;
   padding: 0px;
-  border-top: 1px solid #d6cfc6;
-  border-left: 1px solid #d6cfc6;
-  border-right: 1px solid #424142;
-  border-bottom: 1px solid #424142;
+  border-top: 1px solid #FFFFFF;
+  border-left: 1px solid #FFFFFF;
+  border-bottom: 1px solid #909090;
+  border-right: 1px solid #909090;
   overflow: auto; 
   overflow-x: hidden; }
 
@@ -323,11 +223,7 @@ SPAN.toolbarButton:active
   list-style-image: none;
   margin: 0px;
   padding: 0px;
-  padding-top: 1px;
-  border-top: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #9e9a92;
-  /*border-bottom: 1px solid #9e9a92;*/ }
+  padding-top: 1px; }
 
 .menu LI,
 .popupMenu LI
@@ -371,7 +267,7 @@ UL.choiceMenu LI._chosen:hover
 .menu LI:hover,
 .menu LI.selected,
 .menu LI.submenu-selected
-{ background-color: #4b6983;
+{ background-color: #9ABCD8;
   color: #fff; }
 
 .menu LI.separator,
@@ -388,13 +284,13 @@ UL.choiceMenu LI._chosen:hover
   background-repeat: no-repeat; }
 
 .menu LI.submenu
-{ background-image: url('submenu.gif'); }
+{ background-image: url('arrow-right.png'); }
 
 .menu LI[class~="disabled"].submenu
 { background-image: url('submenu-disabled.gif') !important; }
 
 .menu LI.submenu:hover, .menu LI.submenu-selected
-{ background-image: url('submenu-active.gif') !important; }
+{ background-image: url('arrow-right.png') !important; }
 
 DIV#logConsole
 { position: absolute;
@@ -421,6 +317,7 @@ DIV#logConsole
 /* DIV#logConsole > DIV.highlighted
 { background-color: #ddf; }
  */
+
 /* content lists */
 td.tbtv_actcell
 { border-width: 1px;
@@ -438,21 +335,14 @@ TD.headerCell,
 TD.tbtv_headercell,
 TD.tbtv_navcell
 { vertical-align: middle;
-  background-color: #d4d0c8; 
-  border-top: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-right: 2px solid #222;
-  border-bottom: 2px solid #222;
-  -moz-border-bottom-colors: #000 #9c9a94 transparent;
-  -moz-border-right-colors: #000 #9c9a94 transparent; }
+  background: transparent url('thead_bg.png') repeat-x top right;
+  border: 1px solid #9B9B9B;
+  border-left: none;
+  background-color: #E7E7E7;
+  height: 20px; }
 
 TD.sortableTableHeader:active
-{ background-color: #dcdad5;
-  padding-top: 2px;
-  border-top: 1px solid #9c9a94;
-  border-left: 1px solid #9c9a94;
-  border-right: 2px solid #9c9a94;
-  border-bottom: 1px solid #9c9a94; }
+{ background-position: bottom left; }
 
 TD.headerCell SPAN,
 TD.tbtv_headercell SPAN
@@ -515,7 +405,7 @@ td.tbtv_subject_headercell
 DIV.dragHandle
 { position: absolute;
   z-index: 1;
-  background-color: #d4d0c8; }
+  background-color: #E6E7E6; }
 
 DIV.dragHandle:active
 { background-color: #99a; }
@@ -525,17 +415,9 @@ DIV#filterPanel
 { height: 2em;
   vertical-align: middle;
   width: 100%;
+  padding-top: 3px;
 }
 
-INPUT#searchValue
-{ margin-right: 1em;
-  width: 20em;
-  padding-left: 24px;
-  background-image: url('/SOGo.woa/WebServerResources/Search-bar.png');
-  background-repeat: no-repeat;
-  background-position: 2px 2px;
-  color: #aaa; }
-
 DIV#javascriptSafetyNet
 { position: absolute;
   background-color: transparent;
@@ -563,8 +445,8 @@ DIV.javascriptMessagePseudoTopWindow
   border-bottom: 2px solid #888;
   padding: 1em;
   margin: 0px auto;
-  color: #000;
-  background-color: #d4d0c8;
+  color: #535D6D;
+  background-color: #E6E7E6;
   -moz-border-bottom-colors: #000 #9c9a94 transparent;
   -moz-opacity: 1.0;
   opacity: 1.0; }
@@ -591,47 +473,6 @@ DIV.noJavascriptErrorMessage A
 { float: right;
   margin: 0px auto; }
 
-INPUT.button:active,
-A.button:active
-{ color: -moz-buttonhovertext;
-  background-color: #c4c2bd;
-  -moz-border-bottom-colors: #efebe7 #fff;
-  -moz-border-right-colors: #efebe7 #fff;
-  -moz-border-top-colors: #9c9a94 #000;
-  -moz-border-left-colors: #9c9a94 #000; }
-
-INPUT.button,
-INPUT.button:disabled,
-A.button,
-A[class~="_disabled"].button:active
-{ cursor: default;
-  padding: 1px 0.5em;
-  background-color: #d4d0c8;
-  border-top: 2px solid #fff;
-  border-left: 2px solid #fff;
-  border-bottom: 2px solid #888;
-  border-right: 2px solid #888;
-  -moz-border-top-colors: #efebe7 #fff;
-  -moz-border-left-colors: #efebe7 #fff;
-  -moz-border-bottom-colors: #000 #9c9a94 transparent;
-  -moz-border-right-colors: #000 #9c9a94 transparent;
-  text-decoration: none;
-  color: inherit; }
-
-INPUT.button:disabled
-{ color: #999; }
-
-A.button
-{ padding: 4px; }
-
-A.button IMG
-{ vertical-align: middle; }
-
-A[class~="_disabled"].button,
-A[class~="_disabled"].button:active
-{ color: #999;
-  background: inherit; }
-
 LI.denied
 { background-color: #fefefe;
   font-style: italic;
@@ -643,7 +484,7 @@ LI._selected,
 TR._selected > TD,
 TD._selected
 {
-  background-color: #4b6983;
+  background: #9ABCD8;
   color: #fff;
 }
 
@@ -662,90 +503,18 @@ DIV.dTreeNode A SPAN.nodeName
 
 DIV.dTreeNode A._selected SPAN.nodeName
 {
-  background-color: #4b6983;
+  background-color: #9ABCD8;
   color: #fff;
 }
 
 DIV.dTreeNode SPAN._dragOver
 { 
-  background-color: #4b6983;
+  background-color: #9ABCD8;
   color: #fff;
 }
 
-/* tabs */
-DIV.tabsContainer
-{ position: relative;
-  color: #000;
-  background-color: #d4d0c8;
-  margin-top: 1.5em;
-  border-top: 2px solid #fff;
-  border-left: 2px solid #fff;
-  border-right: 2px solid #888;
-  border-bottom: 2px solid #888;
-  -moz-border-top-colors: #efebe7 #fff;
-  -moz-border-left-colors: #efebe7 #fff;
-  -moz-border-right-colors: #000 #9c9a94 transparent;
-  -moz-border-bottom-colors: #000 #9c9a94 transparent; }
-
-DIV.tabsContainer > UL
-{ cursor: default;
-  list-style-type: none;
-  list-style-image: none;
-  margin: 0px;
-  margin-top: -17px;
-  padding: 0px; }
-
-DIV.tabsContainer > UL LI
-{ z-index: 3;
-  float: left;
-  padding: 0px .5em;
-  padding-top: 0px;
-  -moz-border-radius-topleft: 3px;
-  -moz-border-radius-topright: 3px;
-  border-top: 2px solid #fff;
-  border-bottom: 0px solid #fff;
-  border-right: 2px solid #888;
-  padding-bottom: 1px;
-  -moz-border-top-colors: #efebe7 #fff;
-  -moz-border-right-colors: #000 #9c9a94 transparent;
-  -moz-border-bottom-colors: #efebe7 #fff;
-  color: #000; }
-
-DIV.tabsContainer > UL LI.first,
-DIV.tabsContainer > UL LI.active
-{ border-left: 2px solid #fff;
-  margin-left: -2px;
-  -moz-border-left-colors: #efebe7 #fff; }
-
-DIV.tabsContainer > UL LI.active
-{ z-index: 5;
-  background-color: #d4d0c8;
-  border-bottom: 1px none #fff;
-  padding-top: 2px;
-  padding-bottom: 3px;
-  margin-top: -3px; }
-
-DIV.tabsContainer > DIV.tab
-{ position: absolute;
-  overflow: auto;
-  top: .5em;
-  left: .5em;
-  right: .5em;
-  bottom: .5em;
-  display: none; }
-
-DIV.tabsContainer DIV.active
-{ display: block; }
-
-DIV.tabsContainer > DIV[class~="active"].tab
-{ display: block !important; }
-
 INPUT.checkBox
-{ vertical-align: middle;
-  -moz-border-top-colors: #000 #fff;
-  -moz-border-left-colors: #000 #fff; 
-  -moz-border-bottom-colors: #000 #fff;
-  -moz-border-right-colors: #000 #fff; }
+{ vertical-align: middle; }
 
 /* tablekit resizable columns */
 
@@ -778,22 +547,10 @@ DIV.resize-handle
 }
 
 .genericHoverClass
-{ background-color: #0033cc !important;
-  color: #fff !important; }
-
-DIV#uploadDialog, DIV#uploadResults
-{ border-width: 1px;
-  width: 260px; }
-
-DIV#uploadDialog DIV, DIV#uploadResults DIV
-{ width: 260px; }
-
-DIV.dialog H3
-{ margin-top: 0; }
-
-DIV.dialog P.buttons
-{ margin-bottom: 0;
-  text-align: right;}
+{
+  background-color: #9ABCD8 !important;
+  color: #fff !important;
+}
 
 DIV.dialog 
 { position: absolute;
@@ -804,7 +561,8 @@ DIV.dialog
 DIV.dialog DIV
 { border: 1px solid #444;
   background-color: #fff;
-  padding: 5px; }
+  padding: 5px;
+  padding-bottom: 26px; }
 
 DIV.dialog.left
 { background-image: url("dialog-left.png");
@@ -825,3 +583,322 @@ DIV.dialog.right DIV
 { border-right: 0;
   margin-right: 19px;
   text-align: right; }
+
+DIV#uploadDialog,
+DIV#uploadResults
+{ border-width: 1px;
+  width: 260px; }
+
+DIV#uploadDialog DIV,
+DIV#uploadResults DIV
+{ width: 260px; }
+
+DIV#uploadDialog H3,
+DIV#uploadResults H3
+{ margin-top: 0;
+  font-size: 1.2em; }
+
+/* INPUT styles */
+TEXTAREA
+{ vertical-align: top; }
+
+DIV, TEXTAREA, INPUT, SELECT
+{ font-family: inherit;
+  font-size: 8pt;
+  font-size: inherit; }
+
+INPUT[type="text"], INPUT[type="password"], INPUT[type="file"],
+SELECT,
+TEXTAREA
+{ border-top: 1px solid #909090;
+  border-left: 1px solid #909090;
+  border-bottom: 1px solid #EFF0EF;
+  border-right: 1px solid #EFF0EF;
+  background-color: #CCDDEC;
+  color: #535D6D; }
+
+INPUT[disabled], INPUT[readonly],
+SELECT[disabled], SELECT[readonly],
+TEXTAREA[disabled], TEXTAREA[readonly]
+{ background: #E6E7E6;
+  color: #9ABCD8; }
+
+INPUT[type="text"], INPUT[type="password"], INPUT[type="file"],
+SELECT
+{ background: url("input_bg.gif"); }
+
+TEXTAREA
+{ padding: 0px;
+  padding-left: 2px; }
+
+INPUT.textField
+{ margin: 2px; padding: 2px;
+  vertical-align: middle;
+  width: 250px; }
+
+INPUT#searchValue
+{ margin-right: 1em;
+  width: 20em;
+  padding-left: 24px;
+  background-image: url('Search-bar.png');
+  background-repeat: no-repeat;
+  background-position: 2px 2px;
+  background-color: #CCDDEC;
+  color: #909090; }
+
+/* Buttons 
+ * Avoid using DIVS as buttons, they're only helpful when they have multiple
+ * listeners for "onclick" 
+ */
+A.button {
+  padding: 0px 0.5em;
+  background: transparent url('btn_a_bg.png') no-repeat scroll top right;
+  display: block;
+  float: right;
+  height: 23px;
+  padding-right: 3px; /* sliding doors padding */
+  text-decoration: none;  
+  color: inherit;
+  cursor: pointer;
+}
+
+A.button SPAN {
+    background: transparent url('btn_span_bg.png') no-repeat;
+    display: block;
+    line-height: 13px;
+    padding: 5px 2px 5px 5px;
+    cursor: pointer;
+}
+
+A.button.actionButton SPAN 
+{ font-weight: bold; }
+
+A.button:active SPAN
+{ background-position: bottom left;
+  padding: 6px 2px 4px 5px; }
+
+A.disabled.button,
+A.disabled.button:active,
+A.disabled.button SPAN
+{ color: #999; }
+
+A.disabled.button:active SPAN
+{ background-position: top left;
+  padding: 5px 2px 5px 5px; }
+
+/* Frames */
+TABLE.frame,
+TABLE.framenocaption
+{ border-top: 1px solid #909090;
+  border-left: 1px solid #909090;
+  border-bottom: 1px solid #FFFFFF;
+  border-right: 1px solid #FFFFFF;
+  margin-top: -.5em;
+  margin-left: auto;
+  margin-right: auto;
+  margin-bottom: 1em;
+  padding: 1em;
+  display: table;
+  text-align: right;
+  width: 100%; }
+
+TABLE.nopadding
+{ padding: 4px; }
+TABLE.framenocaption
+{ margin-top: 14px; }
+
+TABLE.frame TD
+{ padding: 0; }
+
+SPAN.caption
+{ display: inline-block;
+  position: relative;
+  text-align: center;
+  cursor: default;
+  background-color: #E6E7E6;
+  color: #535D6D;
+  width: auto;
+  padding: .25em;
+  margin-left: 7px;
+  border: 0px; }
+
+
+/* Tabs */
+DIV.tabsContainer
+{ position: relative;
+  color: #535D6D;
+  background-color: #E6E7E6;
+  margin-top: 0.5em; 
+  border: 1px solid #9B9B9B;
+  position: absolute;
+  top: 2.5em;
+  left: .5em;
+  right: .5em;
+  bottom: 2.5em;
+  margin-bottom: 1em;
+  padding: 0 5px; }
+
+DIV.tabsContainer > UL
+{ cursor: default;
+  list-style-type: none;
+  list-style-image: none;
+  margin: 0px;
+  margin-top: -24px;
+  padding: 0px; }
+
+DIV.tabsContainer > UL LI {
+  padding: 0px;
+  margin-right: -1px;
+  background: transparent url('tab_a_inactive_bg.png') no-repeat scroll top right;
+  display: block;
+  float: left;
+  height: 24px;
+  padding-right: 2px; /* sliding doors padding */
+  text-decoration: none;  
+  color: inherit;
+}
+DIV.tabsContainer > UL LI SPAN {
+    background: transparent url('tab_span_inactive_bg.png') no-repeat;
+    display: block;
+    line-height: 14px;
+    padding: 5px 6px 5px 5px;
+}
+DIV.tabsContainer > UL LI.active {
+  background: transparent url('tab_a_active_bg.png') no-repeat scroll top right !important;
+}
+DIV.tabsContainer > UL LI.active SPAN {
+    background: transparent url('tab_span_active_bg.png') no-repeat !important;
+}
+DIV.tabsContainer > UL LI.first
+{ margin-left: -1px;
+  padding-left: -1px; }
+
+DIV.tabsContainer DIV.active
+{ display: block; }
+
+DIV.tabsContainer > DIV[class~="active"].tab
+{ display: block !important; }
+
+DIV.tab
+{ padding: 2px;
+  display: none;
+  margin-top: 24px;
+  overflow: hidden; }
+
+
+/* Toolbar */
+DIV#toolbar
+{ left: 0px;
+  border-top: 1px solid #fff;
+  border-bottom: 1px solid #848284;
+  margin: 0px;
+  padding: 0px;
+  white-space: nowrap;
+  overflow: auto; }
+
+BODY.popup DIV#toolbar
+{ border-top: 0px; }
+
+SPAN.toolbarSeparator
+{ display: block;
+  float: left;
+  height: 3.8em;
+  vertical-align: middle;
+  border-right : 1px solid #fff;
+  border-left : 1px solid #9c9a94;
+  margin: 0px .25em;
+  margin-top: 0.125em;
+  width: 0px;
+  padding: 0px; }
+
+A.toolbarButton, 
+A.toolbarButton:hover, 
+A.smallToolbarButton, 
+A.smallToolbarButton:hover {
+  display: inline;
+  float: left;
+  height: 49px;
+  padding-right: 3px; /* sliding doors padding */
+  text-decoration: none;  
+  color: inherit;
+  cursor: pointer;
+}
+A.smallToolbarButton,
+A.smallToolbarButton:hover {
+  height: 35px;
+}
+A.toolbarButton:hover {
+  background: transparent url('toolbarbtn_a_bg.png') no-repeat scroll top right;
+}
+A.smallToolbarButton:hover {
+  background: transparent url('smalltoolbarbtn_a_bg.png') no-repeat scroll top right;
+}
+
+A.toolbarButton SPAN, 
+A.toolbarButton:hover SPAN {
+  text-align: center;
+  display: block;
+  line-height: 13px;
+  padding: 5px 2px 5px 5px;
+  cursor: pointer;
+}
+
+A.smallToolbarButton SPAN, 
+A.smallToolbarButton:hover SPAN {
+  text-align: center;
+  display: block;
+  line-height: 8px;
+  padding: 5px 2px 5px 5px !important;
+  cursor: pointer;
+}
+
+A.toolbarButton:hover SPAN {
+  background: transparent url('toolbarbtn_span_bg.png') no-repeat;
+}
+A.smallToolbarButton:hover SPAN {
+  background: transparent url('smalltoolbarbtn_span_bg.png') no-repeat;
+}
+A.toolbarButton:active SPAN {
+    background-position: bottom left;
+}
+A.smallToolbarButton:active SPAN {
+    background-position: bottom left;
+}
+
+A[class~="_disabled"].toolbarButton,
+A[class~="_disabled"].toolbarButton:active
+{ color: #999; }
+
+P#mailerSelectionContainer
+{ line-height: 25px;
+  margin-top: 2px; }
+
+DIV.bottomToolbar {
+  vertical-align: middle;
+  background-image: url("thead_bg.png");
+  border: 1px solid #9B9B9B;
+  background-color: #E6E7E6;
+  height: 20px;
+  margin-top: -4px;
+  text-align: left;
+  margin-left: 2px;
+  margin-right: 2px; }
+
+DIV.bottomToolbar A.bottomButton SPAN, DIV.bottomToolbar A.bottomButton {
+  margin: 0;
+  padding: 0;
+  width: 23px;
+  text-align: center;
+  text-decoration: none;  
+  color: inherit;
+  cursor: pointer;
+  border-bottom: 1px solid #9B9B9B;
+  border-right: 1px solid #9B9B9B;
+  float: left;
+  height: 20px;
+}
+
+DIV.bottomToolbar A.bottomButton SPAN
+{ background: transparent url('thead_bg.png') repeat-x top right; }
+DIV.bottomToolbar A.bottomButton SPAN:active
+{ background-position: bottom left; }
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 1b4126f43..41a05c550 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -169,7 +169,7 @@ function openContactWindow(url, wId) {
         wId = sanitizeWindowName(wId);
 
     var w = window.open(url, wId,
-                        "width=450,height=600,resizable=0,location=0");
+                        "width=450,height=530,resizable=0,location=0");
     w.focus();
 
     return w;
@@ -914,13 +914,13 @@ function onSearchFocus(event) {
         this.selectElement();
     }
 
-    this.setStyle({ color: "#000" });
+    this.setStyle({ color: "#535D6D" });
 }
 
 function onSearchBlur(event) {
     if (!this.value || this.value.blank()) {
         this.setAttribute("modified", "");
-        this.setStyle({ color: "#aaa" });
+        this.setStyle({ color: "#909090" });
         this.value = this.ghostPhrase;
         search["value"] = "";
         if (this.lastSearch != "") {
@@ -929,10 +929,10 @@ function onSearchBlur(event) {
         }
     } else if (this.value == this.ghostPhrase) {
         this.setAttribute("modified", "");
-        this.setStyle({ color: "#aaa" });
+        this.setStyle({ color: "#909090" });
     } else {
         this.setAttribute("modified", "yes");
-        this.setStyle({ color: "#000" });
+        this.setStyle({ color: "#535D6D" });
     }
 }
 
@@ -983,7 +983,7 @@ function initCriteria() {
             if (searchValue.value == '') {
                 searchValue.value = firstOption.innerHTML;
                 searchValue.setAttribute("modified", "");
-                searchValue.setStyle({ color: "#aaa" });
+                searchValue.setStyle({ color: "#909090" });
             }
             // Set the checkmark to the first option
             if (searchOptions.chosenNode)
@@ -1373,41 +1373,41 @@ function onTabClick(event) {
     //container.activeTab.show();
 }
 
-function enableAnchor(anchor) {
-    var classStr = '' + anchor.getAttribute("class");
-    var position = classStr.indexOf("_disabled", 0);
-    if (position > -1) {
-        var disabledHref = anchor.getAttribute("disabled-href");
-        if (disabledHref)
-            anchor.setAttribute("href", disabledHref);
-        var disabledOnclick = anchor.getAttribute("disabled-onclick");
-        if (disabledOnclick)
-            anchor.setAttribute("onclick", disabledOnclick);
-        anchor.removeClassName("_disabled");
-        anchor.setAttribute("disabled-href", null);
-        anchor.setAttribute("disabled-onclick", null);
-        anchor.disabled = 0;
-        anchor.enabled = 1;
-    }
-}
+//function enableAnchor(anchor) {
+//    var classStr = '' + anchor.getAttribute("class");
+//    var position = classStr.indexOf("_disabled", 0);
+//    if (position > -1) {
+//        var disabledHref = anchor.getAttribute("disabled-href");
+//        if (disabledHref)
+//            anchor.setAttribute("href", disabledHref);
+//        var disabledOnclick = anchor.getAttribute("disabled-onclick");
+//        if (disabledOnclick)
+//            anchor.setAttribute("onclick", disabledOnclick);
+//        anchor.removeClassName("_disabled");
+//        anchor.setAttribute("disabled-href", null);
+//        anchor.setAttribute("disabled-onclick", null);
+//        anchor.disabled = 0;
+//        anchor.enabled = 1;
+//    }
+//}
 
-function disableAnchor(anchor) {
-    var classStr = '' + anchor.getAttribute("class");
-    var position = classStr.indexOf("_disabled", 0);
-    if (position < 0) {
-        var href = anchor.getAttribute("href");
-        if (href)
-            anchor.setAttribute("disabled-href", href);
-        var onclick = anchor.getAttribute("onclick");
-        if (onclick)
-            anchor.setAttribute("disabled-onclick", onclick);
-        anchor.addClassName("_disabled");
-        anchor.setAttribute("href", "#");
-        anchor.setAttribute("onclick", "return false;");
-        anchor.disabled = 1;
-        anchor.enabled = 0;
-    }
-}
+//function disableAnchor(anchor) {
+//    var classStr = '' + anchor.getAttribute("class");
+//    var position = classStr.indexOf("_disabled", 0);
+//    if (position < 0) {
+//        var href = anchor.getAttribute("href");
+//        if (href)
+//            anchor.setAttribute("disabled-href", href);
+//        var onclick = anchor.getAttribute("onclick");
+//        if (onclick)
+//            anchor.setAttribute("disabled-onclick", onclick);
+//        anchor.addClassName("_disabled");
+//        anchor.setAttribute("href", "#");
+//        anchor.setAttribute("onclick", "return false;");
+//        anchor.disabled = 1;
+//        anchor.enabled = 0;
+//    }
+//}
 
 function d2h(d) {
     var hD = "0123456789abcdef";
diff --git a/UI/WebServerResources/iefixes.css b/UI/WebServerResources/iefixes.css
index 87ed4e43c..0cc1b77c1 100644
--- a/UI/WebServerResources/iefixes.css
+++ b/UI/WebServerResources/iefixes.css
@@ -27,21 +27,11 @@ TD.tbtv_navcell
 DIV#windowButtons
 { height: 3em; }
 
-A.button,
 INPUT.button
 { border: 1px solid #fff;
   border-right: 1px solid #666;
   border-bottom: 1px solid #666; }
 
-A.button
-{ color: #000;
-  padding: 1px 4px; }
-
-A.button IMG
-{ margin: 1px; }
-
-/* UIxAclEditor */
-
 DIV#userRoles
 {  }
 
@@ -63,8 +53,8 @@ TD.mailer_fieldname
 
 /* ContactsUI */
 
-DIV#contactFoldersList SPAN.toolbarButton
-{ padding: 2px; }
+/*DIV#contactFoldersList SPAN.toolbarButton
+{ padding: 2px; } */
 
 /* SchedulerUI */
 
@@ -321,6 +311,9 @@ DIV#propertiesView LEGEND
 
 /* UIxMailPartICalViewer */
 
+.clear
+{ padding-top: 0; }
+
 #messageContent FIELDSET
 { padding: 0.5em 1.0em; }
 
@@ -332,10 +325,61 @@ DIV#propertiesView LEGEND
 DIV#headerArea
 { padding-bottom: 0px; }
 
-/* UIxPreferences */
-TEXTAREA#signature
-{ height: 33em;
-  overflow: auto; }
-
 TABLE#categoriesList
 { width: auto; }
+
+DIV#categoriesListWrapper
+{ top: 92px; }
+
+DIV#windowButtons
+{ bottom: 11px; }
+
+TABLE.frame,
+TABLE.framenocaption
+{ margin-top: -4px; }
+
+TABLE.frame TBODY
+{ padding: 20px; }
+
+UL#calendarList
+{ height: 100px; }
+
+A.toolbarButton SPAN, 
+A.toolbarButton:hover SPAN {
+  height: 50px;
+  padding: 5px 2px 6px 5px;
+}
+A.smallToolbarButton, A.smallToolbarButton:hover,
+A.smallToolbarButton SPAN, A.smallToolbarButton:hover SPAN
+{ height: 33px; }
+
+A.toolbarButton:active SPAN {
+    background-position: auto; /*broken*/
+}
+A.toolbarButton, A.toolbarButton SPAN, A.button, A.button SPAN
+{ color: #535D6D; }
+
+DIV#toolbar
+{ overflow: hidden; }
+
+INPUT#statusPercent
+{ width: 2em !important; }
+
+DIV.bottomToolbar
+{ position: relative; display: block; }
+
+DIV#referencesListWrapper
+{ margin-bottom: 0px; }
+
+DIV#listEditor TABLE TBODY TR TD:first-child
+{ margin-bottom: 0px;
+  padding-bottom: 0px; }
+
+A#aboutClose
+{ top: 25px;}
+
+DIV#uploadDialog P,
+DIV#uploadResults P
+{ margin: 5px;
+  padding: 0; }
+
diff --git a/UI/WebServerResources/input_bg.gif b/UI/WebServerResources/input_bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..dc621e21a376792dc4e0756b40741f35701887b7
GIT binary patch
literal 2492
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

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/remove-icon.png b/UI/WebServerResources/remove-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..105e259059d65b81b08aa364250450b9b4476074
GIT binary patch
literal 1011
zcmV<P0}T9$P)<h;3K|Lk000e1NJLTq000sI000yS1^@s6fR}Ab0009!X+uL$Nkc;*
zP;zf(X>4Tx0C)j~luKyTP!xv$j46V&f~d6?l;A>(v?V^!ics5Wwbqew82iv7$TV|j
z8cj1XnHe95NI~5BT8bMVh>I%XLb_0Jr3;Zl>uXU2ait=NLN`*z|0eBBDpoHf`Et&G
z&+CQ&RS#2+V?{Jz*v`AjuBdkC@PM{>0#&F%HMmlS=d>ph`+cTXKIgCLw@{>IvPs5@
z^&Ob_v~BhMOOImj>z?-dp85KDZ#6Cx0*XfKifq7JB@YI?SMtfclc(m0WMe3mCOhOt
zw<p;_zCm7^4e?-z)50@=sy1qJhT}3$WCgjUXk=x~QL=8QO`AL=?P<>#riT4Se#lwS
z#+8o&t!scqFDteI4;Z}*tXf~OHPits`+>1772D6GKOd!b+{<j)?1xjTqpayesq}L_
zu=pA<bG20Zb*ogGxy>A`<C$d?+@h~#Vah8Ys5jWn_{lk1h=ZPdRSR&FbL?LN#4Z5W
zKLQ&b0Lvc(i5j412O{U$ZgAzrDb5Ax$T_E7Gdq;mHtYI!t(`|Jv~JsIZq!nirTH#T
zbA>0|qDVJm*eY<&{#wR+wXk~+^2z=p=Y+R=mX(oos*|%sGu!%-7M;7vjpTb7b5A$9
zf!9>V-P0SeveC?U_XHg2v#mJKMQS2-_F((~nei3X$w%cpB#(H-gEFRXKbG2;AlK8L
zJf4e5O)dAfof+!k8A(>GGeaHmS$^#nk}~f)YVJ6e|IM?u$a5Tq1pyN_?>00f(S<0Q
z;J`%=8G1}AOj@O1&}zcN@xLl9B+9!iD!TBQdp`SnPN2ZuGJYSTaf~#UBWU_N{hR(q
zzp3BRzh0>?G*mnz?orbizx<tXWoB88j2qM_<I9?Y_y((Or`JN3)?r>jPhMHy6s|5~
zU#Ty9G?_zOj8BKU6roH_7-T%zwd}q~w)iIed~?|rnjW<;&OWKD<a(oy9ht0taW-5H
zYyY#WVA8Uy@Z^n<E<9_Yu2naw-D-=v1Dd)^ZBtv-PQL9__m_9{a#kizvTm2vr`Usy
z)AUwOx-we?{}z5R{4aG0Tezm7$$x0V&1FnW_>SQAA9qOkFZ>Mwg%u5aOFKIN000Sa
zNLh0L01FcU01FcV0GgZ_00019Nkl<ZI1yuD7zLvtFo;5c5!o%F(ODt?nVF{{i(zB4
z{rP3RY}w4)$Z{;moIi{V>`ea|M3Kd?vA_T2M9~LQgCfAm#(w<wzyFEYG$V^K@v}ce
h=8v*RLx5T#008b)5n0zf7Z3md002ovPDHLkV1jL$-uVCk

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/smalltoolbarbtn_a_bg.png b/UI/WebServerResources/smalltoolbarbtn_a_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..fff491ce36feb58ed1d6af8066f4c8c986ada43c
GIT binary patch
literal 1047
zcmV+y1nB#TP)<h;3K|Lk000e1NJLTq00093001Kh1^@s6QG~FG0009!X+uL$Nkc;*
zP;zf(X>4Tx0C)j~luKyTP!xv$j46V&f~d6?l;A>(v?V^!ics5Wwbqew82iv7$TV|j
z8cj1XnHe95NI~5BT8bMVh>I%XLb_0Jr3;Zl>uXU2ait=NLN`*z|0eBBDpoHf`Et&G
z&+CQ&RS#2+V?{Jz*v`AjuBdkC@PM{>0#&F%HMmlS=d>ph`+cTXKIgCLw@{>IvPs5@
z^&Ob_v~BhMOOImj>z?-dp85KDZ#6Cx0*XfKifq7JB@YI?SMtfclc(m0WMe3mCOhOt
zw<p;_zCm7^4e?-z)50@=sy1qJhT}3$WCgjUXk=x~QL=8QO`AL=?P<>#riT4Se#lwS
z#+8o&t!scqFDteI4;Z}*tXf~OHPits`+>1772D6GKOd!b+{<j)?1xjTqpayesq}L_
zu=pA<bG20Zb*ogGxy>A`<C$d?+@h~#Vah8Ys5jWn_{lk1h=ZPdRSR&FbL?LN#4Z5W
zKLQ&b0Lvc(i5j412O{U$ZgAzrDb5Ax$T_E7Gdq;mHtYI!t(`|Jv~JsIZq!nirTH#T
zbA>0|qDVJm*eY<&{#wR+wXk~+^2z=p=Y+R=mX(oos*|%sGu!%-7M;7vjpTb7b5A$9
zf!9>V-P0SeveC?U_XHg2v#mJKMQS2-_F((~nei3X$w%cpB#(H-gEFRXKbG2;AlK8L
zJf4e5O)dAfof+!k8A(>GGeaHmS$^#nk}~f)YVJ6e|IM?u$a5Tq1pyN_?>00f(S<0Q
z;J`%=8G1}AOj@O1&}zcN@xLl9B+9!iD!TBQdp`SnPN2ZuGJYSTaf~#UBWU_N{hR(q
zzp3BRzh0>?G*mnz?orbizx<tXWoB88j2qM_<I9?Y_y((Or`JN3)?r>jPhMHy6s|5~
zU#Ty9G?_zOj8BKU6roH_7-T%zwd}q~w)iIed~?|rnjW<;&OWKD<a(oy9ht0taW-5H
zYyY#WVA8Uy@Z^n<E<9_Yu2naw-D-=v1Dd)^ZBtv-PQL9__m_9{a#kizvTm2vr`Usy
z)AUwOx-we?{}z5R{4aG0Tezm7$$x0V&1FnW_>SQAA9qOkFZ>Mwg%u5aOFKIN000Sa
zNLh0L01FcU01FcV0GgZ_0001jNkl<Z7#Vd@$q~RH2wa)`O%w5Ny;?@no(3L<#hL62
z2KGQxYi(ZTLMa7lDthmzwL*Z21<}E(A!ASzCbR|R4CicXL4ejif)?US*03qaNJa=6
z8d4CjK#UVO6hYs>p$RA`1+YuqXm5z)T6zz8+NFO2f%DuC?6VAqeUc%c882`$O<}5S
RS3dv%002ovPDHLkV1kp(=VJf>

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/smalltoolbarbtn_span_bg.png b/UI/WebServerResources/smalltoolbarbtn_span_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb69e60576e0eee742ba058285419784d75f0125
GIT binary patch
literal 4912
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

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/tab_a_active_bg.png b/UI/WebServerResources/tab_a_active_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cf4c9b0515585fdd94c97b1cc290e746adb28fe
GIT binary patch
literal 977
zcmV;?11|iDP)<h;3K|Lk000e1NJLTq00062000;W1^@s6(EBXe0009!X+uL$Nkc;*
zP;zf(X>4Tx0C)j~luKyTP!xv$j46V&f~d6?l;A>(v?V^!ics5Wwbqew82iv7$TV|j
z8cj1XnHe95NI~5BT8bMVh>I%XLb_0Jr3;Zl>uXU2ait=NLN`*z|0eBBDpoHf`Et&G
z&+CQ&RS#2+V?{Jz*v`AjuBdkC@PM{>0#&F%HMmlS=d>ph`+cTXKIgCLw@{>IvPs5@
z^&Ob_v~BhMOOImj>z?-dp85KDZ#6Cx0*XfKifq7JB@YI?SMtfclc(m0WMe3mCOhOt
zw<p;_zCm7^4e?-z)50@=sy1qJhT}3$WCgjUXk=x~QL=8QO`AL=?P<>#riT4Se#lwS
z#+8o&t!scqFDteI4;Z}*tXf~OHPits`+>1772D6GKOd!b+{<j)?1xjTqpayesq}L_
zu=pA<bG20Zb*ogGxy>A`<C$d?+@h~#Vah8Ys5jWn_{lk1h=ZPdRSR&FbL?LN#4Z5W
zKLQ&b0Lvc(i5j412O{U$ZgAzrDb5Ax$T_E7Gdq;mHtYI!t(`|Jv~JsIZq!nirTH#T
zbA>0|qDVJm*eY<&{#wR+wXk~+^2z=p=Y+R=mX(oos*|%sGu!%-7M;7vjpTb7b5A$9
zf!9>V-P0SeveC?U_XHg2v#mJKMQS2-_F((~nei3X$w%cpB#(H-gEFRXKbG2;AlK8L
zJf4e5O)dAfof+!k8A(>GGeaHmS$^#nk}~f)YVJ6e|IM?u$a5Tq1pyN_?>00f(S<0Q
z;J`%=8G1}AOj@O1&}zcN@xLl9B+9!iD!TBQdp`SnPN2ZuGJYSTaf~#UBWU_N{hR(q
zzp3BRzh0>?G*mnz?orbizx<tXWoB88j2qM_<I9?Y_y((Or`JN3)?r>jPhMHy6s|5~
zU#Ty9G?_zOj8BKU6roH_7-T%zwd}q~w)iIed~?|rnjW<;&OWKD<a(oy9ht0taW-5H
zYyY#WVA8Uy@Z^n<E<9_Yu2naw-D-=v1Dd)^ZBtv-PQL9__m_9{a#kizvTm2vr`Usy
z)AUwOx-we?{}z5R{4aG0Tezm7$$x0V&1FnW_>SQAA9qOkFZ>Mwg%u5aOFKIN000Sa
zNLh0L01FcU01FcV0GgZ_0000yNkl<Z2pwZMaPYu?1|VR1{pvLXh{O2p+qeHqmo8;s
z`uF!QNQQyw&p#;R@85qAk$<>FzzRUR29yB+Wq~0N3hPc_00000NkvXXu0mjf6T8k8

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/tab_a_inactive_bg.png b/UI/WebServerResources/tab_a_inactive_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad0453c5f0e91e7b32300b9ef18b5afb41e00593
GIT binary patch
literal 961
zcmV;y13vtTP)<h;3K|Lk000e1NJLTq00062000;W1^@s6(EBXe0009!X+uL$Nkc;*
zP;zf(X>4Tx0C)j~luKyTP!xv$j46V&f~d6?l;A>(v?V^!ics5Wwbqew82iv7$TV|j
z8cj1XnHe95NI~5BT8bMVh>I%XLb_0Jr3;Zl>uXU2ait=NLN`*z|0eBBDpoHf`Et&G
z&+CQ&RS#2+V?{Jz*v`AjuBdkC@PM{>0#&F%HMmlS=d>ph`+cTXKIgCLw@{>IvPs5@
z^&Ob_v~BhMOOImj>z?-dp85KDZ#6Cx0*XfKifq7JB@YI?SMtfclc(m0WMe3mCOhOt
zw<p;_zCm7^4e?-z)50@=sy1qJhT}3$WCgjUXk=x~QL=8QO`AL=?P<>#riT4Se#lwS
z#+8o&t!scqFDteI4;Z}*tXf~OHPits`+>1772D6GKOd!b+{<j)?1xjTqpayesq}L_
zu=pA<bG20Zb*ogGxy>A`<C$d?+@h~#Vah8Ys5jWn_{lk1h=ZPdRSR&FbL?LN#4Z5W
zKLQ&b0Lvc(i5j412O{U$ZgAzrDb5Ax$T_E7Gdq;mHtYI!t(`|Jv~JsIZq!nirTH#T
zbA>0|qDVJm*eY<&{#wR+wXk~+^2z=p=Y+R=mX(oos*|%sGu!%-7M;7vjpTb7b5A$9
zf!9>V-P0SeveC?U_XHg2v#mJKMQS2-_F((~nei3X$w%cpB#(H-gEFRXKbG2;AlK8L
zJf4e5O)dAfof+!k8A(>GGeaHmS$^#nk}~f)YVJ6e|IM?u$a5Tq1pyN_?>00f(S<0Q
z;J`%=8G1}AOj@O1&}zcN@xLl9B+9!iD!TBQdp`SnPN2ZuGJYSTaf~#UBWU_N{hR(q
zzp3BRzh0>?G*mnz?orbizx<tXWoB88j2qM_<I9?Y_y((Or`JN3)?r>jPhMHy6s|5~
zU#Ty9G?_zOj8BKU6roH_7-T%zwd}q~w)iIed~?|rnjW<;&OWKD<a(oy9ht0taW-5H
zYyY#WVA8Uy@Z^n<E<9_Yu2naw-D-=v1Dd)^ZBtv-PQL9__m_9{a#kizvTm2vr`Usy
z)AUwOx-we?{}z5R{4aG0Tezm7$$x0V&1FnW_>SQAA9qOkFZ>Mwg%u5aOFKIN000Sa
zNLh0L01FcU01FcV0GgZ_0000iNkl<Z2pwZ!zyJph9{3LuWV(IpHUo&mc>DJ4{|62n
jU|@o&9lQ*XGeH0V%T5tW71R6300000NkvXXu0mjfVFki|

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/tab_span_active_bg.png b/UI/WebServerResources/tab_span_active_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b0f799961389a789c7b68355e0652f2d0c1f641
GIT binary patch
literal 1408
zcmb`G`9ISQ0LQ;`mAteRUKpe0YKn3uqin7{m^llDVseM&$UM%>T%j~sS*2VV37f1k
zdBjGJayLvN)f_43T#x5}cz$?)KCk!hpHBuBV=Z|=;Q#;tl4u(Xr@dzHA-7*_FIoO|
zF9AT<BoKwdqERRnY~*$Szz`e&#DdZaYy$?c(!|~D<0%a(6?EBxNn}=onps~amK#VP
z%8!uS?1QoO@z)gW^-dSbE0b)@$2L4NA<CpI_*Wzo8(u1rkK_kCibRycNJt~6_FeUP
zJGh&U>PBQwVlSTvxPqN;`&#PzjP$(b)Ko-&|CPju6>_aGH+bbloNdrJy!m&To7wD(
zAC1^&xH@!u=8Dq&^@h-uZQI<di+t*;fVv^LdEG$!h)|{#KQpAoQw=Qk=E85zo4e)T
zNPfPW_tZ_Mtr|5(&6~}=D3VJ)r2baDr00e~k;ExojGt&zX@DQ@gJWG-x%~r#+I(QI
zTp4lODuM0Z*M2V-R2`gTsiVaJf#u#x&^)|f8VrE6Hj`hTl;QS1JEvS4J=PU6I+yPJ
z{3-1Rs&W}`TDz`r3Qu<tL{+&^nz|KfQ$;xGv62_KE1g;@6-Fc7>l|YbQYtmxRU-T@
ze$HE{O&b_KCj@~4UCP243XiYtgUybHh0nY{-Xr>*ZCrj?&!k}3kS~a?F1FTc2;&BX
z4LFfYH?$q_X&PfCHb%Z9@bI1;k9GpRmH__E*@4a8Y9x^F<==RIx86dJE4U+D{F;+9
zO_0Ys7&RpiyR?t@Lu%_jeu!BUQT$O~eWuqk2o|;Kvjr3_$qaI=XAr8nvF}rL%dVdz
ze=bxR?x!NCS!nx{Ym8#~pI_wBZZtiV(vo|^yzCv_#j`;RXUMzV^$a#%kthl}Vz_9i
zulg}flQP+2c~Cyi4sPdB>fIOA`p*&zep0pb^$9rhR}sN%lYn{LGOnATToRG3Pd*kP
zFxh^vW5ufEePnr6>gc;5jx9L$%dxhKBXIuiIoXf_&8aR*%DPxpX!$UbJaom&+`-G8
zCtaiM>s_fs&@Vz=%63R+N<Xo)m-9o6(&w6O80+d=@%T|$3Y4zXV^&!;9ryIMQV}g7
z!tj!0@NRvT&!@VoU(-2x+KAvMHLgaL<3U+WVG7eW)Y)?o(>(98Rv5D!>86gU3o9Hf
zA4$#WUv|SVbv;FPWfM+s=|qWpzAAgdNepQ1#@X4f-=17mj<MO$*^&gM$w<cAnwadp
zNj%)f9S;B!NB#o@P#($w0EmyaFn5Us&EI#t)2edF0@XP+Bi2MC<gAGCWeg`j96C(u
z<H76)nKqDM!Js~tiEiJXg+f{2;>bKe+)v~oacX1jAsNRZTT_VRGze#TfxckMu7gN*
zEcZ;6X>>4aoU!o2e77K4+$ZezI|AOc7yqSMBhe$a%QyJ)BlJX6g3`29#@O;B9^<$s
zXF$f$#G5dDe%q`qX~1y5FhHf(Y~ApGyfZx>p9ya4up=ZRU|<P0i+77O8S#ZpinO0h
zDdAs~XyK}Blsgaqc{S0Stt=%4{Zsok?@w(~$OGQm!JJ#2L%QVLW16cqG4pQ|xRyBM
ziBr6&`t6wsaPDXz3W~IhZPOxCRnA^bY};6&$5cDAywpB<Gi(bMAibZ{<N6c~pv~{u
zH>2CYT$!pdB?tAK#Z4>dsCcB;Y0TjWa_ET*oVdSk4z`yg(tp-k<$X=PbTnAll$%Nn
zvYWv3GLQjV*=fx$_DK$2oN}b97+1dgW^g9;sOFp?wgWz774N*mFouER)IsNyK%j8V
hd_cGrs`7u!q$q5*=urK-qW#_$0JJ5>q6X=c@-J!+mLLEC

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/tab_span_inactive_bg.png b/UI/WebServerResources/tab_span_inactive_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..675e43ea8274556b86aa64e71f164249ebd524a6
GIT binary patch
literal 1222
zcmeAS@N?(olHy`uVBq!ia0vp^CxBRjgAGXTPusMSfq~gN)7d$|)7e=epeR2rGbfdS
zp@Ok>ig(790Fk!;J(^8hnpSKToASV^dyA^wg|2|xnOm<-ER^_tLFt4^ak`YRvEfWf
z`3?`qJ3phkq~$xhwH`U`3Mg30J<;iPb|6dPQl$<j^Ppq@)!zDOh3TvOEIL<z{&gEe
zD1UHYva3nLjdQzCu3J&|;zPr>3Z~E%j;1?;+MaJw7y4bhEX?lt`j^`SmZWa-Jl6G9
zcE*n_xnKW!_b0u7J@4DEc|U(u=9}sXGj+MW?#ek3t;)}~C;ZdNJ(HI|>qtq~n5t&|
z#BIC!O~-wXakF?oCUjgrWZbaIEUT#Pv5{X2>&~SaDXC`yH{~t&oo%D~HuJp1vbMi&
zbtfV(9GlwDxHh}NRbP7>BfrF6?ln>I8%?h;YX5HBs4IH={1SWlrDb<c=iGeL9=vMt
znwQQizZBbU_#tIbyfx%k>FSVKJI~6jc|0>!<j$h?sfnkw6;_zvIQ!$IWmHG=yqZw%
zg2}~i;+c-<F<iH2l9ppQEzjI3wIH2c>G{pPf~Q9{&#}HZVYxik*m}x!v)8}M*3Na;
z-ja7aBkxMkw531w{EJ)F?=12#Prjj5aPD8!vFfcGs`)>i{HOH1Wqb9ssS`_9P2TKc
zeEZiVvAMfX_CBeWEcQ3w*?2wV*xk$08#Y}$Q~sSr=H=$K7Ux~FluExP{9%~+QS|Cb
z_op^0{S`->jh5xxPrEf;;riuyHuJhYeRaQYn=AS1p`>Tn8e?bKkCAn6#U>fOx5|2F
zG421^&D%~C%e1jF3Y)z*Gf}zNsxj-q0arfBDjzMMsHO22vJM^oxL-?G<<xE+tz92x
zR@?oq_FHh^u2G%*qQV}NY04SDtpCpb=eB?4{fqnKR_dFC*eJgXyezT*&)mY)w8-8b
z=_?wKPtR)l!L~Yg`E{ph*An9#{o^9<i>%X2j$f%?Z8Fn2rpLd1m&igNUx^f(n_J)P
z^Vs%7?N3edO|e;WTlLS`tz7-2YH^?J%r$j|W-+|k|2MBrxU^~YhbO%g^lY*ht_w9^
zc{i(j7xS!L-nqfiSN-<A4f#I3{7X@on%}0p=~tKEXzsoICCqP^Q8decu{y&)`lX!F
zJC-dxS)Xy}Y^sm<kG==r<jXyN>i^+oY!&6L@wT=G<|fVpkH}&M25w;xW@MN(M}mQY
z(a_VyF{Fa=?JY;XCIf-iL<6~=#n-b>BpR4%>J@nXI@DIVU;4}x#WUA!3Lct#bYx&;
z5pZx2oRJ+|IW@O-y_dZ$#}cs_(H7HEJ#94(D=y%$c{RJaK%?Y~1&57HTZ$V?2qV*?
zQy0?}9UOGF%~T8}p4XV?u<h;t)Wub{)=|5?_xjpY?Vp*J&vx<R$z{?LI6ADD^qB58
zoVox1mz?IJDqCZ)8fz3aE3PfRp0i&4^sLWs(yM2jb>s8+B4WvWX2Uz1-#7oIZl1_o
z#CG)8UzSa_f7jn&WGZS^y6&Ov;BYDL?T>_;b#lGjGS(a?F1Bzn?LM%%PJ8Ja)_n>M
d2mBu}n{5u0U9Gcr5imp<JYD@<);T3K0RVI)I3WN4

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/tbtv_junction_17x17.gif b/UI/WebServerResources/tbtv_junction_17x17.gif
index f3c22703871340588c478726ab5bf90f15b2a7c0..0137956d2771acab71c8baf13840276f0c9a7ed4 100644
GIT binary patch
literal 4483
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

literal 82
zcmZ?wbhEHb6l4%&XkcV$XlVHV|G(ltQRkx6#FEq$h4Rdj426)4R0VfW-v9<31|R?_
iWnhx%sc$&__UEFO&1R{_Au-->A`>inQ&OZ@8LR<Su^RCJ

diff --git a/UI/WebServerResources/thead_bg.png b/UI/WebServerResources/thead_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..5feb85045576b42fcdfe0d484c0470d4d54f52ea
GIT binary patch
literal 951
zcmV;o14#UdP)<h;3K|Lk000e1NJLTq00031001rs1^@s6>F;xD0009!X+uL$Nkc;*
zP;zf(X>4Tx0C)j~luKyTP!xv$j46V&f~d6?l;A>(v?V^!ics5Wwbqew82iv7$TV|j
z8cj1XnHe95NI~5BT8bMVh>I%XLb_0Jr3;Zl>uXU2ait=NLN`*z|0eBBDpoHf`Et&G
z&+CQ&RS#2+V?{Jz*v`AjuBdkC@PM{>0#&F%HMmlS=d>ph`+cTXKIgCLw@{>IvPs5@
z^&Ob_v~BhMOOImj>z?-dp85KDZ#6Cx0*XfKifq7JB@YI?SMtfclc(m0WMe3mCOhOt
zw<p;_zCm7^4e?-z)50@=sy1qJhT}3$WCgjUXk=x~QL=8QO`AL=?P<>#riT4Se#lwS
z#+8o&t!scqFDteI4;Z}*tXf~OHPits`+>1772D6GKOd!b+{<j)?1xjTqpayesq}L_
zu=pA<bG20Zb*ogGxy>A`<C$d?+@h~#Vah8Ys5jWn_{lk1h=ZPdRSR&FbL?LN#4Z5W
zKLQ&b0Lvc(i5j412O{U$ZgAzrDb5Ax$T_E7Gdq;mHtYI!t(`|Jv~JsIZq!nirTH#T
zbA>0|qDVJm*eY<&{#wR+wXk~+^2z=p=Y+R=mX(oos*|%sGu!%-7M;7vjpTb7b5A$9
zf!9>V-P0SeveC?U_XHg2v#mJKMQS2-_F((~nei3X$w%cpB#(H-gEFRXKbG2;AlK8L
zJf4e5O)dAfof+!k8A(>GGeaHmS$^#nk}~f)YVJ6e|IM?u$a5Tq1pyN_?>00f(S<0Q
z;J`%=8G1}AOj@O1&}zcN@xLl9B+9!iD!TBQdp`SnPN2ZuGJYSTaf~#UBWU_N{hR(q
zzp3BRzh0>?G*mnz?orbizx<tXWoB88j2qM_<I9?Y_y((Or`JN3)?r>jPhMHy6s|5~
zU#Ty9G?_zOj8BKU6roH_7-T%zwd}q~w)iIed~?|rnjW<;&OWKD<a(oy9ht0taW-5H
zYyY#WVA8Uy@Z^n<E<9_Yu2naw-D-=v1Dd)^ZBtv-PQL9__m_9{a#kizvTm2vr`Usy
z)AUwOx-we?{}z5R{4aG0Tezm7$$x0V&1FnW_>SQAA9qOkFZ>Mwg%u5aOFKIN000Sa
zNLh0L01FcU01FcV0GgZ_0000YNkl<Z2pwbi{{8!ZrhotbF%UyA00GlrBAA$%7=V}%
Z0RX`O96xoS-m(Ay002ovPDHLkV1gC1zv2J@

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/toolbarbtn_a_bg.png b/UI/WebServerResources/toolbarbtn_a_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..73cea5d600de968e06d443b46c0ce1d2df432ccb
GIT binary patch
literal 1030
zcmV+h1o``kP)<h;3K|Lk000e1NJLTq00093001!v1^@s6ADR;x0009!X+uL$Nkc;*
zP;zf(X>4Tx0C)j~luKyTP!xv$j46V&f~d6?l;A>(v?V^!ics5Wwbqew82iv7$TV|j
z8cj1XnHe95NI~5BT8bMVh>I%XLb_0Jr3;Zl>uXU2ait=NLN`*z|0eBBDpoHf`Et&G
z&+CQ&RS#2+V?{Jz*v`AjuBdkC@PM{>0#&F%HMmlS=d>ph`+cTXKIgCLw@{>IvPs5@
z^&Ob_v~BhMOOImj>z?-dp85KDZ#6Cx0*XfKifq7JB@YI?SMtfclc(m0WMe3mCOhOt
zw<p;_zCm7^4e?-z)50@=sy1qJhT}3$WCgjUXk=x~QL=8QO`AL=?P<>#riT4Se#lwS
z#+8o&t!scqFDteI4;Z}*tXf~OHPits`+>1772D6GKOd!b+{<j)?1xjTqpayesq}L_
zu=pA<bG20Zb*ogGxy>A`<C$d?+@h~#Vah8Ys5jWn_{lk1h=ZPdRSR&FbL?LN#4Z5W
zKLQ&b0Lvc(i5j412O{U$ZgAzrDb5Ax$T_E7Gdq;mHtYI!t(`|Jv~JsIZq!nirTH#T
zbA>0|qDVJm*eY<&{#wR+wXk~+^2z=p=Y+R=mX(oos*|%sGu!%-7M;7vjpTb7b5A$9
zf!9>V-P0SeveC?U_XHg2v#mJKMQS2-_F((~nei3X$w%cpB#(H-gEFRXKbG2;AlK8L
zJf4e5O)dAfof+!k8A(>GGeaHmS$^#nk}~f)YVJ6e|IM?u$a5Tq1pyN_?>00f(S<0Q
z;J`%=8G1}AOj@O1&}zcN@xLl9B+9!iD!TBQdp`SnPN2ZuGJYSTaf~#UBWU_N{hR(q
zzp3BRzh0>?G*mnz?orbizx<tXWoB88j2qM_<I9?Y_y((Or`JN3)?r>jPhMHy6s|5~
zU#Ty9G?_zOj8BKU6roH_7-T%zwd}q~w)iIed~?|rnjW<;&OWKD<a(oy9ht0taW-5H
zYyY#WVA8Uy@Z^n<E<9_Yu2naw-D-=v1Dd)^ZBtv-PQL9__m_9{a#kizvTm2vr`Usy
z)AUwOx-we?{}z5R{4aG0Tezm7$$x0V&1FnW_>SQAA9qOkFZ>Mwg%u5aOFKIN000Sa
zNLh0L01FcU01FcV0GgZ_0001SNkl<ZC>8BeF%rNa2#a2K`w7{7uRfzbuTUJU(4kYu
zW+De9#v{~PB~u0wA&8>2hEfWm2xB5L%dFwaW6bQh&RT~`pJt4)dTMHjGksBGt7aeS
z)SQ6v)I2un9aD?=lMnu&A06Yw2DWip18GmV0IEMfeZ5OEN&o-=07*qoM6N<$f{yCq
AWB>pF

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/toolbarbtn_span_bg.png b/UI/WebServerResources/toolbarbtn_span_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..7971b08b56ac62fbe43e8873afec970b716a7b77
GIT binary patch
literal 4405
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
azLR(SO?*!44(M`$18AtcRIXLDjrbpm4swqG

literal 0
HcmV?d00001