diff --git a/extensions/xforms/jar.mn b/extensions/xforms/jar.mn
index e70c22bc7707..dbede0bdf120 100755
--- a/extensions/xforms/jar.mn
+++ b/extensions/xforms/jar.mn
@@ -23,12 +23,12 @@ xforms.jar:
   content/xforms/select1.xml                   (resources/content/select1.xml)
   content/xforms/range.xml                     (resources/content/range.xml)
   content/xforms/range-xhtml.xml               (resources/content/range-xhtml.xml)
-  content/xforms/select.xml                    (resources/content/select.xml)
-  content/xforms/select-xhtml.xml              (resources/content/select-xhtml.xml)
-  content/xforms/select-xul.xml                (resources/content/select-xul.xml)
   content/xforms/selects.xml                   (resources/content/selects.xml)
   content/xforms/selects-xhtml.xml             (resources/content/selects-xhtml.xml)
   content/xforms/selects-xul.xml               (resources/content/selects-xul.xml)
+  content/xforms/selectsnw.xml                 (resources/content/selectsnw.xml)
+  content/xforms/selectsnw-xhtml.xml           (resources/content/selectsnw-xhtml.xml)
+  content/xforms/selectsnw-xul.xml             (resources/content/selectsnw-xul.xml)
   content/xforms/bindingex.css                 (resources/content/bindingex.css)
   content/xforms/bindingex.xul                 (resources/content/bindingex.xul)
   content/xforms/calendar.png                  (resources/content/calendar.png)
diff --git a/extensions/xforms/nsIXFormsItemElement.idl b/extensions/xforms/nsIXFormsItemElement.idl
index 6d82fdb6550a..ef8d9a3dbe4f 100644
--- a/extensions/xforms/nsIXFormsItemElement.idl
+++ b/extensions/xforms/nsIXFormsItemElement.idl
@@ -43,7 +43,7 @@
 /**
  * Interface implemented by the item element.
  */
-[scriptable, uuid(e7e65a10-bf37-488f-9c74-add34abdd309)]
+[scriptable, uuid(0acdfa92-0b0a-4c7a-bcd8-7256ec04673c)]
 interface nsIXFormsItemElement : nsISupports
 {
   /**
@@ -63,13 +63,6 @@ interface nsIXFormsItemElement : nsISupports
    */
   void setActive(in boolean aActive);
 
-  /**
-   * This is called by the \<label\> child element whenever it is refreshed.
-   * This information will be propagated by the \<item\> to the nearest
-   * \<select1\> element, which can then refresh its UI.
-   */
-  void labelRefreshed();
-
   /**
    * Indicates whether the item element contains a value child or a copy
    * child.  We'll assume that if the item is NOT a copy item, then it must
diff --git a/extensions/xforms/nsXFormsItemElement.cpp b/extensions/xforms/nsXFormsItemElement.cpp
index f658f63632a6..6b28d29e0cc3 100644
--- a/extensions/xforms/nsXFormsItemElement.cpp
+++ b/extensions/xforms/nsXFormsItemElement.cpp
@@ -481,27 +481,6 @@ nsXFormsItemElement::GetLabelText(nsAString& aValue)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsXFormsItemElement::LabelRefreshed()
-{
-  NS_ENSURE_STATE(mElement);
-  nsCOMPtr<nsIDOMNode> parent, current;
-  current = mElement;
-  do {
-    current->GetParentNode(getter_AddRefs(parent));
-    if (nsXFormsUtils::IsXFormsElement(parent, NS_LITERAL_STRING("select1")) ||
-        nsXFormsUtils::IsXFormsElement(parent, NS_LITERAL_STRING("select"))) {
-      nsCOMPtr<nsIXFormsControl> select(do_QueryInterface(parent));
-      if (select) {
-        select->Refresh();
-      }
-      return NS_OK;
-    }
-    current = parent;
-  } while(current);
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsXFormsItemElement::GetIsCopyItem(PRBool *aIsCopyItem)
 {
diff --git a/extensions/xforms/nsXFormsLabelElement.cpp b/extensions/xforms/nsXFormsLabelElement.cpp
index 48b216bfc9a1..875d7c1603a6 100644
--- a/extensions/xforms/nsXFormsLabelElement.cpp
+++ b/extensions/xforms/nsXFormsLabelElement.cpp
@@ -311,20 +311,6 @@ nsXFormsLabelElement::Refresh()
   nsCOMPtr<nsIDOMNode> parent;
   mElement->GetParentNode(getter_AddRefs(parent));
 
-  // If <label> is inside <select1> its parent is <item>
-  // or <contextcontainer> (which parent is <item>).
-  nsCOMPtr<nsIXFormsItemElement> item(do_QueryInterface(parent));
-  if (item) {
-    item->LabelRefreshed();
-  } else if (parent) {
-    nsCOMPtr<nsIDOMNode> grandparent;
-    parent->GetParentNode(getter_AddRefs(grandparent));
-    item = do_QueryInterface(grandparent);
-    if (item) {
-      item->LabelRefreshed();
-    }
-  }
-
   return NS_OK;
 }
 
diff --git a/extensions/xforms/resources/content/select-xhtml.xml b/extensions/xforms/resources/content/select-xhtml.xml
deleted file mode 100644
index 9db46e1a5581..000000000000
--- a/extensions/xforms/resources/content/select-xhtml.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla XForms support.
-   -
-   - The Initial Developer of the Original Code is
-   - IBM Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2005
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -  Doron Rosenberg <doronr@us.ibm.com>
-   -  Olli Pettay <Olli.Pettay@helsinki.fi>
-   -  Alexander Surkov <surkov@dc.baikal.ru>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- SELECT CONTROLS FOR XHTML
-  This file contains xforms select controls implementations for XHTML.
--->
-
-
-<bindings id="xformsSelectBindingsForXHTML"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:html="http://www.w3.org/1999/xhtml"
-          xmlns:xbl="http://www.mozilla.org/xbl"
-          xmlns:xforms="http://www.w3.org/2002/xforms"
-          xmlns:mozType="http://www.mozilla.org/projects/xforms/2005/type">
-
-
-<!-- SELECT/SELECT1 CONTROLS
-  The section contains xforms select/select1 controls implementations for XHTML.
-  All controls are inherited from interface bindings realized in select.xml.
-
-  XXX: select of minimal appearance is not implemented (see bug 332928).
-
-  select1 of minimal appearance is implemented in select1.xml file.
-  select/select1 of appearance="full" is implemented in selects-xhtml.xml file.
--->
-
-  <!-- SELECT APPEARANCE='COMPACT' : <DEFAULT> -->
-  <binding id="xformswidget-select-compact"
-           extends="chrome://xforms/content/select.xml#xformswidget-select-base">
-    <content>
-      <html:span class="label-container">
-         <children includes="label"/>
-      </html:span>
-      <html:span anonid="control"
-                 xbl:inherits="style, mozType:tabindex=tabindex"/>
-      <children/>
-    </content>
-  </binding>
-
-  <!-- SELECT1 APPEARANCE='COMPACT' : <DEFAULT> -->
-  <binding id="xformswidget-select1-compact"
-           extends="chrome://xforms/content/select.xml#xformswidget-select1-base">
-    <content>
-      <html:label>
-        <html:span class="label-container">
-           <children includes="label"/>
-        </html:span>
-        <html:span anonid="control"
-                   xbl:inherits="style, mozType:tabindex=tabindex"/>
-        <children/>
-      </html:label>
-    </content>
-  </binding>
-
-
-<!-- CONTROL WIDGETS FOR SELECT/SELECT1 CONTROLS
-  All control widgets are underlying controls for select/select1 and serve to
-  realize functionality needed for select/select1 work in XHTML context. Thease
-  widgets are inherited from 'controlwidget-base' binding and implement the
-  interface what base widget for xforms select/select1 controls ask for. You can
-  find interface description in 'select.xml' file.
--->
-
-
-<!-- CONTROL WIDGETS FOR SELECT CONTROLS
-  The section contains underlying widgets implementations needed for select
-  controls.
--->
-
-  <!-- CONTROL WIDGET FOR SELECT APPEARANCE='COMPACT' -->
-  <binding id="controlwidget-select-compact"
-           extends="chrome://xforms/content/select.xml#controlwidget-base">
-
-    <content>
-      <html:select xbl:inherits="style, disabled=readonly, tabindex=mozType:tabindex"
-                   class="xf-value" multiple="true" size="5" anonid="control"/>
-    </content>
-
-    <implementation>
-      <method name="removeAllItems">
-        <body>
-          for (var i = this.control.childNodes.length; i > 0; i--) {
-             this.control.removeChild(this.control.childNodes[i-1]);
-          }
-        </body>
-      </method>
-
-      <method name="appendItem">
-        <parameter name="aLabel"/>
-        <parameter name="aValue"/>
-        <parameter name="aGroup"/>
-        <body>
-          var item = document.createElementNS(this.XHTML_NS, "option");
-          item.setAttribute("value", aValue);
-
-          if (aLabel) {
-            item.appendChild(aLabel.cloneNode(true));
-          }
-
-          if (aGroup) {
-            aGroup.appendChild(item);
-          } else {
-            this.control.appendChild(item);
-          }
-          return item;
-        </body>
-      </method>
-
-      <method name="appendGroup">
-        <parameter name="aLabel"/>
-        <parameter name="aGroup"/>
-        <body>
-          var item = document.createElementNS(this.XHTML_NS, "optgroup");
-          if (aLabel) {
-            item.appendChild(aLabel.cloneNode(true));
-          }
-          if (aGroup) {
-            aGroup.appendChild(item);
-          } else {
-            this.control.appendChild(item);
-          }
-          return item;
-        </body>
-      </method>
-
-      <method name="addItemToSelection">
-        <parameter name="aItem"/>
-        <body>
-          aItem.selected = true;
-        </body>
-      </method>
-
-      <method name="removeItemFromSelection">
-        <parameter name="aItem"/>
-        <body>
-          aItem.selected = false;
-        </body>
-      </method>
-
-      <method name="isItemSelected">
-        <parameter name="aItem"/>
-        <body>
-          return aItem.selected;
-        </body>
-      </method>
-    </implementation>
-
-    <handlers>
-      <handler event="focus" phase="capturing">
-        this.dispatchDOMUIEvent("DOMFocusIn");
-      </handler>
-
-      <handler event="blur" phase="capturing">
-        this.updateInstanceData(false);
-        this.dispatchDOMUIEvent("DOMFocusOut");
-      </handler>
-
-      <handler event="change">
-        this.updateInstanceData(true);
-      </handler>
-
-      <!--
-        XXX: since xforms:label can include arbitrary elements then 'focus',
-          'blur' and 'change' events should be listen from 'xhtml:select'
-          element only.
-      -->
-    </handlers>
-  </binding>
-
-
-<!-- CONTROL WIDGETS FOR SELECT1 CONTROLS
-  The section contains underlying widgets implementations needed for select1
-  controls.
--->
-
-  <!-- CONTROL WIDGET FOR SELECT1 APPEARANCE='COMPACT' -->
-  <binding id="controlwidget-select1-compact"
-           extends="#controlwidget-select-compact">
-    <content>
-      <html:select xbl:inherits="style, disabled=readonly, tabindex=mozType:tabindex"
-                   class="xf-value" size="5" anonid="control"/>
-    </content>
-  </binding>
-
-</bindings>
-
diff --git a/extensions/xforms/resources/content/select-xul.xml b/extensions/xforms/resources/content/select-xul.xml
deleted file mode 100644
index c0a2c5ada9c0..000000000000
--- a/extensions/xforms/resources/content/select-xul.xml
+++ /dev/null
@@ -1,395 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla XForms support.
-   -
-   - The Initial Developer of the Original Code is
-   - Alexander Surkov.
-   - Portions created by the Initial Developer are Copyright (C) 2006
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -  Alexander Surkov <surkov@dc.baikal.ru>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- SELECT CONTROLS FOR XUL
-  This file contains xforms select and xforms select1 controls implementations
-  for XUL.
--->
-
-<bindings id="xformsBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:html="http://www.w3.org/1999/xhtml"
-          xmlns:xbl="http://www.mozilla.org/xbl"
-          xmlns:xforms="http://www.w3.org/2002/xforms"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-          xmlns:mozType="http://www.mozilla.org/projects/xforms/2005/type">
-
-
-<!-- SELECT, SELECT1 CONTROLS
-  The section contains xforms select and select1 controls implementations for
-  XUL. All controls are inherited from interface bindings realized in
-  select.xml file.
-
-  XXX: Element select of minimal appearance is not implemented (see bug 332928).
-
-  select/select1 of full appearance are implemented in selects-xul.xml file.
--->
-
-  <binding id="xformswidget-select"
-           extends="chrome://xforms/content/select.xml#xformswidget-select-base">
-    <content>
-      <xul:hbox flex="1">
-        <children includes="label"/>
-        <xul:box anonid="control"
-                 xbl:inherits="style, mozType:tabindex=tabindex"
-                 class="xf-value" flex="1"/>
-      </xul:hbox>
-      <children/>
-    </content>
-  </binding>
-
-  <binding id="xformswidget-select1"
-           extends="chrome://xforms/content/select.xml#xformswidget-select1-base">
-    <content>
-      <xul:hbox flex="1">
-        <children includes="label"/>
-        <xul:box anonid="control"
-                 xbl:inherits="style, mozType:tabindex=tabindex"
-                 class="xf-value" flex="1"/>
-      </xul:hbox>
-      <children/>
-    </content>
-  </binding>
-
-
-  <!-- The following bindings do a trick. When appearance attribute is changed
-    then we should call nsIXFormsDelegate.widgetAttached() method. If we'll have
-    separate binding for each appearance attribute value then it will be happen
-    automatically.
-  -->
-
-  <binding id="xformswidget-select-compact"
-           extends="#xformswidget-select"/>
-
-  <binding id="xformswidget-select1-minimal"
-           extends="#xformswidget-select1"/>
-
-  <binding id="xformswidget-select1-compact"
-           extends="#xformswidget-select1"/>
-
-<!-- CONTROL WIDGETS FOR SELECT CONTROLS
-  The section contains underlying widgets implementations needed for xforms
-  select controls. All underlying widgets implement the interface what base
-  widget for xforms select controls ask for. You can find interface description
-  in 'select.xml' file.
--->
-
-  <!-- CONTROL WIDGET FOR SELECT APPEARANCE='COMPACT' -->
-  <binding id="controlwidget-select-compact"
-           extends="chrome://xforms/content/select.xml#controlwidget-base">
-
-    <content>
-      <xul:listbox xbl:inherits="style, disabled=readonly, tabindex=mozType:tabindex"
-                   rows="5" flex="1"
-                   seltype="multiple"
-                   anonid="control"/>
-    </content>
-
-    <implementation>
-      <method name="removeAllItems">
-        <body>
-          // removeItemAt fires 'select' event event if 'suppressonselect'
-          // attribute is specified, we shouldn't listen the event (bug 312149)
-
-          this.suppress = true;
-          for (var i = this.control.childNodes.length-1; i >= 0; i--) {
-             this.control.removeItemAt(i);
-          }
-          this.suppress = false;
-        </body>
-      </method>
-      <field name="suppress">false</field>
-
-      <method name="appendItem">
-        <parameter name="aLabel"/>
-        <parameter name="aValue"/>
-        <parameter name="aGroup"/>
-        <body>
-          var item = this.ownerDocument.createElementNS(this.XUL_NS, "listitem");
-          item.setAttribute("value", aValue);
-          if (aLabel) {
-            // since label node can contains textnodes then we use
-            // 'description' element as container for label node.
-            var description = this.ownerDocument.
-              createElementNS(this.XUL_NS, "description");
-            description.appendChild(aLabel.cloneNode(true));
-            item.appendChild(description);
-          }
-
-          // XXX: Group supporting isn't implemented
-          this.control.appendChild(item);
-
-          return item;
-        </body>
-      </method>
-
-      <method name="appendGroup">
-        <parameter name="aLabel"/>
-        <parameter name="aGroup"/>
-        <body>
-          // XXX: Group supporting isn't implemented
-          return null;
-        </body>
-      </method>
-
-      <method name="addItemToSelection">
-        <parameter name="aItem"/>
-        <body>
-          // there are cases when 'listitem' binding isn't created yet,
-          // therefore we use setTimeout
-
-          window.setTimeout(
-            function(list, item) {
-              list.setAttribute("suppressonselect", "true");
-              list.addItemToSelection(item);
-              list.removeAttribute("suppressonselect");
-            },
-            0,
-            this.control, aItem
-          );
-        </body>
-      </method>
-
-      <method name="removeItemFromSelection">
-        <parameter name="aItem"/>
-        <body>
-          this.control.setAttribute("suppressonselect", "true");
-          this.control.removeItemFromSelection(aItem);
-          this.control.removeAttribute("suppressonselect");
-        </body>
-      </method>
-
-      <method name="isItemSelected">
-        <parameter name="aItem"/>
-        <body>
-          return aItem.selected;
-        </body>
-      </method>
-
-      <constructor>
-        // 'select' event is not always handled when handler is added by using
-        // xbl:handler element.
-        var selectHandler = {
-          control: this,
-          handleEvent: function() {
-            if (!this.control.suppress) {
-              this.control.updateInstanceData(true);
-            }
-          }
-        };
-        this.addEventListener("select", selectHandler, false);
-      </constructor>
-    </implementation>
-
-    <handlers>
-      <handler event="focus" phase="capturing">
-        this.dispatchDOMUIEvent("DOMFocusIn");
-      </handler>
-
-      <handler event="blur" phase="capturing">
-        this.updateInstanceData(false);
-        this.dispatchDOMUIEvent("DOMFocusOut");
-      </handler>
-
-      <!--
-        XXX: Since xforms:label can include arbitrary elements then 'focus',
-          'blur' and 'command' events should be listen from 'xul:listbox'
-          element only.
-      -->
-    </handlers>
-  </binding>
-
-
-<!-- CONTROL WIDGETS FOR SELECT1 CONTROLS
-  The section contains underlying widgets implementations needed for xforms
-  select1 controls. All underlying widgets implement the interface what base
-  widget for xforms select1 controls ask for. You can find interface description
-  in 'select.xml' file.
--->
-
-  <!-- CONTROL WIDGET FOR SELECT1 APPEARANCE='MINIMAL' -->
-  <binding id="controlwidget-select1-minimal"
-           extends="chrome://xforms/content/select.xml#controlwidget-base">
-
-    <content>
-      <xul:menulist xbl:inherits="style, disabled=readonly, tabindex=mozType:tabindex"
-                    anonid="control" flex="1">
-        <xul:menupopup/>
-      </xul:menulist>
-    </content>
-
-    <implementation>
-      <property name="editor" readonly="true">
-        <getter>
-          if (!this.control.hasAttribute("editable"))
-            return null;
-
-          return this.control.editor;
-        </getter>
-      </property>
-
-      <method name="removeAllItems">
-        <body>
-          var popup = this.control.menupopup;
-          while (popup.hasChildNodes()) {
-            popup.removeChild(popup.lastChild);
-          }
-        </body>
-      </method>
-
-      <method name="appendItem">
-        <parameter name="aLabel"/>
-        <parameter name="aValue"/>
-        <parameter name="aGroup"/>
-        <body>
-          var item = this.ownerDocument.createElementNS(this.XUL_NS, "menuitem");
-          item.setAttribute("value", aValue);
-          if (aLabel) {
-            // XXX: We should use node instead of its text content to add a
-            // label. But we cannot put node into menuitem, therefore we now
-            // use label text and set @label for menulist.
-            item.setAttribute("label", aLabel.textContent);
-          }
-
-          // XXX: Group supporting isn't implemented
-          this.control.menupopup.appendChild(item);
-          return item;
-        </body>
-      </method>
-
-      <method name="appendGroup">
-        <parameter name="aLabel"/>
-        <parameter name="aGroup"/>
-        <body>
-          // XXX: Group supporting isn't implemented
-          return null;
-        </body>
-      </method>
-
-      <method name="addItemToSelection">
-        <parameter name="aItem"/>
-        <body>
-          this.control.selectedItem = aItem;
-        </body>
-      </method>
-
-      <method name="removeItemFromSelection">
-        <parameter name="aItem"/>
-        <body>
-          if (this.control.selectedItem == aItem)
-            this.control.selectedItem = null;
-        </body>
-      </method>
-
-      <method name="isItemSelected">
-        <parameter name="aItem"/>
-        <body>
-          return aItem.getAttribute("selected") == "true";
-        </body>
-      </method>
-
-      <method name="getFreeEntryValues">
-        <body>
-          if (this.control.getAttribute("editable") == "true") {
-            if (!this.control.selectedItem)
-              return this.control.value;
-            return "";
-          }
-        </body>
-      </method>
-
-      <method name="allowFreeEntry">
-        <parameter name="aAllowed"/>
-        <body>
-          if (aAllowed)
-            this.control.setAttribute("editable", "true");
-          else
-            this.control.removeAttribute("editable");
-        </body>
-      </method>
-
-      <method name="appendFreeEntryItem">
-        <parameter name="aValue"/>
-        <body>
-          if (this.control.getAttribute("editable") == "true") {
-            this.control.value = aValue;
-          }
-        </body>
-      </method>
-    </implementation>
-
-    <handlers>
-      <handler event="input">
-        this.updateInstanceData(true);
-      </handler>
-
-      <handler event="focus" phase="capturing">
-        this.dispatchDOMUIEvent("DOMFocusIn");
-      </handler>
-
-      <handler event="blur" phase="capturing">
-        this.updateInstanceData(false);
-        this.dispatchDOMUIEvent("DOMFocusOut");
-      </handler>
-
-      <handler event="command">
-        this.updateInstanceData(true);
-      </handler>
-
-      <!--
-        XXX: Since xforms:label can include arbitrary elements then 'focus',
-          'blur', 'command' and 'input' events should be listen from
-          'xul:menulist' element only. The described problem is not actual now.
-          Note we will get it when we will use node instead of text content for
-          a label.
-      -->
-    </handlers>
-  </binding>
-
-
-  <!-- CONTROL WIDGET FOR SELECT1 APPEARANCE='COMPACT' -->
-  <binding id="controlwidget-select1-compact"
-           extends="#controlwidget-select-compact">
-    <content>
-      <xul:listbox xbl:inherits="style, disabled=readonly, tabindex=mozType:tabindex"
-                   rows="5" anonid="control"/>
-    </content>
-  </binding>
-
-</bindings>
diff --git a/extensions/xforms/resources/content/select.xml b/extensions/xforms/resources/content/select.xml
deleted file mode 100644
index e46d83c8dc30..000000000000
--- a/extensions/xforms/resources/content/select.xml
+++ /dev/null
@@ -1,1234 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla XForms support.
-   -
-   - The Initial Developer of the Original Code is
-   - IBM Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2005
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -  Doron Rosenberg <doronr@us.ibm.com>
-   -  Olli Pettay <Olli.Pettay@helsinki.fi>
-   -  Alexander Surkov <surkov.alexander@gmail.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<bindings id="xformsSelectBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:html="http://www.w3.org/1999/xhtml"
-          xmlns:xbl="http://www.mozilla.org/xbl">
-
-<!--
-  This file implements the "abstract" UI class for XForms select controls. It
-  have "pure virtual" functions that it expect to be implemented by concrete
-  application and returned in the getElementControl() call. An example is the
-  controls for XHTML in select-xhtml.xml.
-
-  The "abstact" UI class parses the child nodes of the xforms:select and then
-  constructs the anonymous content programmatically.
-
-  The interface of object returned by getElementControl() method is:
-
-    readonly - set/get readonly state
-
-    editor - return nsIEditor object if native widget contains editor, otherwise
-             return null
-
-    appendItem(label, value, group) - appends item, returns item control
-      @param label - label control
-      @param value - item's value
-      @param group - parent group
-
-    appendGroup(label, group) - appends group, returns group control
-      @param label - label control 
-      @param group - parent group
-
-    removeAllItems() - remove all items
-
-    addItemToSelection(item) - selects item
-      @param item - item control returned by appendItem()
-
-    removeItemFromSelection(item) - unselects item
-      @param item - item control returned by appendItem()
-
-    isItemSelected(item) - return true if item is selected
-      @param item - item control returned by appendItem()
-
-    getFreeEntryValues() - return space delimited list of free entry items values
-
-    allowFreeEntry(allowed) - enable/disable free entry
-      @param allowed - boolean value
-
-    appendFreeEntryItem(value) - append and select free entry item
-      @param value - item value
--->
-
-  <!-- BASE for select/select1 elements. -->
-  <binding id="xformswidget-selectcontrols-base"
-           extends="chrome://xforms/content/xforms.xml#xformswidget-base">
-
-    <implementation implements="nsIXFormsNSEditableElement, nsIAccessibleProvider">
-
-    <!-- nsIAccessibleProvider -->
-      <property name="accessibleType" readonly="true">
-       <getter>
-         return Components.interfaces.nsIAccessibleProvider.XFormsSelect;
-       </getter>
-      </property>
-
-     <!-- nsIXFormsNSEditableElement -->
-      <property name="editor" readonly="true"
-                onget="return this.control.editor;"/>
-
-     <!-- nsIXFormsUIWidget -->
-
-      <!-- Make sure we don't refresh while we are refreshing (race condition).
-           This happens when we are inside a repeat for example. We use the
-           _refreshing field to store if we are refreshing or not. -->
-      <field name="_refreshing">false</field>
-      <method name="refresh">
-        <body>
-          <![CDATA[
-          if (this._refreshing)
-            return true;
-
-          this.control.readonly = this.accessors.isReadonly();
-
-          this._refreshing = true;
-
-          // if this node contains a non TEXT node, then we have to throw
-          // the 'just string values' logic out the window
-          var boundNode = this.accessors.getBoundNode();
-          var containsNonText = false;
-          if (boundNode && boundNode.hasChildNodes()) {
-            var child = boundNode.firstChild;
-            while (child) {
-              var type = child.nodeType;
-              if (type != Node.TEXT_NODE && type != Node.CDATA_SECTION_NODE) {
-                containsNonText = true;
-                this._accessorValueCache = null;
-                break;
-              }
-              child = child.nextSibling;
-            }
-          }
-
-          // We detect if the instance data we bind to has changed.  If it has,
-          // changed, we simply update the selection.  If it hasn't, that means
-          // we rebuild the select UI.  We also rebuild if the accessor cache is
-          // null (first load).
-          if (this._accessorValueCache == null ||
-              this._accessorValueCache == this.accessors.getValue() ||
-              containsNonText) {
-            // if we reached here and the instance data only contains text
-            // nodes, then we need to rebuild the control since we know it
-            // wasn't due to a simple instance data changing scenario.  But if
-            // the bound node contains non TEXT nodes, then it is too expensive
-            // to figure out if this was because a child node changed somewhere
-            // along the way.  We'd basically have to cache the whole bound node
-            // subtree to compare against.  To avoid this we'll just rebuild the
-            // control from scratch.
-
-            // XXX at a future time we need to figure out which will be more
-            //     efficient give the most probable use cases.
-
-            // builds select UI
-            this._buildDefaultValues(containsNonText);
-            this._buildSelect();
-
-          } else if (!containsNonText) {
-            // update selection
-            this._updateDefaultValues();
-            this._updateSelection();
-
-            // store the accessor value
-            this._accessorValueCache = this.accessors.getValue();
-          }
-
-          this._refreshing = false;
-
-          return true;
-          ]]>
-        </body>
-      </method>
-
-      <method name="focus">
-        <body>
-          <![CDATA[
-          this.control.focus();
-          return true;
-          ]]>
-        </body>
-      </method>
-
-      <method name="getCurrentValue">
-        <body>
-          throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
-        </body>
-      </method>
-
-      <property name="incremental">
-        <getter>
-          <![CDATA[
-          // default is true
-          var incremental = true;
-
-          if (this.hasAttribute("incremental")) {
-            if (this.getAttribute("incremental") == "false")
-              incremental = false;
-          }
-
-          return incremental;
-          ]]>
-        </getter>
-      </property>
-
-      <property name="selection">
-        <getter>
-          return this.getAttribute("selection");
-        </getter>
-        <setter>
-          this.setAttribute("selection", val);
-
-          if (val == "open")
-            this.control.allowFreeEntry(true);
-          else
-            this.control.allowFreeEntry(false);
-        </setter>
-      </property>
-
-      <method name="_buildSelect">
-        <body>
-          <![CDATA[
-          // select builds its own UI by parsing it's children.
-
-          // clear the UI children
-          this.control.removeAllItems();
-
-          // create children
-          var child, option;
-          var childNodes = this.childNodes;
-
-          // these hold an array of generated HTML controls
-          this._controlArray = new Array();
-
-          for (var i = 0; i < childNodes.length; i++) {
-            child = childNodes[i];
-
-            // we only care about element nodes in the XForms namespace.
-            if (child.nodeType != child.ELEMENT_NODE || 
-                child.namespaceURI != this.XFORMS_NS) {
-              continue;
-            }
-
-            switch (child.localName) {
-              case "item":
-                this._buildItem(child);
-                break;
-              case "choices":
-                this._buildChoices(child);
-                break;
-              case "itemset":
-                this._buildItemset(child);
-                break;
-            }
-          }
-
-          var outOfRange = false;
-          var selectionOpen = this.selection == 'open';
-          // check if any default values were not found
-          for (var index in this._defaultHash) {
-            if (this._defaultHash[index].hits == 0) {
-              if (selectionOpen) {
-                this.control.appendFreeEntryItem(index);
-              } else {
-                // some of default values not found, we need to throw an
-                // xforms-out-of-range event, but only if the select is 'closed'.
-                outOfRange = true;
-              }
-            }
-          }
-
-          // check if any default elements were not found
-          for (var j = 0; j < this._selectedElementArray.length; j++) {
-            if (this._selectedElementArray[j].hits == 0) {
-              if (selectionOpen) {
-                // XXX: If the select is open, the missing elements should be added
-                // and selected per 8.1.10 in the spec.
-              } else {
-                // some of default values not found, we need to throw an
-                // xforms-out-of-range event, but only if the select is 'closed'.
-                outOfRange = true;
-              }
-            }
-          }
-
-          // a control can't be out of range (or in range for that matter) if
-          // there is no selected value, so make sure that there is a bound
-          // node first.
-          if (!selectionOpen && this.accessors.hasBoundNode() &&
-              (outOfRange != this._outOfRange)) {
-            this._outOfRange = outOfRange;
-            this.accessors.setInRange(!outOfRange);
-          }
-
-          return true;
-          ]]>
-         </body>
-      </method>
-
-      <method name="_buildDefaultValues">
-        <parameter name="aContainsNonText"/>
-        <body><![CDATA[
-          // builds default values hash
-
-          // if accessors.value has something, then only text node(s) should
-          // exist under the bound node
-
-          // create a hash from the default values so we can store how often
-          // we encountered them.  This allows us to figure out later if any
-          // were not hit, which requires us to send an event.
-          this._defaultHash = new Object();
-
-          // holds an array of DOMElements that exist under bound node,
-          this._selectedElementArray = new Array();
-
-          if (!aContainsNonText) {
-            var selectedArray = this._getValuesArray();
-
-            for (var run = 0; run < selectedArray.length; run++) {
-              this._defaultHash[selectedArray[run]] = {hits: 0}
-            }
-            return;
-          }
-
-          var boundNode = this.accessors.getBoundNode();
-          var child = boundNode ? boundNode.firstChild : null;
-
-          var childcount = 0;
-          for (; child; child = child.nextSibling) {
-            var type = child.nodeType;
-
-            if (type == Node.TEXT_NODE || type == Node.CDATA_SECTION_NODE) {
-              // if child is a text node completely filled with
-              // whitespace let's ignore it and get the next node
-              var string = child.nodeValue;
-              var nonWhitespace = false;
-              if (string) {
-                // this regexp tests whether only whitespace is contained
-                // between the beginning and ending of the string.
-                nonWhitespace = !(/^\s*$/.test(string));
-              }
-              if (nonWhitespace) {
-                if (++childcount > 1 && this.localName == "select1")
-                  break;
-
-                // When the string is empty, the method returns an array
-                // containing one empty string, rather than an empty array.
-                // We'll allow that into the defaultHash so that
-                // 'xforms-out-of-range' will be correctly generated if none of
-                // the items in the select have an empty string as a value.
-                var selectedArray = this._getValuesArray(string);
-
-                for (var run = 0; run < selectedArray.length; run++) {
-                  this._defaultHash[selectedArray[run]] = {hits: 0}
-                }
-              }
-            } else {
-              if (++childcount > 1 && this.localName == "select1")
-                  break;
-
-              // if it's not a text node, we'll assume that we are looking at
-              // a node worth comparing.  As such, look for an
-              // item with a copy element that might match this node.
-              this._selectedElementArray.push({element: child, hits: 0});
-            }
-          }
-
-          if (this.localName == "select1") {
-            var outOfRange = childcount > 1;
-            if (outOfRange != this._outOfRange) {
-              this._outOfRange = outOfRange;
-              this.accessors.setInRange(!outOfRange);
-              if (outOfRange)
-                return;
-            }
-          }
-        ]]></body>
-      </method>
-
-      <method name="_buildItem">
-        <parameter name="aItem"/>
-        <parameter name="aParentGroup"/>
-        <body>
-          // cache the item's label/value
-          aItem = aItem.QueryInterface(Components.interfaces.nsIXFormsItemElement);
-          var labels = aItem.getElementsByTagNameNS(this.XFORMS_NS, "label");
-
-          var controlitem;
-          if (labels[0]) {
-            controlitem = this.control.
-              appendItem(labels[0].nodeValue, aItem.value, aParentGroup);
-          } else {
-            controlitem = this.control.
-              appendItem(null, aItem.value, aParentGroup);
-          }
-
-          var selected = false;
-          if (aItem.value in this._defaultHash) {
-            selected = true;
-            this.control.addItemToSelection(controlitem);
-            this._defaultHash[aItem.value].hits++;
-          }
-
-          this._controlArray.push(
-            {control: aItem, option: controlitem, wasSelected: selected}
-          );
-        </body>
-      </method>
-
-      <method name="_buildChoices">
-      <parameter name="aChoice"/>
-      <parameter name="aParentGroup"/>
-      <body>
-        <![CDATA[
-        // finds label for a choice
-        for (var i = 0; i < aChoice.childNodes.length; i++) {
-          var item = aChoice.childNodes[i];
-          if (item.nodeType == item.ELEMENT_NODE && 
-              item.namespaceURI == this.XFORMS_NS && 
-              item.localName == "label") {
-            break;
-          }
-        }
-
-        // creates group for a choice
-        var group;
-        if (i != aChoice.childNodes.length) {
-          // XXX: If xf:label is bounded to instance data then since xf:label
-          // gets refresh after xf:choices refresh then label.nodeValue returns
-          // incorrect value. Threafore we use xf:label node instead of 
-          // node returned by label.nodeValue. It is workaround and we should
-          // use label.nodeValue when the problem related with it will be fixed.
-          var label = aChoice.childNodes[i];
-          group = this.control.appendGroup(label, aParentGroup);
-        } else {
-          group = this.control.appendGroup(null, aParentGroup);
-        }
-
-        // creates the items for a choice and it's children
-        for (var i = 0; i < aChoice.childNodes.length; i++) {
-          var item = aChoice.childNodes[i];
-          if (item.nodeType != item.ELEMENT_NODE) 
-            continue;
-
-          switch (item.localName) {
-            case "item":
-              this._buildItem(item, group);
-              break;
-            case "choices":
-              this._buildChoices(item, group);
-              break;
-          }
-        }
-        ]]>
-      </body>
-      </method>
-
-      <method name="_buildItemset">
-        <parameter name="aItemset"/>
-        <body>
-          <![CDATA[
-          aItemset = aItemset.
-            QueryInterface(Components.interfaces.nsIXFormsItemSetUIElement);
-
-          var containers = aItemset.anonymousItemSetContent.childNodes;
-
-          // go through each item in the itemset and add it to the
-          // html:select.  Select any of the items that contain a value
-          // that also appears under the bound node.
-          for (var y = 0; y < containers.length; y++) {
-            if (containers[y].nodeType != Node.ELEMENT_NODE)
-              continue;
-
-            var item = containers[y].
-              QueryInterface(Components.interfaces.nsIXFormsItemElement);
-
-            var copyItem = item.isCopyItem;
-            var valueText = copyItem ? "" : item.value;
-            var labelText = item.labelText;
-            var textNode = this.ownerDocument.createTextNode(labelText);
-
-            var controlitem =
-              this.control.appendItem(textNode, valueText);
-
-            var selected = false;
-
-            // if this item contains a copy element AND if the bound node contains
-            // non-text elements, then see if any of these non-text elements match
-            // this copyItem's node.
-            if (copyItem && this._selectedElementArray.length > 0) {
-              item = item.QueryInterface(Components.interfaces.nsIXFormsSelectChild);
-
-              for (var j = 0; j < this._selectedElementArray.length; j++ ) {
-                var selectedItem =
-                  item.selectItemByNode(this._selectedElementArray[j].element);
-                if (selectedItem) {
-                  this.control.addItemToSelection(controlitem);
-                  selected = true;
-                  this._selectedElementArray[j].hits++;
-                  // XXX It is possible that two identical elements are under the
-                  // bound node.  I guess we shouldn't mark one and not the other
-                  // if there is an item in the select that matches it.  So we'll
-                  // go through the whole list.  But this is quite an edge case
-                  // and will cause more inefficiency just to prevent an errant
-                  // xforms-out-of-range.
-                }
-              }
-            }
-
-            if (!copyItem) {
-              if (item.value in this._defaultHash) {
-                this.control.addItemToSelection(controlitem);
-                selected = true;
-                this._defaultHash[item.value].hits++;
-              }
-            }
-
-            this._controlArray.push(
-              {control: item, option: controlitem, wasSelected: selected}
-            );
-          }
-          ]]>
-        </body>
-      </method>
-
-      <method name="_updateSelection">
-        <body>
-          <![CDATA[
-          // select if found, unselect if not
-          var options = this._controlArray;
-
-          for (var i = 0; i < options.length; i++) {
-            var item = options[i].control.
-              QueryInterface(Components.interfaces.nsIXFormsSelectChild);
-            if (item.isCopyItem)
-              // _updateSelection is used only to select items when _defaultHash
-              // contains only text nodes.  So we can ignore copyItems.
-              continue;
-
-            var value = item.value;
-            var selectionValue = value in this._defaultHash;
-
-            if (selectionValue) {
-              this.control.addItemToSelection(options[i].option);
-              options[i].wasSelected = true;
-              this._defaultHash[value].hits++;
-            }
-            else {
-              this.control.removeItemFromSelection(options[i].option);
-              options[i].wasSelected = false;
-            }
-          }
-          // see if any of default values are not found.  If so, we need to
-          // throw an xforms-out-of-range event and style the control as
-          // being out of range.  But only if the select is 'closed'.
-          if (this.selection == 'open') {
-            return;
-          }
-
-          var outOfRange = false;
-          var length = 0;
-          for (var index in this._defaultHash) {
-            length++;
-            if (this._defaultHash[index].hits == 0) {
-              outOfRange = true;
-            }
-          }
-
-          if (length == 0) {
-            // this covers the scenario where some items were previously
-            // selected and the user selected a copyItem, yet because the
-            // bound node wasn't an element node the copyItem was deselected
-            // and the bound node was set to empty.  If there is no selected
-            // item, then we must be out of range.
-            outOfRange = true;
-          }
-
-          if (this._outOfRange != outOfRange) {
-            this._outOfRange = outOfRange;
-            this.accessors.setInRange(!outOfRange);
-          }
-
-          ]]>
-        </body>
-      </method>
-
-      <method name="_updateDefaultValues">
-        <body>
-        <![CDATA[
-          var selectedArray = this._getValuesArray();
-
-          // store the values in a hash for quick access
-          this._defaultHash = new Object();
-          for (var run = 0; run < selectedArray.length; run++) {
-            this._defaultHash[selectedArray[run]] = {hits: 0}
-          }
-        ]]>
-        </body>
-      </method>
-
-      <!-- Return an array of values to be selected for the given string or of
-        the bound node if string argument is omitted. -->
-      <method name="_getValuesArray">
-        <parameter name="aValue"/>
-        <body>
-          // When the instance value is empty, then we return an array
-          // containing one empty string, rather than an empty array.  We'll
-          // allow that into the defaultHash so that 'xforms-out-of-range' event
-          // will be correctly generated if none of the items in the select have
-          // an empty string as a value.
-
-          if (!aValue) {
-            aValue = this.accessors.getValue();
-            if (!aValue) {
-              aValue = "";
-            }
-          }
-
-          if (this.localName == "select1")
-            return [aValue];
-
-          // A limitation of the XML Schema list datatypes is that white space
-          // characters in the storage values (the value element) are always
-          // interpreted as separators between individual data values.
-          // Therefore, authors should avoid using white space characters within
-          // storage values with list simpleContent.
-
-          // Replace new line (\n), tabs (\t) and carriage returns (\r) with
-          // space (" ").
-          aValue = aValue.replace(/\n|\t|\r/g, " ");
-
-          return aValue.split(/\s/);
-        </body>
-      </method>
-
-      <!-- Updates the instance data bound to this control.
-
-        @param aIncremental - if true then it means the update is additional and
-          instance data will be updated only if @incremental attribute value of
-          this control is not false.
-      -->
-      <method name="updateInstanceData">
-        <parameter name="aIncremental"/>
-        <body>
-        <![CDATA[
-          // Fire 'xfroms-select'/'xforms-deselect' events and unselect illegaly
-          // selected items.
-          var copySelectedOrDeselected = new Boolean();
-          copySelectedOrDeselected.value = false;
-          var contentEnvelope =
-            this._processSelectedValues(copySelectedOrDeselected);
-
-          if (!aIncremental || this.incremental) {
-            if (contentEnvelope) {
-              this._setBoundValue(contentEnvelope,
-                                  copySelectedOrDeselected.value);
-            }
-          }
-        ]]>
-        </body>
-      </method>
-
-      <method name="_setBoundValue">
-        <parameter name="aContentEnvelope"/>
-        <parameter name="aCopySelectedOrDeselected"/>
-        <body>
-          <![CDATA[
-          var boundNode = this.accessors.getBoundNode();
-          if (!boundNode)
-            return;
-
-          // if a copy item is selected or deselected, then we need to replace
-          // ALL of the current content with the newly selected content.  Which
-          // means calling setContent.  setValue only messes with the first
-          // textnode under the bound node.
-
-          if (boundNode.nodeType == Node.ELEMENT_NODE) {
-            // we shouldn't call setContent if we haven't selected any
-            // copyItems.  We can't just test for a single text node under
-            // the bound node because this could still have been the result
-            // of a copyItem being selected.  And if a copyItem is selected,
-            // then we need to do the whole rebuild, recalculate, revalidate,
-            // refresh process according to the spec...whether we really need
-            // to or not.
-            if (!aCopySelectedOrDeselected) {
-              // well, no copyItems are selected, so need to find the value
-              // to set.  Will be in the first child.
-              var firstChild = aContentEnvelope.firstChild;
-              var value = null;
-              if (firstChild) {
-                value = firstChild.nodeValue;
-              }
-              this.accessors.setValue(value);
-            } else {
-              this.accessors.setContent(aContentEnvelope, true);
-            }
-          } else {
-            // if some copyItems were selected by the user prior to the call
-            // to _processSelectedValues, then we would not have set up
-            // _accessorValueCache.  Since the node we are bound to can't
-            // be set by copyItems (its not an ELEMENT_NODE), any copyItems
-            // in this select would have been deselected during
-            // _processSelectedValues.  Thus, anything in the contentEnvelope at
-            // this point should just be strings and so we can set
-            // delegate.value directly and use _accessorValueCache after all.
-
-            this.accessors.setValue(aContentEnvelope.nodeValue);
-            this._accessorValueCache = aContentEnvelope.nodeValue;
-          }
-          ]]>
-        </body>
-      </method>
-
-      <!--
-        The method serves to
-          1) unselect illegally selected items
-          2) fire "xforms-select"/"xforms-deselect" events
-          3) return list of selected values
-      -->
-      <method name="_processSelectedValues">
-        <parameter name="aIsACopyItemSelectedOrDeselected"/>
-        <body>
-        <![CDATA[
-          if (aIsACopyItemSelectedOrDeselected) {
-            aIsACopyItemSelectedOrDeselected.value = false;
-          }
-
-          var boundNode = this.accessors.getBoundNode();
-          if (!boundNode) {
-            this._dispatchSelectEvents();
-            return null;
-          }
-
-          // we are cloning boundNode to create a node that we will return.
-          // By the end of this function, assuming all went well,
-          // contentEnvelope will contain the values and copyNodes that are
-          // represented by the selected items in this xf:select.  Cloning
-          // the boundNode to use as the envelope so that the caller could
-          // just pass the results straight into accessors.setContent().
-          var contentEnvelope = null;
-          contentEnvelope = boundNode.cloneNode(false);
-          if (!contentEnvelope) {
-            this._dispatchSelectEvents();
-            return null;
-          }
-
-          var contentDocument = contentEnvelope.ownerDocument;
-
-          var selectedValues = "";
-          if (this.selection == "open") {
-            selectedValues = this.control.getFreeEntryValues();
-          }
-
-          var options = this._controlArray;
-          var boundType = boundNode.nodeType;
-          var copyNode;
-
-          // keep in mind, to maintain compatibility with XSmiles and Novell, we
-          // ultimately need to end up with all 'value' elements contained in a
-          // text node and this text node needs to be the first child of the
-          // bound node.
-          for (var i = 0; i < options.length; i++) {
-            var isSelected = this.control.isItemSelected(options[i].option);
-
-            if (isSelected) {
-              // space delimited list
-              if (selectedValues.length > 0) {
-                selectedValues += " ";
-              }
-
-              var item = options[i].control.
-                QueryInterface(Components.interfaces.nsIXFormsItemElement);
-              if (item.isCopyItem) {
-                if (boundType && (boundType != Node.ELEMENT_NODE)) {
-                  // if we are trying to do a copy without being bound to an
-                  // element node, then we need to throw a binding exception
-                  // per spec.
-                  var bindingException = document.createEvent("Events");
-                  bindingException.initEvent("xforms-binding-exception", true, false);
-                  this.dispatchEvent(bindingException);
-
-                  // we should probably un-select the option so that the list
-                  // of selected data is accurate.  This WON'T cause a
-                  // xforms-select/deselect to fire.  Since the user just
-                  // selected this item and we are automatically deselecting
-                  // it from underneath the user, we'll treat it like nothing
-                  // happened.
-                  this.control.removeItemFromSelection(options[i].option);
-                } else {
-                  copyNode = item.copyNode;
-                  if (copyNode) {
-                    var clone = contentDocument.importNode(copyNode, true);
-                    contentEnvelope.appendChild(clone);
-
-                    if (!options[i].wasSelected) {
-                      if (aIsACopyItemSelectedOrDeselected && 
-                          aIsACopyItemSelectedOrDeselected.value != true) {
-                        aIsACopyItemSelectedOrDeselected.value = true;
-                      }
-                    }
-                  }
-                }
-              } else {
-                // not a copyItem, so grab the item's value and append it to our
-                // space separated list.
-                selectedValues += options[i].control.
-                  QueryInterface(Components.interfaces.nsIXFormsSelectChild).value;
-              }
-            } else {
-              // it was selected before, but now unselected
-              if (options[i].wasSelected) {
-                // if a copyItem was deselected, we need to make sure to do a
-                // rebuild.  By setting aIsACopyItemSelectedOrDeselected, this
-                // should tell _handleSelection to use setContent with
-                // aForceUpdate = true
-                var item = options[i].control.
-                  QueryInterface(Components.interfaces.nsIXFormsItemElement);
-                if (item.isCopyItem) {
-                  if (aIsACopyItemSelectedOrDeselected &&
-                      aIsACopyItemSelectedOrDeselected.value != true) {
-                    aIsACopyItemSelectedOrDeselected.value = true;
-                  }
-                }
-              }
-            }
-          }
-
-          // write out the text nodes before we handle copy
-          if (boundType == Node.ELEMENT_NODE) {
-            if (selectedValues.length > 0) {
-              var textNode = contentDocument.createTextNode(selectedValues);
-              if (copyNode) {
-                // making sure all selected 'values' are in the first text node
-                // under the bound node.
-                var firstChild = contentEnvelope.firstChild;
-                contentEnvelope.insertBefore(textNode, firstChild);
-              } else { 
-                contentEnvelope.appendChild(textNode);
-              }
-            }
-          } else {
-            contentEnvelope.nodeValue = selectedValues;
-          }
-
-          this._dispatchSelectEvents();
-          return contentEnvelope;
-        ]]>
-        </body>
-      </method>
-
-      <method name="_dispatchSelectEvents">
-        <body>
-          <![CDATA[
-          var options = this._controlArray;
-
-          for (var i = 0; i < options.length; i++) {
-            var selected = this.control.isItemSelected(options[i].option);
-            if (options[i].wasSelected && !selected) {
-              options[i].wasSelected = false;
-              this.dispatchSelectEvent(options[i].control, "xforms-deselect");
-            }
-          }
-
-          for (var i = 0; i < options.length; i++) {
-            var selected = this.control.isItemSelected(options[i].option);
-            if (!options[i].wasSelected && selected) {
-              options[i].wasSelected = true;
-              this.dispatchSelectEvent(options[i].control, "xforms-select");
-            }
-          }
-          ]]>
-        </body>
-      </method>
-
-      <method name="dispatchSelectEvent">
-        <parameter name="aElement"/>
-        <parameter name="aName"/>
-        <body>
-        <![CDATA[
-          // per http://www.w3.org/TR/2005/PER-xforms-20051006/index-all.html#evt-select
-          // we send the event to the itemset if it is a parent.
-          var parent = this.ownerDocument.getBindingParent(aElement);
-          var elm = parent && parent.localName == "itemset" ? parent : aElement;
-          return this.dispatchXFormsNotificationEvent(aName, elm);
-        ]]>
-        </body>
-      </method>
-
-      <!-- Array of objects that contains objects for all items of this control,
-        serves to keep xforms items and native items together.
-        Object has next properties:
-          control - xforms:item element
-          option - native widget for xforms:item
-          wasSelected - flag specifies whether native item was selected or not.
-      -->
-      <field name="_controlArray">new Array()</field>
-
-      <field name="_selectedElementArray">new Array()</field>
-      <field name="_defaultHash">null</field>
-      <field name="_accessorValueCache">null</field>
-      <field name="_outOfRange">false</field>
-
-      <method name="getControlElement">
-        <body>
-          return document.getAnonymousElementByAttribute(this, "anonid", "control");
-        </body>
-      </method>
-
-    </implementation>
-
-  </binding>
-
-
-  <!-- SELECT BASE
-    Implements nsIXFormsNSSelectElement interface.
-  -->
-  <binding id="xformswidget-select-base"
-           extends="#xformswidget-selectcontrols-base">
-
-    <implementation implements="nsIXFormsNSSelectElement">
-
-    <!-- nsIXFormsNSSelectElement -->
-      <property name="selectedItems" readonly="true">
-        <getter>
-        <![CDATA[
-          var items = [];
-          for (var i = 0; i < this._controlArray.length; i++) {
-            var nativeitem = this._controlArray[i].option;
-            if (this.control.isItemSelected(nativeitem)) {
-              var item = this._controlArray[i].control;
-              items.push(item);
-            }
-          }
-          return items;
-        ]]>
-        </getter>
-      </property>
-
-      <method name="addItemToSelection">
-        <parameter name="aItem"/>
-        <body>
-          var nativeitem = this.getNativeItem(aItem);
-          if (!this.control.isItemSelected(nativeitem)) {
-            this.control.addItemToSelection(nativeitem);
-            this.updateInstanceData();
-          }
-        </body>
-      </method>
-
-      <method name="removeItemFromSelection">
-        <parameter name="aItem"/>
-        <body>
-          var nativeitem = this.getNativeItem(aItem);
-          if (this.control.isItemSelected(nativeitem)) {
-            this.control.removeItemFromSelection(nativeitem);
-            this.updateInstanceData();
-          }
-        </body>
-      </method>
-
-      <method name="clearSelection">
-        <body>
-        <![CDATA[
-          changed = false;
-          for (var i = 0; i < this._controlArray.length; i++) {
-            var nativeitem = this._controlArray[i].option;
-            if (this.control.isItemSelected(nativeitem)) {
-              this.control.removeItemFromSelection(nativeitem);
-              changed = true;
-            }
-          }
-          if (changed)
-            this.updateInstanceData();
-        ]]>
-        </body>
-      </method>
-
-      <method name="selectAll">
-        <body>
-        <![CDATA[
-          var changed = false;
-          for (var i = 0; i < this._controlArray.length; i++) {
-            var nativeitem = this._controlArray[i].option;
-            if (!this.control.isItemSelected(nativeitem)) {
-              this.control.addItemToSelection(nativeitem);
-              changed = true;
-            }
-          }
-          if (changed)
-            this.updateInstanceData();
-        ]]>
-        </body>
-      </method>
-
-      <method name="isItemSelected">
-        <parameter name="aItem"/>
-        <body>
-          return this.control.isItemSelected(this.getNativeItem(aItem));
-        </body>
-      </method>
-
-    <!-- private -->
-      <method name="getNativeItem">
-        <parameter name="aItem"/>
-        <body>
-          <![CDATA[
-            for (var i = 0; i < this._controlArray.length; i++) {
-              if (this._controlArray[i].control == aItem)
-                return this._controlArray[i].option;
-            }
-            return null;
-          ]]>
-        </body>
-      </method>
-    </implementation>
-  </binding>
-
-
-  <!-- SELECT1 BASE
-    Implements nsIXFormsNSSelect1Element interface.
-  -->
-  <binding id="xformswidget-select1-base"
-           extends="#xformswidget-selectcontrols-base">
-
-    <implementation implements="nsIXFormsNSSelect1Element">
-      <property name="selectedItem">
-        <getter>
-        <![CDATA[
-          for (var i = 0; i < this._controlArray.length; i++) {
-            var nativeitem = this._controlArray[i].option;
-            var item = this._controlArray[i].control;
-            if (this.control.isItemSelected(nativeitem)) {
-              return item;
-            }
-          }
-          return null;
-        ]]>
-        </getter>
-        <setter>
-        <![CDATA[
-          var changed = false;
-          for (var i = 0; i < this._controlArray.length; i++) {
-            var nativeitem = this._controlArray[i].option;
-            var item = this._controlArray[i].control;
-            if (!this.control.isItemSelected(nativeitem)) {
-              if (item == val) {
-                this.control.addItemToSelection(nativeitem);
-                if (changed)
-                  break;
-                changed = true;
-              }
-            } else {
-              if (item != val) {
-                this.control.removeItemFromSelection(nativeitem);
-                if (changed)
-                  break;
-                changed = true;
-              }
-            }
-          }
-          if (changed)
-            this.updateInstanceData();
-        ]]>
-        </setter>
-      </property>
-    </implementation>
-  </binding>
-
-
-  <!-- BASE CONTROL WIDGET FOR XFORMS SELECTS
-    The 'controlwidget-base' is the base binding of underlying controls. Thease
-    underlying controls implement functionality asked for by object returned by
-    getControlElement() method of xforms select widgets. Examples of the widget
-    using you can find in 'select-xhtml.xml' file.
-
-    All inherited widgets from this one should be also capable of being bound to
-    directly rather than just through xforms select widgets. We are supporting
-    the use of a readonly attribute on elements that bind this way.
-  -->
-  <binding id="controlwidget-base">
-    <implementation>
-
-      <!-- Return nsIEditor object if native widget contains editor.
-        Of the widgets that extend this binding, only the
-        xforms:select1[appearance='minimal'] implementation for XUL has an
-        editor.
-      -->
-      <property name="editor" readonly="true"
-                onget="return null"/>
-
-      <!-- Return parent xf:select/xf:select1 control. -->
-      <property name="parentControl" readonly="true">
-        <getter>
-          <![CDATA[
-          // returns 'select' or 'select1' parent control
-          if (!this._parentControl) {
-            var root = this.ownerDocument.documentElement;
-            for (var node = this.parentNode; node != root; node = node.parentNode) {
-              if (node.namespaceURI == this.XFORMS_NS &&
-                  (node.localName == "select" || node.localName == "select1")) {
-                this._parentControl = node;
-                break;
-              }
-            }
-          }
-          return this._parentControl;
-          ]]>
-        </getter>
-      </property>
-      <field name="_parentControl">null</field>
-
-      <!-- Return native control widget. -->
-      <property name="control" readonly="true">
-        <getter>
-          if (!this._control) {
-            this._control =
-              document.getAnonymousElementByAttribute(this, "anonid", "control");
-          }
-          return this._control;
-        </getter>
-      </property>
-      <field name="_control">null</field>
-
-      <!-- Set readonly state. The state is used to enable/disable native
-        control widget during select items adding.
-      -->
-      <property name="readonly">
-        <getter>
-          return this.getAttribute("readonly") == "true" ? true : false;
-        </getter>
-        <setter>
-          if (val) {
-            this.setAttribute("readonly", "true");
-          } else {
-            this.removeAttribute("readonly");
-          }
-        </setter>
-      </property>
-
-      <!-- Advance focus to native widget. -->
-      <method name="focus">
-        <body>
-          this.control.focus();
-        </body>
-      </method>
-
-      <!-- Update instance data to native control widget value.
-        @param aIncremental - will be true if this function is called because
-          the user selected a new value in the native control widget. It will be
-          false if this function is called due to focus leaving the native
-          control widget.
-      -->
-      <method name="updateInstanceData">
-        <parameter name="aIncremental"/>
-        <body>
-        <![CDATA[
-          if (!this.parentControl)
-            return;
-
-          // No need to update the bound value if the control is incremental and
-          // we are losing focus. It should already be up to date.
-          if (this.parentControl.incremental && !aIncremental)
-            return;
-
-          this.parentControl.updateInstanceData(aIncremental);
-        ]]>
-        </body>
-      </method>
-
-      <!-- Dispatch event to parent control. -->
-      <method name="dispatchDOMUIEvent">
-        <parameter name="aType"/>
-        <body>
-          if (this.parentControl)
-            this.parentControl.dispatchDOMUIEvent(aType);
-        </body>
-      </method>
-
-      <!-- Return values of free entry. The method is a stub and it should
-        be removed when all native controls will support @selection="open".
-      -->
-      <method name="getFreeEntryValues">
-        <body>
-          return "";
-        </body>
-      </method>
-
-      <!-- Allow free entry. The method is a stub and it should be removed when
-        all native controls will support @selection="open".
-      -->
-      <method name="allowFreeEntry">
-        <parameter name="aAllowed"/>
-        <body>
-        </body>
-      </method>
-
-      <!-- Append and select free entry item. The method is a stub and it should
-        be removed when all native controls will support @selection="open".
-      -->
-      <method name="appendFreeEntryItem">
-        <parameter name="aValue"/>
-        <body>
-        </body>
-      </method>
-
-      <property name="XFORMS_NS" readonly="true"
-                onget="return 'http://www.w3.org/2002/xforms';"/>
-
-      <property name="XHTML_NS" readonly="true"
-                onget="return 'http://www.w3.org/1999/xhtml';"/>
-
-      <property name="XUL_NS" readonly="true"
-                onget="return 'http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul';"/>
-
-      <property name="XBL_NS" readonly="true"
-                onget="return 'http://www.mozilla.org/xbl';"/>
-
-      <constructor>
-        if (this.parentControl.selection == "open")
-          this.allowFreeEntry(true);
-        else
-          this.allowFreeEntry(false);
-      </constructor>
-
-    </implementation>
-  </binding>
-
-</bindings>
diff --git a/extensions/xforms/resources/content/select1.xml b/extensions/xforms/resources/content/select1.xml
index 06a61eba594e..3c7360b4b317 100644
--- a/extensions/xforms/resources/content/select1.xml
+++ b/extensions/xforms/resources/content/select1.xml
@@ -1220,6 +1220,53 @@
           }
         </body>
       </method>
+
+      <property name="parentControl" readonly="true">
+        <getter>
+        <![CDATA[
+          if (!this._parentControl) {
+            var parent = this.parentNode;
+            for (; parent; parent = parent.parentNode) {
+              if (parent.namespaceURI == this.XFORMS_NS &&
+                  (parent.localName == "select" ||
+                   parent.localName == "select1"))
+                break;
+            }
+            this._parentControl = parent;
+          }
+          return this._parentControl;
+        ]]>
+        </getter>
+      </property>
+
+      <method name="refreshParentControl">
+        <parameter name="aTarget"/>
+        <body>
+        <![CDATA[
+          if (!this.parentControl)
+            return;
+
+          var parent = aTarget.parentNode;
+          for (; parent; parent = parent.parentNode) {
+            if (parent.namespaceURI == this.XFORMS_NS &&
+                parent.localName == "label") {
+              this.parentControl.refreshWidth();
+              return;
+            }
+          }
+        ]]>
+        </body>
+      </method>
+
+      <property name="XFORMS_NS" readonly="true"
+                onget="return 'http://www.w3.org/2002/xforms';"/>
     </implementation>
+
+    <handlers>
+      <handler event="DOMNodeInserted"
+               action="refreshParentControl(event.originalTarget);"/>
+      <handler event="DOMNodeRemoved"
+               action="refreshParentControl(event.originalTarget);"/>
+    </handlers>
   </binding>
 </bindings>
diff --git a/extensions/xforms/resources/content/selects-xhtml.xml b/extensions/xforms/resources/content/selects-xhtml.xml
index 55a9d3052c36..ebc2d56c9836 100644
--- a/extensions/xforms/resources/content/selects-xhtml.xml
+++ b/extensions/xforms/resources/content/selects-xhtml.xml
@@ -51,6 +51,15 @@
         <children/>
       </html:div>
     </content>
+
+    <implementation>
+    <!-- nsIAccessibleProvider -->
+      <property name="accessibleType" readonly="true">
+        <getter>
+          return Components.interfaces.nsIAccessibleProvider.XFormsSelectFull;
+        </getter>
+      </property>
+    </implementation>
   </binding>
 
   <!-- SELECT1: APPEARANCE FULL -->
@@ -63,6 +72,15 @@
       </html:div>
     </content>
 
+    <implementation>
+      <!-- nsIAccessibleProvider -->
+      <property name="accessibleType" readonly="true">
+        <getter>
+          return Components.interfaces.nsIAccessibleProvider.XFormsSelectFull;
+        </getter>
+      </property>
+    </implementation>
+
     <handlers>
       <handler event="keypress" keycode="VK_UP" preventdefault="true">
         var item = this.selectedItem;
diff --git a/extensions/xforms/resources/content/selects-xul.xml b/extensions/xforms/resources/content/selects-xul.xml
index 288890a62175..01b53adee633 100644
--- a/extensions/xforms/resources/content/selects-xul.xml
+++ b/extensions/xforms/resources/content/selects-xul.xml
@@ -51,6 +51,15 @@
         <children/>
       </xul:vbox>
     </content>
+
+    <implementation>
+      <!-- nsIAccessibleProvider -->
+      <property name="accessibleType" readonly="true">
+        <getter>
+          return Components.interfaces.nsIAccessibleProvider.XFormsSelectFull;
+        </getter>
+      </property>
+    </implementation>
   </binding>
 
 
@@ -94,6 +103,13 @@
     </content>
 
     <implementation>
+    <!-- nsIAccessibleProvider -->
+      <property name="accessibleType" readonly="true">
+        <getter>
+          return Components.interfaces.nsIAccessibleProvider.XFormsSelectFull;
+        </getter>
+      </property>
+
       <method name="getControlElement">
         <body>
           return this.ownerDocument.
diff --git a/extensions/xforms/resources/content/selects.xml b/extensions/xforms/resources/content/selects.xml
index c8c585aeb38e..ee5971eab613 100644
--- a/extensions/xforms/resources/content/selects.xml
+++ b/extensions/xforms/resources/content/selects.xml
@@ -44,30 +44,20 @@
 
 <!--
   This file implements the "abstract" UI classes for XForms select/select1
-  controls. The approach used here is different from approach that is realized
-  in select.xml file. Here we don't build programmaticaly native widget that
-  will represent select/select1 control. Instead that every item or choices
-  element is visible and represented. An example is the controls for XHTML in
-  select-xhtml.xml.
+  controls. Bindings defined here are base bindings that are used for two
+  approaches of select/select1 elements implementations:
+  1. Every item or choices element is visible and represented. An example is
+     the controls for XHTML in "selects-xhtml.xml" file
+  2. Using of native widget that represents select/select1 elements. An example
+     is the controls for XHTML in "selectsnw-xhtml.xml" file.
 -->
 
-  <!-- BASE for select/select1 elements.
-    Right now this binding is used only by full appearance select/select1
-    elements. Be care with this accessible type and implementation logic if you
-    want to use this binding for other types of select/select1 elements.
-  -->
+  <!-- BASE for select/select1 elements. -->
   <binding id="selectcontrols-base"
            extends="chrome://xforms/content/xforms.xml#xformswidget-base">
 
     <implementation implements="nsIAccessibleProvider">
 
-    <!-- nsIAccessibleProvider -->
-      <property name="accessibleType" readonly="true">
-        <getter>
-          return Components.interfaces.nsIAccessibleProvider.XFormsSelectFull;
-        </getter>
-      </property>
-
     <!-- nsIXFormsUIWidget -->
       <method name="refresh">
         <body>
@@ -83,6 +73,8 @@
           this.values = this.getValuesArray(boundNode);
 
           this.traverseItems(this, this.selectItemElements);
+          if (this.freeEntryAllowed)
+            this.selectFreeEntryItemElements();
 
           var outOfRange = this.isOutOfRange(this.values) ||
             this.isOutOfRange(this.nodes);
@@ -97,14 +89,16 @@
       <method name="focus">
         <body>
           function focusItem(aItem) {
-            if (!aItem.disabled)
-              aItem.focus();
-            return aItem.disabled;
+            var disabled = this.isItemMarkedDisabled(aItem);
+            if (!disabled)
+              this.focusItem(aItem);
+            return disabled;
           }
           this.traverseItems(this, focusItem);
         </body>
       </method>
 
+    <!-- public -->
       <property name="incremental">
         <getter>
           return this.getAttribute("incremental") != "false";
@@ -117,6 +111,16 @@
         </setter>
       </property>
 
+      <property name="selection">
+        <getter>
+          return this.getAttribute("selection");
+        </getter>
+        <setter>
+          this.setAttribute("selection", val);
+          this.freeEntryAllowed = this.allowFreeEntry(val == "open");
+        </setter>
+      </property>
+
     <!-- private -->
       <!-- Run through xforms:item elements and select them if needed. If
         xforms:item element contains xforms:value element value of which is
@@ -131,36 +135,38 @@
         <parameter name="aItem"/>
         <body>
         <![CDATA[
-          aItem.disabled = this.accessors.isReadonly();
+          this.markItemDisabled(aItem, this.accessors.isReadonly());
 
           if (aItem.isCopyItem) {
             if (!this.nodes || !aItem.copyNode) {
               // aNodes is empty only if select controls is bound to non element
               // node. We just disable item element since it's value can't be
               // saved in bound node.
-              aItem.disabled = true;
+              this.markItemDisabled(aItem, true);
               return true;
             }
 
-            for (var i = 0; i < this.nodes.length; i++) {
+            var length = this.nodes.length;
+            for (var i = 0; i < length; i++) {
               if (aItem.copyNodeEquals(this.nodes[i].node)) {
-                aItem.selected = true;
+                this.markItemSelected(aItem, true);
                 this.nodes[i].isUsed = true;
                 return true;
               }
             }
           } else {
-            for (var i = 0; i < this.values.length; i++) {
+            var length = this.values.length;
+            for (var i = 0; i < length; i++) {
               if (this.values[i].value == aItem.value) {
-                aItem.selected = true;
+                this.markItemSelected(aItem, true);
                 this.values[i].isUsed = true;
                 return true;
               }
             }
           }
 
-          if (aItem.selected)
-            aItem.selected = false;
+          if (this.isItemMarkedSelected(aItem))
+            this.markItemSelected(aItem, false);
 
           return true;
         ]]>
@@ -274,6 +280,8 @@
 
           var forceRebuild = {value: false};
           this.traverseItems(this, this.buildInstanceData, node, forceRebuild);
+          if (this.freeEntryAllowed)
+            this.appendValueForInstanceNode(node, this.getFreeEntryValues());
 
           var nsIDOMNode = Components.interfaces.nsIDOMNode;
 
@@ -306,24 +314,38 @@
         <parameter name="aForceRebuild"/>
         <body>
         <![CDATA[
+          const nsIDOMNode = Components.interfaces.nsIDOMNode;
+
           if (aItem.isCopyItem) {
-            // Per specs we should fire 'xforms-binding-exception' event if
-            // bound node is not element and copy item is selected. We don't do
-            // it because in this case copy items are disabled and can't be
-            // selected.
             var wasSelected = false;
             if (this.nodes) {
-              for (var i = 0; i < this.nodes.length; i++) {
+              var length = this.nodes.length;
+              for (var i = 0; i < length; i++) {
                 if (aItem.copyNodeEquals(this.nodes[i].node)) {
                   wasSelected = true;
                   break;
                 }
               }
             }
-            if (wasSelected != aItem.selected)
+            if (wasSelected != this.isItemMarkedSelected(aItem))
               aForceRebuild.value = true;
 
-            if (aItem.selected) {
+            if (this.isItemMarkedSelected(aItem)) {
+              if (aInstanceNode.nodeType != nsIDOMNode.ELEMENT_NODE) {
+                // Per specs we should fire 'xforms-binding-exception' event if
+                // bound node is not element and copy item is selected.
+                this.dispatchXFormsNotificationEvent("xforms-binding-exception",
+                                                     this);
+
+                // We should probably un-select the item so that the list
+                // of selected data is accurate. This WON'T cause a
+                // xforms-select/deselect to fire. Since the user just selected
+                // this item and we are automatically deselecting it from
+                // underneath the user, we'll treat it like nothing happened.
+                this.markItemSelected(aItem, false);
+                return true;
+            }
+
               var importedNode =
                 aInstanceNode.ownerDocument.importNode(aItem.copyNode, true);
               aInstanceNode.appendChild(importedNode);
@@ -331,11 +353,9 @@
             return true;
           }
 
-          if (!aItem.selected)
+          if (!this.isItemMarkedSelected(aItem))
             return true;
 
-          var nsIDOMNode = Components.interfaces.nsIDOMNode;
-
           if (aInstanceNode.nodeType != nsIDOMNode.ELEMENT_NODE) {
             if (aInstanceNode.textContent)
               aInstanceNode.textContent += " ";
@@ -343,22 +363,37 @@
             return true;
           }
 
+          this.appendValueForInstanceNode(aInstanceNode, aItem.value);
+          return true;
+        ]]>
+        </body>
+      </method>
+
+      <!-- Append the given value for the instance node
+        @param aInstanceNode - the given instance node
+        @param aValue - appended value.
+      -->
+      <method name="appendValueForInstanceNode">
+        <parameter name="aInstanceNode"/>
+        <parameter name="aValue"/>
+        <body>
+        <![CDATA[
+          const nsIDOMNode = Components.interfaces.nsIDOMNode;
+
           var fchild = aInstanceNode.firstChild;
           if (fchild && (fchild.nodeType == nsIDOMNode.TEXT_NODE ||
               fchild.nodeType == nsIDOMNode.CDATA_SECTION_NODE)) {
             if (fchild.nodeValue)
               fchild.nodeValue += " ";
-            fchild.nodeValue += aItem.value;
+            fchild.nodeValue += aValue;
           } else {
             var textnode =
-              aInstanceNode.ownerDocument.createTextNode(aItem.value);
+              aInstanceNode.ownerDocument.createTextNode(aValue);
             if (fchild)
               aInstanceNode.insertBefore(textnode, fchild);
             else
               aInstanceNode.appendChild(textnode);
           }
-
-          return true;
         ]]>
         </body>
       </method>
@@ -481,9 +516,125 @@
         </body>
       </method>
 
+      <!-- Return values of free entry. The method implementation is a stub and
+        it should be removed when all native controls will support
+        @selection="open".
+
+        @note - should be overriden by implementation binding
+      -->
+      <method name="getFreeEntryValues">
+        <body>
+          return "";
+        </body>
+      </method>
+
+      <!-- Allow free entry. The method implementation is a stub and it should
+        be removed when all native controls will support @selection="open".
+
+        @return - true if free entries has been allowed
+        @note - should be overriden by implementation binding
+      -->
+      <method name="allowFreeEntry">
+        <parameter name="aAllowed"/>
+        <body>
+          return false;
+        </body>
+      </method>
+
+      <!-- Append and select free entry item. The implementations of this method
+        for xf:select should consider the scenario where several items may have
+        been selected by the user in addition to the user typing several values
+        directly into the editable field.  In that case, these additional values
+        should be appended to the control's value and the items that represent
+        these additional values should be selected.  In the case of
+        implementations for xf:select1, we'll assume that the widget that
+        represents the select1 will deselect the currently selected item if a
+        user types in the editable field.  So the free entry value, if present,
+        is the only value that the control can have.
+
+        The method implementation is a stub and it should be removed when all
+        native controls will support @selection="open".
+
+        @param aValue - the value of free entry item
+        @note - should be overriden by implementation binding
+      -->
+      <method name="appendFreeEntryItem">
+        <parameter name="aValue"/>
+        <body>
+        </body>
+      </method>
+
+      <!-- Select/Unselect item element.
+
+        @param aItem - the given item element
+        @param aIsSelected - if true then item should be selected, otherwise
+                             unselected
+      -->
+      <method name="markItemSelected">
+        <parameter name="aItem"/>
+        <parameter name="aIsSelected"/>
+        <body>
+          if (aItem)
+            aItem.selected = aIsSelected;
+        </body>
+      </method>
+
+      <!-- Return true if item is selected
+
+        @param aItem - the given item.
+      -->
+      <method name="isItemMarkedSelected">
+        <parameter name="aItem"/>
+        <body>
+          return aItem ? aItem.selected : false;
+        </body>
+      </method>
+
+      <!-- Disable/enable the given item element
+
+        @param aItem - the given item
+        @param aIsDisabled - if true then item should be disabled, otherwise
+                             enabled
+      -->
+      <method name="markItemDisabled">
+        <parameter name="aItem"/>
+        <parameter name="aIsDisabled"/>
+        <body>
+          if (aItem)
+            aItem.disabled = aIsDisabled;
+        </body>
+      </method>
+
+      <!-- Return true if the given item element disabled
+
+        @param aItem - the given item
+      -->
+      <method name="isItemMarkedDisabled">
+        <parameter name="aItem"/>
+        <body>
+          return aItem ? aItem.disabled : false;
+        </body>
+      </method>
+
+      <method name="focusItem">
+        <parameter name="aItem"/>
+        <body>
+          if (aItem)
+            aItem.focus();
+        </body>
+      </method>
+
+      <constructor>
+        this.freeEntryAllowed = this.allowFreeEntry(this.selection == "open");
+      </constructor>
+
       <!-- Storage for previous value of 'in-range' state of select element -->
       <field name="outOfRange">null</field>
 
+      <!-- Specifies whether free entry is allowed by certain implementation of
+        select/select1 element. -->
+      <field name="freeEntryAllowed">false</field>
+
       <!-- Arrays of selected values and nodes that combine to build the content
         of the bound instance node. -->
       <field name="values">null</field>
@@ -492,7 +643,9 @@
   </binding>
 
 
-  <!-- SELECT: BASE -->
+  <!-- SELECT: BASE
+    Note, keep synchronized with 'selectsnw.xml#select-base' binding
+  -->
   <binding id="select-base"
            extends="#selectcontrols-base">
 
@@ -502,7 +655,7 @@
       <property name="selectedItems" readonly="true">
         <getter>
           function _isSelected(aItem, aItemList) {
-            if (aItem.selected)
+            if (this.isItemMarkedSelected(aItem))
               aItemList.push(aItem);
             return true;
           }
@@ -515,23 +668,21 @@
       <method name="addItemToSelection">
         <parameter name="aItem"/>
         <body>
-          if (aItem)
-            aItem.selected = true;
+          this.markItemSelected(aItem, true);
         </body>
       </method>
 
       <method name="removeItemFromSelection">
         <parameter name="aItem"/>
         <body>
-          if (aItem)
-            aItem.selected = false;
+          this.markItemSelected(aItem, false);
         </body>
       </method>
 
       <method name="clearSelection">
         <body>
           function _clearSelection(aItem) {
-            aItem.selected = false;
+            this.markItemSelected(aItem, false);
             return true;
           }
           this.traverseItems(this, _clearSelection);
@@ -541,7 +692,7 @@
       <method name="selectAll">
         <body>
           function _selectAll(aItem) {
-            aItem.selected = true;
+            this.markItemSelected(aItem, true);
             return true;
           }
           this.traverseItems(this, _selectAll);
@@ -551,7 +702,7 @@
       <method name="isItemSelected">
         <parameter name="aItem"/>
         <body>
-          return aItem ? aItem.selected : false;
+          return this.isItemMarkedSelected(aItem);
         </body>
       </method>
 
@@ -586,7 +737,8 @@
             var parent = this.ownerDocument.getBindingParent(aItem);
             var target = parent && parent.localName == "itemset" ? parent : aItem;
 
-            var eventName = aItem.selected ? "xforms-select" : "xforms-deselect";
+            var eventName = this.isItemMarkedSelected(aItem) ?
+              "xforms-select" : "xforms-deselect";
             this.dispatchXFormsNotificationEvent(eventName, target);
           }
 
@@ -595,6 +747,20 @@
         </body>
       </method>
 
+      <method name="selectFreeEntryItemElements">
+        <body>
+        <![CDATA[
+          var length = this.values.length;
+          for (var i = 0; i < length; ++i) {
+            if (!this.values[i].isUsed) {
+              this.appendFreeEntryItem(this.values[i].value);
+              this.values[i].isUsed = true;
+            }
+          }
+        ]]>
+        </body>
+      </method>
+
       <method name="isOutOfRange">
         <parameter name="aHitArray"/>
         <body>
@@ -612,7 +778,9 @@
   </binding>
 
 
-  <!-- SELECT1: BASE -->
+  <!-- SELECT1: BASE
+    Note, keep synchronized with 'selects.xml#select1-base' binding.
+  -->
   <binding id="select1-base"
            extends="#selectcontrols-base">
 
@@ -621,9 +789,9 @@
       <property name="selectedItem">
         <getter>
           function getSelectedItem(aItem, aSelectedItem) {
-            if (aItem.selected)
+            if (this.isItemMarkedSelected(aItem))
               aSelectedItem.value = aItem;
-            return !aItem.selected;
+            return !this.isItemMarkedSelected(aItem);
           }
           var selectedItem = {value: null};
           this.traverseItems(this, getSelectedItem, selectedItem);
@@ -631,7 +799,7 @@
         </getter>
         <setter>
           function setSelectedItem(aItem, aSelectedItem) {
-            aItem.selected = aItem == aSelectedItem;
+            this.markItemSelected(aItem, aItem == aSelectedItem);
             return true;
           }
           this.traverseItems(this, setSelectedItem, val);
@@ -662,8 +830,8 @@
 
             function _unselectItems(aItem, aNewSelectedItem, aTarget) {
               if (aItem != aNewSelectedItem) {
-                if (aItem.selected) {
-                  aItem.selected = false;
+                if (this.isItemMarkedSelected(aItem)) {
+                  this.markItemSelected(aItem, false);
                   this.dispatchXFormsNotificationEvent("xforms-deselect",
                                                        aTarget);
                   return false;
@@ -673,7 +841,8 @@
             }
             this.traverseItems(this, _unselectItems, aItem, target);
 
-            var eventName = aItem.selected ? "xforms-select" : "xforms-deselect";
+            var eventName = this.isItemMarkedSelected(aItem) ?
+              "xforms-select" : "xforms-deselect";
             this.dispatchXFormsNotificationEvent(eventName, target);
           }
 
@@ -682,6 +851,18 @@
         </body>
       </method>
 
+      <method name="selectFreeEntryItemElements">
+        <body>
+          if (this.values.length != 1)
+            return;
+
+          if (!this.values[0].isUsed) {
+            this.appendFreeEntryItem(this.values[0].value);
+            this.values[0].isUsed = true;
+          }
+        </body>
+      </method>
+
       <method name="isOutOfRange">
         <parameter name="aHitArray"/>
         <body>
diff --git a/extensions/xforms/resources/content/selectsnw-xhtml.xml b/extensions/xforms/resources/content/selectsnw-xhtml.xml
new file mode 100644
index 000000000000..066c4d8459dc
--- /dev/null
+++ b/extensions/xforms/resources/content/selectsnw-xhtml.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0"?>
+
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla XForms support.
+   -
+   - The Initial Developer of the Original Code is
+   - Mozilla Foundation.
+   - Portions created by the Initial Developer are Copyright (C) 2007
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -  Alexander Surkov <surkov.alexander@gmail.com> (original author)
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<bindings id="xformsSelectsNativeWidgetBindings"
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:html="http://www.w3.org/1999/xhtml"
+          xmlns:xbl="http://www.mozilla.org/xbl">
+
+<!-- SELECT, SELECT1 CONTROLS
+  The section contains xforms select and select1 controls implementations for
+  XHTML. All controls are inherited from interface bindings realized in
+  'selectsnw.xml' file.
+
+  XXX: Element select of minimal appearance is not implemented (see bug 332928).
+
+  select/select1 of full appearance implementation uses a different approach
+  taken in 'selects.xml' file, their implementation is hosted in
+  'selects-xhtml.xml' file.
+-->
+
+  <binding id="select"
+           extends="chrome://xforms/content/selectsnw.xml#select-base">
+
+    <content>
+      <children includes="label"/>
+      <html:span anonid="nativewidget" xbl:inherits="style, accesskey"/>
+      <children/>
+    </content>
+  </binding>
+
+
+  <binding id="select1"
+           extends="chrome://xforms/content/selectsnw.xml#select1-base">
+
+    <content>
+      <children includes="label"/>
+      <html:span anonid="nativewidget" xbl:inherits="style, accesskey"/>
+      <children/>
+    </content>
+  </binding>
+
+
+<!-- CONTROL WIDGETS FOR SELECT/SELECT1 CONTROLS
+  The section contains underlying widgets implementations needed for xforms
+  select controls. All underlying widgets implement the interface what base
+  widget for xforms select controls ask for. You can find interface description
+  in 'selectsnw.xml' file.
+-->
+
+  <binding id="nativewidget-select-compact"
+           extends="chrome://xforms/content/selectsnw.xml#nativewidget-select">
+    <content>
+      <html:select xbl:inherits="style, accesskey, disabled=readonly"
+                   class="xf-value" multiple="true" size="5" anonid="control"/>
+    </content>
+
+    <implementation>
+      <method name="createGroupElm">
+        <parameter name="aParentElm"/>
+        <parameter name="aNextElm"/>
+        <parameter name="aXFLabel"/>
+        <body>
+          var elm = this.ownerDocument.createElementNS(this.XHTML_NS,
+                                                       "optgroup");
+          if (aXFLabel)
+            elm.textContent = aXFLabel.textValue;
+
+          return aParentElm.insertBefore(elm, aNextElm);
+        </body>
+      </method>
+
+      <method name="createItemElm">
+        <parameter name="aParentElm"/>
+        <parameter name="aNextElm"/>
+        <parameter name="aXFLabel"/>
+        <body>
+          var elm = this.ownerDocument.createElementNS(this.XHTML_NS, "option");
+          if (aXFLabel)
+            elm.textContent = aXFLabel.textValue;
+
+          return aParentElm.insertBefore(elm, aNextElm);
+        </body>
+      </method>
+
+      <method name="setLabelForNative">
+        <parameter name="aElm"/>
+        <parameter name="aXFLabel"/>
+        <body>
+          aElm.textContent = aXFLabel ? aXFLabel.textValue : "";
+        </body>
+      </method>
+
+      <method name="isItemSelectedNative">
+        <parameter name="aItem"/>
+        <body>
+          return aItem.selected;
+        </body>
+      </method>
+
+      <method name="selectItemNative">
+        <parameter name="aItem"/>
+        <parameter name="aDoSelect"/>
+        <body>
+          aItem.selected = aDoSelect;
+        </body>
+      </method>
+
+      <method name="isItemDisabledNative">
+        <parameter name="aItem"/>
+        <body>
+          return aItem.disabled;
+        </body>
+      </method>
+
+      <method name="disableItemNative">
+        <parameter name="aItem"/>
+        <parameter name="aDoDisable"/>
+        <body>
+          aItem.disabled = aDoDisable;
+        </body>
+      </method>
+    </implementation>
+
+    <handlers>
+      <handler event="change">
+        this.updateInstanceData(true);
+      </handler>
+
+      <handler event="blur" phase="capturing">
+        this.updateInstanceData(false);
+      </handler>
+    </handlers>
+  </binding>
+
+
+  <binding id="nativewidget-select1-compact"
+           extends="#nativewidget-select-compact">
+    <content>
+      <html:select xbl:inherits="style, accesskey, disabled=readonly"
+                   class="xf-value" anonid="control"/>
+    </content>
+  </binding>
+
+</bindings>
diff --git a/extensions/xforms/resources/content/selectsnw-xul.xml b/extensions/xforms/resources/content/selectsnw-xul.xml
new file mode 100644
index 000000000000..ad3b4f61aa1b
--- /dev/null
+++ b/extensions/xforms/resources/content/selectsnw-xul.xml
@@ -0,0 +1,286 @@
+<?xml version="1.0"?>
+
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla XForms support.
+   -
+   - The Initial Developer of the Original Code is
+   - Mozilla Foundation.
+   - Portions created by the Initial Developer are Copyright (C) 2007
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -  Alexander Surkov <surkov.alexander@gmail.com> (original author)
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<bindings id="xformsSelectsNativeWidgetBindings"
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+          xmlns:xbl="http://www.mozilla.org/xbl">
+
+<!-- SELECT, SELECT1 CONTROLS
+  The section contains xforms select and select1 controls implementations for
+  XUL. All controls are inherited from interface bindings realized in
+  'selectsnw.xml' file.
+
+  XXX: Element select of minimal appearance is not implemented (see bug 332928).
+
+  select/select1 of full appearance implementation uses a different approach
+  taken in 'selects.xml' file, their implementation is hosted in
+  'selects-xul.xml' file.
+-->
+
+  <binding id="select"
+           extends="chrome://xforms/content/selectsnw.xml#select-base">
+
+    <content>
+      <children includes="label"/>
+      <xul:box anonid="nativewidget" xbl:inherits="style, accesskey"/>
+      <children/>
+    </content>
+  </binding>
+
+
+  <binding id="select1"
+           extends="chrome://xforms/content/selectsnw.xml#select1-base">
+
+    <content>
+      <children includes="label"/>
+      <xul:box anonid="nativewidget" xbl:inherits="style, accesskey"/>
+      <children/>
+    </content>
+  </binding>
+
+  <binding id="select1-minimal"
+           extends="#select1">
+    <implementation implements="nsIXFormsNSEditableElement">
+
+      <!-- nsIXFormsNSEditableElement -->
+      <property name="editor" readonly="true"
+                onget="return this.nativeWidget.editor;"/>
+    </implementation>
+  </binding>
+
+
+<!-- CONTROL WIDGETS FOR SELECT CONTROLS
+  The section contains underlying widgets implementations needed for xforms
+  select controls. All underlying widgets implement the interface what base
+  widget for xforms select controls ask for. You can find interface description
+  in 'selectsnw.xml' file.
+-->
+
+  <binding id="nativewidget-select1-minimal"
+           extends="chrome://xforms/content/selectsnw.xml#nativewidget-select">
+    <content>
+      <xul:menulist xbl:inherits="style, accesskey, disabled=readonly"
+                    class="xf-value" anonid="control"/>
+    </content>
+
+    <implementation>
+      <method name="createGroupElm">
+        <parameter name="aXFLabel"/>
+        <body>
+          return null;
+        </body>
+      </method>
+
+      <method name="createItemElm">
+        <parameter name="aParentElm"/>
+        <parameter name="aNextElm"/>
+        <parameter name="aXFLabel"/>
+        <body>
+          return this.control.appendItem(aXFLabel ? aXFLabel.textValue : "");
+        </body>
+      </method>
+
+      <method name="setLabelForNative">
+        <parameter name="aElm"/>
+        <parameter name="aXFLabel"/>
+        <body>
+          aElm.setAttribute("label", aXFLabel ? aXFLabel.textValue : "");
+        </body>
+      </method>
+
+      <method name="isItemSelectedNative">
+        <parameter name="aItem"/>
+        <body>
+          return aItem.selected;
+        </body>
+      </method>
+
+      <method name="selectItemNative">
+        <parameter name="aItem"/>
+        <parameter name="aDoSelect"/>
+        <body>
+          this.control.selectedItem = aDoSelect ? aItem : null;
+        </body>
+      </method>
+
+      <method name="getFreeEntryValues">
+        <body>
+          if (this.control.getAttribute("editable") == "true") {
+            if (!this.control.selectedItem)
+              return this.control.value;
+            return "";
+          }
+        </body>
+      </method>
+
+      <method name="allowFreeEntry">
+        <parameter name="aAllowed"/>
+        <body>
+          if (aAllowed)
+            this.control.setAttribute("editable", "true");
+          else
+            this.control.removeAttribute("editable");
+
+          return aAllowed;
+        </body>
+      </method>
+
+      <method name="appendFreeEntryItem">
+        <parameter name="aValue"/>
+        <body>
+          if (this.control.getAttribute("editable") == "true")
+            this.control.value = aValue;
+        </body>
+      </method>
+
+      <property name="editor" readonly="true">
+        <getter>
+          if (!this.control.hasAttribute("editable"))
+            return null;
+
+          return this.control.editor;
+        </getter>
+      </property>
+    </implementation>
+
+    <handlers>
+      <handler event="input">
+        this.updateInstanceData(true);
+      </handler>
+
+      <handler event="command">
+        this.updateInstanceData(true);
+      </handler>
+
+      <handler event="blur" phase="capturing">
+        this.updateInstanceData(false);
+      </handler>
+    </handlers>
+  </binding>
+
+
+  <binding id="nativewidget-select-compact"
+           extends="chrome://xforms/content/selectsnw.xml#nativewidget-select">
+    <content>
+      <xul:listbox xbl:inherits="style, accesskey, disabled=readonly"
+                   class="xf-value" seltype="multiple" rows="5"
+                   anonid="control"/>
+    </content>
+
+    <implementation>
+      <method name="createGroupElm">
+        <parameter name="aXFLabel"/>
+        <body>
+          return null;
+        </body>
+      </method>
+
+      <method name="createItemElm">
+        <parameter name="aParentElm"/>
+        <parameter name="aNextElm"/>
+        <parameter name="aXFLabel"/>
+        <body>
+          var elm = this.ownerDocument.createElementNS(this.XUL_NS, "listitem");
+          if (aXFLabel)
+            elm.setAttribute("label", aXFLabel.textValue);
+
+          return aParentElm.insertBefore(elm, aNextElm);
+        </body>
+      </method>
+
+      <method name="setLabelForNative">
+        <parameter name="aElm"/>
+        <parameter name="aXFLabel"/>
+        <body>
+          aElm.setAttribute("label", aXFLabel.textValue);
+        </body>
+      </method>
+
+      <method name="isItemSelectedNative">
+        <parameter name="aItem"/>
+        <body>
+          return aItem.selected;
+        </body>
+      </method>
+
+      <method name="selectItemNative">
+        <parameter name="aItem"/>
+        <parameter name="aDoSelect"/>
+        <body>
+          this.control.setAttribute("suppressonselect", "true");
+          if (aDoSelect)
+            this.control.addItemToSelection(aItem);
+          else
+            this.control.removeItemFromSelection(aItem);
+          this.control.removeAttribute("suppressonselect");
+        </body>
+      </method>
+
+      <constructor>
+        // 'select' event is fired by 'listbox' binding and therefore it is
+        // not handled in 'handler' element until bug 350334 is fixed.
+        var selectHandler = {
+          control: this,
+          handleEvent: function() {
+            this.control.updateInstanceData(true);
+          }
+        };
+        this.addEventListener("select", selectHandler, false);
+      </constructor>
+    </implementation>
+
+    <handlers>
+      <handler event="blur" phase="capturing">
+        this.updateInstanceData(false);
+      </handler>
+    </handlers>
+  </binding>
+
+
+  <binding id="nativewidget-select1-compact"
+           extends="#nativewidget-select-compact">
+    <content>
+      <xul:listbox xbl:inherits="style, accesskey, disabled=readonly"
+                   class="xf-value" seltype="single" rows="5"
+                   anonid="control"/>
+    </content>
+  </binding>
+
+</bindings>
diff --git a/extensions/xforms/resources/content/selectsnw.xml b/extensions/xforms/resources/content/selectsnw.xml
new file mode 100644
index 000000000000..7145329219b7
--- /dev/null
+++ b/extensions/xforms/resources/content/selectsnw.xml
@@ -0,0 +1,991 @@
+<?xml version="1.0"?>
+
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla XForms support.
+   -
+   - The Initial Developer of the Original Code is
+   - Mozilla Foundation.
+   - Portions created by the Initial Developer are Copyright (C) 2007
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -  Alexander Surkov <surkov.alexander@gmail.com> (original author)
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<bindings id="xformsSelectsNativeWidgetBindings"
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:xbl="http://www.mozilla.org/xbl">
+
+<!--
+  This file implements the "abstract" UI classes for XForms select/select1
+  controls that are used native widgets for their representation.
+-->
+
+  <!-- BASE binding for select/select1 elements that are used native widgets -->
+  <binding id="selectcontrols-base"
+           extends="chrome://xforms/content/selects.xml#selectcontrols-base">
+
+    <implementation>
+    <!-- nsIAccessibleProvider -->
+      <property name="accessibleType" readonly="true">
+        <getter>
+          return Components.interfaces.nsIAccessibleProvider.XFormsSelect;
+        </getter>
+      </property>
+
+    <!-- overriding the methods from the 'selectcontrols-base' binding -->
+      <method name="getFreeEntryValues">
+        <body>
+          return this.nativeWidget.getFreeEntryValues();
+        </body>
+      </method>
+
+      <method name="allowFreeEntry">
+        <parameter name="aAllowed"/>
+        <body>
+          return this.nativeWidget.allowFreeEntry(aAllowed);
+        </body>
+      </method>
+
+      <method name="appendFreeEntryItem">
+        <parameter name="aValue"/>
+        <body>
+          this.nativeWidget.appendFreeEntryItem(aValue);
+        </body>
+      </method>
+
+      <method name="markItemSelected">
+        <parameter name="aItem"/>
+        <parameter name="aIsSelected"/>
+        <body>
+          this.nativeWidget.selectItem(aItem, aIsSelected);
+        </body>
+      </method>
+
+      <method name="isItemMarkedSelected">
+        <parameter name="aItem"/>
+        <body>
+          return this.nativeWidget.isItemSelected(aItem);
+        </body>
+      </method>
+
+      <method name="markItemDisabled">
+        <parameter name="aItem"/>
+        <parameter name="aIsDisabled"/>
+        <body>
+          this.nativeWidget.disableItem(aItem, aIsDisabled);
+        </body>
+      </method>
+
+      <method name="isItemMarkedDisabled">
+        <parameter name="aItem"/>
+        <body>
+          return this.nativeWidget.isItemDisabled(aItem);
+        </body>
+      </method>
+
+      <method name="focusItem">
+        <parameter name="aItem"/>
+        <body>
+          this.nativeWidget.focus();
+        </body>
+      </method>
+
+    <!-- private -->
+      <constructor>
+        this.handleInsertion(this, null);
+      </constructor>
+
+      <!-- Return native widget control -->
+      <property name="nativeWidget">
+        <getter>
+          if (!this._nativeWidget)
+            this._nativeWidget = this.ownerDocument.
+              getAnonymousElementByAttribute(this, "anonid", "nativewidget");
+          return this._nativeWidget;
+        </getter>
+      </property>
+
+      <!-- Try to update label element when DOM tree has been changed.
+
+        @param aNode - the node that was inserted or will be removed
+        @param aIsInsertion - if true then node was inserted
+      -->
+      <method name="handleLabel">
+        <parameter name="aNode"/>
+        <parameter name="aIsInsertion"/>
+        <body>
+        <![CDATA[
+          var node = aNode;
+          while (node && node != this && (node.namespaceURI != this.XFORMS_NS ||
+                 node.localName != "label")) {
+            node = node.parentNode;
+          }
+
+          if (!node)
+            return;
+
+          if (!node || node == this)
+            return;
+
+          var label = node;
+
+          var parent = label.parentNode;
+          var labels = parent.getElementsByTagNameNS(this.XFORMS_NS, "label");
+          if (labels[0] != label)
+            return;
+
+          label = ((aNode == label) && !aIsInsertion) ? null : label;
+          if (parent.namespaceURI == this.XFORMS_NS) {
+            // Set label only for xf:item or xf:choices elements.
+            switch (parent.localName) {
+              case "choices":
+              case "item":
+                this.nativeWidget.setLabelFor(parent, label);
+                break;
+              case "contextcontainer":
+                // Parent of xf:contextcontainer element is xf:item element in
+                // the case of auto-generated content of xf:itemset.
+                this.nativeWidget.setLabelFor(parent.parentNode, label);
+                break;
+            }
+          }
+        ]]>
+        </body>
+      </method>
+
+      <!-- Updates native widget when DOM tree has been changed i.e. "item"/
+        "itemset"/"choices" elements have been inserted or removed.
+
+        @param aNode - the given node, is is either "select"/"select1" elements
+                       to initialize native widget or "choices"/"item"/"itemset"
+                       if it was inserted
+        @param aParentNode - either parent node of the given node or null if
+                             native widget is initialized
+        @param aParentIndex - index of parent node (for recursive calls)
+        @param aPrevSiblingIndex - index of previous sibling node (for recursive
+                                   calls)
+      -->
+      <method name="handleInsertion">
+        <parameter name="aNode"/>
+        <parameter name="aParentNode"/>
+        <parameter name="aParentIndex"/>
+        <parameter name="aPrevSiblingIndex"/>
+        <body>
+        <![CDATA[
+          const nsIXFormsItemSetUIElement =
+            Components.interfaces.nsIXFormsItemSetUIElement;
+          if (aNode.namespaceURI != this.XFORMS_NS)
+            return -1;
+
+          var container = null;
+          var index = -1;
+          var prevIndex = -1;
+
+          switch (aNode.localName) {
+            case "select1":
+            case "select":
+            case "choices":
+              container = aNode;
+              break;
+            case "item":
+              break;
+            case "itemset":
+              var itemset = aNode.QueryInterface(nsIXFormsItemSetUIElement);
+              container = itemset.anonymousItemSetContent;
+              index = aParentIndex;
+              prevIndex = aPrevSiblingIndex;
+              break;
+            default:
+              return -1;
+          }
+
+          // Create native item/choices and insert it into native widget
+          // hierarchy if inserted elements are xf:item or xf:choices only.
+          if (index == -1) {
+            this.isInsertionHandlingPrevented = true;
+            if (aParentIndex != null && aParentIndex != -1) {
+              index = this.nativeWidget.appendElm(aNode, aParentIndex,
+                                                  aPrevSiblingIndex);
+            } else {
+              index = this.nativeWidget.insertElm(aNode, aParentNode);
+            }
+            this.isInsertionHandlingPrevented = false;
+          }
+
+          // We return whether inserted element is not container of
+          // select/select1 child elements or native element wasn't inserted
+          // successfully.
+          if (index == -1 || !container)
+            return index;
+
+          // Create/insert native elements for choices/item/itemset child
+          // elements of inserted element if any.
+          var hasChildNodes = false;
+          for (var child = container.firstChild; child; child = child.nextSibling) {
+            if (child.namespaceURI != this.XFORMS_NS)
+              continue;
+
+            switch (child.localName) {
+              case "choices":
+              case "itemset":
+              case "item":
+                hasChildNodes = true;
+                prevIndex = this.handleInsertion(child, null, index, prevIndex);
+                break;
+            }
+          }
+
+          return hasChildNodes ? prevIndex : index;
+        ]]>
+        </body>
+      </method>
+
+      <!-- Flag prevents to handle DOM mutation events if mutation events are
+        cause of native widget is updated. -->
+      <field name="isInsertionHandlingPrevented">false</field>
+    </implementation>
+
+    <handlers>
+      <handler event="DOMNodeInserted">
+      <![CDATA[
+        if (this.isInsertionHandlingPrevented)
+          return;
+
+        var target = event.originalTarget;
+        var parent = event.relatedNode;
+
+        // If inserted element is item/itemset/choides element then we should
+        // update native widget
+        if (target.namespaceURI == this.XFORMS_NS &&
+            (target.localName == "choices" || target.localName == "itemset" ||
+             target.localName == "item")) {
+
+          // Search for parent element that is reflected by native widget.
+          // The parent element can be select/select1, itemset or choices
+          // element so we skip itemset element because it isn't presented
+          // in native widget.
+          while (parent != this && (parent.namespaceURI != this.XFORMS_NS ||
+                 parent.localName != "choices"))
+            parent = parent.parentNode;
+
+          this.handleInsertion(target, parent);
+          return;
+        }
+
+        // otherwise we try to update label for item/choices element.
+        this.handleLabel(target, true);
+      ]]>
+      </handler>
+
+      <handler event="DOMNodeRemoved">
+        if (this.isInsertionHandlingPrevented)
+          return;
+
+        var target = event.originalTarget;
+
+        if (target.namespaceURI == this.XFORMS_NS) {
+          switch (target.localName) {
+            case "choices":
+            case "item":
+              this.nativeWidget.removeNativeElm(target);
+              return;
+
+            case "itemset":
+              var itemset = target.QueryInterface(Components.interfaces.nsIXFormsItemSetUIElement);
+              var container = itemset.anonymousItemSetContent;
+              for (var child = container.firstChild; child; child = child.nextSibling)
+                this.nativeWidget.removeNativeElm(child);
+              return;
+          }
+        }
+
+        this.handleLabel(target, false);
+      </handler>
+
+      <handler event="DOMCharacterDataModified">
+        if (this.isInsertionHandlingPrevented)
+          return;
+
+        this.handleLabel(event.originalTarget, true);
+      </handler>
+    </handlers>
+  </binding>
+
+
+  <!-- SELECT: BASE
+    Note, keep synchronized with 'selects.xml#select-base' binding
+  -->
+  <binding id="select-base"
+           extends="#selectcontrols-base">
+
+    <implementation implements="nsIXFormsNSSelectElement">
+
+    <!-- nsIXFormsNSSelectElement -->
+      <property name="selectedItems" readonly="true">
+        <getter>
+          function _isSelected(aItem, aItemList) {
+            if (this.isItemMarkedSelected(aItem))
+              aItemList.push(aItem);
+            return true;
+          }
+          var list = [];
+          this.traverseItems(this, _isSelected, list);
+          return list;
+        </getter>
+      </property>
+
+      <method name="addItemToSelection">
+        <parameter name="aItem"/>
+        <body>
+          this.markItemSelected(aItem, true);
+        </body>
+      </method>
+
+      <method name="removeItemFromSelection">
+        <parameter name="aItem"/>
+        <body>
+          this.markItemSelected(aItem, false);
+        </body>
+      </method>
+
+      <method name="clearSelection">
+        <body>
+          function _clearSelection(aItem) {
+            this.markItemSelected(aItem, false);
+            return true;
+          }
+          this.traverseItems(this, _clearSelection);
+        </body>
+      </method>
+
+      <method name="selectAll">
+        <body>
+          function _selectAll(aItem) {
+            this.markItemSelected(aItem, true);
+            return true;
+          }
+          this.traverseItems(this, _selectAll);
+        </body>
+      </method>
+
+      <method name="isItemSelected">
+        <parameter name="aItem"/>
+        <body>
+          return this.isItemMarkedSelected(aItem);
+        </body>
+      </method>
+
+    <!-- Private implementation -->
+      <method name="getValuesArrayFor">
+        <parameter name="aString"/>
+        <parameter name="aWhiteSpaceExpr"/>
+        <body>
+          // A limitation of the XML Schema list datatypes is that white space
+          // characters in the storage values (the value element) are always
+          // interpreted as separators between individual data values.
+          // Therefore, authors should avoid using white space characters within
+          // storage values with list simpleContent.
+
+          // Replace new line (\n), tabs (\t) and carriage returns (\r) with
+          // space (" ").
+          var value = aString.replace(aWhiteSpaceExpr, " ");
+          return value.split(/\s/);
+        </body>
+      </method>
+
+      <method name="selectFreeEntryItemElements">
+        <body>
+          for (var i = 0; this.values.length; ++i) {
+            if (!this.values[i].isUsed) {
+              this.appendFreeEntryItem(this.values[i].value);
+              this.values[i].isUsed = true;
+            }
+          }
+        </body>
+      </method>
+
+      <method name="isOutOfRange">
+        <parameter name="aHitArray"/>
+        <body>
+        <![CDATA[
+          if (!aHitArray)
+            return false;
+
+          var i = 0;
+          for (; i < aHitArray.length && aHitArray[i].isUsed; ++i);
+          return i != aHitArray.length;
+        ]]>
+        </body>
+      </method>
+    </implementation>
+  </binding>
+
+
+  <!-- SELECT1: BASE
+    Note, keep synchronized with 'selects.xml#select1-base' binding.
+  -->
+  <binding id="select1-base"
+           extends="#selectcontrols-base">
+
+    <implementation implements="nsIXFormsNSSelect1Element">
+    <!-- nsIXFormsNSSelect1Element -->
+      <property name="selectedItem">
+        <getter>
+          function getSelectedItem(aItem, aSelectedItem) {
+            var selected = this.isItemMarkedSelected(aItem);
+            if (selected)
+              aSelectedItem.value = aItem;
+            return !selected;
+          }
+          var selectedItem = {value: null};
+          this.traverseItems(this, getSelectedItem, selectedItem);
+          return selectedItem.value;
+        </getter>
+        <setter>
+          function setSelectedItem(aItem, aSelectedItem) {
+            this.markItemSelected(aItem, aItem == aSelectedItem);
+            return true;
+          }
+          this.traverseItems(this, setSelectedItem, val);
+        </setter>
+      </property>
+
+    <!-- Private implementation -->
+      <method name="getValuesArrayFor">
+        <parameter name="aString"/>
+        <parameter name="aWhiteSpaceExpr"/>
+        <body>
+          return [aString];
+        </body>
+      </method>
+
+      <method name="selectFreeEntryItemElements">
+        <body>
+          if (this.values.length != 1)
+            return;
+
+          if (!this.values[0].isUsed) {
+            this.appendFreeEntryItem(this.values[0].value);
+            this.values[0].isUsed = true;
+          }
+        </body>
+      </method>
+
+      <method name="isOutOfRange">
+        <parameter name="aHitArray"/>
+        <body>
+        <![CDATA[
+          return aHitArray && (aHitArray.length > 1 || aHitArray.length == 1 &&
+            !aHitArray[0].isUsed);
+        ]]>
+        </body>
+      </method>
+    </implementation>
+  </binding>
+
+
+  <!-- BASE binding for NATIVE WIDGET CONTROL -->
+  <binding id="nativewidget-select">
+
+    <implementation>
+    <!-- public -->
+      <method name="selectItem">
+        <parameter name="aItem"/>
+        <parameter name="aDoSelect"/>
+        <body>
+          var index = this.getIndexByElm(aItem);
+          if (index != -1) {
+            var listElm = this.nodeList[index];
+            this.selectItemNative(listElm.nativeElm, aDoSelect);
+            listElm.wasSelected = aDoSelect;
+          }
+        </body>
+      </method>
+
+      <method name="isItemSelected">
+        <parameter name="aItem"/>
+        <body>
+          var index = this.getIndexByElm(aItem);
+          if (index != -1)
+            return this.isItemSelectedNative(this.nodeList[index].nativeElm);
+          return false;
+        </body>
+      </method>
+
+      <method name="disableItem">
+        <parameter name="aItem"/>
+        <parameter name="aDoDisable"/>
+        <body>
+          var index = this.getIndexByElm(aItem);
+          if (index != -1)
+            this.disableItemNative(this.nodeList[index].nativeElm, aDoDisable);
+        </body>
+      </method>
+
+      <method name="isItemDisabled">
+        <parameter name="aItem"/>
+        <body>
+          var index = this.getIndexByElm(aItem);
+          if (index != -1)
+            return this.isItemDisabledNative(this.nodeList[index].nativeElm);
+          return false;
+        </body>
+      </method>
+
+      <method name="focus">
+        <body>
+          this.control.focus();
+        </body>
+      </method>
+
+      <method name="getFreeEntryValues">
+        <body>
+          return "";
+        </body>
+      </method>
+
+      <method name="allowFreeEntry">
+        <parameter name="aAllowed"/>
+        <body>
+          return false;
+        </body>
+      </method>
+
+      <method name="appendFreeEntryItem">
+        <parameter name="aValue"/>
+        <body>
+        </body>
+      </method>
+
+      <method name="setLabelFor">
+        <parameter name="aNode"/>
+        <parameter name="aLabelNode"/>
+        <body>
+          var index = this.getIndexByElm(aNode);
+          if (index != -1)
+            this.setLabelForNative(this.nodeList[index].nativeElm, aLabelNode);
+        </body>
+      </method>
+
+      <!-- Create and appends native element.
+
+        @param aElm - the given element
+        @param aParentIndex - the index of parent element
+        @param aPrevSiblingIndex - the index of previous sibling element
+
+        @note - previous sibling elements must be in native widget already
+      -->
+      <method name="appendElm">
+        <parameter name="aElm"/>
+        <parameter name="aParentIndex"/>
+        <parameter name="aPrevSiblingIndex"/>
+        <body>
+        <![CDATA[
+          var parentListElm = this.nodeList[aParentIndex];
+          var nativeParentElm = parentListElm.nativeElm;
+
+          var isItemElm = {value: false};
+          var nativeElm = this.createNativeElm(aElm, nativeParentElm, null,
+                                               isItemElm);
+          if (!nativeElm)
+            return -1;
+
+          var parentElm = parentListElm.elm;
+          var parentLevel = parentListElm.level;
+
+          var listElm = {
+            elm: aElm,
+            nativeElm: nativeElm,
+            level: parentLevel + 1,
+          };
+
+          if (isItemElm.value)
+            listElm.wasSelected = false;
+
+          var index = -1;
+          if (aPrevSiblingIndex == null || aPrevSiblingIndex == -1)
+            index = aParentIndex + 1;
+          else
+            index = aPrevSiblingIndex + 1;
+
+          this.nodeList.splice(index, 0, listElm);
+
+          return index;
+        ]]>
+        </body>
+      </method>
+
+      <!-- Create and insert native element.
+
+        @param aElm - the given element
+        @param aParent - parent of the given element
+      -->
+      <method name="insertElm">
+        <parameter name="aElm"/>
+        <parameter name="aParent"/>
+        <body>
+        <![CDATA[
+          if (!aParent)
+            return this.appendTopElm(aElm);
+
+          var parentIndex = this.getIndexByElm(aParent);
+          if (parentIndex == -1)
+            return -1;
+
+          var nativeParent = this.nodeList[parentIndex].nativeElm;
+
+          var index = this.getInsertionIndexForElm(aElm, parentIndex);
+          if (index == -1)
+            return;
+
+          var isItemElm = {value: false};
+          var nextElm = aElm.nextSibling ? this.nodeList[index].nativeElm : null;
+
+          var nativeElm = this.createNativeElm(aElm, nativeParent, nextElm,
+                                               isItemElm);
+          if (!nativeElm)
+            return -1;
+
+          var parentLevel = this.nodeList[parentIndex].level;
+          var listElm = {
+            elm: aElm,
+            nativeElm: nativeElm,
+            level: parentLevel + 1,
+          };
+
+          if (isItemElm.value)
+            listElm.wasSelected = false;
+
+          this.nodeList.splice(index, 0, listElm);
+
+          return index;
+        ]]>
+        </body>
+      </method>
+
+      <!-- Remove native node and its children. -->
+      <method name="removeNativeElm">
+        <parameter name="aElm"/>
+        <body>
+        <![CDATA[
+          var index = this.getIndexByElm(aElm);
+          if (index == -1)
+            return;
+
+          var nativeElm = this.nodeList[index];
+          nativeElm.parentNode.removeChild(nativeElm);
+
+          var childCount = 1;
+          var level = this.nodeList[index];
+          for (var i = index + 1; i < this.nodeList.length; ++i) {
+            var childLevel = this.nodeList[i].level;
+            if (childLevel <= level)
+              break;
+
+            childCount++;
+          }
+
+          this.nodeList.splice(index - 1, childCount);
+        ]]>
+        </body>
+      </method>
+
+    <!-- overrideable -->
+      <method name="disableItemNative">
+        <parameter name="aItem"/>
+        <parameter name="aDoDisable"/>
+        <body>
+        </body>
+      </method>
+
+      <method name="isItemDisabledNative">
+        <parameter name="aItem"/>
+        <body>
+          return false;
+        </body>
+      </method>
+
+    <!-- private -->
+      <method name="appendTopElm">
+        <parameter name="aSelect"/>
+        <body>
+          var listElm = {
+            elm: aSelect,
+            nativeElm: this.control,
+            level: 0,
+            wasSelected: false
+          };
+
+          this.nodeList = [listElm];
+          this.selectControl = aSelect;
+          return 0;
+        </body>
+      </method>
+
+      <!-- Create and append native element.
+
+        @param aElm - the given element, this is either item or choices element
+        @param aParentElm - parent element of the given element
+        @param aNextElm - next sibling of the given element if any
+        @param aIsItemElm - [out] returns true if the given element is item
+      -->
+      <method name="createNativeElm">
+        <parameter name="aElm"/>
+        <parameter name="aParentElm"/>
+        <parameter name="aNextElm"/>
+        <parameter name="aIsItemElm"/>
+        <body>
+          switch (aElm.localName) {
+            case "choices":
+              aIsItemElm.value = false;
+              var group = this.createGroupElm(aParentElm, aNextElm,
+                                              this.getLabelFor(aElm));
+              return group ? group : this.control;
+            case "item":
+              aIsItemElm.value = true;
+              return this.createItemElm(aParentElm, aNextElm,
+                                        this.getLabelFor(aElm));
+          }
+          return null;
+        </body>
+      </method>
+
+      <!-- Return label element for the given element -->
+      <method name="getLabelFor">
+        <parameter name="aNode"/>
+        <body>
+        <![CDATA[
+          if (!aNode)
+            return null;
+
+          for (var child = aNode.firstChild; child; child = child.nextSibling) {
+            if (child.namespaceURI == this.XFORMS_NS) {
+              if (child.localName == "label")
+                return child;
+
+              if (child.localName == "contextcontainer")
+                return this.getLabelFor(child);
+            }
+          }
+          return null;
+        ]]>
+        </body>
+      </method>
+
+      <!-- Returns index for the given element.
+        @param aElm - the given element
+        @return - index of the given element
+      -->
+      <method name="getIndexByElm">
+        <parameter name="aElm"/>
+        <body>
+        <![CDATA[
+          for (var i = 0; i < this.nodeList.length; ++i) {
+            if (this.nodeList[i].elm == aElm)
+              return i;
+          }
+
+          dump("ERROR: selectsnw binding, can't locate the given element in the node list\n");
+          return -1;
+        ]]>
+        </body>
+      </method>
+
+      <!-- Return index that the given element will be inserted at
+        @param aElm - the inserted element
+        @param aParentIndex - index of parent element
+        @return - index for inserted element
+      -->
+      <method name="getInsertionIndexForElm">
+        <parameter name="aElm"/>
+        <parameter name="aParentIndex"/>
+        <body>
+        <![CDATA[
+          var delta = 0;
+          var elm = aElm;
+          while (elm = elm.previousSibling)
+            delta++;
+
+          var parentLevel = this.nodeList[aParentIndex].level;
+          var index = aParentIndex + 1;
+          var length = this.nodeList.length;
+          for (; index < length && delta; ++index) {
+            if (this.nodeList[index].level == parentLevel + 1)
+              delta--;
+          }
+
+          if (!delta)
+            return index;
+
+          dump("ERROR: selectsnw binding, can't find insertion point in the node list for the given element\n");
+          return -1;
+          ]]>
+        </body>
+      </method>
+
+      <!-- Fires 'xforms-select'/'xforms-deselect' events and updates instance
+        data. The method is used by bindings of native widget implementation.
+
+        @param aIncremental - specifies if update is incremental
+      -->
+      <method name="updateInstanceData">
+        <parameter name="aIncremental"/>
+        <body>
+        <![CDATA[
+          if (!this.selectControl)
+            return;
+
+          if (aIncremental) {
+            var deferredEventTargets = [];
+            for (var index = 0; index < this.nodeList.length; ++index) {
+              var listElm = this.nodeList[index];
+              if (!("wasSelected" in listElm))
+                continue;
+
+              // event state can be either:
+              // 0 - the state of element wasn't changed
+              // 1 - the element was selected
+              // 2 - the element was unselected
+              var eventState = 0;
+
+              var selected = this.isItemSelectedNative(listElm.nativeElm);
+              if (listElm.wasSelected && !selected)
+                eventState = 1;
+              else if (!listElm.wasSelected && selected)
+                eventState = 2;
+
+              if (!eventState)
+                continue;
+
+              var target = listElm.elm;
+              var parent = target.parentNode;
+              while (parent && parent != this.selectControl) {
+                if (parent.namespaceURI == this.XFORMS_NS &&
+                    parent.localName == "itemset") {
+                  target = parent;
+                  break;
+                }
+                parent = parent.parentNode;
+              }
+
+              // First we should send 'xforms-unselect' events for all
+              // unselected item elements and then 'xforms-select' events.
+              if (eventState == 1) {
+                listElm.wasSelected = false;
+                this.selectControl.
+                  dispatchXFormsNotificationEvent("xforms-deselect", target);
+              } else {
+                listElm.wasSelected = true;
+                deferredEventTargets.push(target);
+              }
+            }
+
+            for (var index = 0; index < deferredEventTargets.length; ++index) {
+              this.selectControl.dispatchXFormsNotificationEvent("xforms-select",
+                                                                 target);
+            }
+          }
+
+          this.selectControl.updateInstanceData(aIncremental);
+        ]]>
+        </body>
+      </method>
+
+      <!-- Returns the underlying control (native widget) -->
+      <property name="control" readonly="true">
+        <getter>
+          if (!this._control)
+            this._control = this.ownerDocument.
+              getAnonymousElementByAttribute(this, "anonid", "control");
+          return this._control;
+        </getter>
+      </property>
+
+      <!-- Reference on xforms 'select'/'select1' element -->
+      <field name="selectControl">null</field>
+
+      <!-- Contains a list of objects each of them has the following properties:
+        elm - xforms element (may be select/select1, item or choices)
+        nativeElm - native element that represents related xforms element
+        level - level of elements hierarchy (level of select/select1 is 0)
+        wasSelected - if 'elm' property contains item element then this property
+                      is presented and takes boolean value
+
+        First object in the list is for 'select'/'select1' element.
+      -->
+      <field name="nodeList">new Array()</field>
+
+      <!-- Debug method. Dumps current state of node list into console. -->
+      <method name="dumpNodeList">
+        <body>
+        <![CDATA[
+          dump("\n\n");
+          for (var i = 0; i < this.nodeList.length; ++i) {
+            var obj = this.nodeList[i];
+            for (var j = 0; j < obj.level; j++)
+              dump("  ");
+            dump("elm: " + obj.elm.localName + "\n");
+
+            for (var j = 0; j < obj.level; j++)
+              dump("  ");
+            dump("native elm: " + obj.nativeElm.localName);
+            var label = this.getLabelFor(obj.elm);
+            if (label)
+              dump(", label: " + label.textContent);
+            dump("\n");
+          }
+        ]]>
+        </body>
+      </method>
+
+      <property name="XFORMS_NS" readonly="true"
+                onget="return 'http://www.w3.org/2002/xforms';"/>
+
+      <property name="XHTML_NS" readonly="true"
+                onget="return 'http://www.w3.org/1999/xhtml';"/>
+
+      <property name="XUL_NS" readonly="true"
+                onget="return 'http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul';"/>
+    </implementation>
+
+    <handlers>
+      <handler event="focus" phase="capturing">
+        if (this.selectControl)
+          this.selectControl.dispatchDOMUIEvent("DOMFocusIn");
+      </handler>
+
+      <handler event="blur" phase="capturing">
+        if (this.selectControl)
+          this.selectControl.dispatchDOMUIEvent("DOMFocusOut");
+      </handler>
+    </handlers>
+  </binding>
+
+</bindings>
+
diff --git a/extensions/xforms/resources/content/xforms.css b/extensions/xforms/resources/content/xforms.css
index 17358194ff27..d76e26181900 100755
--- a/extensions/xforms/resources/content/xforms.css
+++ b/extensions/xforms/resources/content/xforms.css
@@ -110,18 +110,15 @@ contextcontainer-inline {
 xul|*:root select1:not([appearance]) item,
 xul|*:root select1[appearance='minimal'] item,
 select1[appearance='compact'] item,
-select:not([appearance]) item,
-select[appearance='compact'] item,
+select:not([appearance="full"]) item,
 xul|*:root select1:not([appearance]) itemset,
 xul|*:root select1[appearance='minimal'] itemset,
 select1[appearance='compact'] itemset,
-select:not([appearance]) itemset,
-select[appearance='compact'] itemset,
+select:not([appearance="full"]) itemset,
 xul|*:root select1:not([appearance]) choices,
 xul|*:root select1[appearance='minimal'] choices,
 select1[appearance='compact'] choices,
-select:not([appearance]) choices,
-select[appearance='compact'] choices {
+select:not([appearance="full"]) choices {
   display: none;
 }
 
@@ -531,25 +528,25 @@ html|*:root select1[appearance='minimal'] item {
 }
 
 xul|*:root select1 {
-  -moz-binding: url('chrome://xforms/content/select-xul.xml#xformswidget-select1-minimal');
+  -moz-binding: url('chrome://xforms/content/selectsnw-xul.xml#select1-minimal');
 }
-xul|*:root select1 xul|box[anonid="control"] {
-  -moz-binding: url('chrome://xforms/content/select-xul.xml#controlwidget-select1-minimal');
+xul|*:root select1 xul|box[anonid="nativewidget"] {
+  -moz-binding: url('chrome://xforms/content/selectsnw-xul.xml#nativewidget-select1-minimal');
 }
 
   /* select1 appearance='compact' */
 html|*:root select1[appearance="compact"] {
-  -moz-binding: url('chrome://xforms/content/select-xhtml.xml#xformswidget-select1-compact');
+  -moz-binding: url('chrome://xforms/content/selectsnw-xhtml.xml#select1');
 }
-html|*:root select1[appearance="compact"] html|span[anonid="control"] {
-  -moz-binding: url('chrome://xforms/content/select-xhtml.xml#controlwidget-select1-compact');
+html|*:root select1[appearance="compact"] html|span[anonid="nativewidget"] {
+  -moz-binding: url('chrome://xforms/content/selectsnw-xhtml.xml#nativewidget-select1-compact');
 }
 
 xul|*:root select1[appearance="compact"] {
-  -moz-binding: url('chrome://xforms/content/select-xul.xml#xformswidget-select1-compact');
+  -moz-binding: url('chrome://xforms/content/selectsnw-xul.xml#select1');
 }
-xul|*:root select1[appearance="compact"] xul|box[anonid="control"] {
-  -moz-binding: url('chrome://xforms/content/select-xul.xml#controlwidget-select1-compact');
+xul|*:root select1[appearance="compact"] xul|box[anonid="nativewidget"] {
+  -moz-binding: url('chrome://xforms/content/selectsnw-xul.xml#nativewidget-select1-compact');
 }
 
   /* select1 appearance='full' */
@@ -669,17 +666,17 @@ select1[appearance="full"] choices > choices {
 
   /* select appearance="compact" (default) */
 html|*:root select {
-  -moz-binding: url('chrome://xforms/content/select-xhtml.xml#xformswidget-select-compact');
+  -moz-binding: url('chrome://xforms/content/selectsnw-xhtml.xml#select');
 }
-html|*:root select html|span[anonid="control"] {
-  -moz-binding: url('chrome://xforms/content/select-xhtml.xml#controlwidget-select-compact');
+html|*:root select html|span[anonid="nativewidget"] {
+  -moz-binding: url('chrome://xforms/content/selectsnw-xhtml.xml#nativewidget-select-compact');
 }
 
 xul|*:root select {
-  -moz-binding: url('chrome://xforms/content/select-xul.xml#xformswidget-select-compact');
+  -moz-binding: url('chrome://xforms/content/selectsnw-xul.xml#select');
 }
-xul|*:root select xul|box[anonid="control"] {
-  -moz-binding: url('chrome://xforms/content/select-xul.xml#controlwidget-select-compact');
+xul|*:root select xul|box[anonid="nativewidget"] {
+  -moz-binding: url('chrome://xforms/content/selectsnw-xul.xml#nativewidget-select-compact');
 }
 
   /* select appearance="full" */