diff --git a/doc/etemplate2/etemplate2.dtd b/doc/etemplate2/etemplate2.dtd
index dbb91a46da..58d8b95e7d 100644
--- a/doc/etemplate2/etemplate2.dtd
+++ b/doc/etemplate2/etemplate2.dtd
@@ -22,7 +22,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|passwd|hidden|searchbox|int|integer|float|url|url-email|url-phone|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|barcode|itempicker|script">
+<!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|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|barcode|itempicker|script">
 <!ELEMENT overlay (%Widgets;)*>
 <!ELEMENT template (%Widgets;)*>
 <!ATTLIST template
@@ -99,8 +99,6 @@ attributes CDATA #IMPLIED
 >
 <!ELEMENT vbox (%Widgets;)*>
 <!ATTLIST vbox
-rows CDATA #IMPLIED
-cols CDATA #IMPLIED
 statustext CDATA #IMPLIED
 statustext_html (true|false) "false"
 align CDATA "left"
@@ -125,8 +123,6 @@ attributes CDATA #IMPLIED
 >
 <!ELEMENT box (%Widgets;)*>
 <!ATTLIST box
-rows CDATA #IMPLIED
-cols CDATA #IMPLIED
 statustext CDATA #IMPLIED
 statustext_html (true|false) "false"
 align CDATA "left"
@@ -151,10 +147,6 @@ attributes CDATA #IMPLIED
 >
 <!ELEMENT details EMPTY>
 <!ATTLIST details
-toggle_align CDATA "right"
-title CDATA #IMPLIED
-rows CDATA #IMPLIED
-cols CDATA #IMPLIED
 statustext CDATA #IMPLIED
 statustext_html (true|false) "false"
 align CDATA "left"
@@ -677,47 +669,6 @@ blur CDATA #IMPLIED
 rows CDATA #IMPLIED
 cols CDATA #IMPLIED
 validator CDATA #IMPLIED
-autocomplete CDATA #IMPLIED
-onkeypress CDATA #IMPLIED
-needed (true|false) "false"
-onchange CDATA #IMPLIED
-onfocus CDATA #IMPLIED
-validation_error CDATA #IMPLIED
-tabindex CDATA #IMPLIED
-readonly (true|false) "false"
-label CDATA #IMPLIED
-value CDATA #IMPLIED
-statustext CDATA #IMPLIED
-statustext_html (true|false) "false"
-align CDATA "left"
-onclick CDATA #IMPLIED
-disabled (true|false) "false"
-width CDATA #IMPLIED
-height CDATA #IMPLIED
-class CDATA #IMPLIED
-overflow CDATA #IMPLIED
-parent_node CDATA #IMPLIED
-actions CDATA #IMPLIED
-default_execute CDATA #IMPLIED
-resize_ratio CDATA #IMPLIED
-data CDATA #IMPLIED
-background CDATA #IMPLIED
-id CDATA #IMPLIED
-no_lang (true|false) "false"
-span CDATA #IMPLIED
-type CDATA #IMPLIED
-attributes CDATA #IMPLIED
->
-<!ELEMENT passwd EMPTY>
-<!ATTLIST passwd
-multiline (true|false) "false"
-size CDATA #IMPLIED
-maxlength CDATA #IMPLIED
-blur CDATA #IMPLIED
-rows CDATA #IMPLIED
-cols CDATA #IMPLIED
-validator CDATA #IMPLIED
-autocomplete CDATA #IMPLIED
 onkeypress CDATA #IMPLIED
 needed (true|false) "false"
 onchange CDATA #IMPLIED
@@ -757,7 +708,6 @@ blur CDATA #IMPLIED
 rows CDATA #IMPLIED
 cols CDATA #IMPLIED
 validator CDATA #IMPLIED
-autocomplete CDATA #IMPLIED
 onkeypress CDATA #IMPLIED
 needed (true|false) "false"
 onchange CDATA #IMPLIED
@@ -799,7 +749,6 @@ blur CDATA #IMPLIED
 rows CDATA #IMPLIED
 cols CDATA #IMPLIED
 validator CDATA #IMPLIED
-autocomplete CDATA #IMPLIED
 onkeypress CDATA #IMPLIED
 needed (true|false) "false"
 onchange CDATA #IMPLIED
@@ -843,7 +792,6 @@ blur CDATA #IMPLIED
 rows CDATA #IMPLIED
 cols CDATA #IMPLIED
 validator CDATA #IMPLIED
-autocomplete CDATA #IMPLIED
 onkeypress CDATA #IMPLIED
 needed (true|false) "false"
 onchange CDATA #IMPLIED
@@ -886,7 +834,6 @@ blur CDATA #IMPLIED
 rows CDATA #IMPLIED
 cols CDATA #IMPLIED
 validator CDATA #IMPLIED
-autocomplete CDATA #IMPLIED
 onkeypress CDATA #IMPLIED
 needed (true|false) "false"
 onchange CDATA #IMPLIED
@@ -929,7 +876,6 @@ blur CDATA #IMPLIED
 rows CDATA #IMPLIED
 cols CDATA #IMPLIED
 validator CDATA #IMPLIED
-autocomplete CDATA #IMPLIED
 onkeypress CDATA #IMPLIED
 needed (true|false) "false"
 onchange CDATA #IMPLIED
@@ -959,18 +905,58 @@ span CDATA #IMPLIED
 type CDATA #IMPLIED
 attributes CDATA #IMPLIED
 >
-<!ELEMENT url EMPTY>
-<!ATTLIST url
+<!ELEMENT passwd EMPTY>
+<!ATTLIST passwd
+autocomplete CDATA "Off"
+viewable (true|false) "false"
+plaintext (true|false) "true"
+suggest CDATA #IMPLIED
+multiline (true|false) "false"
+size CDATA #IMPLIED
+maxlength CDATA #IMPLIED
+blur CDATA #IMPLIED
+rows CDATA #IMPLIED
+cols CDATA #IMPLIED
+validator CDATA #IMPLIED
+onkeypress CDATA #IMPLIED
+needed (true|false) "false"
+onchange CDATA #IMPLIED
+onfocus CDATA #IMPLIED
+validation_error CDATA #IMPLIED
+tabindex CDATA #IMPLIED
+readonly (true|false) "false"
+label CDATA #IMPLIED
+value CDATA #IMPLIED
+statustext CDATA #IMPLIED
+statustext_html (true|false) "false"
+align CDATA "left"
+onclick CDATA #IMPLIED
+disabled (true|false) "false"
+width CDATA #IMPLIED
+height CDATA #IMPLIED
+class CDATA #IMPLIED
+overflow CDATA #IMPLIED
+parent_node CDATA #IMPLIED
+actions CDATA #IMPLIED
+default_execute CDATA #IMPLIED
+resize_ratio CDATA #IMPLIED
+data CDATA #IMPLIED
+background CDATA #IMPLIED
+id CDATA #IMPLIED
+no_lang (true|false) "false"
+span CDATA #IMPLIED
+type CDATA #IMPLIED
+attributes CDATA #IMPLIED
+>
+<!ELEMENT url EMPTY>
+<!ATTLIST url
 multiline (true|false) "false"
-allow_path (true|false) "false"
-trailing_slash (true|false) "[object Object]"
 size CDATA #IMPLIED
 maxlength CDATA #IMPLIED
 blur CDATA #IMPLIED
 rows CDATA #IMPLIED
 cols CDATA #IMPLIED
 validator CDATA #IMPLIED
-autocomplete CDATA #IMPLIED
 onkeypress CDATA #IMPLIED
 needed (true|false) "false"
 onchange CDATA #IMPLIED
@@ -1004,15 +990,12 @@ attributes CDATA #IMPLIED
 <!ELEMENT url-email EMPTY>
 <!ATTLIST url-email
 multiline (true|false) "false"
-allow_path (true|false) "false"
-trailing_slash (true|false) "[object Object]"
 size CDATA #IMPLIED
 maxlength CDATA #IMPLIED
 blur CDATA #IMPLIED
 rows CDATA #IMPLIED
 cols CDATA #IMPLIED
 validator CDATA #IMPLIED
-autocomplete CDATA #IMPLIED
 onkeypress CDATA #IMPLIED
 needed (true|false) "false"
 onchange CDATA #IMPLIED
@@ -1046,15 +1029,12 @@ attributes CDATA #IMPLIED
 <!ELEMENT url-phone EMPTY>
 <!ATTLIST url-phone
 multiline (true|false) "false"
-allow_path (true|false) "false"
-trailing_slash (true|false) "[object Object]"
 size CDATA #IMPLIED
 maxlength CDATA #IMPLIED
 blur CDATA #IMPLIED
 rows CDATA #IMPLIED
 cols CDATA #IMPLIED
 validator CDATA #IMPLIED
-autocomplete CDATA #IMPLIED
 onkeypress CDATA #IMPLIED
 needed (true|false) "false"
 onchange CDATA #IMPLIED
@@ -2308,24 +2288,18 @@ attributes CDATA #IMPLIED
 >
 <!ELEMENT dropdown_button EMPTY>
 <!ATTLIST dropdown_button
-label CDATA "Select..."
-label_updates (true|false) "true"
-image CDATA #IMPLIED
-ro_image CDATA #IMPLIED
-onclick CDATA #IMPLIED
-select_options CDATA #IMPLIED
-accesskey CDATA #IMPLIED
-tabindex CDATA #IMPLIED
-required CDATA #IMPLIED
 needed (true|false) "false"
 onchange CDATA #IMPLIED
 onfocus CDATA #IMPLIED
 validation_error CDATA #IMPLIED
+tabindex CDATA #IMPLIED
 readonly (true|false) "false"
+label CDATA #IMPLIED
 value CDATA #IMPLIED
 statustext CDATA #IMPLIED
 statustext_html (true|false) "false"
 align CDATA "left"
+onclick CDATA #IMPLIED
 disabled (true|false) "false"
 width CDATA #IMPLIED
 height CDATA #IMPLIED
@@ -2477,6 +2451,7 @@ value CDATA #IMPLIED
 needed CDATA #IMPLIED
 link_hook CDATA "view"
 target_app CDATA #IMPLIED
+extra_link_target CDATA #IMPLIED
 label CDATA #IMPLIED
 statustext CDATA #IMPLIED
 statustext_html (true|false) "false"
@@ -2799,10 +2774,12 @@ attributes CDATA #IMPLIED
 >
 <!ELEMENT taglist-cat EMPTY>
 <!ATTLIST taglist-cat
-minChars CDATA #IMPLIED
-autocomplete_url CDATA #IMPLIED
+autocomplete_url CDATA "EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"
 autocomplete_params CDATA #IMPLIED
-allowFreeEntries (true|false) "false"
+allowFreeEntries (true|false) "true"
+include_lists (true|false) "false"
+useCommaKey (true|false) "false"
+domainOptional (true|false) "false"
 empty_label CDATA #IMPLIED
 select_options CDATA #IMPLIED
 value CDATA #IMPLIED
@@ -2816,8 +2793,8 @@ maxSelection CDATA #IMPLIED
 multiple CDATA #IMPLIED
 rows CDATA #IMPLIED
 tags (true|false) "false"
-useCommaKey (true|false) "true"
 groupBy CDATA #IMPLIED
+minChars CDATA #IMPLIED
 editModeEnabled (true|false) "true"
 expand_multiple_rows CDATA #IMPLIED
 selected_first (true|false) "true"
@@ -3026,23 +3003,19 @@ app CDATA #IMPLIED
 filters CDATA #IMPLIED
 id CDATA "favorite"
 label CDATA #IMPLIED
-label_updates (true|false) "false"
+label_updates CDATA #IMPLIED
 image CDATA "/egroupware/etemplate/templates/pixelegg/images/fav_filter.svg"
 statustext CDATA "Favorite queries"
-ro_image CDATA #IMPLIED
-onclick CDATA #IMPLIED
-select_options CDATA #IMPLIED
-accesskey CDATA #IMPLIED
-tabindex CDATA #IMPLIED
-required CDATA #IMPLIED
 needed (true|false) "false"
 onchange CDATA #IMPLIED
 onfocus CDATA #IMPLIED
 validation_error CDATA #IMPLIED
+tabindex CDATA #IMPLIED
 readonly (true|false) "false"
 value CDATA #IMPLIED
 statustext_html (true|false) "false"
 align CDATA "left"
+onclick CDATA #IMPLIED
 disabled (true|false) "false"
 width CDATA #IMPLIED
 height CDATA #IMPLIED
@@ -3167,7 +3140,7 @@ format CDATA #IMPLIED
 timezone CDATA #IMPLIED
 statustext CDATA "Insert timestamp into description field"
 image CDATA "timestamp"
-background_image (true|false) "true"
+background_image CDATA #IMPLIED
 label CDATA #IMPLIED
 ro_image CDATA #IMPLIED
 onclick CDATA #IMPLIED
@@ -3202,7 +3175,7 @@ format CDATA #IMPLIED
 timezone CDATA #IMPLIED
 statustext CDATA "Insert timestamp into description field"
 image CDATA "timestamp"
-background_image (true|false) "true"
+background_image CDATA #IMPLIED
 label CDATA #IMPLIED
 ro_image CDATA #IMPLIED
 onclick CDATA #IMPLIED
@@ -3255,7 +3228,7 @@ attributes CDATA #IMPLIED
 <!ELEMENT tree EMPTY>
 <!ATTLIST tree
 multiple (true|false) "false"
-select_options CDATA "[object Object]"
+select_options CDATA #IMPLIED
 onclick CDATA #IMPLIED
 onselect CDATA #IMPLIED
 oncheck CDATA #IMPLIED
@@ -3297,7 +3270,7 @@ attributes CDATA #IMPLIED
 <!ELEMENT tree-cat EMPTY>
 <!ATTLIST tree-cat
 multiple (true|false) "false"
-select_options CDATA "[object Object]"
+select_options CDATA #IMPLIED
 onclick CDATA #IMPLIED
 onselect CDATA #IMPLIED
 oncheck CDATA #IMPLIED
@@ -3423,8 +3396,8 @@ attributes CDATA #IMPLIED
 >
 <!ELEMENT appicon EMPTY>
 <!ATTLIST appicon
-default_src CDATA "nonav"
 src CDATA #IMPLIED
+default_src CDATA #IMPLIED
 href CDATA #IMPLIED
 extra_link_target CDATA "_self"
 extra_link_popup CDATA #IMPLIED
@@ -3532,6 +3505,7 @@ seamless (true|false) "true"
 name CDATA #IMPLIED
 fullscreen (true|false) "false"
 src CDATA #IMPLIED
+allow CDATA #IMPLIED
 value CDATA #IMPLIED
 statustext CDATA #IMPLIED
 statustext_html (true|false) "false"
@@ -3735,7 +3709,6 @@ blur CDATA #IMPLIED
 rows CDATA #IMPLIED
 cols CDATA #IMPLIED
 validator CDATA #IMPLIED
-autocomplete CDATA #IMPLIED
 onkeypress CDATA #IMPLIED
 needed (true|false) "false"
 onchange CDATA #IMPLIED
@@ -3776,7 +3749,6 @@ blur CDATA #IMPLIED
 rows CDATA #IMPLIED
 cols CDATA #IMPLIED
 validator CDATA #IMPLIED
-autocomplete CDATA #IMPLIED
 onkeypress CDATA #IMPLIED
 needed (true|false) "false"
 onchange CDATA #IMPLIED