diff --git a/doc/etemplate2-rng.php b/doc/etemplate2-rng.php
index 4ad443e3e2..cdf87cead4 100755
--- a/doc/etemplate2-rng.php
+++ b/doc/etemplate2-rng.php
@@ -54,6 +54,7 @@ $overwrites = [
 	'Et2InputWidget' => [
 		'.attrs' => [
 			'tabindex' => 'int',
+            'value' => 'string',
 		],
 	],
 	'Et2Textbox' => [
@@ -61,8 +62,12 @@ $overwrites = [
 			'placeholder' => 'string',
 			'maxlength' => 'int',
 			'size' => 'int',
+            'type' => 'string',
 		],
 	],
+    'et2-textbox' => [
+            '.children' => ['.quantity' => 'optional', 'et2-image'],
+    ],
 	'Et2InvokerMixin' => 'Et2TextBox',
 	'et2-description' => [
 		'.attrs' => [
@@ -75,6 +80,7 @@ $overwrites = [
 			'rows' => 'int',
 			'resizeRatio' => 'number',  // is this correct
 			'size' => 'int',
+            'placeholder' => 'string',
 		],
 	],
 	'et2-date' => [
@@ -111,6 +117,9 @@ $overwrites = [
 	'et2-tab-panel' => null,
 	'et2-details' => [
 		'.children' => 'Widgets',
+		'.attrs' => [
+			'summary' => 'string',
+		],
 	],
 	'et2-split' => [
 		'.children' => 'Widgets',
@@ -129,6 +138,7 @@ $overwrites = [
 	    '.attrs' => [
 		    'image' => 'string',
             'noSubmit' => 'boolean',
+            'hideOnReadonly' => 'boolean',
 	    ],
     ],
     'Et2ButtonIcon' => 'Et2Button',     // no inheritance from Et2Button, but Et2ButtonMixin, which is not recognised
diff --git a/doc/etemplate2/etemplate2.0.dtd b/doc/etemplate2/etemplate2.0.dtd
index 254acf8f8e..202116ed10 100644
--- a/doc/etemplate2/etemplate2.0.dtd
+++ b/doc/etemplate2/etemplate2.0.dtd
@@ -25,11 +25,11 @@
                     |tracker-value|records-value|hidden|radio|radiogroup|diff|styles|customfields|customfields-list|html
                     |htmlarea|toolbar|historylog|hrule|file|progress|vfs|vfs-name|vfs-size|vfs-mode|vfs-upload|video
                     |audio|barcode|itempicker|script|countdown|customfields-types|nextmatch|nextmatch-header
-                    |nextmatch-customfields|nextmatch-sortheader|et2-avatar|et2-avatar-group|et2-lavatar|et2-button
-                    |et2-button-icon|et2-button-scroll|et2-button-timestamp|et2-checkbox|et2-colorpicker|et2-date
+                    |nextmatch-customfields|nextmatch-sortheader|et2-avatar|et2-avatar-group|et2-lavatar|et2-checkbox
+                    |et2-button|et2-button-icon|et2-button-scroll|et2-button-timestamp|et2-colorpicker|et2-date
                     |et2-date-duration|et2-date-range|et2-date-since|et2-date-time|et2-date-timeonly|et2-date-time-today
-                    |et2-description|et2-label|et2-dialog|et2-dropdown-button|et2-email|et2-favorites|et2-iframe
-                    |et2-appicon|et2-image|et2-link|et2-link-add|et2-link-apps|et2-link-entry|et2-link-list
+                    |et2-description|et2-label|et2-dialog|et2-merge-dialog|et2-dropdown-button|et2-email|et2-favorites
+                    |et2-iframe|et2-appicon|et2-image|et2-link|et2-link-add|et2-link-apps|et2-link-entry|et2-link-list
                     |et2-link-paste-dialog|et2-link-search|et2-link-string|et2-link-to|et2-portlet|et2-listbox
                     |et2-select|et2-spinner|et2-switch|et2-textarea|et2-number|et2-password|et2-searchbox|et2-textbox
                     |et2-tree|et2-tree-dropdown|et2-tree-cat|et2-url|et2-url-email|et2-url-fax|et2-url-phone
@@ -1385,6 +1385,38 @@
     span CDATA #IMPLIED
     slot CDATA #IMPLIED>
 
+<!ELEMENT et2-checkbox EMPTY>
+
+<!ATTLIST et2-checkbox
+    selectedValue CDATA 'true'
+    unselectedValue CDATA ''
+    label CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    ariaLabel CDATA #IMPLIED
+    ariaDescription CDATA #IMPLIED
+    helpText CDATA #IMPLIED
+    class CDATA #IMPLIED
+    disabled (false|true|1) 'false'
+    hidden (false|true|1) #IMPLIED
+    accesskey CDATA #IMPLIED
+    parentId CDATA #IMPLIED
+    statustext CDATA #IMPLIED
+    onclick CDATA #IMPLIED
+    noLang (false|true|1) #IMPLIED
+    align CDATA #IMPLIED
+    data CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
+
 <!ELEMENT et2-button EMPTY>
 
 <!ATTLIST et2-button
@@ -1414,7 +1446,9 @@
     slot CDATA #IMPLIED
     image CDATA #IMPLIED
     noSubmit (false|true|1) #IMPLIED
-    tabindex CDATA #IMPLIED>
+    hideOnReadonly (false|true|1) #IMPLIED
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-button-icon EMPTY>
 
@@ -1445,7 +1479,9 @@
     slot CDATA #IMPLIED
     image CDATA #IMPLIED
     noSubmit (false|true|1) #IMPLIED
-    tabindex CDATA #IMPLIED>
+    hideOnReadonly (false|true|1) #IMPLIED
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-button-scroll EMPTY>
 
@@ -1456,7 +1492,8 @@
     span CDATA #IMPLIED
     slot CDATA #IMPLIED
     image CDATA #IMPLIED
-    noSubmit (false|true|1) #IMPLIED>
+    noSubmit (false|true|1) #IMPLIED
+    hideOnReadonly (false|true|1) #IMPLIED>
 
 <!ELEMENT et2-button-timestamp EMPTY>
 
@@ -1490,38 +1527,9 @@
     slot CDATA #IMPLIED
     image CDATA #IMPLIED
     noSubmit (false|true|1) #IMPLIED
-    tabindex CDATA #IMPLIED>
-
-<!ELEMENT et2-checkbox EMPTY>
-
-<!ATTLIST et2-checkbox
-    selectedValue CDATA 'true'
-    unselectedValue CDATA ''
-    label CDATA #IMPLIED
-    readonly (false|true|1) 'false'
-    required (false|true|1) 'false'
-    onchange CDATA #IMPLIED
-    autofocus (false|true|1) #IMPLIED
-    autocomplete CDATA 'on'
-    ariaLabel CDATA #IMPLIED
-    ariaDescription CDATA #IMPLIED
-    helpText CDATA #IMPLIED
-    class CDATA #IMPLIED
-    disabled (false|true|1) 'false'
-    hidden (false|true|1) #IMPLIED
-    accesskey CDATA #IMPLIED
-    parentId CDATA #IMPLIED
-    statustext CDATA #IMPLIED
-    onclick CDATA #IMPLIED
-    noLang (false|true|1) #IMPLIED
-    align CDATA #IMPLIED
-    data CDATA #IMPLIED
-    id CDATA #IMPLIED
-    width CDATA #IMPLIED
-    height CDATA #IMPLIED
-    span CDATA #IMPLIED
-    slot CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    hideOnReadonly (false|true|1) #IMPLIED
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-colorpicker EMPTY>
 
@@ -1550,7 +1558,8 @@
     height CDATA #IMPLIED
     span CDATA #IMPLIED
     slot CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-date EMPTY>
 
@@ -1585,7 +1594,8 @@
     slot CDATA #IMPLIED
     yearRange CDATA #IMPLIED
     dataFormat CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-date-duration EMPTY>
 
@@ -1622,7 +1632,8 @@
     height CDATA #IMPLIED
     span CDATA #IMPLIED
     slot CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-date-range EMPTY>
 
@@ -1708,7 +1719,8 @@
     height CDATA #IMPLIED
     span CDATA #IMPLIED
     slot CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-date-timeonly EMPTY>
 
@@ -1741,7 +1753,8 @@
     height CDATA #IMPLIED
     span CDATA #IMPLIED
     slot CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-date-time-today EMPTY>
 
@@ -1849,6 +1862,28 @@
     span CDATA #IMPLIED
     slot CDATA #IMPLIED>
 
+<!ELEMENT et2-merge-dialog EMPTY>
+
+<!ATTLIST et2-merge-dialog
+    application CDATA #IMPLIED
+    path CDATA #IMPLIED
+    class CDATA #IMPLIED
+    disabled (false|true|1) 'false'
+    hidden (false|true|1) #IMPLIED
+    accesskey CDATA #IMPLIED
+    parentId CDATA #IMPLIED
+    statustext CDATA #IMPLIED
+    label CDATA #IMPLIED
+    onclick CDATA #IMPLIED
+    noLang (false|true|1) #IMPLIED
+    align CDATA #IMPLIED
+    data CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
+
 <!ELEMENT et2-dropdown-button EMPTY>
 
 <!ATTLIST et2-dropdown-button
@@ -1882,7 +1917,7 @@
 <!ELEMENT et2-email EMPTY>
 
 <!ATTLIST et2-email
-    value CDATA '[]'
+    value CDATA #IMPLIED
     placeholder CDATA ''
     allowDragAndDrop CDATA 'true'
     allowPlaceholder (false|true|1) #IMPLIED
@@ -2219,7 +2254,7 @@
     noLang (false|true|1) #IMPLIED
     align CDATA #IMPLIED
     data CDATA #IMPLIED
-    value CDATA '[]'
+    value CDATA #IMPLIED
     title CDATA 'Select'
     mode CDATA #IMPLIED
     buttonLabel CDATA 'Select'
@@ -2484,7 +2519,8 @@
     height CDATA #IMPLIED
     span CDATA #IMPLIED
     slot CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-textarea EMPTY>
 
@@ -2518,7 +2554,9 @@
     rows CDATA #IMPLIED
     resizeRatio CDATA #IMPLIED
     size CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    placeholder CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-number EMPTY>
 
@@ -2556,7 +2594,9 @@
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     size CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    type CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-password EMPTY>
 
@@ -2592,7 +2632,9 @@
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     size CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    type CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-searchbox EMPTY>
 
@@ -2628,9 +2670,11 @@
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     size CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    type CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
-<!ELEMENT et2-textbox EMPTY>
+<!ELEMENT et2-textbox (et2-image)?>
 
 <!ATTLIST et2-textbox
     validator CDATA #IMPLIED
@@ -2662,7 +2706,9 @@
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     size CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    type CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-tree EMPTY>
 
@@ -2815,7 +2861,9 @@
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     size CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    type CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-url-email EMPTY>
 
@@ -2850,7 +2898,9 @@
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     size CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    type CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-url-fax EMPTY>
 
@@ -2884,7 +2934,9 @@
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     size CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    type CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-url-phone EMPTY>
 
@@ -2918,7 +2970,9 @@
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     size CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    type CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-vfs-mime EMPTY>
 
@@ -2983,7 +3037,7 @@
 
 <!ATTLIST et2-vfs-select
     image CDATA #IMPLIED
-    value CDATA '[]'
+    value CDATA #IMPLIED
     title CDATA 'Select'
     mode CDATA #IMPLIED
     buttonLabel CDATA 'Select'
@@ -3022,7 +3076,7 @@
 <!ELEMENT et2-vfs-select-dialog EMPTY>
 
 <!ATTLIST et2-vfs-select-dialog
-    value CDATA '[]'
+    value CDATA #IMPLIED
     title CDATA 'Select'
     mode CDATA #IMPLIED
     buttonLabel CDATA 'Select'
@@ -4174,7 +4228,8 @@
     width CDATA #IMPLIED
     height CDATA #IMPLIED
     span CDATA #IMPLIED
-    slot CDATA #IMPLIED>
+    slot CDATA #IMPLIED
+    summary CDATA #IMPLIED>
 
 <!ELEMENT et2-split (%Widgets;)+>
 
@@ -4341,7 +4396,8 @@
     span CDATA #IMPLIED
     slot CDATA #IMPLIED
     emptyLabel CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
+    tabindex CDATA #IMPLIED
+    value CDATA #IMPLIED>
 
 <!ELEMENT et2-nextmatch-header-entry EMPTY>
 
@@ -4418,4 +4474,4 @@
     slot CDATA #IMPLIED
     rows CDATA #IMPLIED
     tabindex CDATA #IMPLIED
-    allowFreeEntries (false|true|1) #IMPLIED>
\ No newline at end of file
+    allowFreeEntries (false|true|1) #IMPLIED>
diff --git a/doc/etemplate2/etemplate2.0.rng b/doc/etemplate2/etemplate2.0.rng
index 3d508d82f5..2c1aa31e61 100644
--- a/doc/etemplate2/etemplate2.0.rng
+++ b/doc/etemplate2/etemplate2.0.rng
@@ -66,11 +66,11 @@
       <ref name="et2-avatar"/>
       <ref name="et2-avatar-group"/>
       <ref name="et2-lavatar"/>
+      <ref name="et2-checkbox"/>
       <ref name="et2-button"/>
       <ref name="et2-button-icon"/>
       <ref name="et2-button-scroll"/>
       <ref name="et2-button-timestamp"/>
-      <ref name="et2-checkbox"/>
       <ref name="et2-colorpicker"/>
       <ref name="et2-date"/>
       <ref name="et2-date-duration"/>
@@ -82,6 +82,7 @@
       <ref name="et2-description"/>
       <ref name="et2-label"/>
       <ref name="et2-dialog"/>
+      <ref name="et2-merge-dialog"/>
       <ref name="et2-dropdown-button"/>
       <ref name="et2-email"/>
       <ref name="et2-favorites"/>
@@ -4953,6 +4954,134 @@
       <attribute name="slot"/>
     </optional>
   </define>
+  <define name="et2-checkbox">
+    <element name="et2-checkbox">
+      <ref name="attlist.et2-checkbox"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-checkbox" combine="interleave">
+    <optional>
+      <attribute name="selectedValue" a:defaultValue="true"/>
+    </optional>
+    <optional>
+      <attribute name="unselectedValue" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="label"/>
+    </optional>
+    <optional>
+      <attribute name="readonly" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="required" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="onchange"/>
+    </optional>
+    <optional>
+      <attribute name="autofocus">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="autocomplete" a:defaultValue="on"/>
+    </optional>
+    <optional>
+      <attribute name="ariaLabel"/>
+    </optional>
+    <optional>
+      <attribute name="ariaDescription"/>
+    </optional>
+    <optional>
+      <attribute name="helpText"/>
+    </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="hidden">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="accesskey"/>
+    </optional>
+    <optional>
+      <attribute name="parentId"/>
+    </optional>
+    <optional>
+      <attribute name="statustext"/>
+    </optional>
+    <optional>
+      <attribute name="onclick"/>
+    </optional>
+    <optional>
+      <attribute name="noLang">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="align"/>
+    </optional>
+    <optional>
+      <attribute name="data"/>
+    </optional>
+    <optional>
+      <attribute name="id"/>
+    </optional>
+    <optional>
+      <attribute name="width"/>
+    </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
+    <optional>
+      <attribute name="span"/>
+    </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+  </define>
   <define name="et2-button">
     <element name="et2-button">
       <ref name="attlist.et2-button"/>
@@ -5080,9 +5209,21 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="hideOnReadonly">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-button-icon">
     <element name="et2-button-icon">
@@ -5211,9 +5352,21 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="hideOnReadonly">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-button-scroll">
     <element name="et2-button-scroll">
@@ -5249,6 +5402,15 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="hideOnReadonly">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
   </define>
   <define name="et2-button-timestamp">
     <element name="et2-button-timestamp">
@@ -5387,27 +5549,7 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="tabindex"/>
-    </optional>
-  </define>
-  <define name="et2-checkbox">
-    <element name="et2-checkbox">
-      <ref name="attlist.et2-checkbox"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="attlist.et2-checkbox" combine="interleave">
-    <optional>
-      <attribute name="selectedValue" a:defaultValue="true"/>
-    </optional>
-    <optional>
-      <attribute name="unselectedValue" a:defaultValue=""/>
-    </optional>
-    <optional>
-      <attribute name="label"/>
-    </optional>
-    <optional>
-      <attribute name="readonly" a:defaultValue="false">
+      <attribute name="hideOnReadonly">
         <choice>
           <value>false</value>
           <value>true</value>
@@ -5415,105 +5557,12 @@
         </choice>
       </attribute>
     </optional>
-    <optional>
-      <attribute name="required" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="onchange"/>
-    </optional>
-    <optional>
-      <attribute name="autofocus">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="autocomplete" a:defaultValue="on"/>
-    </optional>
-    <optional>
-      <attribute name="ariaLabel"/>
-    </optional>
-    <optional>
-      <attribute name="ariaDescription"/>
-    </optional>
-    <optional>
-      <attribute name="helpText"/>
-    </optional>
-    <optional>
-      <attribute name="class"/>
-    </optional>
-    <optional>
-      <attribute name="disabled" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="hidden">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="accesskey"/>
-    </optional>
-    <optional>
-      <attribute name="parentId"/>
-    </optional>
-    <optional>
-      <attribute name="statustext"/>
-    </optional>
-    <optional>
-      <attribute name="onclick"/>
-    </optional>
-    <optional>
-      <attribute name="noLang">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="align"/>
-    </optional>
-    <optional>
-      <attribute name="data"/>
-    </optional>
-    <optional>
-      <attribute name="id"/>
-    </optional>
-    <optional>
-      <attribute name="width"/>
-    </optional>
-    <optional>
-      <attribute name="height"/>
-    </optional>
-    <optional>
-      <attribute name="span"/>
-    </optional>
-    <optional>
-      <attribute name="slot"/>
-    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-colorpicker">
     <element name="et2-colorpicker">
@@ -5633,6 +5682,9 @@
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-date">
     <element name="et2-date">
@@ -5782,6 +5834,9 @@
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-date-duration">
     <element name="et2-date-duration">
@@ -5949,6 +6004,9 @@
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-date-range">
     <element name="et2-date-range">
@@ -6303,6 +6361,9 @@
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-date-timeonly">
     <element name="et2-date-timeonly">
@@ -6446,6 +6507,9 @@
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-date-time-today">
     <element name="et2-date-time-today">
@@ -6851,6 +6915,86 @@
       <attribute name="slot"/>
     </optional>
   </define>
+  <define name="et2-merge-dialog">
+    <element name="et2-merge-dialog">
+      <ref name="attlist.et2-merge-dialog"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-merge-dialog" combine="interleave">
+    <optional>
+      <attribute name="application"/>
+    </optional>
+    <optional>
+      <attribute name="path"/>
+    </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="hidden">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="accesskey"/>
+    </optional>
+    <optional>
+      <attribute name="parentId"/>
+    </optional>
+    <optional>
+      <attribute name="statustext"/>
+    </optional>
+    <optional>
+      <attribute name="label"/>
+    </optional>
+    <optional>
+      <attribute name="onclick"/>
+    </optional>
+    <optional>
+      <attribute name="noLang">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="align"/>
+    </optional>
+    <optional>
+      <attribute name="data"/>
+    </optional>
+    <optional>
+      <attribute name="id"/>
+    </optional>
+    <optional>
+      <attribute name="width"/>
+    </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
+    <optional>
+      <attribute name="span"/>
+    </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
+  </define>
   <define name="et2-dropdown-button">
     <element name="et2-dropdown-button">
       <ref name="attlist.et2-dropdown-button"/>
@@ -6981,7 +7125,7 @@
   </define>
   <define name="attlist.et2-email" combine="interleave">
     <optional>
-      <attribute name="value" a:defaultValue="[]"/>
+      <attribute name="value"/>
     </optional>
     <optional>
       <attribute name="placeholder" a:defaultValue=""/>
@@ -8342,7 +8486,7 @@
       <attribute name="data"/>
     </optional>
     <optional>
-      <attribute name="value" a:defaultValue="[]"/>
+      <attribute name="value"/>
     </optional>
     <optional>
       <attribute name="title" a:defaultValue="Select"/>
@@ -9403,6 +9547,9 @@
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-textarea">
     <element name="et2-textarea">
@@ -9534,9 +9681,15 @@
     <optional>
       <attribute name="size"/>
     </optional>
+    <optional>
+      <attribute name="placeholder"/>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-number">
     <element name="et2-number">
@@ -9680,9 +9833,15 @@
     <optional>
       <attribute name="size"/>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-password">
     <element name="et2-password">
@@ -9826,9 +9985,15 @@
     <optional>
       <attribute name="size"/>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-searchbox">
     <element name="et2-searchbox">
@@ -9978,14 +10143,22 @@
     <optional>
       <attribute name="size"/>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-textbox">
     <element name="et2-textbox">
       <ref name="attlist.et2-textbox"/>
-      <empty/>
+      <optional>
+        <ref name="et2-image"/>
+      </optional>
     </element>
   </define>
   <define name="attlist.et2-textbox" combine="interleave">
@@ -10112,9 +10285,15 @@
     <optional>
       <attribute name="size"/>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-tree">
     <element name="et2-tree">
@@ -10741,9 +10920,15 @@
     <optional>
       <attribute name="size"/>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-url-email">
     <element name="et2-url-email">
@@ -10878,9 +11063,15 @@
     <optional>
       <attribute name="size"/>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-url-fax">
     <element name="et2-url-fax">
@@ -11012,9 +11203,15 @@
     <optional>
       <attribute name="size"/>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-url-phone">
     <element name="et2-url-phone">
@@ -11146,9 +11343,15 @@
     <optional>
       <attribute name="size"/>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-vfs-mime">
     <element name="et2-vfs-mime">
@@ -11390,7 +11593,7 @@
       <attribute name="image"/>
     </optional>
     <optional>
-      <attribute name="value" a:defaultValue="[]"/>
+      <attribute name="value"/>
     </optional>
     <optional>
       <attribute name="title" a:defaultValue="Select"/>
@@ -11545,7 +11748,7 @@
   </define>
   <define name="attlist.et2-vfs-select-dialog" combine="interleave">
     <optional>
-      <attribute name="value" a:defaultValue="[]"/>
+      <attribute name="value"/>
     </optional>
     <optional>
       <attribute name="title" a:defaultValue="Select"/>
@@ -16295,6 +16498,9 @@
     <optional>
       <attribute name="slot"/>
     </optional>
+    <optional>
+      <attribute name="summary"/>
+    </optional>
   </define>
   <define name="et2-split">
     <element name="et2-split">
@@ -16979,6 +17185,9 @@
     <optional>
       <attribute name="tabindex"/>
     </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
   </define>
   <define name="et2-nextmatch-header-entry">
     <element name="et2-nextmatch-header-entry">
@@ -17299,4 +17508,4 @@
       </attribute>
     </optional>
   </define>
-</grammar>
\ No newline at end of file
+</grammar>