diff --git a/UI/Templates/ContactsUI/UIxContactSelector.wox b/UI/Templates/ContactsUI/UIxContactSelector.wox
deleted file mode 100644
index dcc759065..000000000
--- a/UI/Templates/ContactsUI/UIxContactSelector.wox
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-  <container 
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:uix="OGo:uix"
-    xmlns:label="OGo:label"
-    xmlns:rsrc="OGo:url"
-    >
-    <div class="contactSelector" var:id="selectorId">
-      <span class="contactSelectorButtons">
-        <a href="#" class="button"
-          onclick="return onContactAdd(this);"
-          ><img rsrc:src="add-contact.gif"
-            label:title="Add..."
-            /></a>
-        <a href="#" class="button"
-          onclick="return onContactRemove(this);"
-          ><img rsrc:src="remove-contact.gif"
-            label:title="Remove"
-            /></a>
-      </span>
-      <input type="hidden"
-        var:id="selectorIdList"
-        var:name="selectorId"
-        var:value="initialContactsAsString" />
-      <ul var:id="selectorIdDisplay"
-        multiselect="yes"
-        class="contactList">
-        <var:foreach list="contacts" item="currentContact"
-          ><li var:uid="currentContactId"
-            onmousedown="return false;"
-            onclick="onRowClick(event);"
-            >
-            <var:if condition="hasColors"
-              ><span class="colorBox" var:style="currentContactStyle"><!-- spacer --></span>
-            </var:if><var:if condition="hasCheckBoxes">
-              <input type="checkbox" class="checkBox"
-                var:checked="isCheckBoxChecked"
-                var:onchange="checkBoxOnChange" />
-            </var:if>
-            <var:if condition="hasCheckBoxes"
-              const:negate="YES">
-              <img rsrc:src="abcard.gif" />
-            </var:if>
-            <var:string value="currentContactName" /></li>
-        </var:foreach>
-      </ul><br />
-    </div>
-  </container>
diff --git a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
index ca5c54bf8..45d90f3b5 100644
--- a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
@@ -58,23 +58,15 @@
 		/></span></a
 	    ></div><!-- var:if -->
 
-	<ul id="contactFolders"
-	  var:additional-addressbooks="additionalAddressBooks">
+	<ul id="contactFolders">
 	  <var:foreach list="contactFolders" item="currentFolder"
-	    ><var:if condition="isFolderCurrent"
-	      ><li var:id="currentContactFolderId" class="_selected"
-		><var:string value="currentContactFolderName" /></li
-		></var:if
-	      ><var:if condition="isFolderCurrent" const:negate="YES"
-	      ><li var:id="currentContactFolderId"
-		><var:string value="currentContactFolderName" /></li
-		></var:if>
-	  </var:foreach
+	    ><li var:id="currentContactFolderId"
+              ><var:string value="currentContactFolderName" /></li
+	      ></var:foreach
 	    ><var:foreach list="additionalFolders"
 	    item="currentAdditionalFolder"
-	    ><li var:id="currentAdditionalFolder"
-	      var:external-addressbook="currentAdditionalFolder"
-	      ><var:string value="currentAdditionalFolder" /></li
+	    ><li var:id="currentAdditionalFolder" class="denied"
+	      ><var:string value="currentAdditionalFolderName" /></li
 	      ></var:foreach>
 	</ul>
 
@@ -113,8 +105,4 @@
   <var:if condition="hideFrame">
     <var:component-content />
   </var:if>
-
-  <script type="text/javascript">
-    currentContactFolder = '<var:string value="contactFolderId" />';
-  </script>
 </var:component>
diff --git a/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox b/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox
index a6e1c1b36..7b391ccba 100644
--- a/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox
+++ b/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox
@@ -1,26 +1,24 @@
 <?xml version='1.0' standalone='yes'?>
-  <span
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:uix="OGo:uix"
-    xmlns:label="OGo:label"
-    xmlns:rsrc="OGo:url"
-    >
-    <span id="selectionLabel"><var:string label:value="Add as..." /></span><br />
-    <input type="submit"
+<!DOCTYPE span>
+<span
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:uix="OGo:uix"
+  xmlns:label="OGo:label"
+  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="Recipient"
-      name="to"
-      onclick="return onConfirmContactSelection('to');" /><br />
-    <input type="submit"
-      class="button"
-      label:value="Carbon Copy"
-      name="cc"
-      onclick="return onConfirmContactSelection('cc');" /><br />
-    <input type="submit"
-      class="button"
-      label:value="Blind Carbon Copy"
-      name="bcc"
-      onclick="return onConfirmContactSelection('bcc');" />
-  </span>
+    label:value="Carbon Copy"
+    name="cc"/><br/>
+  <input type="submit"
+    class="button"
+    label:value="Blind Carbon Copy"
+    name="bcc"/>
+</span>
diff --git a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
new file mode 100644
index 000000000..b6b95e63e
--- /dev/null
+++ b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
@@ -0,0 +1,21 @@
+<?xml version='1.0' standalone='yes'?>
+<!DOCTYPE var:component>
+<var:component
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:rsrc="OGo:url"
+  xmlns:uix="OGo:uix"
+  xmlns:label="OGo:label"
+  className="UIxPageFrame"
+  title="name"
+  const:toolbar="none"
+  const:popup="YES">
+  <script type="text/javascript" rsrc:src="dtree.js"><!-- space --></script>
+  <var:component className="UIxContactsFilterPanel" qualifier="qualifier" />
+  <div id="folders">
+  </div>
+  <div id="buttons">
+    <input type="submit" id="addButton" class="button" label:value="Add..."/>
+  </div>
+</var:component>
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index ec44153e8..a0c4675b8 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -75,10 +75,9 @@
           ><var:component className="UIxCalDateSelector"
             selectedDate="thisMonth"
             /></div>
-        <div id="calendarSelectorView"
-          class="tab"
-          ><var:component className="UIxCalCalendarsListView"
-            /></div>
+        <div id="calendarSelectorView" class="tab"
+          ><var:component className="UIxCalendarSelector"
+	    var:calendarFolders="calendarFolders" /></div>
       </div>
 
       <div id="tasksListView"
diff --git a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
new file mode 100644
index 000000000..b2c455a4c
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
@@ -0,0 +1,38 @@
+<?xml version="1.0" standalone="yes"?>
+<!DOCTYPE container>
+<container
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label">
+  <style type="text/css">
+    <var:foreach list="calendarFolders" item="currentCalendarFolder">
+.ownerIs<var:string value="currentCalendarLogin" />
+{ background-color: <var:string value="currentCalendarSpanBG" /> !important; }
+    </var:foreach>
+  </style>
+  <div id="calendarSelector">
+    <span id="calendarSelectorButtons">
+      <a href="#" class="toolbarButton"
+	><span class="toolbarButton"><img rsrc:src="add-calendar.png"
+	  label:title="Add..."
+	  /></span></a>
+      <a href="#" class="toolbarButton"
+	><span class="toolbarButton"><img rsrc:src="remove-calendar.png"
+	    label:title="Remove"
+	    /></span></a>
+    </span>
+    <ul id="calendarList" multiselect="yes">
+      <var:foreach list="calendarFolders" item="currentCalendarFolder"
+	><li class="denied" var:id="currentCalendarFolder.folder">
+	  <input type="checkbox" class="checkBox"
+	    const:disabled="disabled"
+	    var:checked="currentCalendarFolder.active" />
+	  <div class="colorBox" var:style="currentCalendarStyle">OO</div>
+	  <var:string value="currentCalendarFolder.displayName"
+	    /></li>
+      </var:foreach>
+    </ul>
+  </div>
+</container>
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index f32d48415..d0d6d55f6 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -1,37 +1,64 @@
 <?xml version="1.0" standalone="yes"?>
-  <var:component xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:uix="OGo:uix"
-    xmlns:label="OGo:label"
-    className="UIxPageFrame"
-    title="title"
-    var:toolbar="toolbar"
-    const:popup="YES">
+<!DOCTYPE var:component>
+<var:component xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:uix="OGo:uix"
+  xmlns:label="OGo:label"
+  xmlns:rsrc="OGo:url"
+  className="UIxPageFrame"
+  title="title"
+  var:toolbar="toolbar"
+  const:popup="YES">
 
-    <form id="aclForm" const:href="saveAcls">
-      <div class="acls">
-        <input type="hidden" name="action" value="saveAcls" />
-        <input type="hidden" name="delegates" var:value="delegatesValue"
-          id="delegates" />
-        <input type="hidden" name="assistants" var:value="assistantsValue"
-          id="assistants" />
-        <label><var:string label:value="Owner:" />
-          <span class="value"><strong><var:string value="ownerCN" /></strong></span></label><br />
-        <var:component className="UIxContactSelector"
-          const:selectorId="userRoles"
-          const:checkBoxOnChange="return updateAclStatus(this);"
-          contacts="usersForFolder" />
-        <select id="userRoleDropDown" name="currentUserRole">
-          <option value="assistant"><var:string label:value="Assistant" /></option>
-          <option value="delegate"><var:string label:value="Delegate" /></option>
-        </select><br />
-        <var:if condition="clientIsCalendar"
-          ><label id="freeBusyLabel"><input type="checkbox"
-              var:checked="publishInFreeBusy"
-              class="checkBox" name="freebusy" id="freebusy"
-              /><var:string label:value="Localizable/Publish the Free/Busy information"
-              /></label></var:if>
+  <form id="aclForm" const:href="saveAcls">
+    <div class="acls">
+      <input type="hidden" name="action" value="saveAcls"/>
+      <input type="hidden" name="delegates" var:value="delegatesValue"
+	id="delegates"/>
+      <input type="hidden" name="assistants" var:value="assistantsValue"
+	id="assistants"/>
+      <label><var:string label:value="Owner:"/><br/>
+	<span class="value"><strong><var:string value="ownerName"/></strong></span></label><br/>
+
+      <!-- var:component className="UIxContactSelector"
+      const:checkBoxOnChange="return updateAclStatus(this);"
+      contacts="usersForFolder" -->
+
+      <div class="userSelector" id="userRoles">
+	<span 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>
+	</span>
+	<input type="hidden"
+	  var:id="selectorIdList"
+	  var:name="selectorId"
+	  var:value="initialContactsAsString"/>
+	<ul id="userList" multiselect="yes">
+	  <var:foreach list="usersForFolder" item="currentUser"
+	    ><li var:id="currentUser">
+	      <img rsrc:src="abcard.gif"/>
+	      <var:string value="currentUserDisplayName"/></li>
+	  </var:foreach>
+	</ul>
       </div>
-    </form>
-  </var:component>
+      
+      <select id="userRoleDropDown" name="currentUserRole">
+	<option value="assistant"><var:string label:value="Assistant"/></option>
+	<option value="delegate"><var:string label:value="Delegate"/></option>
+      </select><br/>
+      <var:if condition="clientIsCalendar"
+	><label id="freeBusyLabel"><input type="checkbox"
+	    var:checked="publishInFreeBusy"
+	    class="checkBox" name="freebusy" id="freebusy"
+	    /><var:string label:value="Localizable/Publish the Free/Busy information"
+	    /></label></var:if>
+    </div>
+  </form>
+</var:component>