From d1b3786b2a111c502fb1ed747d82fdf6efc37e47 Mon Sep 17 00:00:00 2001
From: ralf <rb@egroupware.org>
Date: Fri, 19 Apr 2024 12:23:10 +0200
Subject: [PATCH] WIP eTemplate2.0 DTD

---
 doc/etemplate2-rng.php                        |  127 +-
 .../custom-elements-manifest.config.mjs       |    6 +-
 doc/etemplate2/etemplate2.0.dtd               | 1710 ++++-
 doc/etemplate2/etemplate2.0.rng               | 6592 +++++++++++++++--
 doc/etemplate2/etemplate2.dtd                 |   11 +-
 doc/etemplate2/etemplate2.rng                 |   17 +-
 6 files changed, 7404 insertions(+), 1059 deletions(-)
 mode change 100644 => 100755 doc/etemplate2-rng.php

diff --git a/doc/etemplate2-rng.php b/doc/etemplate2-rng.php
old mode 100644
new mode 100755
index 1864ad5a0a..9e2c5ce796
--- a/doc/etemplate2-rng.php
+++ b/doc/etemplate2-rng.php
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
 <?php
 /**
  * eTemplate2 XML schema
@@ -31,9 +32,10 @@ if (!file_exists(($file = __DIR__."/etemplate2/etemplate2.rng")))
 	die("Missing file '$file', you need to generate it from 'etemplate2.dtd' e.g. with PHPStorm!");
 }
 $grammar = new SimpleXMLElement(file_get_contents($file));
-$widgets = getByName($grammar, 'Widgets');
+$widgets_choice = getByName($grammar, 'Widgets')->choice;
 /**
  * Manually overwriting problems / errors in what we automatically generate
+ * Use class-name (e.g. Et2Button) so all descends inherit the fix, use-tag to fix only specific widget.
  * @todo fix in TS sources
  */
 $overwrites = [
@@ -44,7 +46,9 @@ $overwrites = [
 			'id' => 'string',   // commented out with some reasoning in Et2Widget
 			//'data' => null,   // ToDo: not sure, but AFAIK this is no attribute, but somehow listed in each widget
 			'width'  => 'string',
+            'height' => 'string',
 			'span' => 'string', // actually int|"all"
+            'slot' => 'string',
 		],
 	],
 	'Et2InputWidget' => [
@@ -109,7 +113,34 @@ $overwrites = [
 	'et2-split' => [
 		'.children' => 'Widgets',
 	],
-	'et2-select-*' => 'et2-select',     // seems like et2-select-* widgets are NOT parsed
+	'et2-url-email' => [
+		'.attrs' => [
+			'emailDisplay' => 'string', // can't see that anywhere in the code, but in addressbook.index.xet
+		],
+	],
+	'et2-nextmatch-header-custom' => [
+        '.attrs' => [
+            'emptyLabel' => 'string',
+        ],
+    ],
+    'Et2Button' => [
+	    '.attrs' => [
+		    'image' => 'string',
+            'noSubmit' => 'boolean',
+	    ],
+    ],
+    'Et2Select' => [
+        '.attrs' => [
+	        'rows' => 'int',
+            'tabindex' => 'int',
+            'allowFreeEntries' => 'boolean',
+        ],
+    ],
+    'et2-email' => [
+	    '.attrs' => [
+		    'onTagClick' => 'function',
+	    ],
+    ],
 ];
 
 /**
@@ -118,13 +149,75 @@ $overwrites = [
 // make overlay the only allowed start element
 removeNode($grammar->start->choice);
 $grammar->start->addChild('ref')->addAttribute('name', 'overlay');
-// overlay can only container template, not all widgets
-getByName($grammar, 'overlay')->element->zeroOrMore->ref->attributes()['name'] = 'template';
-getByName($grammar, 'attlist.vfs-upload')->addChild('optional')
-	->addChild('attribute')->addAttribute('name', 'callback');
-// add statustext to tab
-getByName($grammar, 'attlist.tab')->addChild('optional')
-	->addChild('attribute')->addAttribute('name', 'statustext');
+// fix legacy widgets: attribute-name => (array of) widgets
+$missing_legacy_attributes = [
+    'callback' => 'vfs-upload',
+    'statustext' => 'tab',
+	'minWidth' => 'column',
+	'maxWidth' => 'column',
+    'id' => [
+		'.optional' => false,
+		'nextmatch-header', 'nextmatch-sortheader', 'nextmatch-customfields', 'nextmatch',
+    ],
+	'template' => ['.optional' => false, 'nextmatch'],
+	'header_left' => 'nextmatch',
+	'header_row' => 'nextmatch',
+	'header_right' => 'nextmatch',
+	'disabled' => 'nextmatch',
+	'onselect' => 'nextmatch',
+	'span' => ['nextmatch', 'nextmatch-header', 'nextmatch-customfields', 'nextmatch-sortheader'],
+	'class' => ['nextmatch','nextmatch-header', 'nextmatch-customfields', 'nextmatch-sortheader'],
+	'label' => [
+        '.optional' => false,
+        'nextmatch-header', 'nextmatch-sortheader',
+    ],
+    'sortmode' => [
+        '.values' => ['ASC', 'DESC'],
+        '.default' => 'ASC',
+	    'nextmatch-sortheader',
+    ],
+];
+foreach($missing_legacy_attributes as $attribute => $widgets)
+{
+    foreach((array)$widgets as $key => $widget)
+    {
+        if (!is_int($key)) continue;	// .(values|default)
+        // widget not found add it plus it's attribute-list
+        if (!getByName($grammar, $widget))
+        {
+	        $widgets_choice->addChild('ref')->addAttribute('name', $widget);
+	        ($define = $grammar->addChild('define'))->addAttribute('name', $widget);
+	        ($element = $define->addChild('element'))->addAttribute('name', $widget);
+            $element->addChild('ref')->addAttribute('name', 'attlist.'.$widget);
+            $element->addChild('empty');	// no children allowed
+	        $grammar->addChild('define')->addAttribute('name', 'attlist.'.$widget);
+        }
+        // add (optional) attribute
+        if (!is_array($widgets) || (!isset($widgets['.optional']) || $widgets['.optional'] === true))
+        {
+	        $attr = getByName($grammar, 'attlist.'.$widget)->addChild('optional')
+	        	->addChild('attribute');
+        }
+        else
+        {
+	        $attr = getByName($grammar, 'attlist.'.$widget)->addChild('attribute');
+        }
+ 	    $attr->addAttribute('name', $attribute);
+        // add values and/or default
+        if (is_array($widgets) && isset($widgets['.values']))
+        {
+            $choice = $attr->addChild('choice');
+            foreach($widgets['.values'] as $value)
+            {
+                $choice->addChild('value', $value);
+            }
+        }
+	    if (is_array($widgets) && isset($widgets['.default']))
+	    {
+            $attr->addAttribute('a:defaultValue', $widgets['.default'], 'http://relaxng.org/ns/compatibility/annotations/1.0');
+	    }
+    }
+}
 
 // build a hashed version of all classes, members and attributes to e.g. find ancestors
 $classes = [];
@@ -175,7 +268,7 @@ foreach($data['modules'] as $module)
 		$attrs = $element->addChild('ref');
 		$attrs->addAttribute('name', 'attlist.'.$export['name']);
 		// add to widgets
-		$widgets->choice->addChild('ref')->addAttribute('name', $export['name']);
+		$widgets_choice->addChild('ref')->addAttribute('name', $export['name']);
 
 		// add the element-attributes
 		$attrs = $grammar->addChild('define');
@@ -193,10 +286,11 @@ foreach($data['modules'] as $module)
 		}
 		else
 		{
+            $list = $element->addChild('oneOrMore');    // zeroOrMore for e.g. empty boxes?
 			// add allowed children
 			foreach((array)$overwrites[$export['name']]['.children'] as $child)
 			{
-				$element->addChild('ref')->addAttribute('name', $child);
+				$list->addChild('ref')->addAttribute('name', $child);
 			}
 		}
 
@@ -206,7 +300,7 @@ foreach($data['modules'] as $module)
 }
 
 $remove = [];
-foreach($widgets->choice->children() as $widget)
+foreach($widgets_choice->children() as $widget)
 {
 	if (preg_match($overwrites['.remove'], $name=(string)$widget->attributes()['name']))
 	{
@@ -261,8 +355,8 @@ echo preg_replace('#<choice>
  */
 function removeWidget(string $name)
 {
-	global $grammar, $widgets;
-	if (removeByName($widgets->choice, $name))
+	global $grammar, $widgets_choice;
+	if (removeByName($widgets_choice, $name))
 	{
 		removeByName($grammar, $name);
 		removeByName($grammar, 'attlist.'.$name);
@@ -381,7 +475,10 @@ function attributes(array $class, ?SimpleXMLElement $attrs=null)
 			{
 				$default = substr($default, 1, -1);
 			}
-			$attribute->addAttribute('a:defaultValue', $default, 'http://relaxng.org/ns/compatibility/annotations/1.0');
+            if ($default !== 'undefined')   // do NOT add undefined, it's the default anyway
+            {
+                $attribute->addAttribute('a:defaultValue', $default, 'http://relaxng.org/ns/compatibility/annotations/1.0');
+            }
 		}
 		switch ($attr['type']['text'] ?? 'any')
 		{
diff --git a/doc/etemplate2/custom-elements-manifest.config.mjs b/doc/etemplate2/custom-elements-manifest.config.mjs
index f9f541d3d1..80782051ec 100644
--- a/doc/etemplate2/custom-elements-manifest.config.mjs
+++ b/doc/etemplate2/custom-elements-manifest.config.mjs
@@ -26,9 +26,9 @@ function replace(string, terms)
 }
 
 export default {
-	globs: ["api/js/etemplate/**/Et2*/*.ts"],
+	globs: ["api/js/etemplate/**/Et2*.ts","api/js/etemplate/Et2Nextmatch/**/*.ts"],
 	/** Globs to exclude */
-	exclude: [],//, 'et2_*.ts', '**/test/*', '**/*.styles.ts', '**/*.test.ts'],
+	exclude: ["api/js/etemplate/**/test/*"],//, 'et2_*.ts', '**/test/*', '**/*.styles.ts', '**/*.test.ts'],
 	dev: false,
 	litelement: true,
 	plugins: [
@@ -195,4 +195,4 @@ export default {
 
 		 */
 	]
-};
+};
\ No newline at end of file
diff --git a/doc/etemplate2/etemplate2.0.dtd b/doc/etemplate2/etemplate2.0.dtd
index 1046fca92c..fcb3022175 100644
--- a/doc/etemplate2/etemplate2.0.dtd
+++ b/doc/etemplate2/etemplate2.0.dtd
@@ -24,16 +24,23 @@
 <!ENTITY % Widgets "template|grid|groupbox|caption|entry|contact-value|contact-account|contact-template|infolog-value
                     |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|et2-avatar|et2-avatar-group|et2-lavatar|et2-colorpicker
-                    |et2-checkbox|et2-button|et2-button-icon|et2-button-scroll|et2-button-timestamp|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-link-paste-dialog|et2-link-search|et2-link-string|et2-link-to|et2-nextmatch-columnselection
-                    |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|et2-vfs-mime|et2-vfs-path|et2-vfs-select|et2-vfs-select-dialog|et2-vfs-select-row
-                    |et2-vfs-uid|et2-vfs-gid|et2-details|et2-box|et2-hbox|et2-vbox|et2-split|et2-tabbox">
+                    |audio|barcode|itempicker|script|countdown|nextmatch-header|nextmatch-sortheader
+                    |nextmatch-customfields|nextmatch|et2-avatar|et2-avatar-group|et2-lavatar|et2-checkbox|et2-button
+                    |et2-button-icon|et2-button-scroll|et2-button-timestamp|et2-colorpicker|et2-description|et2-label
+                    |et2-date|et2-date-duration|et2-date-range|et2-date-since|et2-date-time|et2-date-timeonly
+                    |et2-date-time-today|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-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|et2-vfs-mime
+                    |et2-vfs-path|et2-vfs-select|et2-vfs-select-dialog|et2-vfs-select-row|et2-vfs-uid|et2-vfs-gid
+                    |et2-description-expose|et2-image-expose|et2-select-access|et2-select-account|et2-select-app
+                    |et2-select-bitwise|et2-select-bool|et2-select-cat|et2-select-country|et2-select-day|et2-select-dow
+                    |et2-select-hour|et2-select-lang|et2-select-month|et2-select-number|et2-select-percent
+                    |et2-select-priority|et2-select-state|et2-select-tab|et2-select-thumbnail|et2-select-timezone
+                    |et2-select-year|et2-category-tag|et2-email-tag|et2-tag|et2-thumbnail-tag|et2-box|et2-hbox|et2-vbox
+                    |et2-details|et2-split|et2-tabbox|et2-nextmatch-columnselection|et2-nextmatch-header-account
+                    |et2-nextmatch-header-custom|et2-nextmatch-header-entry|et2-nextmatch-header-filter">
 
 <!ELEMENT overlay (template)*>
 
@@ -74,18 +81,21 @@
 <!ATTLIST column
     disabled CDATA #IMPLIED
     class CDATA #IMPLIED
-    width CDATA #IMPLIED>
+    width CDATA #IMPLIED
+    minWidth CDATA #IMPLIED
+    maxWidth CDATA #IMPLIED>
 
 <!ELEMENT rows (row)*>
 
-<!ELEMENT row (%Widgets;)>
+<!ELEMENT row (%Widgets;)+>
 
 <!ATTLIST row
     class CDATA #IMPLIED
     height CDATA #IMPLIED
     valign CDATA #IMPLIED
     disabled CDATA #IMPLIED
-    part CDATA #IMPLIED>
+    part CDATA #IMPLIED
+    id CDATA #IMPLIED>
 
 <!ATTLIST grid
     border CDATA #IMPLIED
@@ -554,7 +564,7 @@
     fields CDATA #IMPLIED
     value CDATA #IMPLIED
     type_filter CDATA #IMPLIED
-    private (false|true|1) 'undefined'
+    private (false|true|1) #IMPLIED
     sub_app CDATA #IMPLIED
     onchange CDATA #IMPLIED
     prefix CDATA '#'
@@ -588,7 +598,7 @@
     fields CDATA #IMPLIED
     value CDATA #IMPLIED
     type_filter CDATA #IMPLIED
-    private (false|true|1) 'undefined'
+    private (false|true|1) #IMPLIED
     sub_app CDATA #IMPLIED
     onchange CDATA #IMPLIED
     prefix CDATA '#'
@@ -688,7 +698,7 @@
     type CDATA #IMPLIED
     attributes CDATA #IMPLIED>
 
-<!ELEMENT tabs (tab)>
+<!ELEMENT tabs (tab)*>
 
 <!ELEMENT tab EMPTY>
 
@@ -1245,6 +1255,43 @@
     readonly CDATA #IMPLIED
     attributes CDATA #IMPLIED>
 
+<!ELEMENT nextmatch-header EMPTY>
+
+<!ATTLIST nextmatch-header
+    id CDATA #REQUIRED
+    span CDATA #IMPLIED
+    class CDATA #IMPLIED
+    label CDATA #REQUIRED>
+
+<!ELEMENT nextmatch-sortheader EMPTY>
+
+<!ATTLIST nextmatch-sortheader
+    id CDATA #REQUIRED
+    span CDATA #IMPLIED
+    class CDATA #IMPLIED
+    label CDATA #REQUIRED
+    sortmode (ASC|DESC) 'ASC'>
+
+<!ELEMENT nextmatch-customfields EMPTY>
+
+<!ATTLIST nextmatch-customfields
+    id CDATA #REQUIRED
+    span CDATA #IMPLIED
+    class CDATA #IMPLIED>
+
+<!ELEMENT nextmatch EMPTY>
+
+<!ATTLIST nextmatch
+    id CDATA #REQUIRED
+    template CDATA #REQUIRED
+    header_left CDATA #IMPLIED
+    header_row CDATA #IMPLIED
+    header_right CDATA #IMPLIED
+    disabled CDATA #IMPLIED
+    onselect CDATA #IMPLIED
+    span CDATA #IMPLIED
+    class CDATA #IMPLIED>
+
 <!ELEMENT et2-avatar EMPTY>
 
 <!ATTLIST et2-avatar
@@ -1268,7 +1315,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-avatar-group EMPTY>
 
@@ -1287,7 +1336,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-lavatar EMPTY>
 
@@ -1314,31 +1365,9 @@
     size CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
-
-<!ELEMENT et2-colorpicker EMPTY>
-
-<!ATTLIST et2-colorpicker
-    label CDATA #IMPLIED
-    readonly (false|true|1) 'false'
-    required (false|true|1) 'false'
-    onchange CDATA #IMPLIED
-    autofocus (false|true|1) #IMPLIED
-    autocomplete CDATA 'on'
-    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
-    tabindex CDATA #IMPLIED>
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-checkbox EMPTY>
 
@@ -1363,17 +1392,15 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-button EMPTY>
 
 <!ATTLIST et2-button
     label CDATA #IMPLIED
-    image CDATA #IMPLIED
-    hide (false|true|1) 'false'
-    noSubmit (false|true|1) 'false'
-    noValidation (false|true|1) 'false'
     readonly (false|true|1) 'false'
     required (false|true|1) 'false'
     onchange CDATA #IMPLIED
@@ -1391,16 +1418,16 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    image CDATA #IMPLIED
+    noSubmit (false|true|1) #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-button-icon EMPTY>
 
 <!ATTLIST et2-button-icon
-    image CDATA #IMPLIED
-    hide (false|true|1) 'false'
-    noSubmit (false|true|1) 'false'
-    noValidation (false|true|1) 'false'
     label CDATA #IMPLIED
     readonly (false|true|1) 'false'
     required (false|true|1) 'false'
@@ -1419,19 +1446,19 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-button-scroll EMPTY>
 
 <!ATTLIST et2-button-scroll
-    image CDATA #IMPLIED
-    hide (false|true|1) 'false'
-    noSubmit (false|true|1) 'false'
-    noValidation (false|true|1) 'false'
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-button-timestamp EMPTY>
 
@@ -1439,10 +1466,6 @@
     target CDATA #IMPLIED
     format CDATA #IMPLIED
     timezone CDATA #IMPLIED
-    image CDATA 'timestamp'
-    hide (false|true|1) 'false'
-    noSubmit (false|true|1) 'true'
-    noValidation (false|true|1) 'false'
     label CDATA #IMPLIED
     readonly (false|true|1) 'false'
     required (false|true|1) 'false'
@@ -1461,9 +1484,90 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    image CDATA #IMPLIED
+    noSubmit (false|true|1) #IMPLIED
     tabindex CDATA #IMPLIED>
 
+<!ELEMENT et2-colorpicker EMPTY>
+
+<!ATTLIST et2-colorpicker
+    label CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    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>
+
+<!ELEMENT et2-description EMPTY>
+
+<!ATTLIST et2-description
+    activateLinks (false|true|1) 'false'
+    extraLinkTarget CDATA '_browser'
+    extraLinkPopup CDATA ''
+    href CDATA #IMPLIED
+    value CDATA ''
+    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
+    for CDATA #IMPLIED>
+
+<!ELEMENT et2-label EMPTY>
+
+<!ATTLIST et2-label
+    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
+    activateLinks (false|true|1) 'false'
+    extraLinkTarget CDATA '_browser'
+    extraLinkPopup CDATA ''
+    href CDATA #IMPLIED
+    value CDATA ''
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
+
 <!ELEMENT et2-date EMPTY>
 
 <!ATTLIST et2-date
@@ -1489,7 +1593,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     yearRange CDATA #IMPLIED
     dataFormat CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
@@ -1523,7 +1629,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-date-range EMPTY>
@@ -1549,7 +1657,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-date-since EMPTY>
@@ -1570,7 +1680,9 @@
     value CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-date-time EMPTY>
 
@@ -1597,7 +1709,9 @@
     placement CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-date-timeonly EMPTY>
@@ -1625,7 +1739,9 @@
     placement CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-date-time-today EMPTY>
@@ -1645,54 +1761,9 @@
     value CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
-
-<!ELEMENT et2-description EMPTY>
-
-<!ATTLIST et2-description
-    activateLinks (false|true|1) 'false'
-    extraLinkTarget CDATA '_browser'
-    extraLinkPopup CDATA ''
-    href CDATA #IMPLIED
-    value CDATA ''
-    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
-    for CDATA #IMPLIED>
-
-<!ELEMENT et2-label EMPTY>
-
-<!ATTLIST et2-label
-    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
-    activateLinks (false|true|1) 'false'
-    extraLinkTarget CDATA '_browser'
-    extraLinkPopup CDATA ''
-    href CDATA #IMPLIED
-    value CDATA ''
-    id CDATA #IMPLIED
-    width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-dialog EMPTY>
 
@@ -1724,7 +1795,8 @@
     align CDATA #IMPLIED
     data CDATA #IMPLIED
     id CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-dropdown-button EMPTY>
 
@@ -1749,7 +1821,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-email EMPTY>
 
@@ -1783,7 +1857,10 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-favorites EMPTY>
@@ -1812,7 +1889,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-iframe EMPTY>
 
@@ -1836,7 +1915,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-appicon EMPTY>
 
@@ -1859,7 +1940,9 @@
     extraLinkPopup CDATA ''
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-image EMPTY>
 
@@ -1882,7 +1965,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-link EMPTY>
 
@@ -1907,7 +1992,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-link-add EMPTY>
 
@@ -1933,7 +2020,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-link-apps EMPTY>
@@ -1969,7 +2058,12 @@
     select_options CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
 
 <!ELEMENT et2-link-entry EMPTY>
 
@@ -2000,7 +2094,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-link-list EMPTY>
@@ -2027,15 +2123,13 @@
     value CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-link-paste-dialog EMPTY>
 
 <!ATTLIST et2-link-paste-dialog
-    search (false|true|1) 'true'
-    searchUrl CDATA ''
-    searchOptions CDATA '{}'
-    resultsOpen (false|true|1) 'false'
     label CDATA #IMPLIED
     readonly (false|true|1) 'false'
     required (false|true|1) 'false'
@@ -2062,9 +2156,12 @@
     mime CDATA ''
     mimeList CDATA '[&#xA;&#9;&#9;{&#xA;&#9;&#9;&#9;value: &quot;/(application\\/vnd.oasis.opendocument.text|application\\/vnd.openxmlformats-officedocument.wordprocessingml.document)/i&quot;,&#xA;&#9;&#9;&#9;label: &quot;Documents&quot;&#xA;&#9;&#9;},&#xA;&#9;&#9;{&#xA;&#9;&#9;&#9;value: &quot;/(application\\/vnd.oasis.opendocument.spreadsheet|application\\/vnd.openxmlformats-officedocument.spreadsheetml.sheet)/i&quot;,&#xA;&#9;&#9;&#9;label: &quot;Spreadsheets&quot;&#xA;&#9;&#9;},&#xA;&#9;&#9;{value: &quot;image/&quot;, label: &quot;Images&quot;},&#xA;&#9;&#9;{value: &quot;video/&quot;, label: &quot;Videos&quot;}&#xA;&#9;]'
     help-text CDATA ''
+    searchUrl CDATA ''
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-link-search EMPTY>
@@ -2098,7 +2195,12 @@
     select_options CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
 
 <!ELEMENT et2-link-string EMPTY>
 
@@ -2122,7 +2224,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-link-to EMPTY>
 
@@ -2149,34 +2253,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
-    tabindex CDATA #IMPLIED>
-
-<!ELEMENT et2-nextmatch-columnselection EMPTY>
-
-<!ATTLIST et2-nextmatch-columnselection
-    value CDATA #IMPLIED
-    columns CDATA #IMPLIED
-    autoRefresh CDATA #IMPLIED
-    label CDATA #IMPLIED
-    readonly (false|true|1) 'false'
-    required (false|true|1) 'false'
-    onchange CDATA #IMPLIED
-    autofocus (false|true|1) #IMPLIED
-    autocomplete CDATA 'on'
-    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
-    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-portlet EMPTY>
@@ -2200,7 +2279,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-listbox EMPTY>
 
@@ -2227,7 +2308,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-select EMPTY>
 
@@ -2259,7 +2342,12 @@
     select_options CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
 
 <!ELEMENT et2-spinner EMPTY>
 
@@ -2278,7 +2366,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-switch EMPTY>
 
@@ -2303,7 +2393,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-textarea EMPTY>
@@ -2330,6 +2422,7 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     rows CDATA #IMPLIED
     resizeRatio CDATA #IMPLIED
@@ -2362,7 +2455,9 @@
     onkeypress CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
@@ -2392,7 +2487,9 @@
     onkeypress CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
@@ -2422,7 +2519,9 @@
     onkeypress CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
@@ -2450,7 +2549,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
@@ -2489,7 +2590,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-tree-dropdown EMPTY>
 
@@ -2500,10 +2603,6 @@
     open (false|true|1) 'false'
     actions CDATA '{}'
     value CDATA #IMPLIED
-    search (false|true|1) 'true'
-    searchUrl CDATA ''
-    searchOptions CDATA '{}'
-    resultsOpen (false|true|1) 'false'
     emptyLabel CDATA ''
     select_options CDATA #IMPLIED
     label CDATA #IMPLIED
@@ -2524,17 +2623,15 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-tree-cat EMPTY>
 
 <!ATTLIST et2-tree-cat
     application CDATA ''
     globalCategories (false|true|1) 'true'
-    search (false|true|1) 'true'
-    searchUrl CDATA ''
-    searchOptions CDATA '{}'
-    resultsOpen (false|true|1) 'false'
     emptyLabel CDATA ''
     select_options CDATA #IMPLIED
     label CDATA #IMPLIED
@@ -2561,13 +2658,15 @@
     value CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-url EMPTY>
 
 <!ATTLIST et2-url
     allowPath (false|true|1) 'false'
-    trailingSlash (false|true|1) 'undefined'
+    trailingSlash (false|true|1) #IMPLIED
     label CDATA #IMPLIED
     readonly (false|true|1) 'false'
     required (false|true|1) 'false'
@@ -2588,7 +2687,9 @@
     onkeypress CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
@@ -2616,7 +2717,10 @@
     onkeypress CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    emailDisplay CDATA #IMPLIED
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
@@ -2644,7 +2748,9 @@
     onkeypress CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
@@ -2672,7 +2778,9 @@
     onkeypress CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     placeholder CDATA #IMPLIED
     maxlength CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
@@ -2683,9 +2791,27 @@
     mime CDATA #IMPLIED
     symlink (false|true|1) #IMPLIED
     value 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 ''
+    onclick CDATA #IMPLIED
+    noLang (false|true|1) #IMPLIED
+    align CDATA #IMPLIED
+    data CDATA #IMPLIED
+    src CDATA ''
+    defaultSrc CDATA ''
+    href CDATA ''
+    extraLinkTarget CDATA '_self'
+    extraLinkPopup CDATA ''
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-vfs-path EMPTY>
 
@@ -2710,7 +2836,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-vfs-select EMPTY>
@@ -2745,7 +2873,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-vfs-select-dialog EMPTY>
@@ -2762,9 +2892,6 @@
     mimeList CDATA '[&#xA;&#9;&#9;{&#xA;&#9;&#9;&#9;value: &quot;/(application\\/vnd.oasis.opendocument.text|application\\/vnd.openxmlformats-officedocument.wordprocessingml.document)/i&quot;,&#xA;&#9;&#9;&#9;label: &quot;Documents&quot;&#xA;&#9;&#9;},&#xA;&#9;&#9;{&#xA;&#9;&#9;&#9;value: &quot;/(application\\/vnd.oasis.opendocument.spreadsheet|application\\/vnd.openxmlformats-officedocument.spreadsheetml.sheet)/i&quot;,&#xA;&#9;&#9;&#9;label: &quot;Spreadsheets&quot;&#xA;&#9;&#9;},&#xA;&#9;&#9;{value: &quot;image/&quot;, label: &quot;Images&quot;},&#xA;&#9;&#9;{value: &quot;video/&quot;, label: &quot;Videos&quot;}&#xA;&#9;]'
     help-text CDATA ''
     searchUrl CDATA 'EGroupware\\Api\\Etemplate\\Widget\\Vfs::ajax_vfsSelectFiles'
-    search (false|true|1) 'true'
-    searchOptions CDATA '{}'
-    resultsOpen (false|true|1) 'false'
     label CDATA #IMPLIED
     readonly (false|true|1) 'false'
     required (false|true|1) 'false'
@@ -2783,7 +2910,9 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
 
 <!ELEMENT et2-vfs-select-row EMPTY>
@@ -2803,23 +2932,1022 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-vfs-uid EMPTY>
 
 <!ATTLIST et2-vfs-uid
+    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
+    value CDATA #IMPLIED
+    select_options CDATA #IMPLIED
+    searchUrl CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
 <!ELEMENT et2-vfs-gid EMPTY>
 
 <!ATTLIST et2-vfs-gid
+    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
+    value CDATA #IMPLIED
+    select_options CDATA #IMPLIED
+    searchUrl CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
-<!ELEMENT et2-details (%Widgets;)>
+<!ELEMENT et2-description-expose EMPTY>
+
+<!ATTLIST et2-description-expose
+    mime CDATA #IMPLIED
+    mimeData 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
+    activateLinks (false|true|1) 'false'
+    extraLinkTarget CDATA '_browser'
+    extraLinkPopup CDATA ''
+    href CDATA #IMPLIED
+    value CDATA ''
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
+
+<!ELEMENT et2-image-expose EMPTY>
+
+<!ATTLIST et2-image-expose
+    class CDATA #IMPLIED
+    disabled (false|true|1) 'false'
+    hidden (false|true|1) #IMPLIED
+    accesskey CDATA #IMPLIED
+    parentId CDATA #IMPLIED
+    statustext CDATA #IMPLIED
+    label CDATA ''
+    onclick CDATA #IMPLIED
+    noLang (false|true|1) #IMPLIED
+    align CDATA #IMPLIED
+    data CDATA #IMPLIED
+    src CDATA ''
+    defaultSrc CDATA ''
+    href CDATA ''
+    extraLinkTarget CDATA '_self'
+    extraLinkPopup CDATA ''
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
+
+<!ELEMENT et2-select-access EMPTY>
+
+<!ATTLIST et2-select-access
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-account EMPTY>
+
+<!ATTLIST et2-select-account
+    accountType CDATA #IMPLIED
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-app EMPTY>
+
+<!ATTLIST et2-select-app
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-bitwise EMPTY>
+
+<!ATTLIST et2-select-bitwise
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-bool EMPTY>
+
+<!ATTLIST et2-select-bool
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-cat EMPTY>
+
+<!ATTLIST et2-select-cat
+    globalCategories (false|true|1) #IMPLIED
+    application CDATA #IMPLIED
+    parentCat CDATA #IMPLIED
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    hidden (false|true|1) #IMPLIED
+    accesskey CDATA #IMPLIED
+    parentId CDATA #IMPLIED
+    statustext CDATA #IMPLIED
+    onclick CDATA #IMPLIED
+    noLang (false|true|1) 'true'
+    align CDATA #IMPLIED
+    data CDATA #IMPLIED
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-country EMPTY>
+
+<!ATTLIST et2-select-country
+    value CDATA #IMPLIED
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-day EMPTY>
+
+<!ATTLIST et2-select-day
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-dow EMPTY>
+
+<!ATTLIST et2-select-dow
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-hour EMPTY>
+
+<!ATTLIST et2-select-hour
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-lang EMPTY>
+
+<!ATTLIST et2-select-lang
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-month EMPTY>
+
+<!ATTLIST et2-select-month
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-number EMPTY>
+
+<!ATTLIST et2-select-number
+    interval CDATA '1'
+    min CDATA '1'
+    max CDATA '10'
+    leading_zero CDATA ''
+    suffix CDATA ''
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-percent EMPTY>
+
+<!ATTLIST et2-select-percent
+    interval CDATA '10'
+    min CDATA '0'
+    max CDATA '100'
+    leading_zero CDATA ''
+    suffix CDATA '%%'
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-priority EMPTY>
+
+<!ATTLIST et2-select-priority
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-state EMPTY>
+
+<!ATTLIST et2-select-state
+    countryCode CDATA 'DE'
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-tab EMPTY>
+
+<!ATTLIST et2-select-tab
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-thumbnail EMPTY>
+
+<!ATTLIST et2-select-thumbnail
+    placeholder CDATA ''
+    multiple (false|true|1) 'true'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-timezone EMPTY>
+
+<!ATTLIST et2-select-timezone
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-select-year EMPTY>
+
+<!ATTLIST et2-select-year
+    interval CDATA '1'
+    min CDATA '-3'
+    max CDATA '2'
+    leading_zero CDATA ''
+    suffix CDATA ''
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'false'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-category-tag EMPTY>
+
+<!ATTLIST et2-category-tag
+    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
+    editable (false|true|1) 'false'
+    value CDATA ''
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
+
+<!ELEMENT et2-email-tag EMPTY>
+
+<!ATTLIST et2-email-tag
+    contactPlus (false|true|1) 'true'
+    emailDisplay CDATA 'domain'
+    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
+    editable (false|true|1) 'false'
+    value CDATA ''
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
+
+<!ELEMENT et2-tag EMPTY>
+
+<!ATTLIST et2-tag
+    editable (false|true|1) 'false'
+    value CDATA ''
+    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-thumbnail-tag EMPTY>
+
+<!ATTLIST et2-thumbnail-tag
+    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
+    editable (false|true|1) 'false'
+    value CDATA ''
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
+
+<!ELEMENT et2-box (%Widgets;)+>
+
+<!ATTLIST et2-box
+    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
+    overflow CDATA #IMPLIED>
+
+<!ELEMENT et2-hbox (%Widgets;)+>
+
+<!ATTLIST et2-hbox
+    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
+    overflow CDATA #IMPLIED>
+
+<!ELEMENT et2-vbox (%Widgets;)+>
+
+<!ATTLIST et2-vbox
+    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
+    overflow CDATA #IMPLIED>
+
+<!ELEMENT et2-details (%Widgets;)+>
 
 <!ATTLIST et2-details
     toggleOnHover (false|true|1) 'false'
@@ -2839,66 +3967,11 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
-
-<!ELEMENT et2-box (%Widgets;)>
-
-<!ATTLIST et2-box
-    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
-    overflow CDATA #IMPLIED>
+    slot CDATA #IMPLIED>
 
-<!ELEMENT et2-hbox (%Widgets;)>
-
-<!ATTLIST et2-hbox
-    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
-    span CDATA #IMPLIED
-    overflow CDATA #IMPLIED>
-
-<!ELEMENT et2-vbox (%Widgets;)>
-
-<!ATTLIST et2-vbox
-    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
-    span CDATA #IMPLIED
-    overflow CDATA #IMPLIED>
-
-<!ELEMENT et2-split (%Widgets;)>
+<!ELEMENT et2-split (%Widgets;)+>
 
 <!ATTLIST et2-split
     position CDATA #IMPLIED
@@ -2917,9 +3990,11 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
-    span CDATA #IMPLIED>
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED>
 
-<!ELEMENT et2-tabbox (tabs,tabpanels)>
+<!ELEMENT et2-tabbox (tabs,tabpanels)+>
 
 <!ATTLIST et2-tabbox
     extraTabs CDATA '[]'
@@ -2945,10 +4020,179 @@
     data CDATA #IMPLIED
     id CDATA #IMPLIED
     width CDATA #IMPLIED
+    height CDATA #IMPLIED
     span CDATA #IMPLIED
+    slot CDATA #IMPLIED
     cfDisabled (false|true|1) #IMPLIED
     cfTypeFilter CDATA #IMPLIED
     cfPrivateTab (false|true|1) #IMPLIED
     cfPrepend CDATA #IMPLIED
     cfExclude CDATA #IMPLIED
     tabindex CDATA #IMPLIED>
+
+<!ELEMENT et2-nextmatch-columnselection EMPTY>
+
+<!ATTLIST et2-nextmatch-columnselection
+    value CDATA #IMPLIED
+    columns CDATA #IMPLIED
+    autoRefresh CDATA #IMPLIED
+    label CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    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>
+
+<!ELEMENT et2-nextmatch-header-account EMPTY>
+
+<!ATTLIST et2-nextmatch-header-account
+    accountType CDATA #IMPLIED
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'true'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
+
+<!ELEMENT et2-nextmatch-header-custom EMPTY>
+
+<!ATTLIST et2-nextmatch-header-custom
+    widgetType CDATA 'et2-description'
+    widgetOptions 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'
+    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
+    emptyLabel CDATA #IMPLIED
+    tabindex CDATA #IMPLIED>
+
+<!ELEMENT et2-nextmatch-header-entry EMPTY>
+
+<!ATTLIST et2-nextmatch-header-entry
+    label CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    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
+    value CDATA #IMPLIED
+    onlyApp CDATA #IMPLIED
+    applicationList CDATA #IMPLIED
+    appIcons (false|true|1) #IMPLIED
+    query CDATA #IMPLIED
+    select CDATA #IMPLIED
+    placeholder CDATA #IMPLIED
+    searchOptions CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    tabindex CDATA #IMPLIED>
+
+<!ELEMENT et2-nextmatch-header-filter EMPTY>
+
+<!ATTLIST et2-nextmatch-header-filter
+    placeholder CDATA ''
+    multiple (false|true|1) 'false'
+    disabled (false|true|1) 'false'
+    clearable (false|true|1) 'true'
+    label CDATA ''
+    placement CDATA 'bottom'
+    help-text CDATA ''
+    value CDATA #IMPLIED
+    onTagClick CDATA #IMPLIED
+    readonly (false|true|1) 'false'
+    required (false|true|1) 'false'
+    onchange CDATA #IMPLIED
+    autofocus (false|true|1) #IMPLIED
+    autocomplete CDATA 'on'
+    class CDATA #IMPLIED
+    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
+    emptyLabel CDATA ''
+    select_options CDATA #IMPLIED
+    id CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    span CDATA #IMPLIED
+    slot CDATA #IMPLIED
+    rows CDATA #IMPLIED
+    tabindex CDATA #IMPLIED
+    allowFreeEntries (false|true|1) #IMPLIED>
diff --git a/doc/etemplate2/etemplate2.0.rng b/doc/etemplate2/etemplate2.0.rng
index bf2dda39d2..520bb013e3 100644
--- a/doc/etemplate2/etemplate2.0.rng
+++ b/doc/etemplate2/etemplate2.0.rng
@@ -58,15 +58,21 @@
       <ref name="itempicker"/>
       <ref name="script"/>
       <ref name="countdown"/>
+      <ref name="nextmatch-header"/>
+      <ref name="nextmatch-sortheader"/>
+      <ref name="nextmatch-customfields"/>
+      <ref name="nextmatch"/>
       <ref name="et2-avatar"/>
       <ref name="et2-avatar-group"/>
       <ref name="et2-lavatar"/>
-      <ref name="et2-colorpicker"/>
       <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-colorpicker"/>
+      <ref name="et2-description"/>
+      <ref name="et2-label"/>
       <ref name="et2-date"/>
       <ref name="et2-date-duration"/>
       <ref name="et2-date-range"/>
@@ -74,8 +80,6 @@
       <ref name="et2-date-time"/>
       <ref name="et2-date-timeonly"/>
       <ref name="et2-date-time-today"/>
-      <ref name="et2-description"/>
-      <ref name="et2-label"/>
       <ref name="et2-dialog"/>
       <ref name="et2-dropdown-button"/>
       <ref name="et2-email"/>
@@ -92,7 +96,6 @@
       <ref name="et2-link-search"/>
       <ref name="et2-link-string"/>
       <ref name="et2-link-to"/>
-      <ref name="et2-nextmatch-columnselection"/>
       <ref name="et2-portlet"/>
       <ref name="et2-listbox"/>
       <ref name="et2-select"/>
@@ -117,12 +120,43 @@
       <ref name="et2-vfs-select-row"/>
       <ref name="et2-vfs-uid"/>
       <ref name="et2-vfs-gid"/>
-      <ref name="et2-details"/>
+      <ref name="et2-description-expose"/>
+      <ref name="et2-image-expose"/>
+      <ref name="et2-select-access"/>
+      <ref name="et2-select-account"/>
+      <ref name="et2-select-app"/>
+      <ref name="et2-select-bitwise"/>
+      <ref name="et2-select-bool"/>
+      <ref name="et2-select-cat"/>
+      <ref name="et2-select-country"/>
+      <ref name="et2-select-day"/>
+      <ref name="et2-select-dow"/>
+      <ref name="et2-select-hour"/>
+      <ref name="et2-select-lang"/>
+      <ref name="et2-select-month"/>
+      <ref name="et2-select-number"/>
+      <ref name="et2-select-percent"/>
+      <ref name="et2-select-priority"/>
+      <ref name="et2-select-state"/>
+      <ref name="et2-select-tab"/>
+      <ref name="et2-select-thumbnail"/>
+      <ref name="et2-select-timezone"/>
+      <ref name="et2-select-year"/>
+      <ref name="et2-category-tag"/>
+      <ref name="et2-email-tag"/>
+      <ref name="et2-tag"/>
+      <ref name="et2-thumbnail-tag"/>
       <ref name="et2-box"/>
       <ref name="et2-hbox"/>
       <ref name="et2-vbox"/>
+      <ref name="et2-details"/>
       <ref name="et2-split"/>
       <ref name="et2-tabbox"/>
+      <ref name="et2-nextmatch-columnselection"/>
+      <ref name="et2-nextmatch-header-account"/>
+      <ref name="et2-nextmatch-header-custom"/>
+      <ref name="et2-nextmatch-header-entry"/>
+      <ref name="et2-nextmatch-header-filter"/>
     </choice>
   </define>
   <define name="overlay">
@@ -264,6 +298,12 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="minWidth"/>
+    </optional>
+    <optional>
+      <attribute name="maxWidth"/>
+    </optional>
   </define>
   <define name="rows">
     <element name="rows">
@@ -279,7 +319,9 @@
   <define name="row">
     <element name="row">
       <ref name="attlist.row"/>
-      <ref name="Widgets"/>
+      <oneOrMore>
+        <ref name="Widgets"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="attlist.row" combine="interleave">
@@ -298,6 +340,9 @@
     <optional>
       <attribute name="part"/>
     </optional>
+    <optional>
+      <attribute name="id"/>
+    </optional>
   </define>
   <define name="attlist.grid" combine="interleave">
     <optional>
@@ -1925,7 +1970,7 @@
       <attribute name="type_filter"/>
     </optional>
     <optional>
-      <attribute name="private" a:defaultValue="undefined">
+      <attribute name="private">
         <choice>
           <value>false</value>
           <value>true</value>
@@ -2047,7 +2092,7 @@
       <attribute name="type_filter"/>
     </optional>
     <optional>
-      <attribute name="private" a:defaultValue="undefined">
+      <attribute name="private">
         <choice>
           <value>false</value>
           <value>true</value>
@@ -2423,7 +2468,9 @@
   <define name="tabs">
     <element name="tabs">
       <ref name="attlist.tabs"/>
-      <ref name="tab"/>
+      <zeroOrMore>
+        <ref name="tab"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="attlist.tabs" combine="interleave">
@@ -4483,6 +4530,92 @@
   <start>
     <ref name="overlay"/>
   </start>
+  <define name="nextmatch-header">
+    <element name="nextmatch-header">
+      <ref name="attlist.nextmatch-header"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.nextmatch-header">
+    <attribute name="id"/>
+    <optional>
+      <attribute name="span"/>
+    </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
+    <attribute name="label"/>
+  </define>
+  <define name="nextmatch-sortheader">
+    <element name="nextmatch-sortheader">
+      <ref name="attlist.nextmatch-sortheader"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.nextmatch-sortheader">
+    <attribute name="id"/>
+    <optional>
+      <attribute name="span"/>
+    </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
+    <attribute name="label"/>
+    <optional>
+      <attribute name="sortmode" a:defaultValue="ASC">
+        <choice>
+          <value>ASC</value>
+          <value>DESC</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="nextmatch-customfields">
+    <element name="nextmatch-customfields">
+      <ref name="attlist.nextmatch-customfields"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.nextmatch-customfields">
+    <attribute name="id"/>
+    <optional>
+      <attribute name="span"/>
+    </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
+  </define>
+  <define name="nextmatch">
+    <element name="nextmatch">
+      <ref name="attlist.nextmatch"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.nextmatch">
+    <attribute name="id"/>
+    <attribute name="template"/>
+    <optional>
+      <attribute name="header_left"/>
+    </optional>
+    <optional>
+      <attribute name="header_row"/>
+    </optional>
+    <optional>
+      <attribute name="header_right"/>
+    </optional>
+    <optional>
+      <attribute name="disabled"/>
+    </optional>
+    <optional>
+      <attribute name="onselect"/>
+    </optional>
+    <optional>
+      <attribute name="span"/>
+    </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
+  </define>
   <define name="et2-avatar">
     <element name="et2-avatar">
       <ref name="attlist.et2-avatar"/>
@@ -4580,9 +4713,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-avatar-group">
     <element name="et2-avatar-group">
@@ -4651,9 +4790,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-lavatar">
     <element name="et2-lavatar">
@@ -4759,111 +4904,13 @@
       <attribute name="width"/>
     </optional>
     <optional>
-      <attribute name="span"/>
-    </optional>
-  </define>
-  <define name="et2-colorpicker">
-    <element name="et2-colorpicker">
-      <ref name="attlist.et2-colorpicker"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="attlist.et2-colorpicker" combine="interleave">
-    <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="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"/>
+      <attribute name="height"/>
     </optional>
     <optional>
       <attribute name="span"/>
     </optional>
     <optional>
-      <attribute name="tabindex"/>
+      <attribute name="slot"/>
     </optional>
   </define>
   <define name="et2-checkbox">
@@ -4969,9 +5016,15 @@
     <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>
@@ -4986,36 +5039,6 @@
     <optional>
       <attribute name="label"/>
     </optional>
-    <optional>
-      <attribute name="image"/>
-    </optional>
-    <optional>
-      <attribute name="hide" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="noSubmit" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="noValidation" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
     <optional>
       <attribute name="readonly" a:defaultValue="false">
         <choice>
@@ -5103,9 +5126,27 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
+    <optional>
+      <attribute name="image"/>
+    </optional>
+    <optional>
+      <attribute name="noSubmit">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
@@ -5117,36 +5158,6 @@
     </element>
   </define>
   <define name="attlist.et2-button-icon" combine="interleave">
-    <optional>
-      <attribute name="image"/>
-    </optional>
-    <optional>
-      <attribute name="hide" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="noSubmit" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="noValidation" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
     <optional>
       <attribute name="label"/>
     </optional>
@@ -5237,9 +5248,15 @@
     <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>
@@ -5251,45 +5268,21 @@
     </element>
   </define>
   <define name="attlist.et2-button-scroll" combine="interleave">
-    <optional>
-      <attribute name="image"/>
-    </optional>
-    <optional>
-      <attribute name="hide" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="noSubmit" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="noValidation" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </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-button-timestamp">
     <element name="et2-button-timestamp">
@@ -5308,10 +5301,10 @@
       <attribute name="timezone"/>
     </optional>
     <optional>
-      <attribute name="image" a:defaultValue="timestamp"/>
+      <attribute name="label"/>
     </optional>
     <optional>
-      <attribute name="hide" a:defaultValue="false">
+      <attribute name="readonly" a:defaultValue="false">
         <choice>
           <value>false</value>
           <value>true</value>
@@ -5320,7 +5313,7 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="noSubmit" a:defaultValue="true">
+      <attribute name="required" a:defaultValue="false">
         <choice>
           <value>false</value>
           <value>true</value>
@@ -5329,7 +5322,10 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="noValidation" a:defaultValue="false">
+      <attribute name="onchange"/>
+    </optional>
+    <optional>
+      <attribute name="autofocus">
         <choice>
           <value>false</value>
           <value>true</value>
@@ -5337,6 +5333,95 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="autocomplete" a:defaultValue="on"/>
+    </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="image"/>
+    </optional>
+    <optional>
+      <attribute name="noSubmit">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+  </define>
+  <define name="et2-colorpicker">
+    <element name="et2-colorpicker">
+      <ref name="attlist.et2-colorpicker"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-colorpicker" combine="interleave">
     <optional>
       <attribute name="label"/>
     </optional>
@@ -5427,13 +5512,212 @@
     <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>
   </define>
+  <define name="et2-description">
+    <element name="et2-description">
+      <ref name="attlist.et2-description"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-description" combine="interleave">
+    <optional>
+      <attribute name="activateLinks" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="extraLinkTarget" a:defaultValue="_browser"/>
+    </optional>
+    <optional>
+      <attribute name="extraLinkPopup" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="href"/>
+    </optional>
+    <optional>
+      <attribute name="value" a:defaultValue=""/>
+    </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>
+    <optional>
+      <attribute name="for"/>
+    </optional>
+  </define>
+  <define name="et2-label">
+    <element name="et2-label">
+      <ref name="attlist.et2-label"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-label" combine="interleave">
+    <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="activateLinks" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="extraLinkTarget" a:defaultValue="_browser"/>
+    </optional>
+    <optional>
+      <attribute name="extraLinkPopup" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="href"/>
+    </optional>
+    <optional>
+      <attribute name="value" a:defaultValue=""/>
+    </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-date">
     <element name="et2-date">
       <ref name="attlist.et2-date"/>
@@ -5555,9 +5839,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
     <optional>
       <attribute name="yearRange"/>
     </optional>
@@ -5713,9 +6003,15 @@
     <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>
@@ -5829,9 +6125,15 @@
     <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>
@@ -5906,9 +6208,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-date-time">
     <element name="et2-date-time">
@@ -6031,9 +6339,15 @@
     <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>
@@ -6159,9 +6473,15 @@
     <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>
@@ -6234,188 +6554,13 @@
       <attribute name="width"/>
     </optional>
     <optional>
-      <attribute name="span"/>
-    </optional>
-  </define>
-  <define name="et2-description">
-    <element name="et2-description">
-      <ref name="attlist.et2-description"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="attlist.et2-description" combine="interleave">
-    <optional>
-      <attribute name="activateLinks" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="extraLinkTarget" a:defaultValue="_browser"/>
-    </optional>
-    <optional>
-      <attribute name="extraLinkPopup" a:defaultValue=""/>
-    </optional>
-    <optional>
-      <attribute name="href"/>
-    </optional>
-    <optional>
-      <attribute name="value" a:defaultValue=""/>
-    </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"/>
+      <attribute name="height"/>
     </optional>
     <optional>
       <attribute name="span"/>
     </optional>
     <optional>
-      <attribute name="for"/>
-    </optional>
-  </define>
-  <define name="et2-label">
-    <element name="et2-label">
-      <ref name="attlist.et2-label"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="attlist.et2-label" combine="interleave">
-    <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="activateLinks" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="extraLinkTarget" a:defaultValue="_browser"/>
-    </optional>
-    <optional>
-      <attribute name="extraLinkPopup" a:defaultValue=""/>
-    </optional>
-    <optional>
-      <attribute name="href"/>
-    </optional>
-    <optional>
-      <attribute name="value" a:defaultValue=""/>
-    </optional>
-    <optional>
-      <attribute name="id"/>
-    </optional>
-    <optional>
-      <attribute name="width"/>
-    </optional>
-    <optional>
-      <attribute name="span"/>
+      <attribute name="slot"/>
     </optional>
   </define>
   <define name="et2-dialog">
@@ -6545,6 +6690,9 @@
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-dropdown-button">
     <element name="et2-dropdown-button">
@@ -6649,9 +6797,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-email">
     <element name="et2-email">
@@ -6801,9 +6955,18 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
@@ -6920,9 +7083,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-iframe">
     <element name="et2-iframe">
@@ -7024,9 +7193,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-appicon">
     <element name="et2-appicon">
@@ -7107,9 +7282,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-image">
     <element name="et2-image">
@@ -7190,9 +7371,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-link">
     <element name="et2-link">
@@ -7279,9 +7466,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-link-add">
     <element name="et2-link-add">
@@ -7389,9 +7582,15 @@
     <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>
@@ -7547,9 +7746,30 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
+    <optional>
+      <attribute name="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
   </define>
   <define name="et2-link-entry">
     <element name="et2-link-entry">
@@ -7678,9 +7898,15 @@
     <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>
@@ -7785,9 +8011,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-link-paste-dialog">
     <element name="et2-link-paste-dialog">
@@ -7796,30 +8028,6 @@
     </element>
   </define>
   <define name="attlist.et2-link-paste-dialog" combine="interleave">
-    <optional>
-      <attribute name="search" a:defaultValue="true">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="searchUrl" a:defaultValue=""/>
-    </optional>
-    <optional>
-      <attribute name="searchOptions" a:defaultValue="{}"/>
-    </optional>
-    <optional>
-      <attribute name="resultsOpen" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
     <optional>
       <attribute name="label"/>
     </optional>
@@ -7940,15 +8148,24 @@
     <optional>
       <attribute name="help-text" a:defaultValue=""/>
     </optional>
+    <optional>
+      <attribute name="searchUrl" a:defaultValue=""/>
+    </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>
@@ -8092,9 +8309,30 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
+    <optional>
+      <attribute name="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
   </define>
   <define name="et2-link-string">
     <element name="et2-link-string">
@@ -8184,9 +8422,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-link-to">
     <element name="et2-link-to">
@@ -8304,121 +8548,14 @@
       <attribute name="width"/>
     </optional>
     <optional>
-      <attribute name="span"/>
-    </optional>
-    <optional>
-      <attribute name="tabindex"/>
-    </optional>
-  </define>
-  <define name="et2-nextmatch-columnselection">
-    <element name="et2-nextmatch-columnselection">
-      <ref name="attlist.et2-nextmatch-columnselection"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="attlist.et2-nextmatch-columnselection" combine="interleave">
-    <optional>
-      <attribute name="value"/>
-    </optional>
-    <optional>
-      <attribute name="columns"/>
-    </optional>
-    <optional>
-      <attribute name="autoRefresh"/>
-    </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="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"/>
+      <attribute name="height"/>
     </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
     <optional>
       <attribute name="tabindex"/>
     </optional>
@@ -8502,9 +8639,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-listbox">
     <element name="et2-listbox">
@@ -8621,9 +8764,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-select">
     <element name="et2-select">
@@ -8761,9 +8910,30 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
+    <optional>
+      <attribute name="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
   </define>
   <define name="et2-spinner">
     <element name="et2-spinner">
@@ -8832,9 +9002,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-switch">
     <element name="et2-switch">
@@ -8939,9 +9115,15 @@
     <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>
@@ -9052,6 +9234,9 @@
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
     <optional>
       <attribute name="maxlength"/>
     </optional>
@@ -9180,9 +9365,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
     <optional>
       <attribute name="placeholder"/>
     </optional>
@@ -9308,9 +9499,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
     <optional>
       <attribute name="placeholder"/>
     </optional>
@@ -9442,9 +9639,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
     <optional>
       <attribute name="placeholder"/>
     </optional>
@@ -9558,9 +9761,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
     <optional>
       <attribute name="placeholder"/>
     </optional>
@@ -9707,9 +9916,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-tree-dropdown">
     <element name="et2-tree-dropdown">
@@ -9748,30 +9963,6 @@
     <optional>
       <attribute name="value"/>
     </optional>
-    <optional>
-      <attribute name="search" a:defaultValue="true">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="searchUrl" a:defaultValue=""/>
-    </optional>
-    <optional>
-      <attribute name="searchOptions" a:defaultValue="{}"/>
-    </optional>
-    <optional>
-      <attribute name="resultsOpen" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
     <optional>
       <attribute name="emptyLabel" a:defaultValue=""/>
     </optional>
@@ -9868,9 +10059,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-tree-cat">
     <element name="et2-tree-cat">
@@ -9891,30 +10088,6 @@
         </choice>
       </attribute>
     </optional>
-    <optional>
-      <attribute name="search" a:defaultValue="true">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="searchUrl" a:defaultValue=""/>
-    </optional>
-    <optional>
-      <attribute name="searchOptions" a:defaultValue="{}"/>
-    </optional>
-    <optional>
-      <attribute name="resultsOpen" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
     <optional>
       <attribute name="emptyLabel" a:defaultValue=""/>
     </optional>
@@ -10041,9 +10214,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-url">
     <element name="et2-url">
@@ -10062,7 +10241,7 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="trailingSlash" a:defaultValue="undefined">
+      <attribute name="trailingSlash">
         <choice>
           <value>false</value>
           <value>true</value>
@@ -10166,9 +10345,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
     <optional>
       <attribute name="placeholder"/>
     </optional>
@@ -10282,9 +10467,18 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
+    <optional>
+      <attribute name="emailDisplay"/>
+    </optional>
     <optional>
       <attribute name="placeholder"/>
     </optional>
@@ -10398,9 +10592,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
     <optional>
       <attribute name="placeholder"/>
     </optional>
@@ -10514,9 +10714,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
     <optional>
       <attribute name="placeholder"/>
     </optional>
@@ -10549,15 +10755,87 @@
     <optional>
       <attribute name="value"/>
     </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" a:defaultValue=""/>
+    </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="src" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="defaultSrc" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="href" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="extraLinkTarget" a:defaultValue="_self"/>
+    </optional>
+    <optional>
+      <attribute name="extraLinkPopup" a:defaultValue=""/>
+    </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-vfs-path">
     <element name="et2-vfs-path">
@@ -10662,9 +10940,15 @@
     <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>
@@ -10805,9 +11089,15 @@
     <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>
@@ -10858,27 +11148,6 @@
     <optional>
       <attribute name="searchUrl" a:defaultValue="EGroupware\\Api\\Etemplate\\Widget\\Vfs::ajax_vfsSelectFiles"/>
     </optional>
-    <optional>
-      <attribute name="search" a:defaultValue="true">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="searchOptions" a:defaultValue="{}"/>
-    </optional>
-    <optional>
-      <attribute name="resultsOpen" a:defaultValue="false">
-        <choice>
-          <value>false</value>
-          <value>true</value>
-          <value>1</value>
-        </choice>
-      </attribute>
-    </optional>
     <optional>
       <attribute name="label"/>
     </optional>
@@ -10969,9 +11238,15 @@
     <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>
@@ -11043,9 +11318,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-vfs-uid">
     <element name="et2-vfs-uid">
@@ -11054,15 +11335,81 @@
     </element>
   </define>
   <define name="attlist.et2-vfs-uid" combine="interleave">
+    <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="value"/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </optional>
+    <optional>
+      <attribute name="searchUrl"/>
+    </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-vfs-gid">
     <element name="et2-vfs-gid">
@@ -11071,20 +11418,4157 @@
     </element>
   </define>
   <define name="attlist.et2-vfs-gid" combine="interleave">
+    <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="value"/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </optional>
+    <optional>
+      <attribute name="searchUrl"/>
+    </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-description-expose">
+    <element name="et2-description-expose">
+      <ref name="attlist.et2-description-expose"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-description-expose" combine="interleave">
+    <optional>
+      <attribute name="mime"/>
+    </optional>
+    <optional>
+      <attribute name="mimeData"/>
+    </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="activateLinks" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="extraLinkTarget" a:defaultValue="_browser"/>
+    </optional>
+    <optional>
+      <attribute name="extraLinkPopup" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="href"/>
+    </optional>
+    <optional>
+      <attribute name="value" a:defaultValue=""/>
+    </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-image-expose">
+    <element name="et2-image-expose">
+      <ref name="attlist.et2-image-expose"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-image-expose" combine="interleave">
+    <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" a:defaultValue=""/>
+    </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="src" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="defaultSrc" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="href" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="extraLinkTarget" a:defaultValue="_self"/>
+    </optional>
+    <optional>
+      <attribute name="extraLinkPopup" a:defaultValue=""/>
+    </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-select-access">
+    <element name="et2-select-access">
+      <ref name="attlist.et2-select-access"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-access" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-account">
+    <element name="et2-select-account">
+      <ref name="attlist.et2-select-account"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-account" combine="interleave">
+    <optional>
+      <attribute name="accountType"/>
+    </optional>
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-app">
+    <element name="et2-select-app">
+      <ref name="attlist.et2-select-app"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-app" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-bitwise">
+    <element name="et2-select-bitwise">
+      <ref name="attlist.et2-select-bitwise"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-bitwise" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-bool">
+    <element name="et2-select-bool">
+      <ref name="attlist.et2-select-bool"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-bool" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-cat">
+    <element name="et2-select-cat">
+      <ref name="attlist.et2-select-cat"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-cat" combine="interleave">
+    <optional>
+      <attribute name="globalCategories">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="application"/>
+    </optional>
+    <optional>
+      <attribute name="parentCat"/>
+    </optional>
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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" a:defaultValue="true">
+        <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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-country">
+    <element name="et2-select-country">
+      <ref name="attlist.et2-select-country"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-country" combine="interleave">
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-day">
+    <element name="et2-select-day">
+      <ref name="attlist.et2-select-day"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-day" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-dow">
+    <element name="et2-select-dow">
+      <ref name="attlist.et2-select-dow"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-dow" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-hour">
+    <element name="et2-select-hour">
+      <ref name="attlist.et2-select-hour"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-hour" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-lang">
+    <element name="et2-select-lang">
+      <ref name="attlist.et2-select-lang"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-lang" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-month">
+    <element name="et2-select-month">
+      <ref name="attlist.et2-select-month"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-month" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-number">
+    <element name="et2-select-number">
+      <ref name="attlist.et2-select-number"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-number" combine="interleave">
+    <optional>
+      <attribute name="interval" a:defaultValue="1"/>
+    </optional>
+    <optional>
+      <attribute name="min" a:defaultValue="1"/>
+    </optional>
+    <optional>
+      <attribute name="max" a:defaultValue="10"/>
+    </optional>
+    <optional>
+      <attribute name="leading_zero" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="suffix" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-percent">
+    <element name="et2-select-percent">
+      <ref name="attlist.et2-select-percent"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-percent" combine="interleave">
+    <optional>
+      <attribute name="interval" a:defaultValue="10"/>
+    </optional>
+    <optional>
+      <attribute name="min" a:defaultValue="0"/>
+    </optional>
+    <optional>
+      <attribute name="max" a:defaultValue="100"/>
+    </optional>
+    <optional>
+      <attribute name="leading_zero" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="suffix" a:defaultValue="%%"/>
+    </optional>
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-priority">
+    <element name="et2-select-priority">
+      <ref name="attlist.et2-select-priority"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-priority" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-state">
+    <element name="et2-select-state">
+      <ref name="attlist.et2-select-state"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-state" combine="interleave">
+    <optional>
+      <attribute name="countryCode" a:defaultValue="DE"/>
+    </optional>
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-tab">
+    <element name="et2-select-tab">
+      <ref name="attlist.et2-select-tab"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-tab" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-thumbnail">
+    <element name="et2-select-thumbnail">
+      <ref name="attlist.et2-select-thumbnail"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-thumbnail" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="true">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-timezone">
+    <element name="et2-select-timezone">
+      <ref name="attlist.et2-select-timezone"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-timezone" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-select-year">
+    <element name="et2-select-year">
+      <ref name="attlist.et2-select-year"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-select-year" combine="interleave">
+    <optional>
+      <attribute name="interval" a:defaultValue="1"/>
+    </optional>
+    <optional>
+      <attribute name="min" a:defaultValue="-3"/>
+    </optional>
+    <optional>
+      <attribute name="max" a:defaultValue="2"/>
+    </optional>
+    <optional>
+      <attribute name="leading_zero" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="suffix" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-category-tag">
+    <element name="et2-category-tag">
+      <ref name="attlist.et2-category-tag"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-category-tag" combine="interleave">
+    <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="editable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="value" a:defaultValue=""/>
+    </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-email-tag">
+    <element name="et2-email-tag">
+      <ref name="attlist.et2-email-tag"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-email-tag" combine="interleave">
+    <optional>
+      <attribute name="contactPlus" a:defaultValue="true">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="emailDisplay" a:defaultValue="domain"/>
+    </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="editable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="value" a:defaultValue=""/>
+    </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-tag">
+    <element name="et2-tag">
+      <ref name="attlist.et2-tag"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-tag" combine="interleave">
+    <optional>
+      <attribute name="editable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="value" a:defaultValue=""/>
+    </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-thumbnail-tag">
+    <element name="et2-thumbnail-tag">
+      <ref name="attlist.et2-thumbnail-tag"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-thumbnail-tag" combine="interleave">
+    <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="editable" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="value" a:defaultValue=""/>
+    </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-box">
+    <element name="et2-box">
+      <ref name="attlist.et2-box"/>
+      <oneOrMore>
+        <ref name="Widgets"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="attlist.et2-box" combine="interleave">
+    <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>
+    <optional>
+      <attribute name="overflow"/>
+    </optional>
+  </define>
+  <define name="et2-hbox">
+    <element name="et2-hbox">
+      <ref name="attlist.et2-hbox"/>
+      <oneOrMore>
+        <ref name="Widgets"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="attlist.et2-hbox" combine="interleave">
+    <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>
+    <optional>
+      <attribute name="overflow"/>
+    </optional>
+  </define>
+  <define name="et2-vbox">
+    <element name="et2-vbox">
+      <ref name="attlist.et2-vbox"/>
+      <oneOrMore>
+        <ref name="Widgets"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="attlist.et2-vbox" combine="interleave">
+    <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>
+    <optional>
+      <attribute name="overflow"/>
+    </optional>
   </define>
   <define name="et2-details">
     <element name="et2-details">
       <ref name="attlist.et2-details"/>
-      <ref name="Widgets"/>
+      <oneOrMore>
+        <ref name="Widgets"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="attlist.et2-details" combine="interleave">
@@ -11176,226 +15660,21 @@
       <attribute name="width"/>
     </optional>
     <optional>
-      <attribute name="span"/>
-    </optional>
-  </define>
-  <define name="et2-box">
-    <element name="et2-box">
-      <ref name="attlist.et2-box"/>
-      <ref name="Widgets"/>
-    </element>
-  </define>
-  <define name="attlist.et2-box" combine="interleave">
-    <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"/>
+      <attribute name="height"/>
     </optional>
     <optional>
       <attribute name="span"/>
     </optional>
     <optional>
-      <attribute name="overflow"/>
-    </optional>
-  </define>
-  <define name="et2-hbox">
-    <element name="et2-hbox">
-      <ref name="attlist.et2-hbox"/>
-      <ref name="Widgets"/>
-    </element>
-  </define>
-  <define name="attlist.et2-hbox" combine="interleave">
-    <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="span"/>
-    </optional>
-    <optional>
-      <attribute name="overflow"/>
-    </optional>
-  </define>
-  <define name="et2-vbox">
-    <element name="et2-vbox">
-      <ref name="attlist.et2-vbox"/>
-      <ref name="Widgets"/>
-    </element>
-  </define>
-  <define name="attlist.et2-vbox" combine="interleave">
-    <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="span"/>
-    </optional>
-    <optional>
-      <attribute name="overflow"/>
+      <attribute name="slot"/>
     </optional>
   </define>
   <define name="et2-split">
     <element name="et2-split">
       <ref name="attlist.et2-split"/>
-      <ref name="Widgets"/>
+      <oneOrMore>
+        <ref name="Widgets"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="attlist.et2-split" combine="interleave">
@@ -11465,15 +15744,23 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
   </define>
   <define name="et2-tabbox">
     <element name="et2-tabbox">
       <ref name="attlist.et2-tabbox"/>
-      <ref name="tabs"/>
-      <ref name="tabpanels"/>
+      <oneOrMore>
+        <ref name="tabs"/>
+        <ref name="tabpanels"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="attlist.et2-tabbox" combine="interleave">
@@ -11588,9 +15875,15 @@
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="height"/>
+    </optional>
     <optional>
       <attribute name="span"/>
     </optional>
+    <optional>
+      <attribute name="slot"/>
+    </optional>
     <optional>
       <attribute name="cfDisabled">
         <choice>
@@ -11622,4 +15915,707 @@
       <attribute name="tabindex"/>
     </optional>
   </define>
+  <define name="et2-nextmatch-columnselection">
+    <element name="et2-nextmatch-columnselection">
+      <ref name="attlist.et2-nextmatch-columnselection"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-nextmatch-columnselection" combine="interleave">
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="columns"/>
+    </optional>
+    <optional>
+      <attribute name="autoRefresh"/>
+    </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="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>
+  </define>
+  <define name="et2-nextmatch-header-account">
+    <element name="et2-nextmatch-header-account">
+      <ref name="attlist.et2-nextmatch-header-account"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-nextmatch-header-account" combine="interleave">
+    <optional>
+      <attribute name="accountType"/>
+    </optional>
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="true">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="et2-nextmatch-header-custom">
+    <element name="et2-nextmatch-header-custom">
+      <ref name="attlist.et2-nextmatch-header-custom"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-nextmatch-header-custom" combine="interleave">
+    <optional>
+      <attribute name="widgetType" a:defaultValue="et2-description"/>
+    </optional>
+    <optional>
+      <attribute name="widgetOptions" 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="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="emptyLabel"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+  </define>
+  <define name="et2-nextmatch-header-entry">
+    <element name="et2-nextmatch-header-entry">
+      <ref name="attlist.et2-nextmatch-header-entry"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-nextmatch-header-entry" combine="interleave">
+    <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="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="value"/>
+    </optional>
+    <optional>
+      <attribute name="onlyApp"/>
+    </optional>
+    <optional>
+      <attribute name="applicationList"/>
+    </optional>
+    <optional>
+      <attribute name="appIcons">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="query"/>
+    </optional>
+    <optional>
+      <attribute name="select"/>
+    </optional>
+    <optional>
+      <attribute name="placeholder"/>
+    </optional>
+    <optional>
+      <attribute name="searchOptions"/>
+    </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>
+  </define>
+  <define name="et2-nextmatch-header-filter">
+    <element name="et2-nextmatch-header-filter">
+      <ref name="attlist.et2-nextmatch-header-filter"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="attlist.et2-nextmatch-header-filter" combine="interleave">
+    <optional>
+      <attribute name="placeholder" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="multiple" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="disabled" a:defaultValue="false">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="clearable" a:defaultValue="true">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="placement" a:defaultValue="bottom"/>
+    </optional>
+    <optional>
+      <attribute name="help-text" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="value"/>
+    </optional>
+    <optional>
+      <attribute name="onTagClick"/>
+    </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="class"/>
+    </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="emptyLabel" a:defaultValue=""/>
+    </optional>
+    <optional>
+      <attribute name="select_options"/>
+    </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="rows"/>
+    </optional>
+    <optional>
+      <attribute name="tabindex"/>
+    </optional>
+    <optional>
+      <attribute name="allowFreeEntries">
+        <choice>
+          <value>false</value>
+          <value>true</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
 </grammar>
diff --git a/doc/etemplate2/etemplate2.dtd b/doc/etemplate2/etemplate2.dtd
index 12cbe8d77d..36472e501a 100644
--- a/doc/etemplate2/etemplate2.dtd
+++ b/doc/etemplate2/etemplate2.dtd
@@ -23,7 +23,7 @@
 -->
 
 <!ENTITY % Widgets "template|grid|vbox|box|details|hbox|groupbox|caption|split|button|buttononly|colorpicker|description|label|entry|contact-value|contact-account|contact-template|infolog-value|tracker-value|records-value|textbox|hidden|searchbox|int|integer|float|passwd|url|url-email|url-phone|url-fax|menupopup|listbox|select|select-cat|select-percent|select-priority|select-country|select-state|select-year|select-month|select-day|select-dow|select-hour|select-number|select-app|select-lang|select-bool|select-timezone|select-bitwise|menulist|checkbox|radio|radiogroup|date|date-time|date-timeonly|date-duration|date-since|date-time_today|time_or_date|date-range|diff|dropdown_button|styles|link-to|link-apps|link-entry|link|link-string|link-list|link-add|select-account|taglist|taglist-account|taglist-email|taglist-cat|taglist-thumbnail|taglist-state|customfields|customfields-list|favorites|html|htmlarea|tabbox|button-timestamp|timestamper|toolbar|tree|tree-cat|historylog|hrule|image|appicon|avatar|lavatar|iframe|file|progress|portlet|ajax_select|vfs|vfs-name|vfs-path|vfs-mime|vfs-size|vfs-mode|vfs-uid|vfs-gid|vfs-upload|vfs-select|video|audio|barcode|itempicker|script|countdown">
-<!ELEMENT overlay (%Widgets;)*>
+<!ELEMENT overlay (template)*>
 <!ELEMENT template (%Widgets;)*>
 <!ATTLIST template
 template CDATA #IMPLIED
@@ -59,13 +59,14 @@ attributes CDATA #IMPLIED
 						class CDATA #IMPLIED
 						width CDATA #IMPLIED>
 					<!ELEMENT rows (row)*>
-					<!ELEMENT row (%Widgets;)>
+					<!ELEMENT row (%Widgets;)+>
 					<!ATTLIST row
 						class CDATA #IMPLIED
 						height CDATA #IMPLIED
 						valign CDATA #IMPLIED
 						disabled CDATA #IMPLIED
 						part CDATA #IMPLIED
+						id CDATA #IMPLIED
 					>
 <!ATTLIST grid
 border CDATA #IMPLIED
@@ -2984,7 +2985,7 @@ customfields CDATA #IMPLIED
 fields CDATA #IMPLIED
 value CDATA #IMPLIED
 type_filter CDATA #IMPLIED
-private (true|false) "undefined"
+private (true|false) #IMPLIED
 sub_app CDATA #IMPLIED
 onchange CDATA #IMPLIED
 prefix CDATA "#"
@@ -3017,7 +3018,7 @@ customfields CDATA #IMPLIED
 fields CDATA #IMPLIED
 value CDATA #IMPLIED
 type_filter CDATA #IMPLIED
-private (true|false) "undefined"
+private (true|false) #IMPLIED
 sub_app CDATA #IMPLIED
 onchange CDATA #IMPLIED
 prefix CDATA "#"
@@ -3158,7 +3159,7 @@ add_tabs (true|false) "false"
 tab_height CDATA #IMPLIED
 align_tabs (v|h) "h"
 >
-<!ELEMENT tabs (tab)>
+<!ELEMENT tabs (tab)*>
 <!ELEMENT tab EMPTY>
 <!ATTLIST tab
 id CDATA #IMPLIED
diff --git a/doc/etemplate2/etemplate2.rng b/doc/etemplate2/etemplate2.rng
index 8601cd9f19..d0e7effa96 100644
--- a/doc/etemplate2/etemplate2.rng
+++ b/doc/etemplate2/etemplate2.rng
@@ -147,7 +147,7 @@
         <element name="overlay">
             <ref name="attlist.overlay"/>
             <zeroOrMore>
-                <ref name="Widgets"/>
+                <ref name="template"/>
             </zeroOrMore>
         </element>
     </define>
@@ -295,7 +295,9 @@
     <define name="row">
         <element name="row">
             <ref name="attlist.row"/>
-            <ref name="Widgets"/>
+            <oneOrMore>
+                <ref name="Widgets"/>
+            </oneOrMore>
         </element>
     </define>
     <define name="attlist.row" combine="interleave">
@@ -314,6 +316,9 @@
         <optional>
             <attribute name="part"/>
         </optional>
+        <optional>
+            <attribute name="id"/>
+        </optional>
     </define>
     <define name="attlist.grid" combine="interleave">
         <optional>
@@ -11611,7 +11616,7 @@
             <attribute name="type_filter"/>
         </optional>
         <optional>
-            <attribute name="private" a:defaultValue="undefined">
+            <attribute name="private">
                 <choice>
                     <value>true</value>
                     <value>false</value>
@@ -11729,7 +11734,7 @@
             <attribute name="type_filter"/>
         </optional>
         <optional>
-            <attribute name="private" a:defaultValue="undefined">
+            <attribute name="private">
                 <choice>
                     <value>true</value>
                     <value>false</value>
@@ -12254,7 +12259,9 @@
     <define name="tabs">
         <element name="tabs">
             <ref name="attlist.tabs"/>
-            <ref name="tab"/>
+            <zeroOrMore>
+                <ref name="tab"/>
+            </zeroOrMore>
         </element>
     </define>
     <define name="attlist.tabs" combine="interleave">