From 8ec106f22b0713f6ea0320b3f77d070a4550d350 Mon Sep 17 00:00:00 2001
From: ralf <rb@egroupware.org>
Date: Wed, 4 Jan 2023 11:28:10 -0600
Subject: [PATCH] converting .xet files to new webcomponents-format

---
 .../templates/default/add_list_dialog.xet     |  13 +-
 addressbook/templates/default/admin.types.xet |   5 +-
 addressbook/templates/default/config.xet      | 155 ++++----
 addressbook/templates/default/contactform.xet | 169 ++++----
 addressbook/templates/default/display.xet     |  57 ++-
 .../templates/default/dupconfirmdialog.xet    |   9 +-
 .../default/export_explode_fields.xet         |  19 +-
 .../default/export_vcard_selectors.xet        |   9 +-
 addressbook/templates/default/home.link.xet   |  51 ++-
 .../templates/default/import_vcard.xet        |  11 +-
 .../importexport_wizard_chooseowner.xet       |  21 +-
 .../importexport_wizard_vcard_charset.xet     |  13 +-
 .../importexport_wizard_vcard_chooseowner.xet |  13 +-
 .../templates/default/index.cat_add.xet       |  20 +-
 .../default/index.duplicate_rows.xet          |  65 ++--
 .../templates/default/index.org_rows.xet      |  77 ++--
 addressbook/templates/default/index.rows.xet  | 176 ---------
 addressbook/templates/default/index.xet       | 179 +++++----
 .../templates/default/mail_merge_dialog.xet   |  15 +-
 addressbook/templates/default/view.xet        |  61 ++-
 addressbook/templates/mobile/edit.xet         | 361 +++++++++---------
 addressbook/templates/mobile/index.xet        |  67 ++--
 addressbook/templates/mobile/view.xet         | 177 +++++----
 admin/templates/default/accesslog.xet         |  47 ++-
 admin/templates/default/account.delete.xet    |  51 ++-
 admin/templates/default/account.xet           | 101 +++--
 admin/templates/default/acl.delete.xet        |  11 +-
 admin/templates/default/acl.edit.xet          |  39 +-
 admin/templates/default/acl.xet               |  37 +-
 admin/templates/default/categories.delete.xet |  25 +-
 admin/templates/default/categories.edit.xet   |  69 ++--
 admin/templates/default/categories.index.xet  |  75 ++--
 admin/templates/default/cmds.xet              | 132 +++----
 admin/templates/default/config.xet            | 324 ++++++++--------
 admin/templates/default/customfield_edit.xet  |  77 ++--
 admin/templates/default/customfields.xet      |  63 ++-
 admin/templates/default/customtranslation.xet |  27 +-
 .../default/export_users_csv_selectors.xet    |   9 +-
 admin/templates/default/group.edit.xet        |  44 +--
 admin/templates/default/index.xet             |  49 ++-
 admin/templates/default/mailaccount.xet       | 318 ++++++++-------
 admin/templates/default/mailwizard.folder.xet |  63 ++-
 admin/templates/default/mailwizard.sieve.xet  |  49 ++-
 admin/templates/default/mailwizard.smtp.xet   |  51 ++-
 admin/templates/default/mailwizard.xet        |  53 ++-
 .../templates/default/mainscreen_message.xet  |  33 +-
 admin/templates/default/passwordreset.xet     |  67 ++--
 admin/templates/default/remotes.xet           |  51 ++-
 admin/templates/default/site-config.xet       |  21 +-
 admin/templates/default/smimeCertGen.xet      |  35 +-
 admin/templates/default/statistics.xet        |  79 ++--
 admin/templates/mobile/account.xet            |  75 ++--
 admin/templates/mobile/categories.edit.xet    |  65 ++--
 admin/templates/mobile/categories.index.xet   |  79 ++--
 admin/templates/mobile/index.xet              |  71 ++--
 admin/templates/mobile/mailaccount.xet        | 328 ++++++++--------
 admin/templates/mobile/mailwizard.folder.xet  |  57 ++-
 admin/templates/mobile/mailwizard.sieve.xet   |  55 ++-
 admin/templates/mobile/mailwizard.smtp.xet    |  57 ++-
 admin/templates/mobile/mailwizard.xet         |  61 ++-
 admin/templates/mobile/site-config.xet        |  13 +-
 api/templates/default/about.index.xet         |  29 +-
 api/templates/default/add_favorite.xet        |  18 +-
 api/templates/default/audio_player.xet        |   9 +-
 api/templates/default/avatar_edit.xet         |  27 +-
 api/templates/default/dtd.xet                 |  13 +-
 .../default/insert_merge_placeholder.xet      |  45 +--
 api/templates/default/long_task.xet           |  21 +-
 api/templates/default/nm_column_selection.xet |  13 +-
 api/templates/default/nm_print_dialog.xet     |  15 +-
 api/templates/default/password.xet            |  29 +-
 api/templates/default/pgp_backup_restore.xet  |  16 +-
 api/templates/default/pgp_installation.xet    |  10 +-
 api/templates/default/placeholder_snippet.xet |  25 +-
 api/templates/default/prompt.xet              |  19 +-
 api/templates/default/promptOpenedDialog.xet  |   9 +-
 api/templates/default/show_replacements.xet   |  17 +-
 .../default/toolbarAdminSettings.xet          |  15 +-
 api/templates/default/vfsSelectUI.xet         |  37 +-
 api/templates/test/date_test.xet              |   8 +-
 api/templates/test/email_test.xet             |   4 +-
 api/templates/test/entry_test.xet             |   2 +-
 api/templates/test/entry_test_contact.xet     |   2 +-
 api/templates/test/float_test.xet             |   4 +-
 api/templates/test/integer_test.xet           |   6 +-
 api/templates/test/nested.xet                 |   4 +-
 api/templates/test/select_test.xet            |   8 +-
 api/templates/test/textbox_test.xet           |   6 +-
 api/templates/test/url_test.xet               |   4 +-
 calendar/templates/default/add.xet            |  35 +-
 calendar/templates/default/cat_acl.xet        |  31 +-
 .../templates/default/category_report.xet     |  64 ++--
 calendar/templates/default/config.xet         | 111 +++---
 calendar/templates/default/conflicts.xet      |  41 +-
 calendar/templates/default/edit.alarms.xet    |  61 ++-
 calendar/templates/default/edit.xet           | 257 ++++++-------
 calendar/templates/default/edit_series.xet    |  31 +-
 calendar/templates/default/export.xet         |  31 +-
 .../templates/default/export_csv_select.xet   |  27 +-
 calendar/templates/default/freetimesearch.xet |  69 ++--
 .../templates/default/import.conditions.xet   |  13 +-
 .../default/import.ical_conditions.xet        |  33 +-
 calendar/templates/default/import.xet         |  17 +-
 calendar/templates/default/import_ical.xet    |  11 +-
 .../importexport_wizard_ical_chooseowner.xet  |  15 +-
 calendar/templates/default/list.dates.xet     |  17 +-
 calendar/templates/default/list.rows.xet      |  65 ++--
 calendar/templates/default/list.xet           | 159 ++++----
 calendar/templates/default/meeting.xet        |  93 +++--
 calendar/templates/default/notify_dialog.xet  |  50 +--
 calendar/templates/default/planner.xet        |   4 +-
 calendar/templates/default/print.xet          |  95 +++--
 calendar/templates/default/sidebox.xet        |  28 +-
 calendar/templates/default/todo.xet           |  22 +-
 calendar/templates/default/toolbar.xet        |  23 +-
 calendar/templates/default/view.xet           |   4 +-
 calendar/templates/mobile/edit.xet            | 241 ++++++------
 calendar/templates/mobile/freetimesearch.xet  |  69 ++--
 calendar/templates/mobile/list.xet            |  94 ++---
 calendar/templates/mobile/toolbar.xet         |  12 +-
 calendar/templates/mobile/view.xet            |   8 +-
 filemanager/templates/default/admin.xet       | 120 +++---
 filemanager/templates/default/editor.xet      |  13 +-
 filemanager/templates/default/file.xet        | 159 ++++----
 .../templates/default/file_share_received.xet |  21 +-
 .../templates/default/home.header_left.xet    |  13 +-
 filemanager/templates/default/home.rows.xet   |  25 +-
 filemanager/templates/default/index.xet       |  46 +--
 filemanager/templates/default/quota.xet       |  33 +-
 .../templates/default/replacements.xet        |  11 +-
 filemanager/templates/default/select.xet      |  43 +--
 .../templates/default/share_dialog.xet        |  10 +-
 filemanager/templates/default/shares.xet      |  21 +-
 filemanager/templates/default/tile.xet        |  13 +-
 filemanager/templates/mobile/editor.xet       |  13 +-
 filemanager/templates/mobile/file.xet         | 148 ++++---
 filemanager/templates/mobile/index.xet        |  59 ++-
 home/templates/default/birthdays.xet          |   7 +-
 home/templates/default/edit.xet               |   7 +-
 home/templates/default/favorite.xet           |   7 +-
 home/templates/default/index.xet              |  19 +-
 home/templates/default/legacy.xet             |   5 +-
 home/templates/default/link.xet               |   9 +-
 home/templates/default/list.xet               |   7 +-
 home/templates/default/note.xet               |  15 +-
 home/templates/default/weather.xet            |  45 ++-
 importexport/templates/default/config.xet     |  17 +-
 .../templates/default/definition_index.xet    |  78 ++--
 .../default/export_csv_selectors.xet          |  11 +-
 .../templates/default/export_dialog.xet       |  97 ++---
 .../templates/default/import_definition.xet   |  15 +-
 .../templates/default/import_dialog.xet       |  58 ++-
 .../templates/default/schedule_edit.xet       |  85 ++---
 .../templates/default/schedule_index.xet      |  97 +++--
 .../wizard_basic_export_csv.choose_fields.xet |  23 +-
 ...ard_basic_export_csv.choosesepncharset.xet |  29 +-
 .../wizard_basic_export_csv.filter.xet        |   7 +-
 ...ard_basic_import_csv.choosesepncharset.xet |  33 +-
 .../wizard_basic_import_csv.conditions.xet    |  71 ++--
 .../wizard_basic_import_csv.fieldmapping.xet  |  23 +-
 .../wizard_basic_import_csv.overrides.xet     |  11 +-
 .../wizard_basic_import_csv.sample_file.xet   |   7 +-
 .../default/wizard_chooseallowedusers.xet     |   9 +-
 .../templates/default/wizard_chooseapp.xet    |  11 +-
 .../templates/default/wizard_choosename.xet   |   9 +-
 .../templates/default/wizard_chooseplugin.xet |  11 +-
 importexport/templates/default/wizardbox.xet  |  35 +-
 infolog/templates/default/admin.types.xet     |  57 ++-
 infolog/templates/default/config.xet          | 100 +++--
 infolog/templates/default/delete.xet          | 337 ++++++++--------
 infolog/templates/default/edit.print.xet      | 217 +++++------
 .../default/export_csv_selectors.xet          |  11 +-
 infolog/templates/default/home.link.xet       |  20 +-
 infolog/templates/default/home.xet            | 147 ++++---
 .../default/import.ical_conditions.xet        |  11 +-
 infolog/templates/default/index.rows.xet      | 229 -----------
 infolog/templates/default/index.xet           | 270 +++++++------
 .../default/widget.infolog-value.xet          |  53 ++-
 infolog/templates/mobile/edit.xet             | 176 ++++-----
 infolog/templates/mobile/index.xet            | 131 ++++---
 infolog/templates/mobile/view.xet             | 164 ++++----
 infolog/templates/test/entry_test.xet         |  28 +-
 mail/templates/default/acl.xet                |  99 +++--
 mail/templates/default/checkmailbox.xet       |  53 ++-
 mail/templates/default/compose.xet            | 169 ++++----
 mail/templates/default/config.xet             | 138 ++++---
 mail/templates/default/display.xet            | 185 +++++----
 mail/templates/default/displayAllAdresses.xet |  15 +-
 mail/templates/default/folder_management.xet  |  23 +-
 mail/templates/default/importMessage.xet      |  19 +-
 .../default/index.rows.horizental.xet         |  33 +-
 .../templates/default/index.rows.vertical.xet |  43 +--
 mail/templates/default/index.xet              | 138 ++++---
 .../default/integration_to_entry_dialog.xet   |  15 +-
 .../default/modifyMessageSubjectDialog.xet    |  17 +-
 mail/templates/default/moveFolder.xet         |  17 +-
 .../default/predefinedAddressesDialog.xet     |  27 +-
 mail/templates/default/profiles.index.xet     |  21 +-
 mail/templates/default/sieve.edit.xet         | 141 ++++---
 .../default/sieve.emailNotification.xet       |  41 +-
 mail/templates/default/sieve.index.xet        |  19 +-
 mail/templates/default/sieve.vacation.xet     |  71 ++--
 mail/templates/default/signatures.index.xet   |  21 +-
 .../default/smimeCertAddToContact.xet         |  33 +-
 mail/templates/default/smimeCertGen.xet       |  34 +-
 mail/templates/default/subscribe.xet          |  25 +-
 mail/templates/mobile/acl.xet                 |  59 ++-
 mail/templates/mobile/compose.xet             | 149 ++++----
 mail/templates/mobile/display.xet             | 123 +++---
 mail/templates/mobile/index.xet               |  57 ++-
 mail/templates/mobile/sieve.vacation.xet      |  75 ++--
 mail/templates/mobile/subscribe.xet           |  27 +-
 mail/templates/mobile/view.xet                | 115 +++---
 notifications/templates/default/config.xet    |  27 +-
 preferences/templates/default/config.xet      |  21 +-
 preferences/templates/default/password.xet    |  78 ++--
 preferences/templates/default/settings.xet    |  47 +--
 preferences/templates/mobile/password.xet     |  78 ++--
 preferences/templates/mobile/settings.xet     |  50 +--
 resources/templates/default/acl.xet           |  42 +-
 resources/templates/default/acl_edit.xet      |  59 ++-
 resources/templates/default/admin.types.xet   |   8 +-
 .../templates/default/calendar_sidebox.xet    |   9 +-
 resources/templates/default/config.xet        |  27 +-
 resources/templates/default/edit.xet          | 149 ++++----
 resources/templates/default/show.rows.xet     |  71 ++--
 resources/templates/default/show.xet          | 118 +++---
 resources/templates/default/showdetails.xet   |  77 ++--
 resources/templates/default/sitemgr_book.xet  |  69 ++--
 resources/templates/mobile/edit.xet           | 152 ++++----
 resources/templates/mobile/show.xet           | 107 +++---
 resources/templates/mobile/view.xet           |  90 ++---
 timesheet/templates/default/config.xet        |  47 ++-
 timesheet/templates/default/editstatus.xet    |  41 +-
 .../importexport_wizard_chooseowner.xet       |  19 +-
 timesheet/templates/default/index.rows.xet    |  88 -----
 timesheet/templates/default/index.xet         |  79 ++--
 timesheet/templates/default/timer.xet         |  40 +-
 .../default/wizard_import_options.xet         |  23 +-
 timesheet/templates/mobile/edit.xet           | 118 +++---
 timesheet/templates/mobile/index.xet          |  57 ++-
 timesheet/templates/mobile/view.xet           | 114 +++---
 242 files changed, 6502 insertions(+), 7812 deletions(-)
 delete mode 100644 addressbook/templates/default/index.rows.xet
 delete mode 100644 infolog/templates/default/index.rows.xet
 delete mode 100644 timesheet/templates/default/index.rows.xet

diff --git a/addressbook/templates/default/add_list_dialog.xet b/addressbook/templates/default/add_list_dialog.xet
index e695789a95..6683fd2670 100644
--- a/addressbook/templates/default/add_list_dialog.xet
+++ b/addressbook/templates/default/add_list_dialog.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.add_list_dialog" template="" lang="" group="0" version="">
 		<grid>
@@ -10,14 +9,14 @@
 			</columns>
 			<rows>
 			<row>
-				<description value="Name for the distribution list"/>
-				<textbox id="name"/>
+				<et2-description  value="Name for the distribution list"></et2-description>
+				<et2-textbox  id="name"></et2-textbox>
 			</row>
 			<row>
-			<description value="Addressbook"/>
-			<select id="owner"/>
+			<et2-description  value="Addressbook"></et2-description>
+			<et2-select  id="owner"></et2-select>
 			</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/admin.types.xet b/addressbook/templates/default/admin.types.xet
index 8b6e97856e..704dc913ad 100644
--- a/addressbook/templates/default/admin.types.xet
+++ b/addressbook/templates/default/admin.types.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.admin.types" template="" lang="" group="0" version="">
 		<template id="admin.customfields.types" content="content_types"/>
@@ -8,4 +7,4 @@
 font-weight: bold;
 }</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/config.xet b/addressbook/templates/default/config.xet
index 2a500ffd5f..bbb9ca667a 100644
--- a/addressbook/templates/default/config.xet
+++ b/addressbook/templates/default/config.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.config" template="" lang="" group="0" version="16.1">
 		<grid width="100%" class="admin-config egwGridView_grid">
@@ -10,160 +9,160 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Telephony integration" span="all" class="subHeader"/>
+					<et2-description  value="Telephony integration" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="URL to link telephone numbers to (use %1 = number to call, %u = account name, %t = account phone)" label="%s:"/>
-					<textbox id="newsettings[call_link]" class="et2_fullWidth"/>
+					<et2-description  value="URL to link telephone numbers to (use %1 = number to call, %u = account name, %t = account phone)" label="%s:"></et2-description>
+					<et2-textbox  id="newsettings[call_link]"></et2-textbox>
 				</row>
 				<row>
-					<description value="Size of popup (WxH, eg.400x300, if a popup should be used)" label="%s:"/>
-					<textbox id="newsettings[call_popup]" size="10"/>
+					<et2-description  value="Size of popup (WxH, eg.400x300, if a popup should be used)" label="%s:"></et2-description>
+					<et2-textbox  id="newsettings[call_popup]"></et2-textbox>
 				</row>
 				<row>
-					<description value="Send fax via email by replacing fax number with an email address" label="%s:"/>
-					<hbox>
-						<textbox id="newsettings[fax_email_regexp]" blur="(.*)"/>
-						<textbox id="newsettings[fax_email]" blur="$1@fax.local"/>
-					</hbox>
+					<et2-description  value="Send fax via email by replacing fax number with an email address" label="%s:"></et2-description>
+					<et2-hbox>
+						<et2-textbox  id="newsettings[fax_email_regexp]" placeholder="(.*)"></et2-textbox>
+						<et2-textbox  id="newsettings[fax_email]" placeholder="$1@fax.local"></et2-textbox>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="GeoLocation integration" span="all" class="subHeader"/>
+					<et2-description  value="GeoLocation integration" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Choose pre-defined map source or use custom URL (use %r = street, %t = city, %c = country, %z = zipcode)" label="%s:"/>
-					<taglist id="newsettings[geolocation_url]" maxSelection="1" empty_label="Select a map or write an URL"/>
+					<et2-description  value="Choose pre-defined map source or use custom URL (use %r = street, %t = city, %c = country, %z = zipcode)" label="%s:"></et2-description>
+					<et2-select  id="newsettings[geolocation_url]" allowFreeEntries="true" editModeEnabled="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_search" emptyLabel="Select a map or write an URL"></et2-select>
 				</row>
 				<row>
-					<description value="Calendar integration" span="all" class="subHeader"/>
+					<et2-description  value="Calendar integration" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Disable Last/Next Event column"/>
-					<select id="newsettings[disable_event_column]">
+					<et2-description  value="Disable Last/Next Event column"></et2-description>
+					<et2-select  id="newsettings[disable_event_column]">
 						<option value="">Allow</option>
 						<option value="contacts">Allow for contacts only</option>
 						<option value="True">Disabled</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Allow users to maintain their own account-data" span="all" class="subHeader"/>
+					<et2-description  value="Allow users to maintain their own account-data" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Fields the user is allowed to edit himself"/>
-					<select id="newsettings[own_account_acl]" multiple="true" tags="true" class="et2_fullWidth"/>
+					<et2-description  value="Fields the user is allowed to edit himself"></et2-description>
+					<et2-select  id="newsettings[own_account_acl]" multiple="true"></et2-select>
 				</row>
 				<row>
-					<description value="General" span="all" class="subHeader"/>
+					<et2-description  value="General" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Use a category tree?"/>
-					<select id="newsettings[cat_tab]">
+					<et2-description  value="Use a category tree?"></et2-description>
+					<et2-select  id="newsettings[cat_tab]">
 						<option value="True">No</option>
 						<option value="Tree">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Use an extra tab for private custom fields?"/>
-					<select id="newsettings[private_cf_tab]">
+					<et2-description  value="Use an extra tab for private custom fields?"></et2-description>
+					<et2-select  id="newsettings[private_cf_tab]">
 						<option value="">No</option>
 						<option value="True">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)"/>
-					<select id="newsettings[index_load_cfs]" multiple="true" tags="true" class="et2_fullWidth"/>
+					<et2-description  value="Load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)"></et2-description>
+					<et2-select  id="newsettings[index_load_cfs]" multiple="true"></et2-select>
 				</row>
 				<row>
-					<description value="Update Fields by edited organisations?"/>
-					<select id="newsettings[org_fileds_to_update]" multiple="true" tags="true" class="et2_fullWidth"/>
+					<et2-description  value="Update Fields by edited organisations?"></et2-description>
+					<et2-select  id="newsettings[org_fileds_to_update]" multiple="true"></et2-select>
 				</row>
 				<row>
-					<description value="Fields to copy when copying an address?"/>
-					<select id="newsettings[copy_fields]" multiple="true" tags="true" class="et2_fullWidth"/>
+					<et2-description  value="Fields to copy when copying an address?"></et2-description>
+					<et2-select  id="newsettings[copy_fields]" multiple="true"></et2-select>
 				</row>
 				<row>
-					<description value="Security" span="all" class="subHeader"/>
+					<et2-description  value="Security" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<vbox>
-						<description value="How many contacts should non-admins be able to export"/>
-						<description value="(empty = use global limit, no = no export at all)"/>
-					</vbox>
-					<textbox id="newsettings[contact_export_limit]" size="5"/>
+					<et2-vbox>
+						<et2-description  value="How many contacts should non-admins be able to export"></et2-description>
+						<et2-description  value="(empty = use global limit, no = no export at all)"></et2-description>
+					</et2-vbox>
+					<et2-textbox  id="newsettings[contact_export_limit]"></et2-textbox>
 				</row>
 				<row>
-					<description value="Allow members of following groups to edit contact-data of accounts" label="%s:"/>
-					<select-account id="newsettings[allow_account_edit]" account_type="groups" multiple="true" tags="true" width="100%"/>
+					<et2-description  value="Allow members of following groups to edit contact-data of accounts" label="%s:"></et2-description>
+					<et2-select-account  id="newsettings[allow_account_edit]" multiple="true" width="100%" accountType="groups"></et2-select-account>
 				</row>
 				<row>
-					<description value="History logging" span="all" class="subHeader"/>
+					<et2-description  value="History logging" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Prevent deleting of contacts"/>
-					<select id="newsettings[history]">
+					<et2-description  value="Prevent deleting of contacts"></et2-description>
+					<et2-select  id="newsettings[history]">
 						<option value="">Yes, only admins can purge deleted items</option>
 						<option value="userpurge">Yes, users can purge their deleted items</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Contact maintenance" span="all" class="subHeader"/>
+					<et2-description  value="Contact maintenance" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Set full name and file as field in contacts of all users (either all or only empty values)" label="%s:"/>
-					<hbox>
-						<select id="fileas" empty_label="Set only full name" width="70%"/>
-						<button onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_fileas&amp;all=1&amp;type='+this.form.fileas.value;" label="All"/>
-						<button onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_fileas&amp;type='+this.form.fileas.value;" label="Empty"/>
-					</hbox>
+					<et2-description  value="Set full name and file as field in contacts of all users (either all or only empty values)" label="%s:"></et2-description>
+					<et2-hbox>
+						<et2-select  id="fileas" width="70%" emptyLabel="Set only full name"></et2-select>
+						<et2-button  onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_fileas&amp;all=1&amp;type='+this.form.fileas.value;" label="All"></et2-button>
+						<et2-button  onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_fileas&amp;type='+this.form.fileas.value;" label="Empty"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Cleanup addressbook fields (apply if synchronization creates duplicates)" label="%s:"/>
-					<button onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_all_cleanup'" label="Start"/>
+					<et2-description  value="Cleanup addressbook fields (apply if synchronization creates duplicates)" label="%s:"></et2-description>
+					<et2-button  onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_all_cleanup'" label="Start"></et2-button>
 				</row>
 				<row>
-					<description value="Contact repository" span="all" class="subHeader"/>
+					<et2-description  value="Contact repository" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Select where you want to store / retrieve contacts" label="%s:"/>
-					<select id="newsettings[contact_repository]"/>
+					<et2-description  value="Select where you want to store / retrieve contacts" label="%s:"></et2-description>
+					<et2-select  id="newsettings[contact_repository]"></et2-select>
 				</row>
 				<row>
-					<description value="You can only use LDAP as contact repository if the accounts are stored in LDAP too!" span="all"/>
+					<et2-description  value="You can only use LDAP as contact repository if the accounts are stored in LDAP too!" span="all"></et2-description>
 				</row>
 				<row>
-					<description value="Account repository" label="%s:"/>
-					<hbox>
-						<description id="newsettings[account_repository]" class="subHeader"/>
-						<description value="Can be changed via Setup &gt;&gt; Configuration"/>
-					</hbox>
+					<et2-description  value="Account repository" label="%s:"></et2-description>
+					<et2-hbox>
+						<et2-description  id="newsettings[account_repository]" class="subHeader"></et2-description>
+						<et2-description  value="Can be changed via Setup &gt;&gt; Configuration"></et2-description>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="LDAP settings for contacts" span="all" class="subHeader"/>
+					<et2-description  value="LDAP settings for contacts" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="LDAP host for contacts" label="%s:"/>
-					<textbox id="newsettings[ldap_contact_host]"/>
+					<et2-description  value="LDAP host for contacts" label="%s:"></et2-description>
+					<et2-textbox  id="newsettings[ldap_contact_host]"></et2-textbox>
 				</row>
 				<row>
-					<description value="LDAP context for contacts" label="%s:"/>
-					<textbox id="newsettings[ldap_contact_context]" class="et2_fullWidth"/>
+					<et2-description  value="LDAP context for contacts" label="%s:"></et2-description>
+					<et2-textbox  id="newsettings[ldap_contact_context]"></et2-textbox>
 				</row>
 				<row>
-					<description value="Additional information about using LDAP as contact repository" class="subHeader"/>
-					<description value="README" href="/doc/ldap/README.contacts" extra_link_target="_blank"/>
+					<et2-description  value="Additional information about using LDAP as contact repository" class="subHeader"></et2-description>
+					<et2-description  value="README" href="/doc/ldap/README.contacts" extraLinkTarget="_blank"></et2-description>
 				</row>
 				<row>
-					<description value="Migration to LDAP"/>
-					<hbox>
-						<select id="migrate">
+					<et2-description  value="Migration to LDAP"></et2-description>
+					<et2-hbox>
+						<et2-select  id="migrate">
 							<option value="">Select migration type</option>
 							<option value="contacts" title="if accounts are already in LDAP">contacts to LDAP</option>
 							<option value="contacts,accounts" title="use setup for a full account-migration">contacts and account contact-data to LDAP</option>
 							<option value="contacts,accounts-back" title="for read only LDAP">contacts to LDAP, account contact-data to SQL</option>
 							<option value="sql" title="for read only LDAP">contacts and account contact-data to SQL</option>
-						</select>
-						<button onclick="if (this.form.migrate.value) document.location.href='index.php?menuaction=addressbook.addressbook_ui.migrate2ldap&amp;type='+this.form.migrate.value;" label="Start"/>
-					</hbox>
+						</et2-select>
+						<et2-button  onclick="if (this.form.migrate.value) document.location.href='index.php?menuaction=addressbook.addressbook_ui.migrate2ldap&amp;type='+this.form.migrate.value;" label="Start"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
diff --git a/addressbook/templates/default/contactform.xet b/addressbook/templates/default/contactform.xet
index 222aa6da16..cfb324ff6e 100644
--- a/addressbook/templates/default/contactform.xet
+++ b/addressbook/templates/default/contactform.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.contactform" template="" lang="" group="0" version="1.5.001">
 		<grid border="0">
@@ -15,140 +14,140 @@
 			</columns>
 			<rows>
 				<row disabled="!@show[org_name]">
-					<image src="home"/>
-					<description value="Company"/>
-					<textbox size="64" maxlength="64" id="org_name" span="4"/>
-					<description/>
+					<et2-image  src="home"></et2-image>
+					<et2-description  value="Company"></et2-description>
+					<et2-textbox  maxlength="64" id="org_name" span="4"></et2-textbox>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="!@show[org_unit]">
-					<description/>
-					<description value="Department"/>
-					<textbox size="64" maxlength="64" span="4" id="org_unit"/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description  value="Department"></et2-description>
+					<et2-textbox  maxlength="64" span="4" id="org_unit"></et2-textbox>
+					<et2-description></et2-description>
 				</row>
 				<row valign="top" disabled="!@show[n_fn]">
-					<image src="accounts"/>
-					<description value="Contact"/>
-					<textbox size="10" maxlength="64" id="n_prefix" blur="Prefix"/>
-					<textbox id="n_given" size="20" maxlength="64" align="center"/>
-					<textbox id="n_family" align="right" size="22" maxlength="64" span="2" needed="1"/>
-					<description class="redItalic" value="*"/>
+					<et2-image  src="accounts"></et2-image>
+					<et2-description  value="Contact"></et2-description>
+					<et2-textbox  maxlength="64" id="n_prefix" placeholder="Prefix"></et2-textbox>
+					<et2-textbox  id="n_given" maxlength="64" align="center"></et2-textbox>
+					<et2-textbox  id="n_family" align="right" maxlength="64" span="2" required="1"></et2-textbox>
+					<et2-description  class="redItalic" value="*"></et2-description>
 				</row>
 				<row disabled="!@show[sep1]">
 					<hrule span="all"/>
 				</row>
 				<row disabled="!@show[email]">
-					<image src="email.png"/>
-					<description value="Email"/>
-					<textbox size="64" maxlength="64" validator="/^[a-z0-9._-]+@[a-z0-9-]+(\.[a-z0-9-]+)+$/i" span="4" id="email" needed="1"/>
-					<description class="redItalic" value="*"/>
+					<et2-image  src="email.png"></et2-image>
+					<et2-description  value="Email"></et2-description>
+					<et2-textbox  maxlength="64" validator="/^[a-z0-9._-]+@[a-z0-9-]+(\.[a-z0-9-]+)+$/i" span="4" id="email" required="1"></et2-textbox>
+					<et2-description  class="redItalic" value="*"></et2-description>
 				</row>
 				<row disabled="!@show[tel_work]">
-					<image src="phone"/>
-					<description value="Business phone"/>
-					<textbox size="64" maxlength="64" span="4" id="tel_work"/>
-					<description/>
+					<et2-image  src="phone"></et2-image>
+					<et2-description  value="Business phone"></et2-description>
+					<et2-textbox  maxlength="64" span="4" id="tel_work"></et2-textbox>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="!@show[tel_cell]">
-					<description/>
-					<description value="Mobile phone"/>
-					<textbox size="64" maxlength="64" span="4" id="tel_cell"/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description  value="Mobile phone"></et2-description>
+					<et2-textbox  maxlength="64" span="4" id="tel_cell"></et2-textbox>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="!@show[tel_fax]">
-					<description/>
-					<description value="Fax"/>
-					<textbox size="64" maxlength="64" span="4" id="tel_fax"/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description  value="Fax"></et2-description>
+					<et2-textbox  maxlength="64" span="4" id="tel_fax"></et2-textbox>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="!@show[tel_home]">
-					<description/>
-					<description value="Home phone"/>
-					<textbox size="64" maxlength="64" span="4" id="tel_home"/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description  value="Home phone"></et2-description>
+					<et2-textbox  maxlength="64" span="4" id="tel_home"></et2-textbox>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="!@show[url]">
-					<image src="internet"/>
-					<description value="Internet"/>
-					<textbox size="64" maxlength="64" span="4" id="url"/>
-					<description/>
+					<et2-image  src="internet"></et2-image>
+					<et2-description  value="Internet"></et2-description>
+					<et2-textbox  maxlength="64" span="4" id="url"></et2-textbox>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="!@show[sep2]">
 					<hrule span="all"/>
 				</row>
 				<row disabled="!@show[adr_one_street]">
-					<image src="home"/>
-					<description value="Street"/>
-					<textbox size="64" maxlength="64" span="4" id="adr_one_street" needed="1"/>
-					<description class="redItalic" value="*"/>
+					<et2-image  src="home"></et2-image>
+					<et2-description  value="Street"></et2-description>
+					<et2-textbox  maxlength="64" span="4" id="adr_one_street" required="1"></et2-textbox>
+					<et2-description  class="redItalic" value="*"></et2-description>
 				</row>
 				<row disabled="!@show[adr_one_street2]">
-					<description/>
-					<description/>
-					<textbox size="64" maxlength="64" span="4" id="adr_one_street2"/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-textbox  maxlength="64" span="4" id="adr_one_street2"></et2-textbox>
+					<et2-description></et2-description>
 				</row>
 				<row valign="top" disabled="!@show[adr_one_locality]=postcode_city">
-					<description/>
-					<description value="City"/>
-					<textbox size="10" maxlength="64" id="adr_one_postalcode" needed="1"/>
-					<textbox size="48" maxlength="64" span="3" id="adr_one_locality" align="right" needed="1"/>
-					<description class="redItalic" value="*"/>
+					<et2-description></et2-description>
+					<et2-description  value="City"></et2-description>
+					<et2-textbox  maxlength="64" id="adr_one_postalcode" required="1"></et2-textbox>
+					<et2-textbox  maxlength="64" span="3" id="adr_one_locality" align="right" required="1"></et2-textbox>
+					<et2-description  class="redItalic" value="*"></et2-description>
 				</row>
 				<row valign="top" disabled="!@show[adr_one_locality]=city_state_postcode">
-					<description/>
-					<description value="Stadt"/>
-					<textbox size="36" maxlength="64" span="2" id="adr_one_locality" needed="1"/>
-					<textbox size="8" maxlength="64" id="adr_one_region" align="center"/>
-					<textbox size="8" maxlength="64" id="adr_one_postalcode" align="right" needed="1"/>
-					<description class="redItalic" value="*"/>
+					<et2-description></et2-description>
+					<et2-description  value="Stadt"></et2-description>
+					<et2-textbox  maxlength="64" span="2" id="adr_one_locality" required="1"></et2-textbox>
+					<et2-textbox  maxlength="64" id="adr_one_region" align="center"></et2-textbox>
+					<et2-textbox  maxlength="64" id="adr_one_postalcode" align="right" required="1"></et2-textbox>
+					<et2-description  class="redItalic" value="*"></et2-description>
 				</row>
 				<row disabled="!@show[sep3]">
 					<hrule span="all"/>
 				</row>
 				<row disabled="!@show[custom1]">
-					<image src="gear"/>
-					<description value="@customlabel[1]"/>
-					<textbox id="@customfield[1]" span="4" needed="1" size="64"/>
-					<description class="redItalic" value="*"/>
+					<et2-image  src="gear"></et2-image>
+					<et2-description  value="@customlabel[1]"></et2-description>
+					<et2-textbox  id="@customfield[1]" span="4" required="1"></et2-textbox>
+					<et2-description  class="redItalic" value="*"></et2-description>
 				</row>
 				<row disabled="!@show[custom2]">
-					<description/>
-					<description value="@customlabel[2]"/>
-					<textbox id="@customfield[2]" span="4" size="64"/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description  value="@customlabel[2]"></et2-description>
+					<et2-textbox  id="@customfield[2]" span="4"></et2-textbox>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="!@show[sep4]">
 					<hrule span="all"/>
 				</row>
 				<row valign="top" disabled="!@show[note]">
-					<image src="edit.png"/>
-					<description value="Message"/>
-					<textbox multiline="true" rows="5" cols="45" span="4" class="width100" needed="1" id="note"/>
+					<et2-image  src="edit.png"></et2-image>
+					<et2-description  value="Message"></et2-description>
+					<et2-textarea  rows="5" cols="45" span="4" class="width100" id="note" required="1"></et2-textarea>
 				</row>
 				<row disabled="!@show[sep5]">
 					<hrule span="all"/>
 				</row>
 				<row disabled="!@show[recaptcha]">
-					<description span="2"/>
+					<et2-description  span="2"></et2-description>
 					<html id="recaptcha"/>
-					<description/>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="!@show[captcha]">
-					<image src="private.svg"/>
-					<description value="Verification"/>
-					<description value="@captcha_task"/>
-					<textbox label="%s please calculate the result" needed="1" span="3" id="captcha" size="3"/>
-					<description class="redItalic" value="*"/>
+					<et2-image  src="private.svg"></et2-image>
+					<et2-description  value="Verification"></et2-description>
+					<et2-description  value="@captcha_task"></et2-description>
+					<et2-textbox  label="%s please calculate the result" span="3" id="captcha" required="1"></et2-textbox>
+					<et2-description  class="redItalic" value="*"></et2-description>
 				</row>
 				<row>
-					<description/>
-					<description/>
-					<button label="Submit" id="submitit"/>
-					<description span="all" class="redItalic" value="required fields *" align="right"/>
-					<description/>
-					<description/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-button  label="Submit" id="submitit"></et2-button>
+					<et2-description  span="all" class="redItalic" value="required fields *" align="right"></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -156,4 +155,4 @@
 			.width100 textarea { width: 99%; }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/display.xet b/addressbook/templates/default/display.xet
index 40a05569bd..091fc596ec 100644
--- a/addressbook/templates/default/display.xet
+++ b/addressbook/templates/default/display.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.display.rows" template="" lang="" group="0" version="1.5.001">
 		<grid width="100%" overflow="auto">
@@ -41,32 +40,32 @@
 					<nextmatch-header label="Region" id="adr_one_region"/>
 					<nextmatch-header label="@customlabel[1]" id="custom1"/>
 					<nextmatch-header label="@customlabel[2]" id="custom2"/>
-					<vbox options="0,0">
+					<et2-vbox  cellpadding="0" cellspacing="0" >
 						<nextmatch-header label="select country" id="country"/>
 						<nextmatch-customfilter id="adr_one_countryname" options="select-country,Country,1" class="countrySelect"/>
-					</vbox>
+					</et2-vbox>
 				</row>
 				<row class="row" valign="top">
-					<image options="1" src="${row}[type]" readonly="true" label="$row_cont[type_label]"/>
-					<description id="${row}[org_name]"/>
-					<description id="${row}[org_unit]"/>
-					<description id="${row}[line1]"/>
-					<description id="${row}[email]"/>
-					<description id="${row}[tel_work]"/>
-					<description id="${row}[tel_cell]"/>
-					<description id="${row}[tel_fax]"/>
-					<description id="${row}[tel_home]"/>
-					<description id="${row}[url]"/>
-					<vbox>
-						<description id="${row}[adr_one_street]"/>
-						<description id="${row}[adr_one_street2]"/>
-					</vbox>
-					<description id="${row}[adr_one_postalcode]"/>
-					<description id="${row}[adr_one_locality]"/>
-					<description id="${row}[adr_one_region]"/>
-					<description id="${row}[custom1]"/>
-					<description id="${row}[custom2]"/>
-					<description id="${row}[adr_one_countryname]"/>
+					<et2-image  options="1" src="${row}[type]" readonly="true" label="$row_cont[type_label]"></et2-image>
+					<et2-description  id="${row}[org_name]"></et2-description>
+					<et2-description  id="${row}[org_unit]"></et2-description>
+					<et2-description  id="${row}[line1]"></et2-description>
+					<et2-description  id="${row}[email]"></et2-description>
+					<et2-description  id="${row}[tel_work]"></et2-description>
+					<et2-description  id="${row}[tel_cell]"></et2-description>
+					<et2-description  id="${row}[tel_fax]"></et2-description>
+					<et2-description  id="${row}[tel_home]"></et2-description>
+					<et2-description  id="${row}[url]"></et2-description>
+					<et2-vbox>
+						<et2-description  id="${row}[adr_one_street]"></et2-description>
+						<et2-description  id="${row}[adr_one_street2]"></et2-description>
+					</et2-vbox>
+					<et2-description  id="${row}[adr_one_postalcode]"></et2-description>
+					<et2-description  id="${row}[adr_one_locality]"></et2-description>
+					<et2-description  id="${row}[adr_one_region]"></et2-description>
+					<et2-description  id="${row}[custom1]"></et2-description>
+					<et2-description  id="${row}[custom2]"></et2-description>
+					<et2-description  id="${row}[adr_one_countryname]"></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -79,12 +78,12 @@
 			</columns>
 			<rows>
 				<row disabled="!@msg">
-					<description span="all" class="redItalic" align="center" id="msg" no_lang="1"/>
-					<description/>
+					<et2-description  span="all" class="redItalic" align="center" id="msg" noLang="1"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="1">
-					<description/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
 					<nextmatch options="addressbook.display.rows" id="nm1" span="all"/>
@@ -92,4 +91,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/dupconfirmdialog.xet b/addressbook/templates/default/dupconfirmdialog.xet
index 17dc087741..ff7d9afbaf 100644
--- a/addressbook/templates/default/dupconfirmdialog.xet
+++ b/addressbook/templates/default/dupconfirmdialog.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.dupconfirmdialog" template="" lang="" group="0" version="">
 		<grid id="grid">
@@ -10,10 +9,10 @@
 			</columns>
 			<rows>
 				<row>
-					<checkbox id="${row}[confirm]"/>
-					<description id="${row}[name]"/>
+					<et2-checkbox  id="${row}[confirm]"></et2-checkbox>
+					<et2-description  id="${row}[name]"></et2-description>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/export_explode_fields.xet b/addressbook/templates/default/export_explode_fields.xet
index a02a694a71..bc37f660d4 100644
--- a/addressbook/templates/default/export_explode_fields.xet
+++ b/addressbook/templates/default/export_explode_fields.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.export_explode_fields" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -9,7 +8,7 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="List as seperate columns"/>
+					<et2-description  value="List as seperate columns"></et2-description>
 				</row>
 				<row disabled="!@explode_multiselects">
 					<grid width="100%" id="explode_multiselects">
@@ -19,22 +18,20 @@
 						</columns>
 						<rows>
 							<row class="th">
-								<description value="Field"/>
-								<description value="Style"/>
+								<et2-description  value="Field"></et2-description>
+								<et2-description  value="Style"></et2-description>
 							</row>
 							<row>
-								<description id="${row}[name]"/>
-								<menulist>
-									<menupopup id="${row}[explode]"/>
-								</menulist>
+								<et2-description  id="${row}[name]"></et2-description>
+								<et2-select  id="${row}[explode]"></et2-select>
 							</row>
 						</rows>
 					</grid>
 				</row>
 				<row disabled="@explode_multiselects">
-					<description value="No multi-select columns selected for export"/>
+					<et2-description  value="No multi-select columns selected for export"></et2-description>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/export_vcard_selectors.xet b/addressbook/templates/default/export_vcard_selectors.xet
index 6cc7208942..bb152c4bb0 100644
--- a/addressbook/templates/default/export_vcard_selectors.xet
+++ b/addressbook/templates/default/export_vcard_selectors.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.export_vcard_selectors" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -9,12 +8,12 @@
 			</columns>
 			<rows>
 				<row>
-					<radio label="Use all" id="selection" options="all"/>
+					<radio label="Use all" id="selection" set_value="all" />
 				</row>
 				<row>
-					<radio label="Use search results" id="selection" options="search"/>
+					<radio label="Use search results" id="selection" set_value="search" />
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/home.link.xet b/addressbook/templates/default/home.link.xet
index fa508c5682..096399c20e 100644
--- a/addressbook/templates/default/home.link.xet
+++ b/addressbook/templates/default/home.link.xet
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.home.link" template="" lang="" group="0" version="1.9.001">
-		<hbox height="100px">
-			<image src="image" class="photo"/>
-			<vbox>
-				<description id="n_fn" class="addressbook_sidebox_name"/>
-				<description id="org_name" class="addressbook_sidebox_org"/>
-				<description id="org_unit"/>
-				<description id="adr_one_locality"/>
-			</vbox>
-		</hbox>
+		<et2-hbox  height="100px">
+			<et2-image  src="image" class="photo"></et2-image>
+			<et2-vbox>
+				<et2-description  id="n_fn" class="addressbook_sidebox_name"></et2-description>
+				<et2-description  id="org_name" class="addressbook_sidebox_org"></et2-description>
+				<et2-description  id="org_unit"></et2-description>
+				<et2-description  id="adr_one_locality"></et2-description>
+			</et2-vbox>
+		</et2-hbox>
 		<grid class="tooltip">
 			<columns>
 				<column width="70"/>
@@ -19,36 +18,36 @@
 			</columns>
 			<rows>
 				<row>
-					<description span="2" value="Phone numbers" class="addressbook_sidebox_header"/>
+					<et2-description  span="2" value="Phone numbers" class="addressbook_sidebox_header"></et2-description>
 				</row>
 				<row>
-					<description for="tel_work" value="Business"/>
-					<url-phone id="tel_work" readonly="true"/>
+					<et2-description  for="tel_work" value="Business"></et2-description>
+					<et2-url-phone  id="tel_work" readonly="true"></et2-url-phone>
 				</row>
 				<row>
-					<description for="tel_cell" value="Mobile phone"/>
-					<url-phone id="tel_cell" readonly="true"/>
+					<et2-description  for="tel_cell" value="Mobile phone"></et2-description>
+					<et2-url-phone  id="tel_cell" readonly="true"></et2-url-phone>
 				</row>
 				<row>
-					<description for="tel_home" value="Private"/>
-					<url-phone id="tel_home" readonly="true"/>
+					<et2-description  for="tel_home" value="Private"></et2-description>
+					<et2-url-phone  id="tel_home" readonly="true"></et2-url-phone>
 				</row>
 				<row>
-					<description for="tel_fax" value="Fax"/>
-					<url-phone id="tel_fax" readonly="true"/>
+					<et2-description  for="tel_fax" value="Fax"></et2-description>
+					<et2-url-phone  id="tel_fax" readonly="true"></et2-url-phone>
 				</row>
 				<row>
-					<description span="2" value="EMail &amp; Internet" class="addressbook_sidebox_header"/>
+					<et2-description  span="2" value="EMail &amp; Internet" class="addressbook_sidebox_header"></et2-description>
 				</row>
 				<row>
-					<description for="email" value="EMail"/>
-					<url-email id="email" readonly="true"/>
+					<et2-description  for="email" value="EMail"></et2-description>
+					<et2-url-email  id="email" readonly="true"></et2-url-email>
 				</row>
 				<row>
-					<description for="url" value="URL"/>
-					<url id="url" readonly="true"/>
+					<et2-description  for="url" value="URL"></et2-description>
+					<et2-url  id="url" readonly="true"></et2-url>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/import_vcard.xet b/addressbook/templates/default/import_vcard.xet
index a6e1ab5d65..eb972a5a30 100644
--- a/addressbook/templates/default/import_vcard.xet
+++ b/addressbook/templates/default/import_vcard.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.import_vcard" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -10,10 +9,8 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Charset of file"/>
-					<menulist class="width180">
-						<menupopup id="charset" no_lang="1"/>
-					</menulist>
+					<et2-description  value="Charset of file"></et2-description>
+					<et2-select  class="width180" id="charset" noLang="1"></et2-select>
 				</row>
 			</rows>
 		</grid>
@@ -21,4 +18,4 @@
 			.width180 select { width:150px;}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/importexport_wizard_chooseowner.xet b/addressbook/templates/default/importexport_wizard_chooseowner.xet
index ddedc44079..3f7dbec8b2 100644
--- a/addressbook/templates/default/importexport_wizard_chooseowner.xet
+++ b/addressbook/templates/default/importexport_wizard_chooseowner.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.importexport_wizard_chooseowner" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -9,28 +8,24 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="msg" no_lang="1"/>
+					<et2-description  id="msg" noLang="1"></et2-description>
 				</row>
 				<row disabled="@no_owner_map">
-					<checkbox label="Use field from CSV if possible" id="owner_from_csv"/>
+					<et2-checkbox  label="Use field from CSV if possible" id="owner_from_csv"></et2-checkbox>
 				</row>
 				<row>
-					<menulist>
-						<menupopup id="contact_owner"/>
-					</menulist>
+					<et2-select  id="contact_owner"></et2-select>
 				</row>
 				<row>
-					<description/>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<menulist>
-						<menupopup type="select-bool" label="Change addressbook when updating" id="change_owner"/>
-					</menulist>
+					<et2-select-bool  label="Change addressbook when updating" id="change_owner"></et2-select-bool>
 				</row>
 				<row>
-					<checkbox label="Empty addressbook before importing" id="empty_addressbook"/>
+					<et2-checkbox  label="Empty addressbook before importing" id="empty_addressbook"></et2-checkbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/importexport_wizard_vcard_charset.xet b/addressbook/templates/default/importexport_wizard_vcard_charset.xet
index 08495ec5a9..250ec636ae 100644
--- a/addressbook/templates/default/importexport_wizard_vcard_charset.xet
+++ b/addressbook/templates/default/importexport_wizard_vcard_charset.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.importexport_wizard_vcard_charset" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -10,13 +9,11 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="msg" no_lang="1" span="all"/>
+					<et2-description  id="msg" span="all" noLang="1"></et2-description>
 				</row>
 				<row>
-					<description value="Charset of file"/>
-					<menulist class="width180">
-						<menupopup id="charset" no_lang="1"/>
-					</menulist>
+					<et2-description  value="Charset of file"></et2-description>
+					<et2-select  class="width180" id="charset" noLang="1"></et2-select>
 				</row>
 			</rows>
 		</grid>
@@ -24,4 +21,4 @@
 			.width180 select { width:150px;}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/importexport_wizard_vcard_chooseowner.xet b/addressbook/templates/default/importexport_wizard_vcard_chooseowner.xet
index 9202645fde..a261da0044 100644
--- a/addressbook/templates/default/importexport_wizard_vcard_chooseowner.xet
+++ b/addressbook/templates/default/importexport_wizard_vcard_chooseowner.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.importexport_wizard_vcard_chooseowner" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -9,17 +8,15 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="title" no_lang="1"/>
+					<et2-description  id="title" noLang="1"></et2-description>
 				</row>
 				<row>
-					<menulist>
-						<menupopup id="contact_owner"/>
-					</menulist>
+					<et2-select  id="contact_owner"></et2-select>
 				</row>
 				<row>
-					<select-cat id="override_values[cat_id][value]" label="Category" empty_label="From file" options=",,,@application"/>
+					<et2-select-cat  id="override_values[cat_id][value]" label="Category" application="@application" emptyLabel="From file"></et2-select-cat>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/index.cat_add.xet b/addressbook/templates/default/index.cat_add.xet
index b80b715a7d..9909e2232f 100644
--- a/addressbook/templates/default/index.cat_add.xet
+++ b/addressbook/templates/default/index.cat_add.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.index.cat_add" template="" lang="" group="0" version="1.5.001">
 		<grid width="100%" height="300" overflow="auto">
@@ -12,19 +11,18 @@
 			</columns>
 			<rows>
 				<row valign="top">
-					<image src="folder"/>
-					<description value="Categories"/>
-					<listbox type="select-cat" id="cat_id" rows="013" options=",width:99%"/>
+					<et2-image  src="folder"></et2-image>
+					<et2-description  value="Categories"></et2-description>
+					<et2-select-cat  id="cat_id" rows="013" multiple="1" globalCategories="width:99%"></et2-select-cat>
 					<tree-cat id="cat_id" options="13,,width:99%"/>
 				</row>
 				<row>
-					<hbox span="all">
-						<button label="add" id="cat_add"/ image="add" background_image="1">
-						<button label="delete" id="cat_delete" image="delete" background_image="1"/>
-						<button label="cancel" id="cat_cancel" onclick="window.close();" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="delete" id="cat_delete" image="delete"></et2-button>
+						<et2-button  label="cancel" id="cat_cancel" onclick="window.close();" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/index.duplicate_rows.xet b/addressbook/templates/default/index.duplicate_rows.xet
index 3247e15bbc..caa7524932 100644
--- a/addressbook/templates/default/index.duplicate_rows.xet
+++ b/addressbook/templates/default/index.duplicate_rows.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.index.duplicate_rows" template="" lang="" group="0" version="16.001">
 		<grid width="100%">
@@ -46,49 +45,47 @@
 					</grid>
 					<nextmatch-header label="Business address" id="business"/>
 					<!--
-					<vbox>
+					<et2-vbox>
 						<nextmatch-header label="Business phone" id="tel_work"/>
 						<nextmatch-header label="Mobile phone" id="tel_cell"/>
 						<nextmatch-header label="Home phone" id="tel_home"/>
-						<description value="Fax"/>
-					</vbox>
+						<et2-description  value="Fax"></et2-description>
+					</et2-vbox>
 					-->
-					<vbox>
+					<et2-vbox>
 						<nextmatch-header label="Business email" id="email"/>
 						<nextmatch-header label="Home email" id="email_home"/>
-					</vbox>
+					</et2-vbox>
 				</row>
 				<row class="$row_cont[cat_id] $row_cont[class]" valign="top">
-					<image label="$row_cont[type_label]" src="${row}[type]" align="center" no_lang="1"/>
-					<int id="${row}[group_count]" readonly="true" align="center"/>
-					<vbox id="${row}[id]">
-						<description id="${row}[line1]" no_lang="1"/>
-						<description id="${row}[line2]" no_lang="1"/>
-						<description id="${row}[org_unit]" no_lang="1"/>
-						<description id="${row}[title]" no_lang="1"/>
-						<description id="${row}[first_org]" no_lang="1"/>
-					</vbox>
-					<vbox>
-						<description value=" " id="${row}[adr_one_locality]" no_lang="1" class="leftPad5"/>
-						<menulist>
-							<menupopup type="select-country" id="${row}[adr_one_countrycode]" readonly="true"/>
-						</menulist>
-					</vbox>
+					<et2-image  label="$row_cont[type_label]" src="${row}[type]" align="center" noLang="1"></et2-image>
+					<et2-number  id="${row}[group_count]" readonly="true" align="center" precision="0"></et2-number>
+					<et2-vbox  id="${row}[id]">
+						<et2-description  id="${row}[line1]" noLang="1"></et2-description>
+						<et2-description  id="${row}[line2]" noLang="1"></et2-description>
+						<et2-description  id="${row}[org_unit]" noLang="1"></et2-description>
+						<et2-description  id="${row}[title]" noLang="1"></et2-description>
+						<et2-description  id="${row}[first_org]" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-description  value=" " id="${row}[adr_one_locality]" class="leftPad5" noLang="1"></et2-description>
+						<et2-select-country  id="${row}[adr_one_countrycode]" readonly="true"></et2-select-country>
+					</et2-vbox>
 					<!--
-					<vbox>
-						<url-phone id="${row}[tel_work]" readonly="true" class="telNumbers"/>
-						<url-phone id="${row}[tel_cell]" readonly="true" class="telNumbers"/>
-						<url-phone id="${row}[tel_home]" readonly="true" class="telNumbers"/>
-						<url-phone id="${row}[tel_fax]" readonly="true"/>
-						<description id="${row}[tel_prefered]" no_lang="1" href="$row_cont[tel_prefered_link]" extra_link_target="calling" extra_link_popup="$cont[call_popup]"/>
-					</vbox>
+					<et2-vbox>
+						<et2-url-phone  id="${row}[tel_work]" readonly="true" class="telNumbers"></et2-url-phone>
+						<et2-url-phone  id="${row}[tel_cell]" readonly="true" class="telNumbers"></et2-url-phone>
+						<et2-url-phone  id="${row}[tel_home]" readonly="true" class="telNumbers"></et2-url-phone>
+						<et2-url-phone  id="${row}[tel_fax]" readonly="true"></et2-url-phone>
+						<et2-description  id="${row}[tel_prefered]" href="$row_cont[tel_prefered_link]" noLang="1" extraLinkTarget="calling" extraLinkPopup="$cont[call_popup]"></et2-description>
+					</et2-vbox>
 					-->
-					<vbox>
-						<url-email id="${row}[email]" readonly="true" class="fixedHeight"/>
-						<url-email id="${row}[email_home]" readonly="true" class="fixedHeight"/>
-					</vbox>
+					<et2-vbox>
+						<et2-url-email  id="${row}[email]" readonly="true" class="fixedHeight"></et2-url-email>
+						<et2-url-email  id="${row}[email_home]" readonly="true" class="fixedHeight"></et2-url-email>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/index.org_rows.xet b/addressbook/templates/default/index.org_rows.xet
index abc904aa0c..fc6dfd2cee 100644
--- a/addressbook/templates/default/index.org_rows.xet
+++ b/addressbook/templates/default/index.org_rows.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.index.org_rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -20,53 +19,51 @@
 					<nextmatch-sortheader id="org_name" label="Organisation"/>
 					<nextmatch-header label="Department" id="org_unit"/>
 					<nextmatch-header label="Business address" id="business"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-header label="Business phone" id="tel_work"/>
 						<nextmatch-header label="Mobile phone" id="tel_cell"/>
 						<nextmatch-header label="Home phone" id="tel_home"/>
-						<description value="Fax"/>
-					</vbox>
-					<vbox>
+						<et2-description  value="Fax"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-header label="Url" id="url"/>
 						<nextmatch-header label="Business email" id="email"/>
 						<nextmatch-header label="Home email" id="email_home"/>
-					</vbox>
+					</et2-vbox>
 				</row>
 				<row class="$row_cont[cat_id] $row_cont[class]" valign="top">
-					<image label="$row_cont[type_label]" src="${row}[type]" align="center" no_lang="1"/>
-					<int id="${row}[org_count]" readonly="true" align="center"/>
-					<vbox>
-						<description id="${row}[org_name]" no_lang="1"/>
-						<description id="${row}[line2]" no_lang="1"/>
-					</vbox>
-					<description id="${row}[org_unit]" no_lang="1"/>
-					<vbox>
-						<description id="${row}[adr_one_street]" no_lang="1"/>
-						<description id="${row}[adr_one_street2]" no_lang="1"/>
-						<hbox>
-							<description id="${row}[adr_one_postalcode]" no_lang="1"/>
-							<description value=" " id="${row}[adr_one_locality]" no_lang="1" class="leftPad5"/>
-							<description id="${row}[adr_one_region]" no_lang="1" class="leftPad5"/>
-						</hbox>
-						<description id="${row}[adr_one_countryname]" no_lang="1"/>
-						<menulist>
-							<menupopup type="select-country" id="${row}[adr_one_countrycode]" readonly="true"/>
-						</menulist>
-					</vbox>
-					<vbox>
-						<url-phone id="${row}[tel_work]" readonly="true" class="telNumbers"/>
-						<url-phone id="${row}[tel_cell]" readonly="true" class="telNumbers"/>
-						<url-phone id="${row}[tel_home]" readonly="true" class="telNumbers"/>
-						<url-phone id="${row}[tel_fax]" readonly="true"/>
-						<description id="${row}[tel_prefered]" no_lang="1" href="$row_cont[tel_prefered_link]" extra_link_target="calling" extra_link_popup="$cont[call_popup]"/>
-					</vbox>
-					<vbox>
-						<url id="${row}[url]" readonly="true" class="fixedHeight"/>
-						<url-email id="${row}[email]" readonly="true" class="fixedHeight"/>
-						<url-email id="${row}[email_home]" readonly="true" class="fixedHeight"/>
-					</vbox>
+					<et2-image  label="$row_cont[type_label]" src="${row}[type]" align="center" noLang="1"></et2-image>
+					<et2-number  id="${row}[org_count]" readonly="true" align="center" precision="0"></et2-number>
+					<et2-vbox>
+						<et2-description  id="${row}[org_name]" noLang="1"></et2-description>
+						<et2-description  id="${row}[line2]" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-description  id="${row}[org_unit]" noLang="1"></et2-description>
+					<et2-vbox>
+						<et2-description  id="${row}[adr_one_street]" noLang="1"></et2-description>
+						<et2-description  id="${row}[adr_one_street2]" noLang="1"></et2-description>
+						<et2-hbox>
+							<et2-description  id="${row}[adr_one_postalcode]" noLang="1"></et2-description>
+							<et2-description  value=" " id="${row}[adr_one_locality]" class="leftPad5" noLang="1"></et2-description>
+							<et2-description  id="${row}[adr_one_region]" class="leftPad5" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-description  id="${row}[adr_one_countryname]" noLang="1"></et2-description>
+						<et2-select-country  id="${row}[adr_one_countrycode]" readonly="true"></et2-select-country>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-url-phone  id="${row}[tel_work]" readonly="true" class="telNumbers"></et2-url-phone>
+						<et2-url-phone  id="${row}[tel_cell]" readonly="true" class="telNumbers"></et2-url-phone>
+						<et2-url-phone  id="${row}[tel_home]" readonly="true" class="telNumbers"></et2-url-phone>
+						<et2-url-phone  id="${row}[tel_fax]" readonly="true"></et2-url-phone>
+						<et2-description  id="${row}[tel_prefered]" href="$row_cont[tel_prefered_link]" noLang="1" extraLinkTarget="calling" extraLinkPopup="$cont[call_popup]"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-url  id="${row}[url]" readonly="true" class="fixedHeight"></et2-url>
+						<et2-url-email  id="${row}[email]" readonly="true" class="fixedHeight"></et2-url-email>
+						<et2-url-email  id="${row}[email_home]" readonly="true" class="fixedHeight"></et2-url-email>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/index.rows.xet b/addressbook/templates/default/index.rows.xet
deleted file mode 100644
index b876d216eb..0000000000
--- a/addressbook/templates/default/index.rows.xet
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
-<overlay>
-	<template id="addressbook.index.rows" template="" lang="" group="0" version="1.9.005">
-		<grid width="100%">
-			<columns>
-				<column width="20"/>
-				<column width="40%"/>
-				<column width="70"/>
-				<column width="100"/>
-				<column width="60"/>
-				<column width="80"/>
-				<column width="180"/>
-				<column width="180"/>
-				<column width="180"/>
-				<column width="180"/>
-				<column width="40"/>
-				<column width="80" disabled="@no_customfields"/>
-				<column width="60%"/>
-				<column width="80" disabled="@no_distribution_list"/>
-				<column width="80"/>
-				<column width="50"/>
-				<column width="80"/>
-				<column width="120"/>
-			</columns>
-			<rows>
-				<row class="th">
-					<nextmatch-header label="Type" id="type"/>
-					<grid spacing="0" padding="0">
-						<columns>
-							<column/>
-							<column/>
-						</columns>
-						<rows>
-							<row disabled="!@order=n_fileas">
-								<nextmatch-sortheader label="own sorting" id="n_fileas" span="all"/>
-							</row>
-							<row disabled="!@order=n_given">
-								<nextmatch-sortheader label="Firstname" id="n_given"/>
-								<nextmatch-sortheader label="Name" id="n_family"/>
-							</row>
-							<row disabled="!@order=n_family">
-								<nextmatch-sortheader label="Name" id="n_family"/>
-								<nextmatch-sortheader label="Firstname" id="n_given"/>
-							</row>
-							<row>
-								<nextmatch-sortheader label="Organisation" id="org_name" span="all"/>
-							</row>
-							<row disabled="!@order=/^(org_name|n_fileas|adr_one_postalcode|contact_modified|contact_created|#)/">
-								<nextmatch-sortheader label="Name" id="n_family"/>
-								<nextmatch-sortheader label="Firstname" id="n_given" class="leftPad5"/>
-							</row>
-							<row disabled="@order=n_fileas">
-								<nextmatch-sortheader label="own sorting" id="n_fileas" span="all"/>
-							</row>
-						</rows>
-					</grid>
-					<nextmatch-header label="role" id="role"/>
-					<nextmatch-header label="Category" id="cat_id"/>
-					<nextmatch-header label="Photo" id="photo"/>
-					<nextmatch-header label="Birthday" id="bday"/>
-					<vbox>
-						<nextmatch-header label="Business address" id="business"/>
-						<nextmatch-customfilter id="adr_one_countrycode" options="select-country,Country,0,No country selected" class="countrySelect"/>
-						<nextmatch-sortheader label="zip code" id="adr_one_postalcode"/>
-					</vbox>
-					<vbox>
-						<nextmatch-header label="Home address" id="home"/>
-						<nextmatch-customfilter id="adr_two_countrycode" options="select-country,Country,0,No country selected" class="countrySelect"/>
-						<nextmatch-sortheader label="zip code" id="adr_two_postalcode"/>
-					</vbox>
-					<vbox>
-						<nextmatch-header label="Business phone" id="tel_work"/>
-						<nextmatch-header label="Mobile phone" id="tel_cell"/>
-						<nextmatch-header label="Home phone" id="tel_home"/>
-						<description value="Fax"/>
-					</vbox>
-					<vbox>
-						<nextmatch-header label="Url" id="url"/>
-						<nextmatch-header label="Business email" id="email"/>
-						<nextmatch-header label="Home email" id="email_home"/>
-					</vbox>
-					<nextmatch-header label="Room" id="room"/>
-					<nextmatch-customfields id="customfields"/>
-					<nextmatch-header label="Note" id="note"/>
-					<nextmatch-header label="Distribution lists" id="distribution_list"/>
-					<nextmatch-header label="Addressbook" id="owner"/>
-					<nextmatch-sortheader label="ID" id="contact_id"/>
-					<vbox>
-						<nextmatch-header label="Last date" id="calendar"/>
-						<nextmatch-header label="Next date" id="calendar"/>
-					</vbox>
-					<vbox>
-						<nextmatch-sortheader label="Created" id="contact_created" sortmode="DESC"/>
-						<nextmatch-sortheader label="Last modified" id="contact_modified" sortmode="DESC"/>
-					</vbox>
-				</row>
-				<row class="$row_cont[cat_id] $row_cont[class]" valign="top">
-					<image align="center" label="$row_cont[type_label]" src="${row}[type]" no_lang="1"/>
-					<vbox id="${row}[id]">
-						<description id="${row}[line1]" no_lang="1"/>
-						<description id="${row}[line2]" no_lang="1"/>
-						<description id="${row}[org_unit]" no_lang="1"/>
-						<description id="${row}[title]" no_lang="1"/>
-						<description id="${row}[first_org]" no_lang="1"/>
-					</vbox>
-					<description id="${row}[role]"/>
-					<listbox type="select-cat" id="${row}[cat_id]" readonly="true" rows="2"/>
-					<image src="${row}[photo]" class="iphoto"/>
-					<date id="${row}[bday]" readonly="true" options="Y-m-d"/>
-					<vbox>
-						<description id="${row}[adr_one_street]" no_lang="1"/>
-						<description id="${row}[adr_one_street2]" no_lang="1"/>
-						<hbox>
-							<description id="${row}[adr_one_postalcode]" no_lang="1"/>
-							<description value=" " id="${row}[adr_one_locality]" no_lang="1" class="leftPad5"/>
-							<description id="${row}[adr_one_region]" no_lang="1" class="leftPad5"/>
-						</hbox>
-						<description id="${row}[adr_one_countryname]" no_lang="1"/>
-						<menulist>
-							<menupopup type="select-country" id="${row}[adr_one_countrycode]" readonly="true"/>
-						</menulist>
-					</vbox>
-					<vbox>
-						<description id="${row}[adr_two_street]" no_lang="1"/>
-						<description id="${row}[adr_two_street2]" no_lang="1"/>
-						<hbox>
-							<description id="${row}[adr_two_postalcode]" no_lang="1"/>
-							<description value=" " id="${row}[adr_two_locality]" no_lang="1" class="leftPad5"/>
-							<description id="${row}[adr_two_region]" no_lang="1" class="leftPad5"/>
-						</hbox>
-						<description id="${row}[adr_two_countryname]" no_lang="1"/>
-						<menulist>
-							<menupopup type="select-country" id="${row}[adr_two_countrycode]" readonly="true"/>
-						</menulist>
-					</vbox>
-					<vbox>
-						<url-phone id="${row}[tel_work]" readonly="true" class="telNumbers"/>
-						<url-phone id="${row}[tel_cell]" readonly="true" class="telNumbers"/>
-						<url-phone id="${row}[tel_home]" readonly="true" class="telNumbers"/>
-						<url-phone id="${row}[tel_fax]" readonly="true"/>
-						<description id="${row}[tel_prefered]" no_lang="1" href="$row_cont[tel_prefered_link]" extra_link_target="calling" extra_link_popup="$cont[call_popup]"/>
-					</vbox>
-					<vbox>
-						<url id="${row}[url]" readonly="true" class="fixedHeight"/>
-						<url-email id="${row}[email]" readonly="true" class="fixedHeight"/>
-						<url-email id="${row}[email_home]" readonly="true" class="fixedHeight"/>
-					</vbox>
-					<description id="${row}[room]"/>
-					<customfields-list id="$row" class="customfields"/>
-					<textbox multiline="true" id="${row}[note]" no_lang="1" readonly="true"/>
-					<description id="${row}[distrib_lists]"/>
-					<menulist>
-						<menupopup id="${row}[owner]" readonly="true"/>
-					</menulist>
-					<description id="${row}[id]" class="contactid"/>
-					<vbox>
-						<link id="${row}[last_link]"/>
-						<link id="${row}[next_link]"/>
-					</vbox>
-					<vbox>
-						<date-time id="${row}[created]" readonly="true" class="noWrap"/>
-						<menulist>
-							<menupopup type="select-account" id="${row}[creator]" readonly="true"/>
-						</menulist>
-						<date-time id="${row}[modified]" readonly="true" class="noBreak"/>
-						<menulist>
-							<menupopup type="select-account" id="${row}[modifier]" readonly="true"/>
-						</menulist>
-					</vbox>
-				</row>
-			</rows>
-		</grid>
-	</template>
-</overlay>
diff --git a/addressbook/templates/default/index.xet b/addressbook/templates/default/index.xet
index b2b1e3fb0d..2d6af6ee4c 100644
--- a/addressbook/templates/default/index.xet
+++ b/addressbook/templates/default/index.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.index.rows" template="" lang="" group="0" version="1.9.005">
 		<grid width="100%">
@@ -60,127 +59,125 @@
 					<nextmatch-header label="Category" id="cat_id"/>
 					<nextmatch-header label="Photo" id="photo"/>
 					<nextmatch-header label="Birthday" id="bday"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-header label="Business address" id="business"/>
-						<nextmatch-customfilter id="adr_one_countrycode" options="select-country" type="select-country" tags="true" empty_label="Country" class="countrySelect"/>
+						<et2-nextmatch-header-custom  id="adr_one_countrycode" class="countrySelect" widgetType="select-country" emptyLabel="Country"/>
 						<nextmatch-sortheader label="zip code" id="adr_one_postalcode"/>
-					</vbox>
-					<vbox>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-header label="Home address" id="home"/>
-						<nextmatch-customfilter id="adr_two_countrycode" options="select-country" type="select-country" tags="true" empty_label="Country" class="countrySelect"/>
+						<et2-nextmatch-header-custom  id="adr_two_countrycode" class="countrySelect" widgetType="select-country" emptyLabel="Country"/>
 						<nextmatch-sortheader label="zip code" id="adr_two_postalcode"/>
-					</vbox>
-					<vbox>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-header label="Business phone" id="tel_work"/>
 						<nextmatch-header label="Mobile phone" id="tel_cell"/>
 						<nextmatch-header label="Home phone" id="tel_home"/>
-						<description value="Fax"/>
-					</vbox>
-					<vbox>
+						<et2-description  value="Fax"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-header label="Url" id="url"/>
 						<nextmatch-header label="Business email" id="email"/>
 						<nextmatch-header label="Home email" id="email_home"/>
-					</vbox>
+					</et2-vbox>
 					<nextmatch-header label="Room" id="room"/>
 					<nextmatch-customfields id="customfields"/>
 					<nextmatch-header label="Note" id="note"/>
 					<nextmatch-header label="Distribution lists" id="distribution_list"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-header label="Addressbook" id="owner"/>
-						<nextmatch-accountfilter empty_label="Shared with" id="shared_with" account_type="both"/>
-					</vbox>
+						<et2-nextmatch-header-account  id="shared_with" emptyLabel="Shared with" accountType="both"/>
+					</et2-vbox>
 					<nextmatch-sortheader label="ID" id="contact_id"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-header label="Last date" id="calendar"/>
 						<nextmatch-header label="Next date" id="calendar"/>
-					</vbox>
-					<vbox>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Created" id="contact_created" sortmode="DESC"/>
 						<nextmatch-sortheader label="Last modified" id="contact_modified" sortmode="DESC"/>
-					</vbox>
+					</et2-vbox>
 				</row>
 				<row class="$row_cont[class] $row_cont[cat_id]" valign="top">
-					<et2-image align="center" label="$row_cont[type_label]" src="$row_cont[type]" no_lang="1"/>
-					<vbox id="${row}[id]">
-						<description id="${row}[line1]" no_lang="1"/>
-						<description id="${row}[line2]" no_lang="1"/>
-						<description id="${row}[org_unit]" no_lang="1"/>
-						<description id="${row}[title]" no_lang="1"/>
-						<description id="${row}[first_org]" no_lang="1"/>
-					</vbox>
-					<description id="${row}[role]"/>
-					<listbox type="select-cat" id="${row}[cat_id]" readonly="true" rows="2"/>
-					<lavatar src="$row_cont[photo]" contactId="$row_cont[id]" lname="$row_cont[n_family]" fname="$row_cont[n_given]"/>
-					<date id="${row}[bday]" readonly="true" options="Y-m-d"/>
-					<vbox>
-						<description id="${row}[adr_one_street]" no_lang="1"/>
-						<description id="${row}[adr_one_street2]" no_lang="1"/>
-						<hbox>
-							<description id="${row}[adr_one_postalcode]" no_lang="1"/>
-							<description value=" " id="${row}[adr_one_locality]" no_lang="1" class="leftPad5"/>
-							<description id="${row}[adr_one_region]" no_lang="1" class="leftPad5"/>
-						</hbox>
-						<description id="${row}[adr_one_countryname]" no_lang="1"/>
-						<select-country id="${row}[adr_one_countrycode]" readonly="true"/>
-					</vbox>
-					<vbox>
-						<description id="${row}[adr_two_street]" no_lang="1"/>
-						<description id="${row}[adr_two_street2]" no_lang="1"/>
-						<hbox>
-							<description id="${row}[adr_two_postalcode]" no_lang="1"/>
-							<description value=" " id="${row}[adr_two_locality]" no_lang="1" class="leftPad5"/>
-							<description id="${row}[adr_two_region]" no_lang="1" class="leftPad5"/>
-						</hbox>
-						<description id="${row}[adr_two_countryname]" no_lang="1"/>
-						<menulist>
-							<menupopup type="select-country" id="${row}[adr_two_countrycode]" readonly="true"/>
-						</menulist>
-					</vbox>
-					<vbox>
-						<url-phone id="${row}[tel_work]" readonly="true" class="telNumbers" statustext="Business phone"/>
-						<url-phone id="${row}[tel_cell]" readonly="true" class="telNumbers" statustext="Mobile phone"/>
-						<url-phone id="${row}[tel_home]" readonly="true" class="telNumbers" statustext="Home phone"/>
-						<url-phone id="${row}[tel_cell_private]" readonly="true" class="telNumbers" statustext="Mobile phone (private)"/>
-						<url-fax id="${row}[tel_fax]" readonly="true" statustext="Fax"/>
-						<url-phone id="${row}[tel_prefered]" readonly="true" class="telNumbers" statustext="$row_cont[tel_prefer_label]"/>
-					</vbox>
-					<vbox>
-						<url id="${row}[url]" readonly="true" class="fixedHeight"/>
-						<url-email id="${row}[email]" readonly="true" class="fixedHeight"/>
-						<url-email id="${row}[email_home]" readonly="true" class="fixedHeight"/>
-					</vbox>
-					<description id="${row}[room]"/>
+					<et2-image  align="center" label="$row_cont[type_label]" src="$row_cont[type]" noLang="1"/>
+					<et2-vbox  id="${row}[id]">
+						<et2-description  id="${row}[line1]" noLang="1"></et2-description>
+						<et2-description  id="${row}[line2]" noLang="1"></et2-description>
+						<et2-description  id="${row}[org_unit]" noLang="1"></et2-description>
+						<et2-description  id="${row}[title]" noLang="1"></et2-description>
+						<et2-description  id="${row}[first_org]" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-description  id="${row}[role]"></et2-description>
+					<et2-select-cat  id="${row}[cat_id]" readonly="true" rows="2" multiple="1"></et2-select-cat>
+					<et2-lavatar  src="$row_cont[photo]" contactId="$row_cont[id]" lname="$row_cont[n_family]" fname="$row_cont[n_given]"></et2-lavatar>
+					<et2-date  id="${row}[bday]" readonly="true" dataFormat="Y-m-d" ></et2-date>
+					<et2-vbox>
+						<et2-description  id="${row}[adr_one_street]" noLang="1"></et2-description>
+						<et2-description  id="${row}[adr_one_street2]" noLang="1"></et2-description>
+						<et2-hbox>
+							<et2-description  id="${row}[adr_one_postalcode]" noLang="1"></et2-description>
+							<et2-description  value=" " id="${row}[adr_one_locality]" class="leftPad5" noLang="1"></et2-description>
+							<et2-description  id="${row}[adr_one_region]" class="leftPad5" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-description  id="${row}[adr_one_countryname]" noLang="1"></et2-description>
+						<et2-select-country  id="${row}[adr_one_countrycode]" readonly="true"></et2-select-country>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-description  id="${row}[adr_two_street]" noLang="1"></et2-description>
+						<et2-description  id="${row}[adr_two_street2]" noLang="1"></et2-description>
+						<et2-hbox>
+							<et2-description  id="${row}[adr_two_postalcode]" noLang="1"></et2-description>
+							<et2-description  value=" " id="${row}[adr_two_locality]" class="leftPad5" noLang="1"></et2-description>
+							<et2-description  id="${row}[adr_two_region]" class="leftPad5" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-description  id="${row}[adr_two_countryname]" noLang="1"></et2-description>
+						<et2-select-country  id="${row}[adr_two_countrycode]" readonly="true"></et2-select-country>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-url-phone  id="${row}[tel_work]" readonly="true" class="telNumbers" statustext="Business phone"></et2-url-phone>
+						<et2-url-phone  id="${row}[tel_cell]" readonly="true" class="telNumbers" statustext="Mobile phone"></et2-url-phone>
+						<et2-url-phone  id="${row}[tel_home]" readonly="true" class="telNumbers" statustext="Home phone"></et2-url-phone>
+						<et2-url-phone  id="${row}[tel_cell_private]" readonly="true" class="telNumbers" statustext="Mobile phone (private)"></et2-url-phone>
+						<et2-url-fax  id="${row}[tel_fax]" readonly="true" statustext="Fax"></et2-url-fax>
+						<et2-url-phone  id="${row}[tel_prefered]" readonly="true" class="telNumbers" statustext="$row_cont[tel_prefer_label]"></et2-url-phone>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-url  id="${row}[url]" readonly="true" class="fixedHeight"></et2-url>
+						<et2-url-email  id="${row}[email]" readonly="true" class="fixedHeight"></et2-url-email>
+						<et2-url-email  id="${row}[email_home]" readonly="true" class="fixedHeight"></et2-url-email>
+					</et2-vbox>
+					<et2-description  id="${row}[room]"></et2-description>
 					<customfields-list id="$row" class="customfields"/>
-					<textbox multiline="true" id="${row}[note]" no_lang="1" readonly="true"/>
-					<description id="${row}[distrib_lists]"/>
-					<vbox>
-						<select-account id="${row}[owner]" readonly="true"/>
-						<select-account id="${row}[shared_with]" readonly="true" multiple="true"/>
-					</vbox>
-					<description id="${row}[id]" class="contactid"/>
-					<vbox>
-                        <link id="${row}[last_link]" readonly="true"/>
-                        <link id="${row}[next_link]" readonly="true"/>
-                    </vbox>
-					<vbox>
-						<date-time id="${row}[created]" readonly="true" class="noWrap"/>
-						<select-account id="${row}[creator]" readonly="true"/>
-						<date-time id="${row}[modified]" readonly="true" class="noBreak"/>
-						<select-account id="${row}[modifier]" readonly="true"/>
-					</vbox>
+					<et2-textarea  id="${row}[note]" readonly="true" noLang="1"></et2-textarea>
+					<et2-description  id="${row}[distrib_lists]"></et2-description>
+					<et2-vbox>
+						<et2-select-account  id="${row}[owner]" readonly="true"></et2-select-account>
+						<et2-select-account  id="${row}[shared_with]" readonly="true" multiple="true"></et2-select-account>
+					</et2-vbox>
+					<et2-description  id="${row}[id]" class="contactid"></et2-description>
+					<et2-vbox>
+                        <et2-link  id="${row}[last_link]" app=""></et2-link>
+                        <et2-link  id="${row}[next_link]" app=""></et2-link>
+                    </et2-vbox>
+					<et2-vbox>
+						<et2-date-time  id="${row}[created]" readonly="true" class="noWrap"></et2-date-time>
+						<et2-select-account  id="${row}[creator]" readonly="true"></et2-select-account>
+						<et2-date-time  id="${row}[modified]" readonly="true" class="noBreak"></et2-date-time>
+						<et2-select-account  id="${row}[modifier]" readonly="true"></et2-select-account>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="addressbook.index.left" template="" lang="" group="0" version="1.7.001">
-		<buttononly align="right" statustext="Add a new contact" id="add" image="add" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'870','610','_blank','addressbook',null,true); return false;"/>
+		<et2-button  align="right" statustext="Add a new contact" id="add" image="add" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'870','610','_blank','addressbook',null,true); return false;" noSubmit="true"></et2-button>
 	</template>
 	<template id="addressbook.index.row" template="" lang="" group="0" version="1.3.001">
-		<buttononly align="right" statustext="Advanced search" image="advanced-search" background_image="1" id="advanced-search" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.extSearch'),'870','610','_blank','addressbook',null,true); return false;"/>
-		<select statustext="Select a view" id="grouped_view" no_lang="1" width="12em" empty_label="All contacts" onchange="app.addressbook.change_grouped_view"/>
+		<et2-button  align="right" statustext="Advanced search" image="advanced-search" id="advanced-search" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.extSearch'),'870','610','_blank','addressbook',null,true); return false;" noSubmit="true"></et2-button>
+		<et2-select  statustext="Select a view" id="grouped_view" width="12em" onchange="app.addressbook.change_grouped_view" noLang="1" emptyLabel="All contacts"></et2-select>
 	</template>
 	<template id="addressbook.index.right" template="" lang="" group="0" version="1.7.001">
-		<select align="right" id="col_filter[tid]" empty_label="All types"/>
+		<et2-select  align="right" id="col_filter[tid]" emptyLabel="All types"></et2-select>
 	</template>
 	<template id="addressbook.index" template="" lang="" group="0" version="1.9.002">
 		<nextmatch id="nm" template="addressbook.index.rows" span="all" header_left="addressbook.index.left" header_row="addressbook.index.row" header_right="addressbook.index.right"/>
diff --git a/addressbook/templates/default/mail_merge_dialog.xet b/addressbook/templates/default/mail_merge_dialog.xet
index 89343cc23b..a7499de76f 100644
--- a/addressbook/templates/default/mail_merge_dialog.xet
+++ b/addressbook/templates/default/mail_merge_dialog.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.mail_merge_dialog" template="" lang="" group="0" version="">
 		<grid>
@@ -10,15 +9,15 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Do you want to send the message to all selected entries, WITHOUT further editing?"/>
+					<et2-description  value="Do you want to send the message to all selected entries, WITHOUT further editing?"></et2-description>
 				</row>
 				<row>
-					<hbox>
-						<checkbox id="infolog" label="Save as infolog"/>
-						<listbox id="info_type"/>
-					</hbox>
+					<et2-hbox>
+						<et2-checkbox  id="infolog" label="Save as infolog"></et2-checkbox>
+						<et2-select  id="info_type"></et2-select>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/default/view.xet b/addressbook/templates/default/view.xet
index b84d1e32ee..fe2a04472f 100644
--- a/addressbook/templates/default/view.xet
+++ b/addressbook/templates/default/view.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.view" template="" lang="" group="0" version="1.9.001">
 		<grid class="addressbook_view" parent_node="@view_sidebox" width="100%">
@@ -10,53 +9,53 @@
 			</columns>
 			<rows>
 				<row span="all">
-					<hbox>
-						<lavatar src="@photo" lname="@n_fn"/>
-						<vbox>
-							<description id="n_fn" class="addressbook_sidebox_name"/>
-							<description id="org_name" class="addressbook_sidebox_org"/>
-							<description id="org_unit"/>
-							<description id="adr_one_locality"/>
-						</vbox>
-					</hbox>
+					<et2-hbox>
+						<et2-lavatar  src="@photo" lname="@n_fn"></et2-lavatar>
+						<et2-vbox>
+							<et2-description  id="n_fn" class="addressbook_sidebox_name"></et2-description>
+							<et2-description  id="org_name" class="addressbook_sidebox_org"></et2-description>
+							<et2-description  id="org_unit"></et2-description>
+							<et2-description  id="adr_one_locality"></et2-description>
+						</et2-vbox>
+					</et2-hbox>
 				</row>
 				<row>
-					<description span="2" value="Phone numbers" class="addressbook_sidebox_header"/>
+					<et2-description  span="2" value="Phone numbers" class="addressbook_sidebox_header"></et2-description>
 				</row>
 				<row>
-					<description for="tel_work" value="Business"/>
-					<url-phone id="tel_work" readonly="true"/>
+					<et2-description  for="tel_work" value="Business"></et2-description>
+					<et2-url-phone  id="tel_work" readonly="true"></et2-url-phone>
 				</row>
 				<row>
-					<description for="tel_cell" value="Mobile phone"/>
-					<url-phone id="tel_cell" readonly="true"/>
+					<et2-description  for="tel_cell" value="Mobile phone"></et2-description>
+					<et2-url-phone  id="tel_cell" readonly="true"></et2-url-phone>
 				</row>
 				<row>
-					<description for="tel_home" value="Private"/>
-					<url-phone id="tel_home" readonly="true"/>
+					<et2-description  for="tel_home" value="Private"></et2-description>
+					<et2-url-phone  id="tel_home" readonly="true"></et2-url-phone>
 				</row>
 				<row>
-					<description for="tel_fax" value="Fax"/>
-					<url-phone id="tel_fax" readonly="true"/>
+					<et2-description  for="tel_fax" value="Fax"></et2-description>
+					<et2-url-phone  id="tel_fax" readonly="true"></et2-url-phone>
 				</row>
 				<row>
-					<description span="2" value="EMail &amp; Internet" class="addressbook_sidebox_header"/>
+					<et2-description  span="2" value="EMail &amp; Internet" class="addressbook_sidebox_header"></et2-description>
 				</row>
 				<row>
-					<description for="email" value="EMail"/>
-					<url-email id="email" readonly="true"/>
+					<et2-description  for="email" value="EMail"></et2-description>
+					<et2-url-email  id="email" readonly="true"></et2-url-email>
 				</row>
 				<row>
-					<description for="url" value="URL"/>
-					<url id="url" readonly="true"/>
+					<et2-description  for="url" value="URL"></et2-description>
+					<et2-url  id="url" readonly="true"></et2-url>
 				</row>
 				<row class="toolbox">
-					<hbox>
-						<button id="button[edit]" label="open" background_image="1" image="edit" onclick="app.addressbook.view_actions"/>
-						<button id="button[copy]" label="copy" background_image="1" image="copy" onclick="app.addressbook.view_actions"/>
-						<button id="button[close]" statustext="close" background_image="1" readonly="false" image="close" onclick="app.addressbook.view_actions"/>
-						<buttononly id="button[delete]" label="delete" image="delete" onclick="app.addressbook.view_actions"/>
-					</hbox>
+					<et2-hbox>
+						<et2-button  id="button[edit]" label="open" image="edit" onclick="app.addressbook.view_actions"></et2-button>
+						<et2-button  id="button[copy]" label="copy" image="copy" onclick="app.addressbook.view_actions"></et2-button>
+						<et2-button  id="button[close]" statustext="close" readonly="false" image="close" onclick="app.addressbook.view_actions"></et2-button>
+						<et2-button  id="button[delete]" label="delete" image="delete" onclick="app.addressbook.view_actions" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
diff --git a/addressbook/templates/mobile/edit.xet b/addressbook/templates/mobile/edit.xet
index c0f93dab18..4c2ac1785e 100644
--- a/addressbook/templates/mobile/edit.xet
+++ b/addressbook/templates/mobile/edit.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.edit.upload" template="" lang="" group="0" version="1.3.004">
 		<grid class="uploadphoto">
@@ -9,13 +8,13 @@
 			</columns>
 			<rows>
 				<row disabled="!@jpegphoto">
-					<checkbox statustext="Deletes the photo" label="delete" id="delete_photo"/>
+					<et2-checkbox  statustext="Deletes the photo" label="delete" id="delete_photo"></et2-checkbox>
 				</row>
 				<row>
 					<file statustext="Select a portrait format jpeg photo. It will be resized to 60 pixel width." id="upload_photo" class="photo"/>
 				</row>
 				<row>
-					<button align="center" label="Ok" onclick="jQuery('table.uploadphoto').css('display','none'); return false;" image="check" background_image="1"/>
+					<et2-button  align="center" label="Ok" onclick="jQuery('table.uploadphoto').css('display','none'); return false;" image="check"></et2-button>
 				</row>
 			</rows>
 		</grid>
@@ -28,28 +27,28 @@
 			</columns>
 			<rows>
 				<row>
-					<description for="n_prefix" value="prefix"/>
-					<textbox id="n_prefix" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" maxlength="64" autocomplete="honorific-prefix" />
+					<et2-description  for="n_prefix" value="prefix"></et2-description>
+					<et2-textbox  id="n_prefix" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="64" autocomplete="honorific-prefix" ></et2-textbox>
 				</row>
 				<row>
-					<description for="n_given" value="first name"/>
-					<textbox id="n_given" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" maxlength="64" autocomplete="given-name" />
+					<et2-description  for="n_given" value="first name"></et2-description>
+					<et2-textbox  id="n_given" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="64" autocomplete="given-name" ></et2-textbox>
 				</row>
 				<row>
-					<description for="n_middle" value="middle name"/>
-					<textbox id="n_middle" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" maxlength="64" autocomplete="additional-name" />
+					<et2-description  for="n_middle" value="middle name"></et2-description>
+					<et2-textbox  id="n_middle" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="64" autocomplete="additional-name" ></et2-textbox>
 				</row>
 				<row>
-					<description for="n_family" value="last name"/>
-					<textbox id="n_family" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" maxlength="64" autocomplete="family-name" />
+					<et2-description  for="n_family" value="last name"></et2-description>
+					<et2-textbox  id="n_family" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="64" autocomplete="family-name" ></et2-textbox>
 				</row>
 				<row>
-					<description for="n_suffix" value="suffix"/>
-					<textbox id="n_suffix" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" maxlength="64" autocomplete="honorific-suffix" />
+					<et2-description  for="n_suffix" value="suffix"></et2-description>
+					<et2-textbox  id="n_suffix" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="64" autocomplete="honorific-suffix" ></et2-textbox>
 				</row>
 				<row>
-					<description/>
-					<button label="Ok" id="button[ok]" class="button_ok" onclick="jQuery('table.editname').css('display','none'); jQuery('#'+form::name('org_name')).focus(); return false;" image="check" background_image="1"/>
+					<et2-description></et2-description>
+					<et2-button  label="Ok" id="button[ok]" class="button_ok" onclick="jQuery('table.editname').css('display','none'); jQuery('#'+form::name('org_name')).focus(); return false;" image="check"></et2-button>
 				</row>
 			</rows>
 		</grid>
@@ -62,69 +61,67 @@
 			</columns>
 			<rows>
 				<row>
-					<description for="adr_one_street" value="street"/>
-					<textbox id="adr_one_street" class="et2_fullWidth" maxlength="64" autocomplete="address-line1"/>
+					<et2-description  for="adr_one_street" value="street"></et2-description>
+					<et2-textbox  id="adr_one_street" maxlength="64" autocomplete="address-line1"></et2-textbox>
 				</row>
 				<row>
-					<description/>
-					<textbox statustext="address line 2" id="adr_one_street2" class="et2_fullWidth" maxlength="64" autocomplete="address-line2"/>
+					<et2-description></et2-description>
+					<et2-textbox  statustext="address line 2" id="adr_one_street2" maxlength="64" autocomplete="address-line2"></et2-textbox>
 				</row>
 				<row disabled="@addr_format=city_state_postcode">
-					<description for="adr_one_locality" value="city" />
-					<textbox statustext="City" id="adr_one_locality" maxlength="64"  class="et2_fullWidth" autocomplete="address-level2"/>
+					<et2-description  for="adr_one_locality" value="city"></et2-description>
+					<et2-textbox  statustext="City" id="adr_one_locality" maxlength="64" autocomplete="address-level2"></et2-textbox>
 				</row>
 				<row disabled="@addr_format=city_state_postcode">
-					<description value="ZIP Code"/>
-					<textbox statustext="ZIP Code" id="adr_one_postalcode" width="35%" maxlength="64" autocomplete="postal-code"/>
+					<et2-description  value="ZIP Code"></et2-description>
+					<et2-textbox  statustext="ZIP Code" id="adr_one_postalcode" width="35%" maxlength="64" autocomplete="postal-code"></et2-textbox>
 				</row>
 				<row disabled="!@addr_format=city_state_postcode">
-					<description value="City"/>
-					<hbox>
-						<textbox statustext="City" id="adr_one_locality" size="30" maxlength="64" autocomplete="address-level2"/>
-						<textbox statustext="State" id="adr_one_region" size="3" maxlength="64" autocomplete="address-level1"/>
-						<textbox statustext="ZIP Code" id="adr_one_postalcode" size="5" maxlength="64" autocomplete="postal-code"/>
-					</hbox>
+					<et2-description  value="City"></et2-description>
+					<et2-hbox>
+						<et2-textbox  statustext="City" id="adr_one_locality" maxlength="64" autocomplete="address-level2"></et2-textbox>
+						<et2-textbox  statustext="State" id="adr_one_region" maxlength="64" autocomplete="address-level1"></et2-textbox>
+						<et2-textbox  statustext="ZIP Code" id="adr_one_postalcode" maxlength="64" autocomplete="postal-code"></et2-textbox>
+					</et2-hbox>
 				</row>
 				<row disabled="@addr_format=city_state_postcode">
-					<description value="Region"/>
-					<textbox statustext="State" id="adr_one_region" maxlength="64" class="et2_fullWidth" autocomplete="address-level1"/>
+					<et2-description  value="Region"></et2-description>
+					<et2-textbox  statustext="State" id="adr_one_region" maxlength="64" autocomplete="address-level1"></et2-textbox>
 				</row>
 				<row>
-					<description for="adr_one_countryname" value="country"/>
-					<vbox width="100%">
-						<menulist class="et2_fullWidth">
-							<menupopup type="select-country" class="countrySelect et2_fullWidth" id="adr_one_countrycode" onchange="app.addressbook.show_custom_country(this);" options="Select one,0,1" autocomplete="country"/>
-						</menulist>
-						<textbox id="adr_one_countryname" class="custom_country et2_fullWidth" autocomplete="country-name"/>
-					</vbox>
+					<et2-description  for="adr_one_countryname" value="country"></et2-description>
+					<et2-vbox  width="100%">
+						<et2-select-country  class="countrySelect" id="adr_one_countrycode" onchange="app.addressbook.show_custom_country(this);" autocomplete="country" emptyLabel="Select one"></et2-select-country>
+						<et2-textbox  id="adr_one_countryname" class="custom_country" autocomplete="country-name"></et2-textbox>
+					</et2-vbox>
 				</row>
 				<row>
-					<description for="role" value="Role"/>
-					<textbox id="role" class="et2_fullWidth" maxlength="64" autocomplete="section-one" />
+					<et2-description  for="role" value="Role"></et2-description>
+					<et2-textbox  id="role" maxlength="64" autocomplete="section-one" ></et2-textbox>
 				</row>
 				<row>
-					<description value="Room"/>
-					<textbox id="room"  width="35%"/>
+					<et2-description  value="Room"></et2-description>
+					<et2-textbox  id="room" width="35%"></et2-textbox>
 				</row>
 				<row>
-					<description for="assistent" value="Assistent"/>
-					<textbox id="assistent" class="et2_fullWidth"/>
+					<et2-description  for="assistent" value="Assistent"></et2-description>
+					<et2-textbox  id="assistent"></et2-textbox>
 				</row>
 				<row>
-					<description for="tel_assistent" value="Assistent phone"/>
-					<url-phone id="tel_assistent" class="et2_fullWidth"/>
+					<et2-description  for="tel_assistent" value="Assistent phone"></et2-description>
+					<et2-url-phone  id="tel_assistent"></et2-url-phone>
 				</row>
 				<row>
-					<description for="tel_fax" value="fax"/>
-					<url-phone id="tel_fax" class="et2_fullWidth" autocomplete="fax" />
+					<et2-description  for="tel_fax" value="fax"></et2-description>
+					<et2-url-phone  id="tel_fax" autocomplete="fax" ></et2-url-phone>
 				</row>
 				<row>
-					<description for="tel_other" value="Other phone"/>
-					<url-phone id="tel_other" class="et2_fullWidth"  autocomplete="tel" />
+					<et2-description  for="tel_other" value="Other phone"></et2-description>
+					<et2-url-phone  id="tel_other" autocomplete="tel" ></et2-url-phone>
 				</row>
 				<row>
-					<description for="tel_car" value="car phone"/>
-					<url-phone id="tel_car" class="et2_fullWidth"/>
+					<et2-description  for="tel_car" value="car phone"></et2-description>
+					<et2-url-phone  id="tel_car"></et2-url-phone>
 				</row>
 			</rows>
 		</grid>
@@ -137,24 +134,24 @@
 			</columns>
 			<rows>
 				<row>
-					<description for="category" value="Categories"/>
-					<taglist-cat id="cat_id" class="et2_fullWidth" empty_label="Select categories"/>
+					<et2-description  for="category" value="Categories"></et2-description>
+					<et2-select-cat  id="cat_id" multiple="true" placeholder="Select categories"></et2-select-cat>
 				</row>
 				<row>
-					<description value="Notes"/>
-					<textbox multiline="true" id="note" rows="10" resize_ratio="0" class="et2_fullWidth" height="200"/>
+					<et2-description  value="Notes"></et2-description>
+					<et2-textarea  id="note" rows="10" height="200" resizeRatio="0"></et2-textarea>
 				</row>
 				<row>
-					<description for="pubkey" value="Public key"/>
-					<textbox multiline="true" id="pubkey" rows="4" resize_ratio="0" class="et2_fullWidth"/>
+					<et2-description  for="pubkey" value="Public key"></et2-description>
+					<et2-textarea  id="pubkey" rows="4" resizeRatio="0"></et2-textarea>
 				</row>
 				<row disabled="@hidebuttons">
-					<description value="Last date"/>
-					<link id="last_link"/>
+					<et2-description  value="Last date"></et2-description>
+					<et2-link  id="last_link" app=""></et2-link>
 				</row>
 				<row disabled="@hidebuttons">
-					<description value="Next date"/>
-					<link id="next_link"/>
+					<et2-description  value="Next date"></et2-description>
+					<et2-link  id="next_link" app=""></et2-link>
 				</row>
 			</rows>
 		</grid>
@@ -167,68 +164,66 @@
 			</columns>
 			<rows>
 				<row>
-					<description for="tel_home" value="Home phone"/>
-					<url-phone id="tel_home" class="et2_fullWidth" autocomplete="section-two home tel" />
+					<et2-description  for="tel_home" value="Home phone"></et2-description>
+					<et2-url-phone  id="tel_home" autocomplete="section-two home tel" ></et2-url-phone>
 				</row>
 				<row>
-					<description for="tel_cell_private" value="mobile phone"/>
-					<url-phone id="tel_cell_private" class="et2_fullWidth" autocomplete="section-two mobile tel" />
+					<et2-description  for="tel_cell_private" value="mobile phone"></et2-description>
+					<et2-url-phone  id="tel_cell_private" autocomplete="section-two mobile tel" ></et2-url-phone>
 				</row>
 				<row>
-					<description for="tel_pager" value="pager" autocomplete="section-two pager tel" />
-					<url-phone id="tel_pager" class="et2_fullWidth"/>
+					<et2-description  for="tel_pager" value="pager" autocomplete="section-two pager tel"></et2-description>
+					<et2-url-phone  id="tel_pager"></et2-url-phone>
 				</row>
 				<row >
-					<description for="tel_fax_home" value="fax"/>
-					<url-phone id="tel_fax_home" class="et2_fullWidth" autocomplete="section-two fax tel" />
+					<et2-description  for="tel_fax_home" value="fax"></et2-description>
+					<et2-url-phone  id="tel_fax_home" autocomplete="section-two fax tel" ></et2-url-phone>
 				</row>
 				<row>
-					<description for="email_home" value="EMail"/>
-					<url-email id="email_home" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" autocomplete="section-two home email" />
+					<et2-description  for="email_home" value="EMail"></et2-description>
+					<et2-url-email  id="email_home" onchange="app.addressbook.check_value(widget,'$cont[id]');" autocomplete="section-two home email" ></et2-url-email>
 				</row>
 				<row>
-					<description for="url_home" value="URL"/>
-					<url id="url_home" class="et2_fullWidth" autocomplete="section-two url" />
+					<et2-description  for="url_home" value="URL"></et2-description>
+					<et2-url  id="url_home" autocomplete="section-two url" ></et2-url>
 				</row>
 				<row>
-					<description for="bday" value="Birthday"/>
-					<date id="bday" options="Y-m-d"  year_range="c-90:c+2" class="et2_fullWidth"/>
+					<et2-description  for="bday" value="Birthday"></et2-description>
+					<et2-date  id="bday" dataFormat="Y-m-d" yearRange="c-90:c+2"></et2-date>
 				</row>
 				<row>
-					<description for="adr_two_street" value="street"/>
-					<textbox id="adr_two_street" class="et2_fullWidth" maxlength="64" autocomplete="section-two address-line1" />
+					<et2-description  for="adr_two_street" value="street"></et2-description>
+					<et2-textbox  id="adr_two_street" maxlength="64" autocomplete="section-two address-line1" ></et2-textbox>
 				</row>
 				<row>
-					<description/>
-					<textbox statustext="address line 2" id="adr_two_street2" class="et2_fullWidth" maxlength="64" autocomplete="section-two address-line2" />
+					<et2-description></et2-description>
+					<et2-textbox  statustext="address line 2" id="adr_two_street2" maxlength="64" autocomplete="section-two address-line2" ></et2-textbox>
 				</row>
 				<row disabled="@addr_format=city_state_postcode">
-					<description for="adr_two_locality" value="city"/>
-					<hbox>
-						<textbox statustext="ZIP Code" id="adr_two_postalcode" width="20%" maxlength="64" autocomplete="section-two postal-code" />
-						<textbox statustext="City" id="adr_two_locality" maxlength="64" width="80%" autocomplete="section-two address-level2" />
-					</hbox>
+					<et2-description  for="adr_two_locality" value="city"></et2-description>
+					<et2-hbox>
+						<et2-textbox  statustext="ZIP Code" id="adr_two_postalcode" width="20%" maxlength="64" autocomplete="section-two postal-code" ></et2-textbox>
+						<et2-textbox  statustext="City" id="adr_two_locality" maxlength="64" width="80%" autocomplete="section-two address-level2" ></et2-textbox>
+					</et2-hbox>
 				</row>
 				<row disabled="@addr_format=city_state_postcode">
-					<description value="Region"/>
-					<textbox statustext="State" id="adr_two_region" maxlength="64" class="et2_fullWidth" autocomplete="section-two address-level1" />
+					<et2-description  value="Region"></et2-description>
+					<et2-textbox  statustext="State" id="adr_two_region" maxlength="64" autocomplete="section-two address-level1" ></et2-textbox>
 				</row>
 				<row disabled="!@addr_format=city_state_postcode">
-					<description value="City"/>
-					<hbox>
-						<textbox statustext="City" id="adr_two_locality" size="30" maxlength="64" autocomplete="section-two address-level2" />
-						<textbox statustext="State" id="adr_two_region" size="3" maxlength="64" autocomplete="section-two address-level1"/>
-						<textbox statustext="ZIP Code" id="adr_two_postalcode" size="5" maxlength="64" autocomplete="section-two postal-code" />
-					</hbox>
+					<et2-description  value="City"></et2-description>
+					<et2-hbox>
+						<et2-textbox  statustext="City" id="adr_two_locality" maxlength="64" autocomplete="section-two address-level2" ></et2-textbox>
+						<et2-textbox  statustext="State" id="adr_two_region" maxlength="64" autocomplete="section-two address-level1"></et2-textbox>
+						<et2-textbox  statustext="ZIP Code" id="adr_two_postalcode" maxlength="64" autocomplete="section-two postal-code" ></et2-textbox>
+					</et2-hbox>
 				</row>
 				<row>
-					<description for="adr_two_countryname" value="country"/>
-					<vbox width="100%">
-						<menulist>
-							<menupopup type="select-country" class="countrySelect et2_fullWidth" id="adr_two_countrycode" onchange="app.addressbook.show_custom_country(this);" options="Select one,0,1" autocomplete="section-two country" />
-						</menulist>
-						<textbox id="adr_two_countryname" class="custom_country et2_fullWidth" autocomplete="section-two country-name" />
-					</vbox>
+					<et2-description  for="adr_two_countryname" value="country"></et2-description>
+					<et2-vbox  width="100%">
+						<et2-select-country  class="countrySelect" id="adr_two_countrycode" onchange="app.addressbook.show_custom_country(this);" autocomplete="section-two country" emptyLabel="Select one"></et2-select-country>
+						<et2-textbox  id="adr_two_countryname" class="custom_country" autocomplete="section-two country-name" ></et2-textbox>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
@@ -240,13 +235,13 @@
 			</columns>
 			<rows>
 				<row disabled="@view">
-					<link-to id="link_to"/>
+					<et2-link-to  id="link_to"></et2-link-to>
 				</row>
 				<row class="th">
-					<description value="Existing links"/>
+					<et2-description  value="Existing links"></et2-description>
 				</row>
 				<row>
-					<link-list id="link_to"/>
+					<et2-link-list  id="link_to"></et2-link-list>
 				</row>
 			</rows>
 		</grid>
@@ -259,9 +254,9 @@
 			</columns>
 			<rows>
 				<row>
-					<box width="100%" overflow="auto">
-						<description id="distrib_lists" span="all"/>
-					</box>
+					<et2-box  width="100%" overflow="auto">
+						<et2-description  id="distrib_lists" span="all"></et2-description>
+					</et2-box>
 				</row>
 			</rows>
 		</grid>
@@ -274,9 +269,9 @@
 			</columns>
 			<rows>
 				<row>
-					<box width="100%" overflow="auto">
-						<customfields options=",$cont[no_private_cfs]" type_filter="$cont[tid]"/>
-					</box>
+					<et2-box  width="100%" overflow="auto">
+						<customfields use-private="$cont[no_private_cfs]"  type_filter="$cont[tid]"/>
+					</et2-box>
 				</row>
 			</rows>
 		</grid>
@@ -289,9 +284,9 @@
 			</columns>
 			<rows>
 				<row>
-					<box width="100%" overflow="auto">
-						<customfields id="private_cfs" options=",1" type_filter="$cont[tid]"/>
-					</box>
+					<et2-box  width="100%" overflow="auto">
+						<customfields id="private_cfs" use-private="1"  type_filter="$cont[tid]"/>
+					</et2-box>
 				</row>
 			</rows>
 		</grid>
@@ -304,50 +299,36 @@
 			</columns>
 			<rows>
 				<row>
-					<description disabled="@no_tid" for="tid" value="Type"/>
-					<menulist disabled="@no_tid">
-						<menupopup id="tid" no_lang="1" class="et2_fullWidth" onchange="1"/>
-					</menulist>
+					<et2-description  disabled="@no_tid" for="tid" value="Type"></et2-description>
+					<et2-select  disabled="@no_tid" id="tid" onchange="1" noLang="1"></et2-select>
 				</row>
 				<row>
-					<description value="Addressbook"/>
-					<menulist span="2" class="et2_fullWidth">
-						<menupopup class="owner" statustext="Addressbook the contact should be saved to" id="owner" no_lang="1"/>
-					</menulist>
+					<et2-description  value="Addressbook"></et2-description>
+					<et2-select  span="2" class="owner" statustext="Addressbook the contact should be saved to" id="owner" noLang="1"></et2-select>
 				</row>
 				<row>
-					<description value="own sorting"/>
-					<menulist span="2">
-						<menupopup blur="Name" id="fileas_type" no_lang="1" class="fileas et2_fullWidth"/>
-					</menulist>
+					<et2-description  value="own sorting"></et2-description>
+					<et2-select  span="2" id="fileas_type" class="fileas" placeholder="Name" noLang="1"></et2-select>
 				</row>
 				<row>
-					<description value="Created"/>
-					<hbox>
-						<menulist>
-							<menupopup type="select-account" id="creator" readonly="true"/>
-						</menulist>
-						<date-time id="created" readonly="true" align="right"/>
-					</hbox>
+					<et2-description  value="Created"></et2-description>
+					<et2-hbox>
+						<et2-select-account  id="creator" readonly="true"></et2-select-account>
+						<et2-date-time  id="created" readonly="true" align="right"></et2-date-time>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Last modified"/>
-					<hbox>
-						<menulist>
-							<menupopup type="select-account" id="modifier" readonly="true"/>
-						</menulist>
-						<date-time id="modified" readonly="true" align="right"/>
-					</hbox>
+					<et2-description  value="Last modified"></et2-description>
+					<et2-hbox>
+						<et2-select-account  id="modifier" readonly="true"></et2-select-account>
+						<et2-date-time  id="modified" readonly="true" align="right"></et2-date-time>
+					</et2-hbox>
 				</row>
 				<row disabled="!@showsearchbuttons">
-					<menulist>
-						<menupopup label="Operator" id="operator" no_lang="1"/>
-					</menulist>
+					<et2-select  label="Operator" id="operator" noLang="1"></et2-select>
 				</row>
 				<row disabled="!@showsearchbuttons">
-					<menulist>
-						<menupopup id="meth_select" no_lang="1"/>
-					</menulist>
+					<et2-select  id="meth_select" noLang="1"></et2-select>
 				</row>
 			</rows>
 		</grid>
@@ -361,80 +342,84 @@
 			</columns>
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
-					<hbox  span="all" width="100%">
-						<button  id="button[apply]" class="button_apply" image="apply"/>
-						<button  id="button[delete]" class="button_delete" onclick="et2_dialog.confirm(widget,'Do you really want to delete this contact?','Delete')" tabindex="25" image="delete"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button-icon  id="button[apply]" class="button_apply" image="apply"></et2-button-icon>
+						<et2-button-icon  id="button[delete]" class="button_delete" onclick="et2_dialog.confirm(widget,'Do you really want to delete this contact?','Delete')" tabindex="25" image="delete"></et2-button-icon>
+					</et2-hbox>
 				</row>
 				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
-					<hbox span="all" width="100%">
-						<button label="Search" id="button[search]" image="search"/>
-						<button label="Cancel" id="button[cancelsearch]" image="cancel"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  label="Search" id="button[search]" image="search"></et2-button>
+						<et2-button  label="Cancel" id="button[cancelsearch]" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 				<row class="dialogHeader">
-					<hbox>
-						<hbox  disabled="@hidebuttons" class="avatar">
-							<image src="photo" onclick="jQuery('table.uploadphoto').css('display','inline'); return false;"/>
+					<et2-hbox>
+						<et2-hbox  disabled="@hidebuttons" class="avatar">
+							<et2-image  src="photo" onclick="jQuery('table.uploadphoto').css('display','inline'); return false;"></et2-image>
 							<template id="addressbook.edit.upload"/>
-						</hbox>
-					</hbox>
+						</et2-hbox>
+					</et2-hbox>
 				</row>
 				<row>
-					<textbox id="n_fn" blur="Name" no_lang="1" tabindex="-1" class="cursorHand et2_fullWidth" onclick="jQuery('table.editname').css('display','inline'); var focElem = document.getElementById(form::name('n_prefix')); if (!(typeof(focElem) == 'undefined') &amp;&amp; typeof(focElem.focus)=='function') document.getElementById(form::name('n_prefix')).focus();" autocomplete="name" />
+					<et2-textbox  id="n_fn" tabindex="-1" class="cursorHand" onclick="jQuery('table.editname').css('display','inline'); var focElem = document.getElementById(form::name('n_prefix')); if (!(typeof(focElem) == 'undefined') &amp;&amp; typeof(focElem.focus)=='function') document.getElementById(form::name('n_prefix')).focus();" autocomplete="name" placeholder="Name" noLang="1" ></et2-textbox>
 				</row>
 				<row>
-					<description for="org_name" value="Organisation"/>
-					<textbox id="org_name" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="128" class="et2_fullWidth" autocomplete="organization" />
+					<et2-description  for="org_name" value="Organisation"></et2-description>
+					<et2-textbox  id="org_name" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="128" autocomplete="organization" ></et2-textbox>
 				</row>
 				<row>
-					<description for="title" value="Title"/>
-					<textbox id="title" size="36" maxlength="64" class="et2_fullWidth" autocomplete="organization-title" placeholder="title"/>
+					<et2-description  for="title" value="Title"></et2-description>
+					<et2-textbox  id="title" maxlength="64" autocomplete="organization-title" placeholder="title"></et2-textbox>
 				</row>
 				<row>
-					<description for="org_unit" value="department"/>
-					<textbox id="org_unit" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" maxlength="64"/>
+					<et2-description  for="org_unit" value="department"></et2-description>
+					<et2-textbox  id="org_unit" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="64"></et2-textbox>
 				</row>
 
 				<row>
-					<description for="tel_work" value="Business phone"/>
-					<url-phone id="tel_work" class="et2_fullWidth" autocomplete="work tel" />
+					<et2-description  for="tel_work" value="Business phone"></et2-description>
+					<et2-url-phone  id="tel_work" autocomplete="work tel" ></et2-url-phone>
 				</row>
 				<row>
-					<description for="tel_cell" value="mobile phone"/>
-					<url-phone id="tel_cell" class="et2_fullWidth" autocomplete="mobile tel" />
+					<et2-description  for="tel_cell" value="mobile phone"></et2-description>
+					<et2-url-phone  id="tel_cell" autocomplete="mobile tel" ></et2-url-phone>
 				</row>
 				<row>
-					<description for="email" value="email"/>
-					<url-email id="email" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" autocomplete="work email" />
+					<et2-description  for="email" value="email"></et2-description>
+					<et2-url-email  id="email" onchange="app.addressbook.check_value(widget,'$cont[id]');" autocomplete="work email" ></et2-url-email>
 				</row>
 				<row>
-					<description for="url" value="url"/>
-					<url id="url" class="et2_fullWidth" autocomplete="url" />
+					<et2-description  for="url" value="url"></et2-description>
+					<et2-url  id="url" autocomplete="url" ></et2-url>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" width="100%" align_tabs="v">
-						<tabs>
-							<tab id="general" label="Organisation"/>
-							<tab id="home" label="Private" statustext="Home address, Birthday, ..."/>
-							<tab id="details" label="Details" statustext="Categories, Notes, ..."/>
-							<tab id="links" label="Links" statustext="Links"/>
-							<tab id="distribution_list" label="Distribution lists" statustext="Distribution lists, ..."/>
-							<tab id="custom" label="Extra" statustext="Custom fields"/>
-							<tab id="custom_private" label="Extra private" statustext="Private custom fields"/>
-							<tab id="ownership" label="Ownership" statustext="Ownership"/>
-						</tabs>
-						<tabpanels>
+					<et2-vbox  id="tabs" span="all" width="100%">
+						<et2-details  id="general" summary="Organisation" title="">
 							<template id="addressbook.edit.general"/>
+						</et2-details>
+						<et2-details  id="home" summary="Private" title="Home address, Birthday, ...">
 							<template id="addressbook.edit.home"/>
+						</et2-details>
+						<et2-details  id="details" summary="Details" title="Categories, Notes, ...">
 							<template id="addressbook.edit.details"/>
+						</et2-details>
+						<et2-details  id="links" summary="Links" title="Links">
 							<template id="addressbook.edit.links"/>
+						</et2-details>
+						<et2-details  id="distribution_list" summary="Distribution lists" title="Distribution lists, ...">
 							<template id="addressbook.edit.distribution_list"/>
+						</et2-details>
+						<et2-details  id="custom" summary="Extra" title="Custom fields">
 							<template id="addressbook.edit.custom"/>
+						</et2-details>
+						<et2-details  id="custom_private" summary="Extra private" title="Private custom fields">
 							<template id="addressbook.edit.custom_private"/>
+						</et2-details>
+						<et2-details  id="ownership" summary="Ownership" title="Ownership">
 							<template id="addressbook.edit.ownership"/>
-						</tabpanels>
-					</tabbox>
+						</et2-details>
+					</et2-vbox>
 				</row>
 				<row>
 
@@ -442,4 +427,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/mobile/index.xet b/addressbook/templates/mobile/index.xet
index 409e2838d3..9edb79f3ae 100644
--- a/addressbook/templates/mobile/index.xet
+++ b/addressbook/templates/mobile/index.xet
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.index.right_add" template="" lang="" group="0" version="1.7.001">
-		<hbox>
-			<menulist>
-				<menupopup align="right" label="Type" id="col_filter[tid]" empty_label="All"/>
-			</menulist>
-		</hbox>
+		<et2-hbox>
+			<et2-select  align="right" label="Type" id="col_filter[tid]" emptyLabel="All"></et2-select>
+		</et2-hbox>
 	</template>
 	<template id="addressbook.index.rows" template="" lang="" group="0" version="1.9.005">
 		<grid width="100%">
@@ -20,17 +17,17 @@
 				<row class="th">
 				</row>
 				<row class="$row_cont[class]" valign="top">
-					<description class=" cat_$row_cont[cat_id] mobile_cat_col"/>
-					<vbox class="addressbookCol1">
+					<et2-description  class="cat_$row_cont[cat_id] mobile_cat_col"></et2-description>
+					<et2-vbox  class="addressbookCol1">
 						<customfields-list id="$row" class="customfields" app="addressbook" disabled="true"/>
-						<vbox id="${row}[id]">
-							<description id="${row}[line2]" no_lang="1" />
-							<description id="${row}[line1]" no_lang="1" />
-						</vbox>
-					</vbox>
-					<vbox class="addressbookCol3">
-						<lavatar src="$row_cont[photo]" contactId="$row_cont[id]" lname="$row_cont[n_family]" fname="$row_cont[n_given]"/>
-					</vbox>
+						<et2-vbox  id="${row}[id]">
+							<et2-description  id="${row}[line2]" noLang="1"></et2-description>
+							<et2-description  id="${row}[line1]" noLang="1"></et2-description>
+						</et2-vbox>
+					</et2-vbox>
+					<et2-vbox  class="addressbookCol3">
+						<et2-lavatar  src="$row_cont[photo]" contactId="$row_cont[id]" lname="$row_cont[n_family]" fname="$row_cont[n_given]"></et2-lavatar>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
@@ -50,35 +47,35 @@
 			</columns>
 			<rows>
 				<row disabled="!@msg">
-					<description align="center" id="msg" no_lang="1" span="all" class="redItalic"/>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
+					<et2-description  align="center" id="msg" span="all" class="redItalic" noLang="1"></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="1">
 					<template align="right" id="addressbook.index.right_add"/>
 				</row>
 				<row>
-					<hbox>
-						<buttononly class="plus_button" size="large" statustext="Add a new contact" id="plus_button" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'850','440','_blank','addressbook',null,true); return false;"/>
-					</hbox>
+					<et2-hbox>
+						<et2-button  class="plus_button" size="large" statustext="Add a new contact" id="plus_button" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'850','440','_blank','addressbook',null,true); return false;" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
 					<nextmatch id="nm" template="addressbook.index.rows" header_right="addressbook.index.right_add" span="all"/>
 				</row>
 				<row class="noPrint dialogFooterToolbar" disabled="!@nm[selectcols]=/legacy_actions/">
-					<button statustext="Add a new contact" label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"/>
-					<hbox align="right" span="all">
-						<buttononly statustext="Select action" label="Select action" id="legacy_actions" onclick="if (!egw_globalObjectManager.getObjectById('addressbook.index.rows').executeActionImplementation(this, 'popup')) alert(egw::lang('You need to select some entries first!')); return false;;"/>
-						<button statustext="Check all" label="Check all" id="check_all" needed="1" onclick="egw_globalObjectManager.getObjectById('addressbook.index.rows').toggleAllSelected(); return false;" image="arrow_ltr" class="checkAllArrow"/>
-					</hbox>
+					<et2-button  statustext="Add a new contact" label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"></et2-button>
+					<et2-hbox  align="right" span="all">
+						<et2-button  statustext="Select action" label="Select action" id="legacy_actions" onclick="if (!egw_globalObjectManager.getObjectById('addressbook.index.rows').executeActionImplementation(this, 'popup')) alert(egw::lang('You need to select some entries first!')); return false;;" noSubmit="true"></et2-button>
+						<et2-button  statustext="Check all" label="Check all" id="check_all" onclick="egw_globalObjectManager.getObjectById('addressbook.index.rows').toggleAllSelected(); return false;" image="arrow_ltr" class="checkAllArrow" required="1"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/addressbook/templates/mobile/view.xet b/addressbook/templates/mobile/view.xet
index 6827a4afdd..0644951cb7 100644
--- a/addressbook/templates/mobile/view.xet
+++ b/addressbook/templates/mobile/view.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.view" template="" lang="" group="0" version="1.9.004" class="addressbook_view">
 		<grid class="addressbook_view" border="1" width="100%">
@@ -12,46 +11,46 @@
 				<row class="dialogHeadbar" >
 				</row>
 				<row>
-					<hbox>
-						<hbox  disabled="@hidebuttons" class="avatar">
-							<image src="photo" onclick="jQuery('table.uploadphoto').css('display','inline'); return false;"/>
-						</hbox>
-					</hbox>
+					<et2-hbox>
+						<et2-hbox  disabled="@hidebuttons" class="avatar">
+							<et2-image  src="photo" onclick="jQuery('table.uploadphoto').css('display','inline'); return false;"></et2-image>
+						</et2-hbox>
+					</et2-hbox>
 				</row>
 				<row>
-					<textbox id="n_fn" blur="Name" no_lang="1" tabindex="-1" class="cursorHand et2_fullWidth" onclick="jQuery('table.editname').css('display','inline'); var focElem = document.getElementById(form::name('n_prefix')); if (!(typeof(focElem) == 'undefined') &amp;&amp; typeof(focElem.focus)=='function') document.getElementById(form::name('n_prefix')).focus();" autocomplete="name" />
+					<et2-textbox  id="n_fn" tabindex="-1" class="cursorHand" onclick="jQuery('table.editname').css('display','inline'); var focElem = document.getElementById(form::name('n_prefix')); if (!(typeof(focElem) == 'undefined') &amp;&amp; typeof(focElem.focus)=='function') document.getElementById(form::name('n_prefix')).focus();" autocomplete="name" placeholder="Name" noLang="1" ></et2-textbox>
 				</row>
 				<row>
-					<description for="org_name" value="Organisation"/>
-					<textbox id="org_name" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="128" class="et2_fullWidth" autocomplete="organization" />
+					<et2-description  for="org_name" value="Organisation"></et2-description>
+					<et2-textbox  id="org_name" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="128" autocomplete="organization" ></et2-textbox>
 				</row>
 				<row>
-					<description for="title" value="Title"/>
-					<textbox id="title" size="36" maxlength="64" class="et2_fullWidth" autocomplete="organization-title" placeholder="title"/>
+					<et2-description  for="title" value="Title"></et2-description>
+					<et2-textbox  id="title" maxlength="64" autocomplete="organization-title" placeholder="title"></et2-textbox>
 				</row>
 				<row>
-					<description for="org_unit" value="department"/>
-					<textbox id="org_unit" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" maxlength="64"/>
+					<et2-description  for="org_unit" value="department"></et2-description>
+					<et2-textbox  id="org_unit" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="64"></et2-textbox>
 				</row>
 
 				<row>
-					<description for="tel_work" value="Business phone"/>
-					<url-phone id="tel_work" class="et2_fullWidth" autocomplete="work tel" />
+					<et2-description  for="tel_work" value="Business phone"></et2-description>
+					<et2-url-phone  id="tel_work" autocomplete="work tel" ></et2-url-phone>
 				</row>
 				<row>
-					<description for="tel_cell" value="mobile phone"/>
-					<url-phone id="tel_cell" class="et2_fullWidth" autocomplete="mobile tel" />
+					<et2-description  for="tel_cell" value="mobile phone"></et2-description>
+					<et2-url-phone  id="tel_cell" autocomplete="mobile tel" ></et2-url-phone>
 				</row>
 				<row>
-					<description for="email" value="email"/>
-					<url-email id="email" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" autocomplete="work email" />
+					<et2-description  for="email" value="email"></et2-description>
+					<et2-url-email  id="email" onchange="app.addressbook.check_value(widget,'$cont[id]');" autocomplete="work email" ></et2-url-email>
 				</row>
 				<row>
-					<description for="url" value="url"/>
-					<url id="url" class="et2_fullWidth" autocomplete="url" />
+					<et2-description  for="url" value="url"></et2-description>
+					<et2-url  id="url" autocomplete="url" ></et2-url>
 				</row>
 				<row>
-					<details title="Organisation">
+					<et2-details  summary="Organisation">
 						<grid width="100%">
 							<columns>
 								<column width = "120"/>
@@ -59,48 +58,46 @@
 							</columns>
 							<rows>
 								<row disabled="@addr_format=city_state_postcode">
-									<description for="adr_one_street" value="street"/>
-									<textbox id="adr_one_street" class="et2_fullWidth" maxlength="64" autocomplete="address-line1"/>
+									<et2-description  for="adr_one_street" value="street"></et2-description>
+									<et2-textbox  id="adr_one_street" maxlength="64" autocomplete="address-line1"></et2-textbox>
 								</row>
 								<row>
-									<description/>
-									<textbox statustext="address line 2" id="adr_one_street2" class="et2_fullWidth" maxlength="64" autocomplete="address-line2"/>
+									<et2-description></et2-description>
+									<et2-textbox  statustext="address line 2" id="adr_one_street2" maxlength="64" autocomplete="address-line2"></et2-textbox>
 								</row>
 								<row disabled="@addr_format=city_state_postcode">
-									<description for="adr_one_locality" value="city" />
-									<textbox statustext="City" id="adr_one_locality" maxlength="64"  class="et2_fullWidth" autocomplete="address-level2"/>
+									<et2-description  for="adr_one_locality" value="city"></et2-description>
+									<et2-textbox  statustext="City" id="adr_one_locality" maxlength="64" autocomplete="address-level2"></et2-textbox>
 								</row>
 								<row disabled="@addr_format=city_state_postcode">
-									<description value="ZIP Code"/>
-									<textbox statustext="ZIP Code" id="adr_one_postalcode" width="35%" maxlength="64" autocomplete="postal-code"/>
+									<et2-description  value="ZIP Code"></et2-description>
+									<et2-textbox  statustext="ZIP Code" id="adr_one_postalcode" width="35%" maxlength="64" autocomplete="postal-code"></et2-textbox>
 								</row>
 								<row disabled="!@addr_format=city_state_postcode">
-									<description value="City"/>
-									<hbox>
-										<textbox statustext="City" id="adr_one_locality" size="30" maxlength="64" autocomplete="address-level2"/>
-										<textbox statustext="State" id="adr_one_region" size="3" maxlength="64" autocomplete="address-level1"/>
-										<textbox statustext="ZIP Code" id="adr_one_postalcode" size="5" maxlength="64" autocomplete="postal-code"/>
-									</hbox>
+									<et2-description  value="City"></et2-description>
+									<et2-hbox>
+										<et2-textbox  statustext="City" id="adr_one_locality" maxlength="64" autocomplete="address-level2"></et2-textbox>
+										<et2-textbox  statustext="State" id="adr_one_region" maxlength="64" autocomplete="address-level1"></et2-textbox>
+										<et2-textbox  statustext="ZIP Code" id="adr_one_postalcode" maxlength="64" autocomplete="postal-code"></et2-textbox>
+									</et2-hbox>
 								</row>
 								<row disabled="@addr_format=city_state_postcode">
-									<description value="Region"/>
-									<textbox statustext="State" id="adr_one_region" maxlength="64" class="et2_fullWidth" autocomplete="address-level1"/>
+									<et2-description  value="Region"></et2-description>
+									<et2-textbox  statustext="State" id="adr_one_region" maxlength="64" autocomplete="address-level1"></et2-textbox>
 								</row>
 								<row disabled="@addr_format=city_state_postcode">
-									<description for="adr_one_countryname" value="country"/>
-									<vbox width="100%">
-										<menulist class="et2_fullWidth">
-											<menupopup type="select-country" class="countrySelect et2_fullWidth" id="adr_one_countrycode" onchange="app.addressbook.show_custom_country(this);" options="Select one,0,1" autocomplete="country"/>
-										</menulist>
-										<textbox id="adr_one_countryname" class="custom_country et2_fullWidth" autocomplete="country-name"/>
-									</vbox>
+									<et2-description  for="adr_one_countryname" value="country"></et2-description>
+									<et2-vbox  width="100%">
+										<et2-select-country  class="countrySelect" id="adr_one_countrycode" onchange="app.addressbook.show_custom_country(this);" autocomplete="country" emptyLabel="Select one"></et2-select-country>
+										<et2-textbox  id="adr_one_countryname" class="custom_country" autocomplete="country-name"></et2-textbox>
+									</et2-vbox>
 								</row>
 							</rows>
 						</grid>
-					</details>
+					</et2-details>
 				</row>
 				<row>
-					<details title="Private">
+					<et2-details  summary="Private">
 						<grid width="100%">
 							<columns>
 								<column width = "120"/>
@@ -108,80 +105,76 @@
 							</columns>
 							<rows>
 								<row>
-									<description for="tel_home" value="Home phone"/>
-									<url-phone id="tel_home" class="et2_fullWidth" autocomplete="section-two home tel" />
+									<et2-description  for="tel_home" value="Home phone"></et2-description>
+									<et2-url-phone  id="tel_home" autocomplete="section-two home tel" ></et2-url-phone>
 								</row>
 								<row>
-									<description for="tel_cell_private" value="mobile phone"/>
-									<url-phone id="tel_cell_private" class="et2_fullWidth" autocomplete="section-two mobile tel" />
+									<et2-description  for="tel_cell_private" value="mobile phone"></et2-description>
+									<et2-url-phone  id="tel_cell_private" autocomplete="section-two mobile tel" ></et2-url-phone>
 								</row>
 								<row >
-									<description for="tel_fax_home" value="fax"/>
-									<url-phone id="tel_fax_home" class="et2_fullWidth" autocomplete="section-two fax tel" />
+									<et2-description  for="tel_fax_home" value="fax"></et2-description>
+									<et2-url-phone  id="tel_fax_home" autocomplete="section-two fax tel" ></et2-url-phone>
 								</row>
 								<row>
-									<description for="email_home" value="EMail"/>
-									<url-email id="email_home" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" autocomplete="section-two home email" />
+									<et2-description  for="email_home" value="EMail"></et2-description>
+									<et2-url-email  id="email_home" onchange="app.addressbook.check_value(widget,'$cont[id]');" autocomplete="section-two home email" ></et2-url-email>
 								</row>
 								<row>
-									<description for="url_home" value="URL"/>
-									<url id="url_home" class="et2_fullWidth" autocomplete="section-two url" />
+									<et2-description  for="url_home" value="URL"></et2-description>
+									<et2-url  id="url_home" autocomplete="section-two url" ></et2-url>
 								</row>
 								<row>
-									<description for="bday" value="Birthday"/>
-									<date id="bday" options="Y-m-d"  year_range="c-90:c+2" class="et2_fullWidth"/>
+									<et2-description  for="bday" value="Birthday"></et2-description>
+									<et2-date  id="bday" dataFormat="Y-m-d" yearRange="c-90:c+2"></et2-date>
 								</row>
 								<row>
-									<description for="adr_two_street" value="street"/>
-									<textbox id="adr_two_street" class="et2_fullWidth" maxlength="64" autocomplete="section-two address-line1" />
+									<et2-description  for="adr_two_street" value="street"></et2-description>
+									<et2-textbox  id="adr_two_street" maxlength="64" autocomplete="section-two address-line1" ></et2-textbox>
 								</row>
 								<row>
-									<description/>
-									<textbox statustext="address line 2" id="adr_two_street2" class="et2_fullWidth" maxlength="64" autocomplete="section-two address-line2" />
+									<et2-description></et2-description>
+									<et2-textbox  statustext="address line 2" id="adr_two_street2" maxlength="64" autocomplete="section-two address-line2" ></et2-textbox>
 								</row>
 								<row disabled="@addr_format=city_state_postcode">
-									<description for="adr_two_locality" value="city"/>
-									<hbox>
-										<textbox statustext="ZIP Code" id="adr_two_postalcode" width="20%" maxlength="64" autocomplete="section-two postal-code" />
-										<textbox statustext="City" id="adr_two_locality" maxlength="64" width="80%" autocomplete="section-two address-level2" />
-									</hbox>
+									<et2-description  for="adr_two_locality" value="city"></et2-description>
+									<et2-hbox>
+										<et2-textbox  statustext="ZIP Code" id="adr_two_postalcode" width="20%" maxlength="64" autocomplete="section-two postal-code" ></et2-textbox>
+										<et2-textbox  statustext="City" id="adr_two_locality" maxlength="64" width="80%" autocomplete="section-two address-level2" ></et2-textbox>
+									</et2-hbox>
 								</row>
 								<row disabled="@addr_format=city_state_postcode">
-									<description value="Region"/>
-									<textbox statustext="State" id="adr_two_region" maxlength="64" class="et2_fullWidth" autocomplete="section-two address-level1" />
+									<et2-description  value="Region"></et2-description>
+									<et2-textbox  statustext="State" id="adr_two_region" maxlength="64" autocomplete="section-two address-level1" ></et2-textbox>
 								</row>
 								<row disabled="!@addr_format=city_state_postcode">
-									<description value="City"/>
-									<hbox>
-										<textbox statustext="City" id="adr_two_locality" size="30" maxlength="64" autocomplete="section-two address-level2" />
-										<textbox statustext="State" id="adr_two_region" size="3" maxlength="64" autocomplete="section-two address-level1"/>
-										<textbox statustext="ZIP Code" id="adr_two_postalcode" size="5" maxlength="64" autocomplete="section-two postal-code" />
-									</hbox>
+									<et2-description  value="City"></et2-description>
+									<et2-hbox>
+										<et2-textbox  statustext="City" id="adr_two_locality" maxlength="64" autocomplete="section-two address-level2" ></et2-textbox>
+										<et2-textbox  statustext="State" id="adr_two_region" maxlength="64" autocomplete="section-two address-level1"></et2-textbox>
+										<et2-textbox  statustext="ZIP Code" id="adr_two_postalcode" maxlength="64" autocomplete="section-two postal-code" ></et2-textbox>
+									</et2-hbox>
 								</row>
 								<row>
-									<description for="adr_two_countryname" value="country"/>
-									<vbox width="100%">
-										<menulist>
-											<menupopup type="select-country" class="countrySelect et2_fullWidth" id="adr_two_countrycode" onchange="app.addressbook.show_custom_country(this);" options="Select one,0,1" autocomplete="section-two country" />
-										</menulist>
-										<textbox id="adr_two_countryname" class="custom_country et2_fullWidth" autocomplete="section-two country-name" />
-									</vbox>
+									<et2-description  for="adr_two_countryname" value="country"></et2-description>
+									<et2-vbox  width="100%">
+										<et2-select-country  class="countrySelect" id="adr_two_countrycode" onchange="app.addressbook.show_custom_country(this);" autocomplete="section-two country" emptyLabel="Select one"></et2-select-country>
+										<et2-textbox  id="adr_two_countryname" class="custom_country" autocomplete="section-two country-name" ></et2-textbox>
+									</et2-vbox>
 								</row>
 							</rows>
 						</grid>
-					</details>
+					</et2-details>
 				</row>
 				<row>
-					<description value="Notes"/>
-					<textbox multiline="true" id="note" rows="10" resize_ratio="0" class="et2_fullWidth" height="200"/>
+					<et2-description  value="Notes"></et2-description>
+					<et2-textarea  id="note" rows="10" height="200" resizeRatio="0"></et2-textarea>
 				</row>
 				<row>
-					<description value="Categories"/>
-					<menulist>
-						<menupopup type="select-cat" id="cat_id"/>
-					</menulist>
+					<et2-description  value="Categories"></et2-description>
+					<et2-select-cat  id="cat_id"></et2-select-cat>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/accesslog.xet b/admin/templates/default/accesslog.xet
index 1e89bc652c..8579421fbb 100644
--- a/admin/templates/default/accesslog.xet
+++ b/admin/templates/default/accesslog.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.accesslog.rows" template="" lang="" group="0" version="1.9.003">
 		<grid width="100%">
@@ -18,7 +17,7 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<nextmatch-accountfilter id="account_id" options="LoginID"/>
+					<et2-nextmatch-header-account  id="account_id" emptyLabel="LoginID"/>
 					<nextmatch-header label="Login-Status" id="sessionstatus"/>
 					<nextmatch-sortheader label="Loginid" id="loginid"/>
 					<nextmatch-sortheader label="IP" id="ip"/>
@@ -30,21 +29,19 @@
 					<nextmatch-header label="Action" id="session_action"/>
 				</row>
 				<row class="row $row_cont[class]">
-					<hbox>
-						<menulist>
-							<menupopup type="select-account" label="" id="${row}[account_id]" readonly="true"/>
-						</menulist>
-						<description id="${row}[alt_loginid]"/>
-					</hbox>
-					<description id="${row}[sessionstatus]"/>
-					<description id="${row}[loginid]"/>
-					<description id="${row}[ip]"/>
-					<date-time id="${row}[li]" readonly="true"/>
-					<date-time id="${row}[lo]" readonly="true"/>
-					<date-duration id="${row}[total]" readonly="true" options=",hm,24"/>
-					<date-since id="${row}[session_dla]" readonly="true"/>
-					<description statustext="$row_cont[user_agent]" id="${row}[os_browser]" class="admin_userAgent"/>
-					<description id="${row}[session_action]"/>
+					<et2-hbox>
+						<et2-select-account  label="" id="${row}[account_id]" readonly="true"></et2-select-account>
+						<et2-description  id="${row}[alt_loginid]"></et2-description>
+					</et2-hbox>
+					<et2-description  id="${row}[sessionstatus]"></et2-description>
+					<et2-description  id="${row}[loginid]"></et2-description>
+					<et2-description  id="${row}[ip]"></et2-description>
+					<et2-date-time  id="${row}[li]" readonly="true"></et2-date-time>
+					<et2-date-time  id="${row}[lo]" readonly="true"></et2-date-time>
+					<et2-date-duration  id="${row}[total]" readonly="true" ></et2-date-duration>
+					<et2-date-since  id="${row}[session_dla]" readonly="true"></et2-date-since>
+					<et2-description  statustext="$row_cont[user_agent]" id="${row}[os_browser]" class="admin_userAgent"></et2-description>
+					<et2-description  id="${row}[session_action]"></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -57,17 +54,17 @@
 			</columns>
 			<rows>
 				<row disabled="!@msg">
-					<description align="center" id="msg" span="all" class="message"/>
-					<description/>
+					<et2-description  align="center" id="msg" span="all" class="message"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
 					<nextmatch id="nm" options="admin.accesslog.rows" span="all"/>
 				</row>
 				<row>
-					<hbox options="0,0">
-						<description value="Percent of users that logged out" readonly="true"/>
-						<textbox type="float" label=": %s %" id="percent" precision="1" readonly="true"/>
-					</hbox>
+					<et2-hbox  cellpadding="0" cellspacing="0" >
+						<et2-description  value="Percent of users that logged out" readonly="true"></et2-description>
+						<et2-number  label=": %s %" id="percent" precision="1" readonly="true"></et2-number>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -75,4 +72,4 @@
 			.selectAllArrow { padding-right: 12px; }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/account.delete.xet b/admin/templates/default/account.delete.xet
index 80288598c5..299b9dc392 100644
--- a/admin/templates/default/account.delete.xet
+++ b/admin/templates/default/account.delete.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.account.delete.delete" template="" lang="" group="0" version="18.1.001">
 		<grid width="100%" height="100%">
@@ -10,18 +9,18 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Who would you like to transfer records owned by the deleted user to?" class="dialogHeader2"/>
-					<select-account id="new_owner" empty_label="Delete all records" class="dialogHeader3"/>
+					<et2-description  value="Who would you like to transfer records owned by the deleted user to?" class="dialogHeader2"></et2-description>
+					<et2-select-account  id="new_owner" class="dialogHeader3" emptyLabel="Delete all records"></et2-select-account>
 				</row>
 				<row>
-					<vbox>
-						<description value="Automatically transfer entries owned by the user:"/>
-						<select id="delete_apps" rows="6" multiple="true" span="2"/>
-					</vbox>
+					<et2-vbox>
+						<et2-description  value="Automatically transfer entries owned by the user:"></et2-description>
+						<et2-select  id="delete_apps" rows="6" multiple="1" span="2"></et2-select>
+					</et2-vbox>
 				</row>
 				<row>
-					<vbox>
-						<description value="Please manually deal with entries owned by the user:"/>
+					<et2-vbox>
+						<et2-description  value="Please manually deal with entries owned by the user:"></et2-description>
 						<grid id="counts" disabled="!@counts">
 							<columns>
 								<column width="150"/>
@@ -29,8 +28,8 @@
 							</columns>
 							<rows>
 								<row>
-									<select-app id="${row}[app]" readonly="true"/>
-									<description id="${row}[count]"/>
+									<et2-select-app  id="${row}[app]" readonly="true"></et2-select-app>
+									<et2-description  id="${row}[count]"></et2-description>
 								</row>
 							</rows>
 						</grid>
@@ -41,17 +40,17 @@
 							</columns>
 							<rows>
 								<row>
-									<select-app value="filemanager" readonly="true"/>
-									<description value="Change owner of found files to the new user, and move the home folder to /home/new-user/old-home-username."/>
+									<et2-select-app  value="filemanager" readonly="true"></et2-select-app>
+									<et2-description  value="Change owner of found files to the new user, and move the home folder to /home/new-user/old-home-username."></et2-description>
 								</row>
 								<row>
-									<select-app value="mail" readonly="true"/>
-									<description value="Please check email.  It gets automatically deleted if email integration is used."/>
+									<et2-select-app  value="mail" readonly="true"></et2-select-app>
+									<et2-description  value="Please check email.  It gets automatically deleted if email integration is used."></et2-description>
 								</row>
 							</rows>
 						</grid>
-						<description value="If you delete the user without selecting an account to move the data to, all entries get deleted!" font_style="b"/>
-					</vbox>
+						<et2-description  value="If you delete the user without selecting an account to move the data to, all entries get deleted!" fontStyle="b"></et2-description>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
@@ -63,25 +62,25 @@
 	        </columns>
 	        <rows>
 	            <row class="dialogHeader">
-                   	<select-account id="account_id" readonly="true" label="Delete" onchange="var apps = widget.getRoot().getWidgetById('delete_apps'); apps.set_enabled(widget.getValue());"/>
+                   	<et2-select-account  id="account_id" readonly="true" label="Delete" onchange="var apps = widget.getRoot().getWidgetById('delete_apps'); apps.set_enabled(widget.getValue());"></et2-select-account>
 	            </row>
 	            <row>
-	                <tabbox id="tabs" width="100%" tab_height="400px">
+	                <et2-tabbox  id="tabs" width="100%" tabHeight="400px">
                     	<tabs>
                     		<tab id="main" label="Delete"/>
                     	</tabs>
                     	<tabpanels>
                     		<template template="admin.account.delete.delete" width="100%"/>
                     	</tabpanels>
-                    </tabbox>
+                    </et2-tabbox>
 	            </row>
 	            <row class="dialogFooterToolbar">
-	                <hbox>
-                        <button id="delete" label="Delete"/>
-                        <button id="cancel" label="Cancel" onclick="window.close()"/>
-                    </hbox>
+	                <et2-hbox>
+                        <et2-button  id="delete" label="Delete"></et2-button>
+                        <et2-button  id="cancel" label="Cancel" onclick="window.close()"></et2-button>
+                    </et2-hbox>
 	            </row>
 	        </rows>
 	    </grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/account.xet b/admin/templates/default/account.xet
index 756e799aeb..3dcf7bba47 100644
--- a/admin/templates/default/account.xet
+++ b/admin/templates/default/account.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.account" template="" lang="" group="0" version="1.9.003">
 		<grid width="100%" height="200">
@@ -14,68 +13,68 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Login ID" for="account_lid"/>
-					<textbox id="account_lid" class="et2_fullWidth" onchange="app.addressbook.account_change" needed="true" autocomplete="new-username"/>
-					<description/>
-					<description value="Expires" for="account_expires"/>
-					<hbox>
-						<date id="account_expires"/>
-						<checkbox id="account_status" selected_value="A" label="Account active"/>
-					</hbox>
-					<description/>
+					<et2-description  value="Login ID" for="account_lid"></et2-description>
+					<et2-textbox  id="account_lid" onchange="app.addressbook.account_change" autocomplete="new-username" required="true"></et2-textbox>
+					<et2-description></et2-description>
+					<et2-description  value="Expires" for="account_expires"></et2-description>
+					<et2-hbox>
+						<et2-date  id="account_expires"></et2-date>
+						<et2-checkbox  id="account_status" label="Account active" selectedValue="A"></et2-checkbox>
+					</et2-hbox>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description value="Password" for="account_passwd"/>
-					<passwd id="account_passwd" class="et2_fullWidth" onchange="app.addressbook.account_change" autocomplete="new-password" suggest="16"/>
-					<description/>
-					<description value="Re-enter password" for="account_passwd_2"/>
-					<passwd id="account_passwd_2" class="et2_fullWidth" onchange="app.addressbook.account_change" suggest="0"/>
-					<description/>
+					<et2-description  value="Password" for="account_passwd"></et2-description>
+					<et2-password  id="account_passwd" onchange="app.addressbook.account_change" autocomplete="new-password" suggest="16"></et2-password>
+					<et2-description></et2-description>
+					<et2-description  value="Re-enter password" for="account_passwd_2"></et2-description>
+					<et2-password  id="account_passwd_2" onchange="app.addressbook.account_change" suggest="0"></et2-password>
+					<et2-description></et2-description>
 				</row>
 				<row valign="top">
-					<description/>
-					<vbox>
-						<checkbox id="mustchangepassword" label="Must change password upon next login"/>
-						<checkbox id="changepassword" label="Can change password"/>
-					</vbox>
-					<description/>
-					<description/>
-					<checkbox id="anonymous" label="Anonymous user. Not shown in list sessions."/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-vbox>
+						<et2-checkbox  id="mustchangepassword" label="Must change password upon next login"></et2-checkbox>
+						<et2-checkbox  id="changepassword" label="Can change password"></et2-checkbox>
+					</et2-vbox>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-checkbox  id="anonymous" label="Anonymous user. Not shown in list sessions."></et2-checkbox>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="!@ldap_extra_attributes">
-					<description value="Home directory" for="homedirectory"/>
-					<textbox id="homedirectory" class="et2_fullWidth"/>
-					<description/>
-					<description value="Login shell" for="loginshell"/>
-					<textbox id="loginshell" class="et2_fullWidth"/>
-					<description/>
+					<et2-description  value="Home directory" for="homedirectory"></et2-description>
+					<et2-textbox  id="homedirectory"></et2-textbox>
+					<et2-description></et2-description>
+					<et2-description  value="Login shell" for="loginshell"></et2-description>
+					<et2-textbox  id="loginshell"></et2-textbox>
+					<et2-description></et2-description>
 				</row>
 				<row>
-                    <description value="Primary group" for="account_primary_group"/>
-                    <select-account id="account_primary_group" account_type="groups" class="et2_fullWidth"/>
-                    <description/>
-                    <description value="Filesystem quota"/>
-                    <textbox id="quota" disabled="!@epl" blur="@default_quota"/>
-                    <description/>
+                    <et2-description  value="Primary group" for="account_primary_group"></et2-description>
+                    <et2-select-account  id="account_primary_group" accountType="groups"></et2-select-account>
+                    <et2-description></et2-description>
+                    <et2-description  value="Filesystem quota"></et2-description>
+                    <et2-textbox  id="quota" disabled="!@epl" placeholder="@default_quota"></et2-textbox>
+                    <et2-description></et2-description>
                 </row>
 				<row>
-					<description value="Groups" for="account_groups"/>
-					<select-account account_type="groups" id="account_groups" multiple="true" class="et2_fullWidth" span="4" tags="true"/>
-					<description/>
+					<et2-description  value="Groups" for="account_groups"></et2-description>
+					<et2-select-account  id="account_groups" multiple="true" span="4" accountType="groups"></et2-select-account>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="!@account_id">
-					<description value="Last login"/>
-					<hbox>
-						<date-time id="account_lastlogin" readonly="true"/>
-						<description id="account_lastloginfrom" readonly="true" align="right"/>
-					</hbox>
-					<description/>
-					<description value="Last password change"/>
-					<date-time id="account_lastpwd_change" readonly="true"/>
-					<description/>
+					<et2-description  value="Last login"></et2-description>
+					<et2-hbox>
+						<et2-date-time  id="account_lastlogin" readonly="true"></et2-date-time>
+						<et2-description  id="account_lastloginfrom" readonly="true" align="right"></et2-description>
+					</et2-hbox>
+					<et2-description></et2-description>
+					<et2-description  value="Last password change"></et2-description>
+					<et2-date-time  id="account_lastpwd_change" readonly="true"></et2-date-time>
+					<et2-description></et2-description>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/acl.delete.xet b/admin/templates/default/acl.delete.xet
index de6a0257f3..5c6d1d03ac 100644
--- a/admin/templates/default/acl.delete.xet
+++ b/admin/templates/default/acl.delete.xet
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.acl.delete.main" template="" lang="" group="0" version="1.9.001">
-		<description value="Delete this access control"/>
+		<et2-description  value="Delete this access control"></et2-description>
 	</template>
 	<template id="admin.acl.delete" template="" lang="" group="0" version="1.9.001">
-		<tabbox id="tabs" class="et2_nowrap" span="all" width="100%" tab_height="250px">
+		<et2-tabbox  id="tabs" class="et2_nowrap" span="all" width="100%" tabHeight="250px">
 			<tabs>
 				<tab id="main" label="Delete" statustext="Delete"/>
 			</tabs>
 			<tabpanels>
 				<template id="admin.acl.delete.main"/>
 			</tabpanels>
-		</tabbox>
+		</et2-tabbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/acl.edit.xet b/admin/templates/default/acl.edit.xet
index 9de3608aa4..c7d141f79e 100644
--- a/admin/templates/default/acl.edit.xet
+++ b/admin/templates/default/acl.edit.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.acl.edit.acl" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%" resize_ratio="0">
@@ -10,53 +9,47 @@
 			</columns>
 			<rows>
 				<row disabled="@acl_location=run" part="header">
-					<description value="Application"/>
-					<menulist>
-						<!-- app.admin doesn't exist (for unknown reason), but accessing it through etemplate2 works -->
-						<menupopup id="acl_appname" needed="1" onchange="etemplate2.getById('admin-acl').app_obj.admin.acl_reopen_dialog();" options="Select one"/>
-					</menulist>
+					<et2-description  value="Application"></et2-description>
+					<!-- app.admin doesn't exist (for unknown reason), but accessing it through etemplate2 works -->
+						<et2-select  id="acl_appname" onchange="etemplate2.getById('admin-acl').app_obj.admin.acl_reopen_dialog();" required="1" emptyLabel="Select one"></et2-select>
 				</row>
 				<row part="header">
-					<description value="Data from" for="acl_account"/>
-					<menulist>
-						<!-- app.admin doesn't exist (for unknown reason), but accessing it through etemplate2 works -->
-						<menupopup type="select-account" id="acl_account" account_type="both" needed="1" onchange="etemplate2.getById('admin-acl').app_obj.admin.acl_reopen_dialog();"/>
-					</menulist>
+					<et2-description  value="Data from" for="acl_account"></et2-description>
+					<!-- app.admin doesn't exist (for unknown reason), but accessing it through etemplate2 works -->
+						<et2-select-account  id="acl_account" onchange="etemplate2.getById('admin-acl').app_obj.admin.acl_reopen_dialog();" accountType="both" required="1"></et2-select-account>
 				</row>
 				<row disabled="@acl_location=run" part="header">
-					<description value="Access by" for="acl_location"/>
-					<menulist>
-						<menupopup type="select-account" id="acl_location" account_type="both"/>
-					</menulist>
+					<et2-description  value="Access by" for="acl_location"></et2-description>
+					<et2-select-account  id="acl_location" accountType="both"></et2-select-account>
 				</row>
 				<row valign="top" disabled="@acl_location=run">
-					<description value="Rights"/>
+					<et2-description  value="Rights"></et2-description>
 					<grid>
 						<columns>
 							<column/>
 						</columns>
 						<rows>
 							<row>
-								<checkbox label="@label[$row]" id="acl[$row]" options="{$cont['right'][$row]},0" span="all"/>
+								<et2-checkbox  label="@label[$row]" id="acl[$row]" span="all" selectedValue="{$cont['right'][$row]}" unselectedValue="0"></et2-checkbox>
 							</row>
 						</rows>
 					</grid>
 				</row>
 				<row disabled="!@acl_location=run">
-					<description value="Applications" for="apps"/>
-					<listbox type="select-app" id="apps" rows="8" options=",enabled,,,,,0"/>
+					<et2-description  value="Applications" for="apps"></et2-description>
+					<et2-select-app  id="apps" rows="8" multiple="1"></et2-select-app>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="admin.acl.edit" template="" lang="" group="0" version="1.9.001">
-		<tabbox id="tabs" class="et2_nowrap" span="all" width="100%" tab_height="250px">
+		<et2-tabbox  id="tabs" class="et2_nowrap" span="all" width="100%" tabHeight="250px">
 			<tabs>
 				<tab id="acl" label="Access" statustext="Access"/>
 			</tabs>
 				<tabpanels>
 				<template id="admin.acl.edit.acl"/>
 			</tabpanels>
-		</tabbox>
+		</et2-tabbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/acl.xet b/admin/templates/default/acl.xet
index 8c37951d8c..03ad4141b5 100644
--- a/admin/templates/default/acl.xet
+++ b/admin/templates/default/acl.xet
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.acl.add" template="" lang="" group="0" version="1.9.001">
-		<buttononly statustext="Add" id="add" onclick="app.admin.acl({id:'add'},[{id:''}])"/>
+		<et2-button  statustext="Add" id="add" onclick="app.admin.acl({id:'add'},[{id:''}])" noSubmit="true"></et2-button>
 	</template>
 	<template id="admin.acl.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -23,7 +22,7 @@
 			</columns>
 			<rows>
 				<row>
-					<description/>
+					<et2-description></et2-description>
 					<nextmatch-sortheader label="Application" id="acl_appname"/>
 					<nextmatch-sortheader label="Data from" id="acl_account"/>
 					<nextmatch-sortheader label="Access by" id="acl_location"/>
@@ -37,18 +36,18 @@
 					<nextmatch-header label="Custom 3" id="custom3"/>
 				</row>
 				<row class="$row_cont[class]">
-					<appicon align="center" src="$row_cont[acl_appname]" class="admin_aclApp"/>
-					<select id="${row}[acl_appname]" readonly="true"/>
-					<select-account id="${row}[acl_account]" readonly="true"/>
-					<select-account id="${row}[acl_location]" readonly="true"/>
-					<description id="${row}[acl1]"/>
-					<description id="${row}[acl2]"/>
-					<description id="${row}[acl4]"/>
-					<description id="${row}[acl8]"/>
-					<description id="${row}[acl16]"/>
-					<description id="${row}[acl64]"/>
-					<description id="${row}[acl128]"/>
-					<description id="${row}[acl256]"/>
+					<et2-appicon  align="center" src="$row_cont[acl_appname]" class="admin_aclApp"></et2-appicon>
+					<et2-select  id="${row}[acl_appname]" readonly="true"></et2-select>
+					<et2-select-account  id="${row}[acl_account]" readonly="true"></et2-select-account>
+					<et2-select-account  id="${row}[acl_location]" readonly="true"></et2-select-account>
+					<et2-description  id="${row}[acl1]"></et2-description>
+					<et2-description  id="${row}[acl2]"></et2-description>
+					<et2-description  id="${row}[acl4]"></et2-description>
+					<et2-description  id="${row}[acl8]"></et2-description>
+					<et2-description  id="${row}[acl16]"></et2-description>
+					<et2-description  id="${row}[acl64]"></et2-description>
+					<et2-description  id="${row}[acl128]"></et2-description>
+					<et2-description  id="${row}[acl256]"></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -63,9 +62,9 @@
 					<nextmatch id="nm" template="admin.acl.rows" header_left="admin.acl.add" height="600"/>
 				</row>
 				<row class="dialogFooterToolbar">
-					<hbox>
-						<button label="Close" id="cancel" onclick="window.close();"/>
-					</hbox>
+					<et2-hbox>
+						<et2-button  label="Close" id="cancel" onclick="window.close();"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
diff --git a/admin/templates/default/categories.delete.xet b/admin/templates/default/categories.delete.xet
index 3525706333..311c02412b 100644
--- a/admin/templates/default/categories.delete.xet
+++ b/admin/templates/default/categories.delete.xet
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.categories.delete.message">
-		<description value="Are you sure you want to delete this category?"/>
+		<et2-description  value="Are you sure you want to delete this category?"></et2-description>
 	</template>
 	<template id="admin.categories.delete">
-		<vbox>
-			<tabbox id="tabs" span="all" tab_height="150">
+		<et2-vbox>
+			<et2-tabbox  id="tabs" span="all" tabHeight="150">
 				<tabs>
 					<tab id="main" label="Category"/>
 				</tabs>
 				<tabpanels>
 					<template id="admin.categories.delete.message"/>
 				</tabpanels>
-			</tabbox>
-			<hbox class="dialogFooterToolbar" id="button">
-				<button id="cancel" label="Cancel" onclick="window.close()"/>
-				<button id="delete" label="Delete"/>
-				<button id="delete_sub" label="Delete including sub-entries"/>
-			</hbox>
-		</vbox>
+			</et2-tabbox>
+			<et2-hbox  class="dialogFooterToolbar" id="button">
+				<et2-button  id="cancel" label="Cancel" onclick="window.close()"></et2-button>
+				<et2-button  id="delete" label="Delete"></et2-button>
+				<et2-button  id="delete_sub" label="Delete including sub-entries"></et2-button>
+			</et2-hbox>
+		</et2-vbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/categories.edit.xet b/admin/templates/default/categories.edit.xet
index 96120b6b2d..83f4383ef6 100644
--- a/admin/templates/default/categories.edit.xet
+++ b/admin/templates/default/categories.edit.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.categories.edit.category" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,41 +9,35 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Parent category" for="parent"/>
-					<menulist>
-						<menupopup type="select-cat" id="parent" options="None,$cont[all_cats],,$cont[appname]"/>
-					</menulist>
+					<et2-description  value="Parent category" for="parent"></et2-description>
+					<et2-select-cat  id="parent" application="$cont[appname]" emptyLabel="None" globalCategories="$cont[all_cats]"></et2-select-cat>
 				</row>
 				<row valign="top">
-					<description value="Description" for="description"/>
-					<textbox multiline="true" id="description" rows="5" cols="50"/>
+					<et2-description  value="Description" for="description"></et2-description>
+					<et2-textarea  id="description" rows="5" cols="50"></et2-textarea>
 				</row>
 				<row class="nmr" disabled="@no_private">
-					<description value="Private"/>
-					<checkbox id="access" options="private,public"/>
+					<et2-description  value="Private"></et2-description>
+					<et2-checkbox  id="access" selectedValue="private" unselectedValue="public" ></et2-checkbox>
 				</row>
 				<row>
-					<description value="Color" for="cat_data[color]"/>
-					<colorpicker id="data[color]"/>
+					<et2-description  value="Color" for="cat_data[color]"></et2-description>
+					<et2-colorpicker  id="data[color]"></et2-colorpicker>
 				</row>
 				<row>
-					<description value="Icon" for="data[icon]"/>
-					<hbox options="0,0">
-						<menulist>
-							<menupopup id="data[icon]" onchange="app.admin.change_icon(widget);" options="None"/>
-						</menulist>
-						<image src="icon_url" id="icon_url" class="leftPad5"/>
-					</hbox>
+					<et2-description  value="Icon" for="data[icon]"></et2-description>
+					<et2-hbox  cellpadding="0" cellspacing="0" >
+						<et2-select  id="data[icon]" onchange="app.admin.change_icon(widget);" emptyLabel="None"></et2-select>
+						<et2-image  src="icon_url" id="icon_url" class="leftPad5"></et2-image>
+					</et2-hbox>
 				</row>
 				<row disabled="@appname=phpgw">
-					<description value="Application"/>
-					<menulist>
-						<menupopup type="select-app" id="appname" readonly="true" options="All applications"/>
-					</menulist>
+					<et2-description  value="Application"></et2-description>
+					<et2-select-app  id="appname" readonly="true" emptyLabel="All applications"></et2-select-app>
 				</row>
 				<row>
-					<description value="Category owner" for="owner"/>
-					<taglist-account statustext="Limit global category to members of a certain group" id="owner" needed="1" class="et2_fullWidth" />
+					<et2-description  value="Category owner" for="owner"></et2-description>
+					<et2-select-account  statustext="Limit global category to members of a certain group" id="owner" multiple="true" required="1"></et2-select-account>
 				</row>
 
 			</rows>
@@ -58,32 +51,32 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader">
-					<description value="Name" for="name"/>
-					<textbox id="name" needed="1" size="50" maxlength="150" class="et2_fullWidth"/>
+					<et2-description  value="Name" for="name"></et2-description>
+					<et2-textbox  id="name" maxlength="150" required="1"></et2-textbox>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" tab_height="350">
+					<et2-tabbox  id="tabs" span="all" tabHeight="350">
 						<tabs>
 							<tab id="category" label="Category"/>
 						</tabs>
 						<tabpanels>
 							<template id="admin.categories.edit.category"/>
 						</tabpanels>
-					</tabbox>
+					</et2-tabbox>
 				</row>
 				<row disabled="!@last_mod">
-					<description value="Modified"/>
-					<date-time id="last_mod" readonly="true"/>
+					<et2-description  value="Modified"></et2-description>
+					<et2-date-time  id="last_mod" readonly="true"></et2-date-time>
 				</row>
 				<row  class="dialogFooterToolbar">
-					<hbox span="all">
-						<button label="Save" id="button[save]" onclick="return app.admin.check_owner(widget);" image="save" background_image="1"/>
-						<button label="Apply" id="button[apply]" onclick="return app.admin.check_owner(widget);" image="apply" background_image="1"/>
-						<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-						<buttononly align="right" statustext="Delete this category" label="Delete" id="button[delete]" onclick="egw.open_link('$cont[delete_link]&amp;cat_id='+widget.getRoot().getArrayMgr('content').getEntry('id'),'_browser','450x400');window.close();" image="delete" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Save" id="button[save]" onclick="return app.admin.check_owner(widget);" image="save"></et2-button>
+						<et2-button  label="Apply" id="button[apply]" onclick="return app.admin.check_owner(widget);" image="apply"></et2-button>
+						<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" noSubmit="true"></et2-button>
+						<et2-button  align="right" statustext="Delete this category" label="Delete" id="button[delete]" onclick="egw.open_link('$cont[delete_link]&amp;cat_id='+widget.getRoot().getArrayMgr('content').getEntry('id'),'_browser','450x400');window.close();" image="delete" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/categories.index.xet b/admin/templates/default/categories.index.xet
index 45c14e033a..e612958afe 100644
--- a/admin/templates/default/categories.index.xet
+++ b/admin/templates/default/categories.index.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.categories.index.rows" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%">
@@ -20,9 +19,9 @@
 				<row class="th">
 					<nextmatch-sortheader label="Name" id="name"/>
 					<nextmatch-sortheader label="Description" id="description"/>
-					<nextmatch-filterheader label="Application" id="app"/>
-					<nextmatch-accountfilter label="Owner" id="owner" options="all,both"/>
-					<nextmatch-filterheader label="Private" id="access" options="All"/>
+					<et2-nextmatch-header-filter  label="Application" id="app"/>
+					<et2-nextmatch-header-account  label="Owner" id="owner" emptyLabel="all" accountType="both"/>
+					<et2-nextmatch-header-filter  label="Private" id="access" emptyLabel="All"/>
 					<nextmatch-header align="center" label="Icon" id="icon"/>
 					<nextmatch-header label="Color" id="color"/>
 					<nextmatch-sortheader label="Modified" id="last_mod"/>
@@ -30,49 +29,45 @@
 					<nextmatch-header label="Actions" id="legacy_actions"/>
 				</row>
 				<row class="$row_cont[id] $row_cont[class]">
-					<hbox options="0,0">
+					<et2-hbox  cellpadding="0" cellspacing="0" >
 						<html id="${row}[level_spacer]" class="level_spacer"/>
-						<description id="${row}[name]" class="$row_cont[class]"/>
-					</hbox>
-					<description id="${row}[description]"/>
-					<menulist>
-						<menupopup id="${row}[appname]" readonly="true"/>
-					</menulist>
-					<menulist>
-						<menupopup type="select-account" id="${row}[owner]" readonly="true" options="All users,groups"/>
-					</menulist>
-					<checkbox align="center" id="${row}[access]" readonly="true" options="private,public"/>
-					<image align="center" label="{$row_cont['data']['icon']}" src="${row}[icon_url]"/>
-					<description id="${row}[data][color]"/>
-					<date-time id="${row}[last_mod]" readonly="true"/>
-					<description align="center" id="${row}[subs]"/>
-					<hbox options="0,0">
-						<buttononly label="Edit" id="edit[$row_cont[id]]" onclick="window.open(egw::link('/index.php','menuaction=$cont[edit_link]&amp;cat_id=$row_cont[id]&amp;appname=$cont[appname]'),'_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;" options="edit"/>
-						<buttononly label="Add sub" id="add[$row_cont[id]]" onclick="window.open(egw::link('/index.php','menuaction=$cont[edit_link]&amp;parent=$row_cont[id]&amp;appname=$cont[appname]'),'_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;" options="new"/>
-						<buttononly statustext="Delete this category" label="Delete" id="delete[$row_cont[id]]" onclick="document.getElementById('exec[delete][cat_id]').value='$row_cont[id]'; set_style_by_class('tr','confirmSubs','visibility','$row_cont[children]'?'visible':'collapse'); set_style_by_class('fieldset','confirmDelete','display','block'); return false;" options="delete" class="leftPad5"/>
-					</hbox>
+						<et2-description  id="${row}[name]" class="$row_cont[class]"></et2-description>
+					</et2-hbox>
+					<et2-description  id="${row}[description]"></et2-description>
+					<et2-select  id="${row}[appname]" readonly="true"></et2-select>
+					<et2-select-account  id="${row}[owner]" readonly="true" emptyLabel="All users" accountType="groups"></et2-select-account>
+					<et2-checkbox  align="center" id="${row}[access]" readonly="true" selectedValue="private" unselectedValue="public" ></et2-checkbox>
+					<et2-image  align="center" label="{$row_cont['data']['icon']}" src="${row}[icon_url]"></et2-image>
+					<et2-description  id="${row}[data][color]"></et2-description>
+					<et2-date-time  id="${row}[last_mod]" readonly="true"></et2-date-time>
+					<et2-description  align="center" id="${row}[subs]"></et2-description>
+					<et2-hbox  cellpadding="0" cellspacing="0" >
+						<et2-button  label="Edit" id="edit[$row_cont[id]]" onclick="window.open(egw::link('/index.php','menuaction=$cont[edit_link]&amp;cat_id=$row_cont[id]&amp;appname=$cont[appname]'),'_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;" image="edit" noSubmit="true"></et2-button>
+						<et2-button  label="Add sub" id="add[$row_cont[id]]" onclick="window.open(egw::link('/index.php','menuaction=$cont[edit_link]&amp;parent=$row_cont[id]&amp;appname=$cont[appname]'),'_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;" image="new" noSubmit="true"></et2-button>
+						<et2-button  statustext="Delete this category" label="Delete" id="delete[$row_cont[id]]" onclick="document.getElementById('exec[delete][cat_id]').value='$row_cont[id]'; set_style_by_class('tr','confirmSubs','visibility','$row_cont[children]'?'visible':'collapse'); set_style_by_class('fieldset','confirmDelete','display','block'); return false;" image="delete" class="leftPad5" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="admin.categories.index.add" template="" lang="" group="0" version="1.9.001">
-		<buttononly label="Add" id="add" onclick="window.open('$cont[add_link]','_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;"/>
+		<et2-button  label="Add" id="add" onclick="window.open('$cont[add_link]','_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;" noSubmit="true"></et2-button>
 	</template>
 	<template id="admin.categories.index" template="" lang="" group="0" version="1.9.001">
 		<nextmatch id="nm" options="admin.categories.index.rows" span="all" header_left="admin.categories.index.add"/>
-		<box class="action_popup prompt" id="owner_popup">
-			<vbox>
-				<description value="Change owner" class="promptheader"/>
-				<description value="Select owner"/>
-				<listbox id="owner" no_lang="1" rows="4" class="action_popup-content"/>
-				<hbox>
-					<button label="Add" id="owner_action[add]" onclick="nm_submit_popup(this); return false;"/>
-					<button label="Delete" id="owner_action[delete]" onclick="nm_submit_popup(this); return false;"/>
-					<button disabled="true" label="OK" onclick="nm_submit_popup(this); return false;"/>
-					<button label="Cancel" id="owner_action[cancel]" onclick="nm_hide_popup(this,'owner_popup');"/>
-				</hbox>
-			</vbox>
-		</box>
+		<et2-box  class="action_popup prompt" id="owner_popup">
+			<et2-vbox>
+				<et2-description  value="Change owner" class="promptheader"></et2-description>
+				<et2-description  value="Select owner"></et2-description>
+				<et2-select  id="owner" rows="4" class="action_popup-content" multiple="1" noLang="1"></et2-select>
+				<et2-hbox>
+					<et2-button  label="Add" id="owner_action[add]" onclick="nm_submit_popup(this); return false;"></et2-button>
+					<et2-button  label="Delete" id="owner_action[delete]" onclick="nm_submit_popup(this); return false;"></et2-button>
+					<et2-button  disabled="true" label="OK" onclick="nm_submit_popup(this); return false;"></et2-button>
+					<et2-button  label="Cancel" id="owner_action[cancel]" onclick="nm_hide_popup(this,'owner_popup');"></et2-button>
+				</et2-hbox>
+			</et2-vbox>
+		</et2-box>
 		<styles>
             .level0 { font-weight: bold; }
             .level_spacer { flex: 0 0 auto;}
@@ -105,4 +100,4 @@
 }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/cmds.xet b/admin/templates/default/cmds.xet
index 21187bc1c4..d89629bace 100644
--- a/admin/templates/default/cmds.xet
+++ b/admin/templates/default/cmds.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.cmds.rows" template="" lang="" group="0" version="1.5.001">
 		<grid width="100%">
@@ -20,56 +20,56 @@
 			<rows>
 				<row class="th">
 					<nextmatch-header label="Title" id="title"/>
-					<nextmatch-customfilter type="select-app" empty_label="All applications" id="app"/>
-					<nextmatch-accountfilter empty_label="All accounts" id="account"/>
-					<nextmatch-filterheader empty_label="Type" id="type"/>
-					<nextmatch-accountfilter empty_label="Requested" id="requested"/>
+					<et2-nextmatch-header-custom  id="app" emptyLabel="All applications" widgetType="select-app"/>
+					<et2-nextmatch-header-account  id="account" emptyLabel="All accounts"/>
+					<et2-nextmatch-header-filter  id="type" emptyLabel="Type"/>
+					<et2-nextmatch-header-account  id="requested" emptyLabel="Requested"/>
 					<nextmatch-header label="Comment" id="comment"/>
 					<nextmatch-sortheader label="Scheduled" id="cmd_scheduled"/>
-					<nextmatch-filterheader empty_label="Periodic" id="periodic"/>
-					<nextmatch-filterheader options="Remote" id="remote_id"/>
-					<vbox>
+					<et2-nextmatch-header-filter  id="periodic" emptyLabel="Periodic"/>
+					<et2-nextmatch-header-filter  id="remote_id" emptyLabel="Remote"/>
+					<et2-vbox>
 						<nextmatch-sortheader label="Created" id="cmd_created"/>
-						<nextmatch-accountfilter empty_label="Creator" id="creator"/>
-					</vbox>
-					<nextmatch-filterheader empty_label="Status" id="status"/>
-					<vbox>
+						<et2-nextmatch-header-account  id="creator" emptyLabel="Creator"/>
+					</et2-vbox>
+					<et2-nextmatch-header-filter  id="status" emptyLabel="Status"/>
+					<et2-vbox>
 						<nextmatch-sortheader label="Modified" id="cmd_modified"/>
-						<nextmatch-accountfilter options="Modifier" id="modifier"/>
-					</vbox>
+						<et2-nextmatch-header-account  id="modifier" emptyLabel="Modifier"/>
+					</et2-vbox>
 				</row>
 				<row class="row $row_cont[class]">
-					<description id="${row}[title]"/>
-					<select-app id="${row}[app]" readonly="true"/>
-					<select-account id="${row}[account]" readonly="true"/>
-					<select id="${row}[type]" readonly="true"/>
-					<url-email id="${row}[requested_email]" readonly="true"/>
-					<description id="${row}[comment]"/>
-					<date-time id="${row}[scheduled]" readonly="true"/>
-					<description id="${row}[rrule]"/>
-					<select id="${row}[remote_id]" readonly="true"/>
-					<vbox>
-						<date-time id="${row}[created]" readonly="true"/>
-						<select-account id="${row}[creator]" readonly="true"/>
-					</vbox>
-					<vbox>
-						<select id="${row}[status]" readonly="true"/>
-						<description id="${row}[error]" class="redItalic"/>
-						<description id="${row}[value]"/>
-					</vbox>
-					<vbox>
-						<date-time id="${row}[modified]" readonly="true"/>
-						<select-account id="${row}[modifier]" readonly="true"/>
-					</vbox>
+					<et2-description  id="${row}[title]"></et2-description>
+					<et2-select-app  id="${row}[app]" readonly="true"></et2-select-app>
+					<et2-select-account  id="${row}[account]" readonly="true"></et2-select-account>
+					<et2-select  id="${row}[type]" readonly="true"></et2-select>
+					<et2-url-email  id="${row}[requested_email]" readonly="true"></et2-url-email>
+					<et2-description  id="${row}[comment]"></et2-description>
+					<et2-date-time  id="${row}[scheduled]" readonly="true"></et2-date-time>
+					<et2-description  id="${row}[rrule]"></et2-description>
+					<et2-select  id="${row}[remote_id]" readonly="true"></et2-select>
+					<et2-vbox>
+						<et2-date-time  id="${row}[created]" readonly="true"></et2-date-time>
+						<et2-select-account  id="${row}[creator]" readonly="true"></et2-select-account>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-select  id="${row}[status]" readonly="true"></et2-select>
+						<et2-description  id="${row}[error]" class="redItalic"></et2-description>
+						<et2-description  id="${row}[value]"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-date-time  id="${row}[modified]" readonly="true"></et2-date-time>
+						<et2-select-account  id="${row}[modifier]" readonly="true"></et2-select-account>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="admin.cmds.splitter" template="" lang="" height="100%" group="0" version="19.01">
-		<split orientation="h" height="100%" id="splitter" dock_side="bottomDock">
+		<et2-split  orientation="h" height="100%" id="splitter" vertical="true" primary="start">
 			<nextmatch options="admin.cmds.rows" id="nm" onselect="app.admin.cmds_onselect"/>
 			<template id="admin.cmds.preview"/>
-		</split>
+		</et2-split>
 	</template>
 
 	<template id="admin.cmds" template="" lang="" height="100%" group="0" version="1.5.001">
@@ -84,33 +84,33 @@
 			</columns>
 			<rows>
 				<row>
-					<vbox>
-						<hbox class="row">
-							<hbox class="et2_hbox_left"><description value="Title" label="%s:"/></hbox>
-							<description value="$row_cont[title]"/>
-						</hbox>
-						<hbox class="row dialogFooterToolbar">
-							<hbox class="et2_hbox_left">
-								<description value="Comment" label="%s:" class="et2_hbox_left"/>
-							</hbox>
-							<description value="$row_cont[comment]"/>
-						</hbox>
-						<hbox class="row">
-							<hbox class="et2_hbox_left">
-								<description value="Creator" label="%s:" class="et2_hbox_left"/>
-							</hbox>
-							<hbox>
-								<description value="$row_cont[creator]" label="%s("/>
-								<description value="$row_cont[creator_email]" label="%s)"/>
-							</hbox>
-						</hbox>
-						<hbox class="row">
-							<hbox class="et2_hbox_left">
-								<description value="Data" label="%s:" align="left" class="et2_hbox_left"/>
-							</hbox>
-							<description value="$row_cont[data]"/>
-						</hbox>
-					</vbox>
+					<et2-vbox>
+						<et2-hbox  class="row">
+							<et2-hbox  class="et2_hbox_left"><et2-description  value="Title" label="%s:"></et2-description></et2-hbox>
+							<et2-description  value="$row_cont[title]"></et2-description>
+						</et2-hbox>
+						<et2-hbox  class="row dialogFooterToolbar">
+							<et2-hbox  class="et2_hbox_left">
+								<et2-description  value="Comment" label="%s:" class="et2_hbox_left"></et2-description>
+							</et2-hbox>
+							<et2-description  value="$row_cont[comment]"></et2-description>
+						</et2-hbox>
+						<et2-hbox  class="row">
+							<et2-hbox  class="et2_hbox_left">
+								<et2-description  value="Creator" label="%s:" class="et2_hbox_left"></et2-description>
+							</et2-hbox>
+							<et2-hbox>
+								<et2-description  value="$row_cont[creator]" label="%s("></et2-description>
+								<et2-description  value="$row_cont[creator_email]" label="%s)"></et2-description>
+							</et2-hbox>
+						</et2-hbox>
+						<et2-hbox  class="row">
+							<et2-hbox  class="et2_hbox_left">
+								<et2-description  value="Data" label="%s:" align="left" class="et2_hbox_left"></et2-description>
+							</et2-hbox>
+							<et2-description  value="$row_cont[data]"></et2-description>
+						</et2-hbox>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
@@ -118,4 +118,4 @@
 			#admin-cmds_cmds_preview .et2_hbox.row {padding: 5px 0 5px 3px;vertical-align: middle;}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/config.xet b/admin/templates/default/config.xet
index ac67a2ab19..666f8ac7c8 100644
--- a/admin/templates/default/config.xet
+++ b/admin/templates/default/config.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.config.general" template="" lang="" group="0" version="18.1">
 		<grid width="100%" class="admin-config egwGridView_grid">
@@ -10,16 +9,16 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Should the login page include a language selectbox (useful for demo-sites) ?" label="%s:"/>
-					<select id="newsettings[login_show_language_selection]">
+					<et2-description  value="Should the login page include a language selectbox (useful for demo-sites) ?" label="%s:"></et2-description>
+					<et2-select  id="newsettings[login_show_language_selection]">
 						<option value="">No</option>
 						<option value="True">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="How should EMail addresses for new users be constructed?" label="%s:"/>
-					<vbox>
-						<select id="newsettings[email_address_format]">
+					<et2-description  value="How should EMail addresses for new users be constructed?" label="%s:"></et2-description>
+					<et2-vbox>
+						<et2-select  id="newsettings[email_address_format]">
 							<option value="first-dot-last">{Firstname}.{Lastname}@domain.com</option>
 							<option value="first-last">{Firstname}{Lastname}@domain.com</option>
 							<option value="first-underscore-last">{Firstname}_{Lastname}@domain.com</option>
@@ -32,45 +31,45 @@
 							<option value="first">{Firstname}@domain.com</option>
 							<option value="account">{Username}@domain.com</option>
 							<option value="none">Do not generate EMail addresses</option>
-						</select>
-						<checkbox label="Lowercase EMail addresses" id="newsettings[email_address_lowercase]" value="true"/>
-					</vbox>
+						</et2-select>
+						<et2-checkbox  label="Lowercase EMail addresses" id="newsettings[email_address_lowercase]" value="true"></et2-checkbox>
+					</et2-vbox>
 				</row>
 				<row>
-					<description value="Enter the VFS-Path where additional images, icons or logos can be placed (and found by EGroupwares applications). The path MUST start with /,and be readable by all users" label="%s:"/>
-					<textbox id="newsettings[vfs_image_dir]" size="40"/>
+					<et2-description  value="Enter the VFS-Path where additional images, icons or logos can be placed (and found by EGroupwares applications). The path MUST start with /,and be readable by all users" label="%s:"></et2-description>
+					<et2-textbox  id="newsettings[vfs_image_dir]"></et2-textbox>
 				</row>
 				<row>
-					<description value="Log user-agent and action of changes in history-log of entries" label="%s:"/>
-					<select id="newsettings[log_user_agent_action]">
+					<et2-description  value="Log user-agent and action of changes in history-log of entries" label="%s:"></et2-description>
+					<et2-select  id="newsettings[log_user_agent_action]">
 						<option value="">No</option>
 						<option value="True">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Offer to installing EGroupware as mail-handler" label="%s:"/>
-					<select id="newsettings[install_mailto_handler]">
+					<et2-description  value="Offer to installing EGroupware as mail-handler" label="%s:"></et2-description>
+					<et2-select  id="newsettings[install_mailto_handler]">
 						<option value="">Yes - {Default}</option>
 						<option value="disabled">{No}</option>
-					</select>
+					</et2-select>
 				</row>
 				<!-- remove currently not supported/necessary development option debug_minify
 				<row>
-					<description value="Disable minifying of javascript and CSS files" label="%s:"/>
-					<select id="newsettings[debug_minify]">
+					<et2-description  value="Disable minifying of javascript and CSS files" label="%s:"></et2-description>
+					<et2-select  id="newsettings[debug_minify]">
 						<option value="">{No} - {Default}</option>
 						<option value="True">Yes</option>
-					</select>
+					</et2-select>
 				</row -->
 				<row>
-					<description value="Encryption" span="all" class="subHeader"/>
+					<et2-description  value="Encryption" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Disable PGP encryption (Mailvelope)" label="%s:"/>
-					<select id="newsettings[disable_pgp_encryption]">
+					<et2-description  value="Disable PGP encryption (Mailvelope)" label="%s:"></et2-description>
+					<et2-select  id="newsettings[disable_pgp_encryption]">
 						<option value="">{No} - {Default}</option>
 						<option value="True">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 			</rows>
 		</grid>
@@ -83,66 +82,66 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Enter the title for your site" label="%s:"/>
-					<textbox id="newsettings[site_title]"/>
+					<et2-description  value="Enter the title for your site" label="%s:"></et2-description>
+					<et2-textbox  id="newsettings[site_title]"></et2-textbox>
 				</row>
 				<row>
-					<description value="Upload your logo or enter the URL" label="%s:"/>
-					<vbox>
-						<taglist-thumbnail id="newsettings[login_logo_file]" width="100%" allowFreeEntries="true" maxSelection="1" />
+					<et2-description  value="Upload your logo or enter the URL" label="%s:"></et2-description>
+					<et2-vbox>
+						<et2-select-thumbnail  id="newsettings[login_logo_file]" width="100%" allowFreeEntries="true"></et2-select-thumbnail>
 						<file onchange="egw.json('admin.admin_config.ajax_upload_anon_images',[widget.get_value(), []], function(_data){widget._parent._children[0].set_value(_data)}).sendRequest()" width="100%" label="upload"/>
-					</vbox>
+					</et2-vbox>
 				</row>
 				<row>
-					<description value="Upload your header logo or enter the URL (leave it empty if it is the same as login logo)" label="%s:"/>
-					<vbox>
-						<taglist-thumbnail id="newsettings[login_logo_header]" width="100%"  allowFreeEntries="true" maxSelection="1"/>
+					<et2-description  value="Upload your header logo or enter the URL (leave it empty if it is the same as login logo)" label="%s:"></et2-description>
+					<et2-vbox>
+						<et2-select-thumbnail  id="newsettings[login_logo_header]" width="100%" allowFreeEntries="true"></et2-select-thumbnail>
 						<file onchange="egw.json('admin.admin_config.ajax_upload_anon_images',[widget.get_value(), []], function(_data){widget._parent._children[0].set_value(_data)}).sendRequest()" width="100%" label="upload"/>
-					</vbox>
+					</et2-vbox>
 				</row>
 				<row>
-					<description value="Enter the url where your logo should link to" label="%s:"/>
-					<textbox id="newsettings[login_logo_url]" width="100%"/>
+					<et2-description  value="Enter the url where your logo should link to" label="%s:"></et2-description>
+					<et2-textbox  id="newsettings[login_logo_url]" width="100%"></et2-textbox>
 				</row>
 				<row>
-					<description value="Enter the title of your logo" label="%s:"/>
-					<textbox id="newsettings[login_logo_title]" width="100%"/>
+					<et2-description  value="Enter the title of your logo" label="%s:"></et2-description>
+					<et2-textbox  id="newsettings[login_logo_title]" width="100%"></et2-textbox>
 				</row>
 				<row>
-					<vbox>
-						<description value="Upload your background image or enter the URL" label="%s:"/>
-						<description value="If you wish to have randomly selected images you may upload multiple images."/>
-					</vbox>
-					<vbox>
-						<taglist-thumbnail id="newsettings[login_background_file]" width="100%" allowFreeEntries="true" empty_label="Upload your background image or enter the URL"/>
+					<et2-vbox>
+						<et2-description  value="Upload your background image or enter the URL" label="%s:"></et2-description>
+						<et2-description  value="If you wish to have randomly selected images you may upload multiple images."></et2-description>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-select-thumbnail  id="newsettings[login_background_file]" width="100%" allowFreeEntries="true" multiple="true" placeholder="Upload your background image or enter the URL"></et2-select-thumbnail>
 						<file width="100%" label="upload" onchange="app.admin.login_background_update"/>
-					</vbox>
+					</et2-vbox>
 				</row>
 				<row>
-					<description value="Upload your favicon or enter the URL" label="%s:"/>
-					<vbox>
-						<taglist-thumbnail id="newsettings[favicon_file]" class="et2_fullWidth"/>
+					<et2-description  value="Upload your favicon or enter the URL" label="%s:"></et2-description>
+					<et2-vbox>
+						<et2-select-thumbnail  id="newsettings[favicon_file]" multiple="true"></et2-select-thumbnail>
 						<file width="100%" label="upload" onchange="egw.json('admin.admin_config.ajax_upload_anon_images',[widget.get_value(), []], function(_data){widget._parent._children[0].set_value(_data)}).sendRequest()"/>
-					</vbox>
+					</et2-vbox>
 				</row>
 				<row>
-					<description value="How big should thumbnails for linked images be (maximum in pixels) ?" label="%s:"/>
-					<textbox id="newsettings[link_list_thumbnail]" size="5"/>
+					<et2-description  value="How big should thumbnails for linked images be (maximum in pixels) ?" label="%s:"></et2-description>
+					<et2-textbox  id="newsettings[link_list_thumbnail]"></et2-textbox>
 				</row>
 				<!-- disable spellcheck config in favor to always use browser native spellchecker
 				<row>
-					<description value="Enable spellcheck in rich text editor" label="%s:"/>
-					<select id="newsettings[enabled_spellcheck]">
+					<et2-description  value="Enable spellcheck in rich text editor" label="%s:"></et2-description>
+					<et2-select  id="newsettings[enabled_spellcheck]">
 						<option value="">{No} - {more secure}</option>
 						<option value="True">Yes</option>
 						<option value="YesNoSCAYT">Yes, but no SCAYT</option>
 						<option value="YesBrowserBased">{Yes, use browser based spell checking engine} - {more secure}</option>
 						<option value="YesUseWebSpellCheck">Yes, use WebSpellChecker</option>
-					</select>
+					</et2-select>
 				</row> -->
 				<row>
-					<description value="Applications available on mobile devices" label="%s:"/>
-					<select-app id="newsettings[fw_mobile_app_list]" multiple="true" tags="true" other=",enabled:home;groupdav;sitemgr-link;sitemgr;developer_tools;etemplate;stylite;archive;importexport;activesync;notifications;esyncpro;preferences;registration" width="100%"/>
+					<et2-description  value="Applications available on mobile devices" label="%s:"></et2-description>
+					<et2-select-app  id="newsettings[fw_mobile_app_list]" multiple="true" other=",enabled:home;groupdav;sitemgr-link;sitemgr;developer_tools;etemplate;stylite;archive;importexport;activesync;notifications;esyncpro;preferences;registration" width="100%"></et2-select-app>
 				</row>
 			</rows>
 		</grid>
@@ -155,34 +154,34 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="2-Factor-Authentication" span="all" class="subHeader"/>
+					<et2-description  value="2-Factor-Authentication" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="2-Factor-Authentication for interactive login" label="%s:"/>
-					<select id="newsettings[2fa_required]">
+					<et2-description  value="2-Factor-Authentication for interactive login" label="%s:"></et2-description>
+					<et2-select  id="newsettings[2fa_required]">
 						<option value="">show as optional, but required once user has it setup</option>
 						<option value="required">show as required, but only once user has it setup</option>
 						<option value="strict">strictly required, user can not login without</option>
 						<option value="disabled">disabled, do not show on login page</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<vbox>
-						<description value="Allow user to set 'Remember me' token" label="%s:"/>
-						<description value="Requires 'OpenID / OAuth2 Server' app." label="(%s)"/>
-					</vbox>
-					<vbox>
-						<select id="newsettings[remember_me_token]">
+					<et2-vbox>
+						<et2-description  value="Allow user to set 'Remember me' token" label="%s:"></et2-description>
+						<et2-description  value="Requires 'OpenID / OAuth2 Server' app." label="(%s)"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-select  id="newsettings[remember_me_token]">
 							<option value="">allowed just as second factor</option>
 							<option value="always">direct login without password or second factor</option>
 							<option value="disabled">disabled, do not show on login page</option>
-						</select>
-						<description value="If disabled existing tokens immediatly stop working." label="(%s)"/>
-					</vbox>
+						</et2-select>
+						<et2-description  value="If disabled existing tokens immediatly stop working." label="(%s)"></et2-description>
+					</et2-vbox>
 				</row>
 				<row>
-					<description value="Lifetime of 'Remember me' token" label="%s:"/>
-					<select id="newsettings[remember_me_lifetime]">
+					<et2-description  value="Lifetime of 'Remember me' token" label="%s:"></et2-description>
+					<et2-select  id="newsettings[remember_me_lifetime]">
 						<option value="">{default of currently} {1 month}</option>
 						<option value="P1W">1 week</option>
 						<option value="P2W">2 weeks</option>
@@ -192,86 +191,85 @@
 						<option value="P6M">6 month</option>
 						<option value="P1Y">1 year</option>
 						<option value="user">User choice</option>
-					</select>
+					</et2-select>
 				</row>
 
 				<row>
-					<description value="Blocking after wrong password" span="all" class="subHeader"/>
+					<et2-description  value="Blocking after wrong password" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="After how many unsuccessful attempts to login, an account should be blocked (default 3) ?" label="%s:"/>
-					<integer id="newsettings[num_unsuccessful_id]" size="5"/>
+					<et2-description  value="After how many unsuccessful attempts to login, an account should be blocked (default 3) ?" label="%s:"></et2-description>
+					<et2-number  id="newsettings[num_unsuccessful_id]" precision="0"></et2-number>
 				</row>
 				<row>
-					<description value="After how many unsuccessful attempts to login, an IP should be blocked (default 15) ?" label="%s:"/>
-					<integer id="newsettings[num_unsuccessful_ip]" size="5"/>
+					<et2-description  value="After how many unsuccessful attempts to login, an IP should be blocked (default 15) ?" label="%s:"></et2-description>
+					<et2-number  id="newsettings[num_unsuccessful_ip]" precision="0"></et2-number>
 				</row>
 				<row>
-					<description value="Comma-separated IP addresses white-listed from above blocking (:optional number of attempts)"/>
-					<textbox id="newsettings[unsuccessful_ip_whitelist]" size="64" blur="X.X.X.X[:N], ..."
-						validator="/^(((\\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))(:\d+)?)(, ?((\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))(:\d+)?))*)?$/"/>
+					<et2-description  value="Comma-separated IP addresses white-listed from above blocking (:optional number of attempts)"></et2-description>
+					<et2-textbox  id="newsettings[unsuccessful_ip_whitelist]" validator="/^(((\\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))(:\d+)?)(, ?((\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))\.(\d|[1-9]\d|1\d\d|2([0-4]\d|5[0-5]))(:\d+)?))*)?$/" placeholder="X.X.X.X[:N], ..."></et2-textbox>
 				</row>
 				<row>
-					<description value="How many minutes should an account or IP be blocked (default 1) ?" label="%s:"/>
-					<integer id="newsettings[block_time]" size="5"/>
+					<et2-description  value="How many minutes should an account or IP be blocked (default 1) ?" label="%s:"></et2-description>
+					<et2-number  id="newsettings[block_time]" precision="0"></et2-number>
 				</row>
 
 				<row>
-					<description value="Sessions" span="all" class="subHeader"/>
+					<et2-description  value="Sessions" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<vbox>
-						<description value="check ip address of all sessions"/>
-						<description value="switch it off, if users are randomly thrown out" label="%s:"/>
-						<description value="Your session could not be verified."/>
-					</vbox>
-					<select id="newsettings[sessions_checkip]">
+					<et2-vbox>
+						<et2-description  value="check ip address of all sessions"></et2-description>
+						<et2-description  value="switch it off, if users are randomly thrown out" label="%s:"></et2-description>
+						<et2-description  value="Your session could not be verified."></et2-description>
+					</et2-vbox>
+					<et2-select  id="newsettings[sessions_checkip]">
 						<option value="True">{Yes} - {more secure}</option>
 						<option value="">No</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Use secure cookies (transmitted only via https)"/>
-					<select id="newsettings[insecure_cookies]">
+					<et2-description  value="Use secure cookies (transmitted only via https)"></et2-description>
+					<et2-select  id="newsettings[insecure_cookies]">
 						<option value="">{Yes} - {more secure}</option>
 						<option value="insecure">No</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="SameSite cookie attribute (send cookie if browser addressbar show a different domain)"/>
-					<select id="newsettings[cookie_samesite_attribute]">
+					<et2-description  value="SameSite cookie attribute (send cookie if browser addressbar show a different domain)"></et2-description>
+					<et2-select  id="newsettings[cookie_samesite_attribute]">
 						<option value="">{Do not set attribute} - {current default}</option>
 						<option value="Lax">"Lax" - {allowed for get requests, default in modern browsers, if attribute is not set}</option>
 						<option value="Strict">"Strict" - {do not send cookie} - {more secure}</option>
 						<option value="None">"None" - {required to embed EGroupware via iframe eg. for LTI}</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Cookie path (allows multiple eGW sessions with different directories, has problemes with SiteMgr!)" label="%s:"/>
-					<select id="newsettings[cookiepath]">
+					<et2-description  value="Cookie path (allows multiple eGW sessions with different directories, has problemes with SiteMgr!)" label="%s:"></et2-description>
+					<et2-select  id="newsettings[cookiepath]">
 						<option value="">Document root (default)</option>
 						<option value="egroupware">EGroupware directory</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Cookie domain (default empty means use full domain name, for SiteMgr eg. &quot;.domain.com&quot; allows to use the same cookie for egw.domain.com and www.domain.com)" label="%s:"/>
-					<textbox id="newsettings[cookiedomain]"/>
+					<et2-description  value="Cookie domain (default empty means use full domain name, for SiteMgr eg. &quot;.domain.com&quot; allows to use the same cookie for egw.domain.com and www.domain.com)" label="%s:"></et2-description>
+					<et2-textbox  id="newsettings[cookiedomain]"></et2-textbox>
 				</row>
 
 				<row>
-					<description value="Passwords" span="all" class="subHeader"/>
+					<et2-description  value="Passwords" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Force users to change their password regularily?(empty for no,number for after that number of days" label="%s:"/>
-					<integer id="newsettings[change_pwd_every_x_days]" size="5"/>
+					<et2-description  value="Force users to change their password regularily?(empty for no,number for after that number of days" label="%s:"></et2-description>
+					<et2-number  id="newsettings[change_pwd_every_x_days]" precision="0"></et2-number>
 				</row>
 				<row>
-					<description value="Warn users about the need to change their password? The number set here should be lower than the value used to enforce the change of passwords every X days. Only effective when enforcing of password change is enabled. (empty for no,number for number of days before they must change)" label="%s:"/>
-					<integer id="newsettings[warn_about_upcoming_pwd_change]" size="5"/>
+					<et2-description  value="Warn users about the need to change their password? The number set here should be lower than the value used to enforce the change of passwords every X days. Only effective when enforcing of password change is enabled. (empty for no,number for number of days before they must change)" label="%s:"></et2-description>
+					<et2-number  id="newsettings[warn_about_upcoming_pwd_change]" precision="0"></et2-number>
 				</row>
 				<row>
-					<description value="Passwords require a minimum number of characters" label="%s:"/>
-					<select id="newsettings[force_pwd_length]">
+					<et2-description  value="Passwords require a minimum number of characters" label="%s:"></et2-description>
+					<et2-select  id="newsettings[force_pwd_length]">
 						<option value="">None</option>
 						<option value="6">6</option>
 						<option value="7">7</option>
@@ -280,117 +278,117 @@
 						<option value="12">12</option>
 						<option value="14">14</option>
 						<option value="16">16</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<vbox>
-						<description value="Passwords requires this number of different character classes"/>
-						<description value="Uppercase, lowercase, number, special char" label="(%s)"/>
-					</vbox>
-					<select id="newsettings[force_pwd_strength]">
+					<et2-vbox>
+						<et2-description  value="Passwords requires this number of different character classes"></et2-description>
+						<et2-description  value="Uppercase, lowercase, number, special char" label="(%s)"></et2-description>
+					</et2-vbox>
+					<et2-select  id="newsettings[force_pwd_strength]">
 						<option value="">None</option>
 						<option value="2">2</option>
 						<option value="3">3</option>
 						<option value="4">4</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Reject passwords containing part of username or full name (3 or more characters long)" label="%s:"/>
-					<select id="newsettings[passwd_forbid_name]">
+					<et2-description  value="Reject passwords containing part of username or full name (3 or more characters long)" label="%s:"></et2-description>
+					<et2-select  id="newsettings[passwd_forbid_name]">
 						<option value="no">No</option>
 						<option value="yes">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 
 				<row>
-					<description value="Other security configuration" span="all" class="subHeader"/>
+					<et2-description  value="Other security configuration" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Deny all users access to grant other users access to their entries ?" label="%s:"/>
-					<select id="newsettings[deny_user_grants_access]">
+					<et2-description  value="Deny all users access to grant other users access to their entries ?" label="%s:"></et2-description>
+					<et2-select  id="newsettings[deny_user_grants_access]">
 						<option value="">No</option>
 						<option value="True">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<!--
 				<row>
-					<description value="Default file system space per user"/>
-					<textbox id="newsettings[vfs_default_account_size_number]" type="text" size="7"/>
+					<et2-description  value="Default file system space per user"></et2-description>
+					<et2-textbox  id="newsettings[vfs_default_account_size_number]" type="text"></et2-textbox>
 
      <td>{Default_file_system_space_per_user}/{group_?}:</td>
      <td>
       <input type="text" name="newsettings[vfs_default_account_size_number]" size="7" value="{value_vfs_default_account_size_number}">&nbsp;&nbsp;
-      <select name="newsettings[vfs_default_account_size_type]">
+      <et2-select  name="newsettings[vfs_default_account_size_type]">
        <option value="gb"{selected_vfs_default_account_size_type_gb}>GB</option>
        <option value="mb"{selected_vfs_default_account_size_type_mb}>MB</option>
        <option value="kb"{selected_vfs_default_account_size_type_kb}>KB</option>
        <option value="b"{selected_vfs_default_account_size_type_b}>B</option>
-      </select>
+      </et2-select>
      </td>
     				</row> -->
 				<row>
-					<description value="How many days should entries stay in the access log, before they get deleted (default 90) ?" label="%s:"/>
-					<integer id="newsettings[max_access_log_age]" size="5"/>
+					<et2-description  value="How many days should entries stay in the access log, before they get deleted (default 90) ?" label="%s:"></et2-description>
+					<et2-number  id="newsettings[max_access_log_age]" precision="0"></et2-number>
 				</row>
 				<row>
-					<description value="Admin email addresses (comma-separated) to be notified about the blocking (empty for no notify)" label="%s:"/>
-					<textbox id="newsettings[admin_mails]" size="40"/>
+					<et2-description  value="Admin email addresses (comma-separated) to be notified about the blocking (empty for no notify)" label="%s:"></et2-description>
+					<et2-textbox  id="newsettings[admin_mails]"></et2-textbox>
 				</row>
 				<!-- not used at the moment RalfBecker 2007/05/17
 				<row>
-					<description value="Disable &quot;auto completion&quot; of the login form " label="%s:"/>
-					<select id="newsettings[autocomplete_login]">
+					<et2-description  value="Disable &quot;auto completion&quot; of the login form " label="%s:"></et2-description>
+					<et2-select  id="newsettings[autocomplete_login]">
 						<option value="">No</option>
 						<option value="True">Yes</option>
-					</select>
+					</et2-select>
 				</row> -->
 				<row>
-					<vbox>
-						<description value="How many entries should non-admins be able to export (empty = no limit, no = no export)"/>
-						<description value="This controls exports and merging."/>
-					</vbox>
-					<textbox id="newsettings[export_limit]" size="5"/>
+					<et2-vbox>
+						<et2-description  value="How many entries should non-admins be able to export (empty = no limit, no = no export)"></et2-description>
+						<et2-description  value="This controls exports and merging."></et2-description>
+					</et2-vbox>
+					<et2-textbox  id="newsettings[export_limit]"></et2-textbox>
 				</row>
 				<row>
-					<description value="Group excepted from above export limit (admins are always excepted)" label="%s:"/>
-					<select-account id="newsettings[export_limit_excepted]" account_type="groups" multiple="true" tags="true" width="100%"/>
+					<et2-description  value="Group excepted from above export limit (admins are always excepted)" label="%s:"></et2-description>
+					<et2-select-account  id="newsettings[export_limit_excepted]" multiple="true" width="100%" accountType="groups"></et2-select-account>
 				</row>
 				<row>
-					<vbox>
-						<description value="Allow remote administration from following install ID's (comma separated)"/>
-						<description id="newsettings[install_id]" label="Own install ID:"/>
-					</vbox>
-					<textbox id="newsettings[allow_remote_admin]" size="40"/>
+					<et2-vbox>
+						<et2-description  value="Allow remote administration from following install ID's (comma separated)"></et2-description>
+						<et2-description  id="newsettings[install_id]" label="Own install ID:"></et2-description>
+					</et2-vbox>
+					<et2-textbox  id="newsettings[allow_remote_admin]"></et2-textbox>
 				</row>
 				<row>
-					<description value="Should exceptions contain a trace (including function arguments)" label="%s:"/>
-					<select id="newsettings[exception_show_trace]">
+					<et2-description  value="Should exceptions contain a trace (including function arguments)" label="%s:"></et2-description>
+					<et2-select  id="newsettings[exception_show_trace]">
 						<option value="">{No} - {more secure}</option>
 						<option value="True">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Google recaptcha" span="all" class="subHeader"/>
+					<et2-description  value="Google recaptcha" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<vbox>
-						<description value="Google recaptcha secret key" label="%s:"/>
-						<description value="This secret key used for communication between your site and Google. Be sure to keep it a secret."/>
-					</vbox>
-					<textbox id="newsettings[recaptcha_secret]" size="60"/>
+					<et2-vbox>
+						<et2-description  value="Google recaptcha secret key" label="%s:"></et2-description>
+						<et2-description  value="This secret key used for communication between your site and Google. Be sure to keep it a secret."></et2-description>
+					</et2-vbox>
+					<et2-textbox  id="newsettings[recaptcha_secret]"></et2-textbox>
 				</row>
 				<row>
-					<vbox>
-						<description value="Google recaptcha site key" label="%s:"/>
-						<description value="This key used in the HTML code your site serves to users." />
-					</vbox>
-					<textbox id="newsettings[recaptcha_site]" size="60"/>
+					<et2-vbox>
+						<et2-description  value="Google recaptcha site key" label="%s:"></et2-description>
+						<et2-description  value="This key used in the HTML code your site serves to users."></et2-description>
+					</et2-vbox>
+					<et2-textbox  id="newsettings[recaptcha_site]"></et2-textbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="admin.config" template="" lang="" group="0" version="18.1">
-		<tabbox id="tabs" width="100%">
+		<et2-tabbox  id="tabs" width="100%">
 			<tabs>
 				<tab id="general" label="General"/>
 				<tab id="appearance" label="Appearance"/>
@@ -401,6 +399,6 @@
 				<template id="admin.config.appearance"/>
 				<template id="admin.config.security"/>
 			</tabpanels>
-		</tabbox>
+		</et2-tabbox>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/admin/templates/default/customfield_edit.xet b/admin/templates/default/customfield_edit.xet
index 10868926c5..9fba04128f 100644
--- a/admin/templates/default/customfield_edit.xet
+++ b/admin/templates/default/customfield_edit.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.customfield_edit.settings" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -12,44 +11,42 @@
 			</columns>
 			<rows>
 				<row disabled="@no_types">
-					<description value="Type"/>
-					<menulist span="3">
-						<menupopup id="cf_type2" no_lang="1" rows="5"/>
-					</menulist>
-					<description/>
+					<et2-description  value="Type"></et2-description>
+					<et2-select  span="3" id="cf_type2" rows="5" multiple="1" noLang="1"></et2-select>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description value="Label"/>
-					<textbox statustext="the text displayed to the user" id="cf_label" maxlength="255" class="et2_fullWidth" span="3"/>
+					<et2-description  value="Label"></et2-description>
+					<et2-textbox  statustext="the text displayed to the user" id="cf_label" maxlength="255" span="3"></et2-textbox>
 				</row>
 				<row>
-					<description value="Type of field"/>
+					<et2-description  value="Type of field"></et2-description>
 					<customfields-types statustext="Type of customfield" id="cf_type" class="et2_fullWidth" span="2" onchange="app.admin.cf_type_change"/>
-					<hbox span="2">
-						<description value="Required"/>
-						<checkbox id="cf_needed"/>
-					</hbox>
+					<et2-hbox  span="2">
+						<et2-description  value="Required"></et2-description>
+						<et2-checkbox  id="cf_needed"></et2-checkbox>
+					</et2-hbox>
 				</row>
 				<row disabled="!@use_private">
-					<description value="Private"/>
-					<taglist-account class="et2_fullWidth" statustext="Select accounts for which the custom field should be visible" id="cf_private" rows="3" account_type="both" span="3" empty_label="Add user or group"/>
+					<et2-description  value="Private"></et2-description>
+					<et2-select-account  statustext="Select accounts for which the custom field should be visible" id="cf_private" rows="3" span="3" multiple="1" placeholder="Add user or group" accountType="both"></et2-select-account>
 				</row>
 				<row>
-					<description statustext="each value is a line like id[=label], or use @path to read options from a file in EGroupware directory" value="Options"/>
-					<textbox multiline="true" statustext="@statustext" id="cf_values" rows="5" cols="30" span="3" width="99%"/>
+					<et2-description  statustext="each value is a line like id[=label], or use @path to read options from a file in EGroupware directory" value="Options"></et2-description>
+					<et2-textarea  statustext="@statustext" id="cf_values" rows="5" cols="30" span="3" width="99%"></et2-textarea>
 				</row>
 				<row>
-					<description value="Attributes"/>
-					<box span="3" class="attributes">
-						<description value="Length"/>
-						<textbox type="integer" statustext="displayed length of input field (set rows=1 to limit length)" id="cf_len" size="4"/>
-						<description value="Rows"/>
-						<textbox type="integer" blur="1" statustext="number of row for a multiline inputfield or line of a multi-select-box" id="cf_rows" min="0" size="4"/>
-						<description value="Order"/>
-						<textbox type="integer" statustext="determines the order the fields are displayed" id="cf_order" min="1" size="4"/>
-					</box>
+					<et2-description  value="Attributes"></et2-description>
+					<et2-box  span="3" class="attributes">
+						<et2-description  value="Length"></et2-description>
+						<et2-number  statustext="displayed length of input field (set rows=1 to limit length)" id="cf_len" precision="0"></et2-number>
+						<et2-description  value="Rows"></et2-description>
+						<et2-number  statustext="number of row for a multiline inputfield or line of a multi-select-box" id="cf_rows" min="0" precision="0" placeholder="1"></et2-number>
+						<et2-description  value="Order"></et2-description>
+						<et2-number  statustext="determines the order the fields are displayed" id="cf_order" min="1" precision="0"></et2-number>
+					</et2-box>
 
-					<description/>
+					<et2-description></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -64,29 +61,29 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader" height="28">
-					<description statustext="the name used internaly (&amp;lt;= 20 chars), changeing it makes existing data unavailible" value="Name"/>
-					<textbox statustext="the name used internaly (&lt;= 20 chars), changeing it makes existing data unavailible" id="cf_name" size="20" maxlength="32" needed="true" class="et2_fullWidth" span="2"/>
-					<appicon/>
+					<et2-description  statustext="the name used internaly (&amp;lt;= 20 chars), changeing it makes existing data unavailible" value="Name"></et2-description>
+					<et2-textbox  statustext="the name used internaly (&lt;= 20 chars), changeing it makes existing data unavailible" id="cf_name" maxlength="32" span="2" required="true"></et2-textbox>
+					<et2-appicon></et2-appicon>
 				</row>
 				<row>
-					<tabbox id="tabs" class="et2_nowrap" span="all" width="100%" tab_height="400px">
+					<et2-tabbox  id="tabs" class="et2_nowrap" span="all" width="100%" tabHeight="400px">
 						<tabs>
 							<tab id="settings" label="Settings" statustext="Settings"/>
 						</tabs>
 						<tabpanels>
 							<template id="admin.customfield_edit.settings"/>
 						</tabpanels>
-					</tabbox>
+					</et2-tabbox>
 				</row>
 				<row class="dialogFooterToolbar">
-					<hbox span="2">
-						<button statustext="Saves this entry" label="Save" id="button[save]" image="save" background_image="1"/>
-						<button statustext="Apply the changes" label="Apply" id="button[apply]" image="apply" background_image="1"/>
-						<button statustext="leave without saveing the entry" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-					</hbox>
-					<button align="right" statustext="delete this entry" label="Delete" id="button[delete]" image="delete" onclick="et2_dialog.confirm(widget,'Delete this entry?','Delete')" background_image="1" span="all"/>
+					<et2-hbox  span="2">
+						<et2-button  statustext="Saves this entry" label="Save" id="button[save]" image="save"></et2-button>
+						<et2-button  statustext="Apply the changes" label="Apply" id="button[apply]" image="apply"></et2-button>
+						<et2-button  statustext="leave without saveing the entry" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel"></et2-button>
+					</et2-hbox>
+					<et2-button  align="right" statustext="delete this entry" label="Delete" id="button[delete]" image="delete" onclick="et2_dialog.confirm(widget,'Delete this entry?','Delete')" span="all"></et2-button>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/customfields.xet b/admin/templates/default/customfields.xet
index 82b2dac7a1..20a204aaac 100644
--- a/admin/templates/default/customfields.xet
+++ b/admin/templates/default/customfields.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.customfields.types" template="" lang="" group="0" version="1.2">
 		<grid>
@@ -14,15 +13,15 @@
 			</columns>
 			<rows>
 				<row>
-					<hbox>
-						<description id="appname"/>
-						<description value="-"/>
-						<description value="type"/>
-					</hbox>
-					<select id="types" no_lang="1" onchange="1"/>
-					<button label="Delete" id="delete" onclick="app.admin.cf_type_delete"/>
-					<textbox blur="new name" id="name"/>
-					<button label="Create" id="create"/>
+					<et2-hbox>
+						<et2-description  id="appname"></et2-description>
+						<et2-description  value="-"></et2-description>
+						<et2-description  value="type"></et2-description>
+					</et2-hbox>
+					<et2-select  id="types" onchange="1" noLang="1"></et2-select>
+					<et2-button  label="Delete" id="delete" onclick="app.admin.cf_type_delete"></et2-button>
+					<et2-textbox  id="name" placeholder="new name"></et2-textbox>
+					<et2-button  label="Create" id="create"></et2-button>
 				</row>
 			</rows>
 		</grid>
@@ -50,40 +49,40 @@
 					<nextmatch-header label="Required" id="cf_needed"/>
 					<nextmatch-header label="Private" id="cf_private"/>
 					<nextmatch-header label="Options"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-header label="Length"/>
 						<nextmatch-header label="Rows"/>
-					</vbox>
+					</et2-vbox>
 					<nextmatch-sortheader label="Order" id="cf_order"/>
 					<nextmatch-sortheader label="Last modified" id="cf_modified"/>
 				</row>
 				<row class="row" valign="top">
-                    <select id="${row}[cf_type2]" no_lang="1" multiple="true" empty_label="All" readonly="true"/>
-                    <description id="${row}[cf_name]" no_lang="1"/>
-                    <vbox>
-                        <description id="${row}[cf_label]" no_lang="1"/>
-                        <description id="${row}[cf_label]"/>
-                    </vbox>
+                    <et2-select  id="${row}[cf_type2]" multiple="true" readonly="true" placeholder="All" noLang="1"></et2-select>
+                    <et2-description  id="${row}[cf_name]" noLang="1"></et2-description>
+                    <et2-vbox>
+                        <et2-description  id="${row}[cf_label]" noLang="1"></et2-description>
+                        <et2-description  id="${row}[cf_label]"></et2-description>
+                    </et2-vbox>
                     <customfields-types statustext="Type of customfield" id="{$row}[cf_type]" readonly="true"
                                         app="$cont[appname]"/>
-                    <checkbox id="${row}[cf_needed]" selected_value="1" unselected_value="0" readonly="true"/>
-                    <select-account id="${row}[cf_private]" account_type="both" readonly="true"/>
-                    <description id="${row}[cf_values]" no_lang="1" class="values"/>
-                    <vbox>
-                        <description id="${row}[cf_len]" no_lang="1"/>
-                        <description id="${row}[cf_rows]" no_lang="1"/>
-                    </vbox>
-                    <description id="${row}[cf_order]" no_lang="1"/>
-                    <vbox>
-                        <date-time id="${row}[cf_modified]" readonly="true"/>
-                        <select-account id="${row}[cf_modifier]" readonly="true"/>
-                    </vbox>
+                    <et2-checkbox  id="${row}[cf_needed]" readonly="true" selectedValue="1" unselectedValue="0"></et2-checkbox>
+                    <et2-select-account  id="${row}[cf_private]" readonly="true" accountType="both"></et2-select-account>
+                    <et2-description  id="${row}[cf_values]" class="values" noLang="1"></et2-description>
+                    <et2-vbox>
+                        <et2-description  id="${row}[cf_len]" noLang="1"></et2-description>
+                        <et2-description  id="${row}[cf_rows]" noLang="1"></et2-description>
+                    </et2-vbox>
+                    <et2-description  id="${row}[cf_order]" noLang="1"></et2-description>
+                    <et2-vbox>
+                        <et2-date-time  id="${row}[cf_modified]" readonly="true"></et2-date-time>
+                        <et2-select-account  id="${row}[cf_modifier]" readonly="true"></et2-select-account>
+                    </et2-vbox>
                 </row>
 			</rows>
 		</grid>
 	</template>
 	<template id="admin.customfields.add" template="" lang="" group="0" version="1.9.001">
-		<buttononly label="Add" id="add" onclick="egw.open_link('admin.admin_customfields.edit&amp;appname='+widget.getArrayMgr('content').getRoot().getEntry('nm[appname]')+'&amp;use_private='+widget.getArrayMgr('content').getRoot().getEntry('use_private'),false,'450x380');"/>
+		<et2-button  label="Add" id="add" onclick="egw.open_link('admin.admin_customfields.edit&amp;appname='+widget.getArrayMgr('content').getRoot().getEntry('nm[appname]')+'&amp;use_private='+widget.getArrayMgr('content').getRoot().getEntry('use_private'),false,'450x380');" noSubmit="true"></et2-button>
 	</template>
 	<template id="admin.customfields" template="" lang="" group="0" version="1.9.001">
 		<template id="@type_template"/>
diff --git a/admin/templates/default/customtranslation.xet b/admin/templates/default/customtranslation.xet
index 40d56fe350..9819fed1d1 100644
--- a/admin/templates/default/customtranslation.xet
+++ b/admin/templates/default/customtranslation.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.customtranslation" template="" lang="" group="0" version="1.9.001">
 		<grid id="rows">
@@ -11,21 +10,21 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description value="Phrase"/>
-					<description value="Translation"/>
-					<description value="Action"/>
+					<et2-description  value="Phrase"></et2-description>
+					<et2-description  value="Translation"></et2-description>
+					<et2-description  value="Action"></et2-description>
 				</row>
 				<row>
-					<textbox id="${row}[phrase]" size="64"/>
-					<textbox id="${row}[translation]" size="64"/>
-					<button align="center" label="Delete" id="delete[$row]" onclick="et2_dialog.confirm(widget,'Delete','Delete')" image="delete"/>
+					<et2-textbox  id="${row}[phrase]"></et2-textbox>
+					<et2-textbox  id="${row}[translation]"></et2-textbox>
+					<et2-button  align="center" label="Delete" id="delete[$row]" onclick="et2_dialog.confirm(widget,'Delete','Delete')" image="delete"></et2-button>
 				</row>
 			</rows>
 		</grid>
-		<hbox>
-			<button label="Save" id="button[save]"/>
-			<button label="Apply" id="button[apply]"/>
-			<button label="Cancel" id="button[cancel]"/>
-		</hbox>
+		<et2-hbox>
+			<et2-button  label="Save" id="button[save]"></et2-button>
+			<et2-button  label="Apply" id="button[apply]"></et2-button>
+			<et2-button  label="Cancel" id="button[cancel]"></et2-button>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/export_users_csv_selectors.xet b/admin/templates/default/export_users_csv_selectors.xet
index 700bd6006d..8a06ae5d0e 100644
--- a/admin/templates/default/export_users_csv_selectors.xet
+++ b/admin/templates/default/export_users_csv_selectors.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.export_users_csv_selectors" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -9,11 +8,9 @@
 			</columns>
 			<rows>
 				<row>
-					<menulist>
-						<menupopup type="select-account" label="Group" id="selection[group_id]" options="All,groups"/>
-					</menulist>
+					<et2-select-account  label="Group" id="selection[group_id]" emptyLabel="All" accountType="groups"></et2-select-account>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/group.edit.xet b/admin/templates/default/group.edit.xet
index 19294e380b..c22b2e4d6b 100644
--- a/admin/templates/default/group.edit.xet
+++ b/admin/templates/default/group.edit.xet
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.group.edit.members" template="" lang="" group="0" version="1.9.001">
-		<select-account account_type="accounts" id="account_members" multiple="true" class="et2_fullWidth" needed="true" tags="true"/>
+		<et2-select-account  id="account_members" multiple="true" accountType="accounts" required="true"></et2-select-account>
 	</template>
 	<template id="admin.group.edit.apps" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%" id="apps" overflow="auto" height="200" resize_ratio="1">
@@ -14,9 +13,9 @@
 			</columns>
 			<rows>
 				<row>
-					<appicon align="center" src="$row_cont[appname]"/>
-					<checkbox label="$row_cont[appname]" id="${row}[run]"/>
-					<button label="ACL" id="button[$row_cont[appname]]" image="edit" title="Edit ACL" onclick="app.admin.aclGroup"/>
+					<et2-appicon  align="center" src="$row_cont[appname]"></et2-appicon>
+					<et2-checkbox  label="$row_cont[appname]" id="${row}[run]"></et2-checkbox>
+					<et2-button  label="ACL" id="button[$row_cont[appname]]" image="edit" title="Edit ACL" onclick="app.admin.aclGroup"></et2-button>
 				</row>
 			</rows>
 		</grid>
@@ -29,25 +28,24 @@
 			</columns>
 			<rows>
                 <row class="dialogHeader">
-                    <description value="Group name" for="account_lid"/>
-                    <textbox id="account_lid" size="40" maxlength="64" class="et2_fullWidth" needed="true"
-                             onchange="app.admin.changeGroup"/>
+                    <et2-description  value="Group name" for="account_lid"></et2-description>
+                    <et2-textbox  id="account_lid" maxlength="64" onchange="app.admin.changeGroup" required="true"></et2-textbox>
                 </row>
                 <row>
-                    <description value="Description" for="account_description"/>
-                    <textbox id="account_description" size="40" maxlength="64" class="et2_fullWidth"/>
+                    <et2-description  value="Description" for="account_description"></et2-description>
+                    <et2-textbox  id="account_description" maxlength="64"></et2-textbox>
                 </row>
                 <row disabled="!@mailAllowed">
-                    <description value="EMail"/>
-                    <url-email id="account_email" size="40" maxlength="64" class="et2_fullWidth"/>
+                    <et2-description  value="EMail"></et2-description>
+                    <et2-url-email  id="account_email" maxlength="64"></et2-url-email>
                 </row>
                 <row>
-                    <description value="Filesystem quota"/>
-                    <textbox id="quota" disabled="!@epl" blur="@default_quota"/>
+                    <et2-description  value="Filesystem quota"></et2-description>
+                    <et2-textbox  id="quota" disabled="!@epl" placeholder="@default_quota"></et2-textbox>
                 </row>
             </rows>
 		</grid>
-		<tabbox id="tabs" class="et2_nowrap" span="all" width="100%" tab_height="250px">
+		<et2-tabbox  id="tabs" class="et2_nowrap" span="all" width="100%" tabHeight="250px">
 			<tabs>
 				<tab id="members" label="Members" statustext="Users in this group"/>
 				<tab id="apps" label="Applications" statustext="Applications this group can use"/>
@@ -56,12 +54,12 @@
 				<template id="admin.group.edit.members"/>
 				<template id="admin.group.edit.apps"/>
 			</tabpanels>
-		</tabbox>
-		<hbox class="dialogFooterToolbar">
-			<button label="Save" id="button[save]"/>
-			<button label="Apply" id="button[apply]"/>
-			<button label="Cancel" id="button[cancel]" onclick="window.close();"/>
-			<button align="right" label="Delete" id="button[delete]" onclick="app.admin.deleteGroup"/>
-		</hbox>
+		</et2-tabbox>
+		<et2-hbox  class="dialogFooterToolbar">
+			<et2-button  label="Save" id="button[save]"></et2-button>
+			<et2-button  label="Apply" id="button[apply]"></et2-button>
+			<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();"></et2-button>
+			<et2-button  align="right" label="Delete" id="button[delete]" onclick="app.admin.deleteGroup"></et2-button>
+		</et2-hbox>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/admin/templates/default/index.xet b/admin/templates/default/index.xet
index 607cc52cca..bcebf05698 100644
--- a/admin/templates/default/index.xet
+++ b/admin/templates/default/index.xet
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.index.add" template="" lang="" group="0" version="1.9.001">
-		<buttononly label="Add" image="add" id="add" onclick="app.admin.account({id:'add'})"/>
+		<et2-button  label="Add" image="add" id="add" onclick="app.admin.account({id:'add'})" noSubmit="true"></et2-button>
 	</template>
 	<template id="admin.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -37,18 +36,18 @@
 					<nextmatch-sortheader label="Last password change" id="account_lastpwd_change"/>
 				</row>
 				<row class="$row_cont[status_class]">
-					<description id="${row}[account_lid]" no_lang="1"/>
-					<description id="${row}[account_id]" no_lang="1"/>
-					<description id="${row}[account_firstname]" no_lang="1"/>
-					<description id="${row}[account_lastname]" no_lang="1"/>
-					<url-email id="${row}[account_email]" readonly="true" class="adminOverflowEllipsis"/>
-					<select-account id="${row}[account_primary_group]" no_lang="1" readonly="true"/>
-					<description id="${row}[status]" no_lang="1" class="adminStatus"/>
-					<date-time id="${row}[account_created]" readonly="true"/>
-					<date-time id="${row}[account_modified]" readonly="true"/>
-					<date-time id="${row}[account_lastlogin]" readonly="true"/>
-					<description id="${row}[account_lastloginfrom]" no_lang="1"/>
-					<date-time id="${row}[account_lastpwd_change]" readonly="true"/>
+					<et2-description  id="${row}[account_lid]" noLang="1"></et2-description>
+					<et2-description  id="${row}[account_id]" noLang="1"></et2-description>
+					<et2-description  id="${row}[account_firstname]" noLang="1"></et2-description>
+					<et2-description  id="${row}[account_lastname]" noLang="1"></et2-description>
+					<et2-url-email  id="${row}[account_email]" readonly="true" class="adminOverflowEllipsis"></et2-url-email>
+					<et2-select-account  id="${row}[account_primary_group]" readonly="true" noLang="1"></et2-select-account>
+					<et2-description  id="${row}[status]" class="adminStatus" noLang="1"></et2-description>
+					<et2-date-time  id="${row}[account_created]" readonly="true"></et2-date-time>
+					<et2-date-time  id="${row}[account_modified]" readonly="true"></et2-date-time>
+					<et2-date-time  id="${row}[account_lastlogin]" readonly="true"></et2-date-time>
+					<et2-description  id="${row}[account_lastloginfrom]" noLang="1"></et2-description>
+					<et2-date-time  id="${row}[account_lastpwd_change]" readonly="true"></et2-date-time>
 				</row>
 			</rows>
 		</grid>
@@ -63,22 +62,22 @@
 			</columns>
 			<rows>
 				<row>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Group name" id="account_lid"/>
 						<nextmatch-sortheader label="Description" id="account_description"/>
-					</vbox>
+					</et2-vbox>
 					<nextmatch-sortheader label="EMail" id="email"/>
 					<nextmatch-header label="Members" id="account_members"/>
 					<nextmatch-header label="Applications" id="apps"/>
 				</row>
 				<row class="$row_cont[status_class]">
-					<vbox>
-						<description id="${row}[account_lid]" no_lang="1"/>
-						<description id="${row}[account_description]" no_lang="1"/>
-					</vbox>
-					<url-email id="${row}[account_email]" readonly="true" no_lang="1" class="adminOverflowEllipsis"/>
-					<select-account id="${row}[members]" no_lang="1" readonly="true"/>
-					<select-app id="${row}[apps]" tags="true" readonly="true"/>
+					<et2-vbox>
+						<et2-description  id="${row}[account_lid]" noLang="1"></et2-description>
+						<et2-description  id="${row}[account_description]" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-url-email  id="${row}[account_email]" readonly="true" class="adminOverflowEllipsis" noLang="1"></et2-url-email>
+					<et2-select-account  id="${row}[members]" readonly="true" noLang="1"></et2-select-account>
+					<et2-select-app  id="${row}[apps]" readonly="true" multiple="true"></et2-select-app>
 				</row>
 			</rows>
 		</grid>
@@ -88,6 +87,6 @@
 		<nextmatch id="nm" template="admin.index.rows" header_left="admin.index.add"/>
 		<nextmatch id="groups" template="admin.index.group" class="hide"/>
 		<iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%" disabled="true"/>
-		<box id="ajax_target" height="99%" disabled="true"/>
+		<et2-box  id="ajax_target" height="99%" disabled="true"></et2-box>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/admin/templates/default/mailaccount.xet b/admin/templates/default/mailaccount.xet
index a989b4501d..5046f27189 100644
--- a/admin/templates/default/mailaccount.xet
+++ b/admin/templates/default/mailaccount.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.mailaccount.identity" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,33 +10,32 @@
 			</columns>
 			<rows>
 				<row>
-					<description for="ident_id" value="Identity"/>
-					<select id="ident_id" no_lang="1" onchange="1"/>
-					<select id="acc_further_identities" class="emailadmin_no_user" onchange="1"/>
+					<et2-description  for="ident_id" value="Identity"></et2-description>
+					<et2-select  id="ident_id" onchange="1" noLang="1"></et2-select>
+					<et2-select  id="acc_further_identities" class="emailadmin_no_user" onchange="1"></et2-select>
 				</row>
 				<row>
-					<description for="ident_name" value="Name"/>
-					<textbox id="ident_name" size="90" maxlength="128" span="all" blur="default your name and email"/>
+					<et2-description  for="ident_name" value="Name"></et2-description>
+					<et2-textbox  id="ident_name" maxlength="128" span="all" placeholder="default your name and email"></et2-textbox>
 				</row>
 				<row>
-					<description for="ident_realname" value="Your name"/>
-					<hbox span="all">
-						<textbox id="ident_realname" size="90" maxlength="128"/>
-						<buttononly label="Placeholders" id="button[placeholders]" image="question-circle"
-							onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_merge.show_replacements&amp;nonavbar=1'),'_blank','dependent=yes,width=860,height=620,scrollbars=yes,status=yes'); return false;"/>
-					</hbox>
+					<et2-description  for="ident_realname" value="Your name"></et2-description>
+					<et2-hbox  span="all">
+						<et2-textbox  id="ident_realname" maxlength="128"></et2-textbox>
+						<et2-button  label="Placeholders" id="button[placeholders]" image="question-circle" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_merge.show_replacements&amp;nonavbar=1'),'_blank','dependent=yes,width=860,height=620,scrollbars=yes,status=yes'); return false;" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<description for="ident_org" value="Organisation"/>
-					<textbox id="ident_org" size="90" maxlength="128" span="all"/>
+					<et2-description  for="ident_org" value="Organisation"></et2-description>
+					<et2-textbox  id="ident_org" maxlength="128" span="all"></et2-textbox>
 				</row>
 				<row disabled="@select_ident_mail">
-					<description for="ident_email" value="EMail address"/>
-					<url-email id="ident_email" size="90" maxlength="128" span="all"/>
+					<et2-description  for="ident_email" value="EMail address"></et2-description>
+					<et2-url-email  id="ident_email" maxlength="128" span="all"></et2-url-email>
 				</row>
 				<row disabled="!@select_ident_mail">
-					<description for="ident_email_alias" value="EMail address"/>
-					<select id="ident_email_alias" span="all" class="et2_fullWidth"/>
+					<et2-description  for="ident_email_alias" value="EMail address"></et2-description>
+					<et2-select  id="ident_email_alias" span="all"></et2-select>
 				</row>
 				<row>
 					<htmlarea expand_toolbar="false" height="237px" id="ident_signature" span="all"/>
@@ -54,35 +53,34 @@
 			</columns>
 			<rows>
 				<row class="emailadmin_no_single">
-					<description for="acc_imap_logintype" value="Type"/>
-					<select id="acc_imap_type"/>
-					<description for="acc_imap_logintype" value="Login" class="emailadmin_no_single"/>
-					<select class="emailadmin_no_single" statustext="How username get constructed" id="acc_imap_logintype"/>
+					<et2-description  for="acc_imap_logintype" value="Type"></et2-description>
+					<et2-select  id="acc_imap_type"></et2-select>
+					<et2-description  for="acc_imap_logintype" value="Login" class="emailadmin_no_single"></et2-description>
+					<et2-select  class="emailadmin_no_single" statustext="How username get constructed" id="acc_imap_logintype"></et2-select>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_imap_username" value="Username"/>
-					<textbox id="acc_imap_username" size="32" maxlength="128" autocomplete="off"/>
-					<description for="acc_domain" value="Domain" class="emailadmin_no_single"/>
-					<textbox id="acc_domain" size="32" maxlength="128" class="emailadmin_no_single"/>
+					<et2-description  for="acc_imap_username" value="Username"></et2-description>
+					<et2-textbox  id="acc_imap_username" maxlength="128" autocomplete="off"></et2-textbox>
+					<et2-description  for="acc_domain" value="Domain" class="emailadmin_no_single"></et2-description>
+					<et2-textbox  id="acc_domain" maxlength="128" class="emailadmin_no_single"></et2-textbox>
 				</row>
 				<row>
-					<description for="acc_imap_password" value="Password"/>
-					<passwd id="acc_imap_password" size="32" maxlength="128" autocomplete="off" blur="Leave empty to use OAuth, if supported"/>
-					<description id="acc_imap_account_id" class="emailadmin_diagnostic"/>
-					<description/>
+					<et2-description  for="acc_imap_password" value="Password"></et2-description>
+					<et2-password  id="acc_imap_password" maxlength="128" autocomplete="off" placeholder="Leave empty to use OAuth, if supported"></et2-password>
+					<et2-description  id="acc_imap_account_id" class="emailadmin_diagnostic"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_imap_host" value="IMAP server"/>
-					<textbox blur="Hostname or IP" id="acc_imap_host" size="32" maxlength="128" span="all"/>
+					<et2-description  for="acc_imap_host" value="IMAP server"></et2-description>
+					<et2-textbox  id="acc_imap_host" maxlength="128" span="all" placeholder="Hostname or IP"></et2-textbox>
 				</row>
 				<row>
-                    <description for="acc_imap_ssl" value="Secure connection"/>
-                    <hbox>
-                        <select class="emailadmin_ssl" id="acc_imap_ssl" needed="1"
-                                onchange="app.admin.wizard_imap_ssl_onchange"/>
-                    </hbox>
-                    <description for="acc_imap_port" value="Port"/>
-                    <textbox type="integer" id="acc_imap_port" needed="1" class="emailadmin_port"/>
+                    <et2-description  for="acc_imap_ssl" value="Secure connection"></et2-description>
+                    <et2-hbox>
+                        <et2-select  class="emailadmin_ssl" id="acc_imap_ssl" onchange="app.admin.wizard_imap_ssl_onchange" required="1"></et2-select>
+                    </et2-hbox>
+                    <et2-description  for="acc_imap_port" value="Port"></et2-description>
+                    <et2-number  id="acc_imap_port" class="emailadmin_port" precision="0" required="1"></et2-number>
                 </row>
 				<row class="emailadmin_no_single">
 					<groupbox span="all" class="emailadmin_imap_admin">
@@ -94,30 +92,30 @@
 							</columns>
 							<rows>
 								<row>
-									<description for="acc_imap_admin_username" value="Admin user"/>
-									<textbox id="acc_imap_admin_username" size="32" maxlength="128" autocomplete="off"/>
+									<et2-description  for="acc_imap_admin_username" value="Admin user"></et2-description>
+									<et2-textbox  id="acc_imap_admin_username" maxlength="128" autocomplete="off"></et2-textbox>
 								</row>
 								<row>
-									<description for="acc_imap_admin_password" value="Password"/>
-									<passwd id="acc_imap_admin_password" size="32" maxlength="128" autocomplete="off"/>
+									<et2-description  for="acc_imap_admin_password" value="Password"></et2-description>
+									<et2-password  id="acc_imap_admin_password" maxlength="128" autocomplete="off"></et2-password>
 								</row>
 								<row>
-									<description/>
-									<checkbox id="acc_admin_use_without_pw" label="Use admin credentials to connect without a session-password, e.g. for SSO"/>
+									<et2-description></et2-description>
+									<et2-checkbox  id="acc_admin_use_without_pw" label="Use admin credentials to connect without a session-password, e.g. for SSO"></et2-checkbox>
 								</row>
 								<row disabled="!@admin_actions">
-									<description value="Administration"/>
+									<et2-description  value="Administration"></et2-description>
 									<toolbar id="admin_actions" default_execute="app.admin.account_edit_action"/>
 								</row>
 							</rows>
 						</grid>
 					</groupbox>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -130,40 +128,40 @@
 			</columns>
 			<rows>
 				<row>
-					<description for="acc_folder_sent" value="Sent folder"/>
-					<taglist id="acc_folder_sent" empty_label="Select one ..." maxSelection="1" autocomplete_url=""/>
+					<et2-description  for="acc_folder_sent" value="Sent folder"></et2-description>
+					<et2-select  id="acc_folder_sent" allowFreeEntries="true" editModeEnabled="true" searchUrl="" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description for="acc_folder_trash" value="Trash folder"/>
-					<taglist id="acc_folder_trash" empty_label="Select one ..." maxSelection="1" autocomplete_url=""/>
+					<et2-description  for="acc_folder_trash" value="Trash folder"></et2-description>
+					<et2-select  id="acc_folder_trash" allowFreeEntries="true" editModeEnabled="true" searchUrl="" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description for="acc_folder_draft" value="Drafts folder"/>
-					<taglist id="acc_folder_draft" empty_label="Select one ..." maxSelection="1" autocomplete_url=""/>
+					<et2-description  for="acc_folder_draft" value="Drafts folder"></et2-description>
+					<et2-select  id="acc_folder_draft" allowFreeEntries="true" editModeEnabled="true" searchUrl="" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description for="acc_folder_template" value="Templates folder"/>
-					<taglist id="acc_folder_template" empty_label="Select one ..." maxSelection="1" autocomplete_url=""/>
+					<et2-description  for="acc_folder_template" value="Templates folder"></et2-description>
+					<et2-select  id="acc_folder_template" allowFreeEntries="true" editModeEnabled="true" searchUrl="" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description for="acc_folder_junk" value="Junk folder"/>
-					<taglist id="acc_folder_junk" empty_label="Select one ..." maxSelection="1" autocomplete_url=""/>
+					<et2-description  for="acc_folder_junk" value="Junk folder"></et2-description>
+					<et2-select  id="acc_folder_junk" allowFreeEntries="true" editModeEnabled="true" searchUrl="" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description for="acc_folder_ham" value="Ham folder"/>
-					<taglist id="acc_folder_ham" empty_label="Mails can be copied to that folder via context menu, if folder is configured." maxSelection="1" autocomplete_url=""/>
+					<et2-description  for="acc_folder_ham" value="Ham folder"></et2-description>
+					<et2-select  id="acc_folder_ham" allowFreeEntries="true" editModeEnabled="true" searchUrl="" emptyLabel="Mails can be copied to that folder via context menu, if folder is configured."></et2-select>
 				</row>
 				<row>
-					<description for="acc_folder_archive" value="Archive folder"/>
-					<taglist id="acc_folder_archive" empty_label="Select one ..." maxSelection="1" autocomplete_url=""/>
+					<et2-description  for="acc_folder_archive" value="Archive folder"></et2-description>
+					<et2-select  id="acc_folder_archive" allowFreeEntries="true" editModeEnabled="true" searchUrl="" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description for="notify_folders" value="Notify about new mail in this folders"/>
-					<vbox>
-						<taglist id="notify_folders" empty_label="Select one ..." autocomplete_url="" onchange="app.admin.change_folders"/>
-						<checkbox id="notify_save_default" label="save as default"/>
-						<checkbox id="notify_use_default" label="use default"/>
-					</vbox>
+					<et2-description  for="notify_folders" value="Notify about new mail in this folders"></et2-description>
+					<et2-vbox>
+						<et2-select  id="notify_folders" onchange="app.admin.change_folders" multiple="true" allowFreeEntries="true" editModeEnabled="true" searchUrl="" placeholder="Select one ..."></et2-select>
+						<et2-checkbox  id="notify_save_default" label="save as default"></et2-checkbox>
+						<et2-checkbox  id="notify_use_default" label="use default"></et2-checkbox>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
@@ -176,24 +174,24 @@
 			</columns>
 			<rows>
 				<row>
-					<description for="acc_sieve_enabled" value="Enable Sieve"/>
-					<select-bool id="acc_sieve_enabled" needed="1"/>
+					<et2-description  for="acc_sieve_enabled" value="Enable Sieve"></et2-description>
+					<et2-select-bool  id="acc_sieve_enabled" required="1"></et2-select-bool>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_sieve_host" value="Sieve server"/>
-					<textbox blur="Hostname or IP" id="acc_sieve_host" onchange="app.admin.wizard_sieve_onchange" size="32" maxlength="128"/>
+					<et2-description  for="acc_sieve_host" value="Sieve server"></et2-description>
+					<et2-textbox  id="acc_sieve_host" onchange="app.admin.wizard_sieve_onchange" maxlength="128" placeholder="Hostname or IP"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_sieve_ssl" value="Secure connection"/>
-					<hbox>
-						<select class="emailadmin_ssl" id="acc_sieve_ssl" onchange="app.admin.wizard_sieve_ssl_onchange"/>
-						<textbox type="integer" label="Port" id="acc_sieve_port" onchange="app.admin.wizard_sieve_onchange" class="label-on-left"/>
-					</hbox>
+					<et2-description  for="acc_sieve_ssl" value="Secure connection"></et2-description>
+					<et2-hbox>
+						<et2-select  class="emailadmin_ssl" id="acc_sieve_ssl" onchange="app.admin.wizard_sieve_ssl_onchange"></et2-select>
+						<et2-number  label="Port" id="acc_sieve_port" onchange="app.admin.wizard_sieve_onchange" class="label-on-left" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row height="150">
-					<description value="Vacation messages with start and end date require an admin account to be set!" span="all" class="emailadmin_no_single"/>
-					<description/>
-					<description/>
+					<et2-description  value="Vacation messages with start and end date require an admin account to be set!" span="all" class="emailadmin_no_single"></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -206,42 +204,42 @@
 			</columns>
 			<rows>
 				<row class="emailadmin_no_single">
-					<description for="acc_smtp_type" value="Type"/>
-					<select id="acc_smtp_type" onchange="1"/>
+					<et2-description  for="acc_smtp_type" value="Type"></et2-description>
+					<et2-select  id="acc_smtp_type" onchange="1"></et2-select>
 				</row>
 				<row class="emailadmin_no_single">
-					<description for="acc_smtp_auth_session" value="Authentication"/>
-					<checkbox label="Use username+password from current user" id="acc_smtp_auth_session"/>
+					<et2-description  for="acc_smtp_auth_session" value="Authentication"></et2-description>
+					<et2-checkbox  label="Use username+password from current user" id="acc_smtp_auth_session"></et2-checkbox>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_smtp_username" value="Username"/>
-					<textbox blur="if authentication required" id="acc_smtp_username" size="32" maxlength="128" autocomplete="off"/>
+					<et2-description  for="acc_smtp_username" value="Username"></et2-description>
+					<et2-textbox  id="acc_smtp_username" maxlength="128" autocomplete="off" placeholder="if authentication required"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_smtp_password" value="Password"/>
-					<hbox>
-						<passwd id="acc_smtp_password" size="32" maxlength="128" autocomplete="off" blur="Leave empty to use OAuth, if supported"/>
-						<description id="acc_smtp_account_id" class="emailadmin_diagnostic"/>
-					</hbox>
+					<et2-description  for="acc_smtp_password" value="Password"></et2-description>
+					<et2-hbox>
+						<et2-password  id="acc_smtp_password" maxlength="128" autocomplete="off" placeholder="Leave empty to use OAuth, if supported"></et2-password>
+						<et2-description  id="acc_smtp_account_id" class="emailadmin_diagnostic"></et2-description>
+					</et2-hbox>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_smtp_host" value="SMTP server"/>
-					<textbox blur="Hostname or IP" id="acc_smtp_host" needed="1" size="32" maxlength="128"/>
+					<et2-description  for="acc_smtp_host" value="SMTP server"></et2-description>
+					<et2-textbox  id="acc_smtp_host" maxlength="128" placeholder="Hostname or IP" required="1"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_smtp_ssl" value="Secure connection"/>
-					<hbox>
-						<select class="emailadmin_ssl" id="acc_smtp_ssl" needed="1" onchange="app.admin.wizard_smtp_ssl_onchange"/>
-						<textbox type="integer" label="Port" id="acc_smtp_port" needed="1" class="label-on-left"/>
-					</hbox>
+					<et2-description  for="acc_smtp_ssl" value="Secure connection"></et2-description>
+					<et2-hbox>
+						<et2-select  class="emailadmin_ssl" id="acc_smtp_ssl" onchange="app.admin.wizard_smtp_ssl_onchange" required="1"></et2-select>
+						<et2-number  label="Port" id="acc_smtp_port" class="label-on-left" precision="0" required="1"></et2-number>
+					</et2-hbox>
 				</row>
 				<row>
-					<description for="acc_spam_api" value="SpamTitan API URL"/>
-					<url id="acc_spam_api" blur="@spamtitan_blur" width="95%" maxlength="128"/>
+					<et2-description  for="acc_spam_api" value="SpamTitan API URL"></et2-description>
+					<et2-url  id="acc_spam_api" width="95%" maxlength="128" placeholder="@spamtitan_blur"></et2-url>
 				</row>
 				<row>
-					<description for="acc_spam_password" value="API Token"/>
-					<passwd id="acc_spam_password" blur="@spamtitan_blur" width="95%" suggest="24"/>
+					<et2-description  for="acc_spam_password" value="API Token"></et2-description>
+					<et2-password  id="acc_spam_password" width="95%" suggest="24" placeholder="@spamtitan_blur"></et2-password>
 				</row>
 			</rows>
 		</grid>
@@ -255,33 +253,33 @@
 			</columns>
 			<rows>
 				<row>
-					<description for="mailLocalAddress" value="EMail address"/>
-					<url-email id="mailLocalAddress" size="32" maxlength="128"/>
-					<checkbox label="Email account active" id="accountStatus" selected_value="active"/>
+					<et2-description  for="mailLocalAddress" value="EMail address"></et2-description>
+					<et2-url-email  id="mailLocalAddress" maxlength="128"></et2-url-email>
+					<et2-checkbox  label="Email account active" id="accountStatus" selectedValue="active"></et2-checkbox>
 				</row>
 				<row>
-					<description for="mailAlternateAddress" value="Alternate email address"/>
-					<select-email id="mailAlternateAddress" autocomplete_url="" full_email="true" allowFreeEntries="true" multiple="true"/>
-					<description/>
+					<et2-description  for="mailAlternateAddress" value="Alternate email address"></et2-description>
+					<et2-select-email  id="mailAlternateAddress" allowFreeEntries="true" multiple="true" autocompleteUrl="" fullEmail="true"></et2-select-email>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="@no_forward_available">
-					<description for="mailForwardingAddress" value="Forward email's to"/>
-					<select-email id="mailForwardingAddress" autocomplete_url="" full_email="true" allowFreeEntries="true" multiple="true"/>
-					<vbox>
-						<checkbox label="Forward only" id="deliveryMode" selected_value="forwardOnly" onchange="if (widget.getValue()) et2_dialog.alert('Forward only disables IMAP mailbox / storing of mails and just forwards them to given address.','Forward only');"/>
-						<checkbox label="Allow users to change forwards" id="acc_user_forward"/>
-					</vbox>
+					<et2-description  for="mailForwardingAddress" value="Forward email's to"></et2-description>
+					<et2-select-email  id="mailForwardingAddress" allowFreeEntries="true" multiple="true" autocompleteUrl="" fullEmail="true"></et2-select-email>
+					<et2-vbox>
+						<et2-checkbox  label="Forward only" id="deliveryMode" onchange="if (widget.getValue()) et2_dialog.alert('Forward only disables IMAP mailbox / storing of mails and just forwards them to given address.','Forward only');" selectedValue="forwardOnly"></et2-checkbox>
+						<et2-checkbox  label="Allow users to change forwards" id="acc_user_forward"></et2-checkbox>
+					</et2-vbox>
 				</row>
 				<row>
-					<description for="quotaLimit" value="Quota (MB)"/>
-					<hbox>
-						<textbox type="integer" id="quotaLimit"/>
-						<description value="Leave empty for no quota"/>
-					</hbox>
-					<textbox type="integer" label="Currently:" id="quotaUsed" readonly="true"/>
+					<et2-description  for="quotaLimit" value="Quota (MB)"></et2-description>
+					<et2-hbox>
+						<et2-number  id="quotaLimit" precision="0"></et2-number>
+						<et2-description  value="Leave empty for no quota"></et2-description>
+					</et2-hbox>
+					<et2-number  label="Currently:" id="quotaUsed" readonly="true" precision="0"></et2-number>
 				</row>
 				<row disabled="!@admin_actions">
-					<description value="Administration"/>
+					<et2-description  value="Administration"></et2-description>
 					<toolbar id="admin_actions" colspan="2" default_execute="app.admin.account_edit_action"/>
 				</row>
 			</rows>
@@ -295,29 +293,29 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="S/MIME" span="all"/>
+					<et2-description  value="S/MIME" span="all"></et2-description>
 				</row>
 				<!-- disabled, because not working/fully implemented
 				<row disabled="@hide_smime_upload">
-					<description value="Certificate"/>
-					<hbox>
-						<buttononly id="smimeGenerate" label="Generate Certificate" onclick="app.admin.smime_genCertificate" image="add" background_image="1"/>
-					</hbox>
+					<et2-description  value="Certificate"></et2-description>
+					<et2-hbox>
+						<et2-button  id="smimeGenerate" label="Generate Certificate" onclick="app.admin.smime_genCertificate" image="add" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 				-->
 				<row disabled="@hide_smime_upload" valign="top">
-					<description value="Upload your certificate .p12/.pfx file"/>
-					<vbox>
+					<et2-description  value="Upload your certificate .p12/.pfx file"></et2-description>
+					<et2-vbox>
 						<file id="smimeKeyUpload" accept=".p12,.pfx"/>
-						<passwd id="smime_pkcs12_password" size="48" maxlength="128"  blur="Password to unlock encrypted p12" autocomplete="off"/>
-					</vbox>
+						<et2-password  id="smime_pkcs12_password" maxlength="128" autocomplete="off" placeholder="Password to unlock encrypted p12"></et2-password>
+					</et2-vbox>
 				</row>
 				<row disabled="!@hide_smime_upload">
-					<description value="Current certificate"/>
-					<hbox>
-						<buttononly id="smime_export_p12" label="export certificate as p12" onclick="app.admin.smime_exportCert" image="export" background_image="1"/>
-						<buttononly id="smime_delete_p12" label="Delete certificate" onclick="app.admin.change_account" image="delete" background_image="1"/>
-					</hbox>
+					<et2-description  value="Current certificate"></et2-description>
+					<et2-hbox>
+						<et2-button  id="smime_export_p12" label="export certificate as p12" onclick="app.admin.smime_exportCert" image="export" noSubmit="true"></et2-button>
+						<et2-button  id="smime_delete_p12" label="Delete certificate" onclick="app.admin.change_account" image="delete" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -331,24 +329,24 @@
 			</columns>
 			<rows>
 				<row disabled="!@accounts" class="dialogHeader">
-					<description for="acc_id" value="Mail account"/>
-                    <select id="acc_id" onchange="app.admin.change_account" class="et2_fullWidth" span="2"/>
-					<description/>
+					<et2-description  for="acc_id" value="Mail account"></et2-description>
+                    <et2-select  id="acc_id" onchange="app.admin.change_account" span="2"></et2-select>
+					<et2-description></et2-description>
 				</row>
 				<row class="dialogHeader">
-					<description for="acc_name" value="Name of account"/>
-					<textbox id="acc_name" needed="1" size="80" class="et2_fullWidth"/>
-					<description align="right" value="$cont[acc_id]" class="emailadmin_diagnostic"/>
+					<et2-description  for="acc_name" value="Name of account"></et2-description>
+					<et2-textbox  id="acc_name" required="1"></et2-textbox>
+					<et2-description  align="right" value="$cont[acc_id]" class="emailadmin_diagnostic"></et2-description>
 				</row>
                 <row class="emailadmin_no_user dialogHeader2">
-                    <description for="account_id" value="Valid for"/>
-                    <hbox span="all">
-                        <select-account account_type="both" id="account_id" placeholder="Everyone" multiple="true"/>
-                        <checkbox label="account editable by user" id="acc_user_editable"/>
-                    </hbox>
+                    <et2-description  for="account_id" value="Valid for"></et2-description>
+                    <et2-hbox  span="all">
+                        <et2-select-account  id="account_id" placeholder="Everyone" multiple="true" accountType="both"></et2-select-account>
+                        <et2-checkbox  label="account editable by user" id="acc_user_editable"></et2-checkbox>
+                    </et2-hbox>
                 </row>
 				<row>
-					<tabbox id="tabs" span="all" tab_height="480">
+					<et2-tabbox  id="tabs" span="all" tabHeight="480">
 						<tabs>
 							<tab id="admin.mailaccount.identity" label="Identity+Signature" statustext="Identity&amp;Signature"/>
 							<tab id="admin.mailaccount.imap" label="IMAP" statustext="incoming mail"/>
@@ -367,17 +365,17 @@
 							<template id="admin.mailaccount.aliases"/>
 							<template id="admin.mailaccount.encryption"/>
 						</tabpanels>
-					</tabbox>
+					</et2-tabbox>
 				</row>
 			</rows>
 		</grid>
-		<hbox class="dialogFooterToolbar">
-			<button label="Save" id="button[save]"/>
-			<button label="Apply" id="button[apply]" />
-			<button statustext="Use wizard to detect or verify configuration" label="Wizard" id="button[wizard]" image="magicwand" background_image="1"/>
-			<button label="Cancel" id="button[cancel]" onclick="window.close();"/>
-			<button align="right" label="Delete" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this account','Delete')" hideOnReadonly="true"/>
-			<button align="right" label="Delete identity" id="button[delete_identity]" onclick="et2_dialog.confirm(widget,'Delete identity','Delete')" hideOnReadonly="true" image="delete" background_image="1"/>
-		</hbox>
+		<et2-hbox  class="dialogFooterToolbar">
+			<et2-button  label="Save" id="button[save]"></et2-button>
+			<et2-button  label="Apply" id="button[apply]"></et2-button>
+			<et2-button  statustext="Use wizard to detect or verify configuration" label="Wizard" id="button[wizard]" image="magicwand"></et2-button>
+			<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();"></et2-button>
+			<et2-button  align="right" label="Delete" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this account','Delete')" hideOnReadonly="true"></et2-button>
+			<et2-button  align="right" label="Delete identity" id="button[delete_identity]" onclick="et2_dialog.confirm(widget,'Delete identity','Delete')" hideOnReadonly="true" image="delete"></et2-button>
+		</et2-hbox>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/admin/templates/default/mailwizard.folder.xet b/admin/templates/default/mailwizard.folder.xet
index 3710ad0351..2d92f64ac7 100644
--- a/admin/templates/default/mailwizard.folder.xet
+++ b/admin/templates/default/mailwizard.folder.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.mailwizard.folder" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,62 +9,48 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader">
-					<description value="Step 2: Folder" span="all" class="emailadmin_header"/>
-					<description/>
+					<et2-description  value="Step 2: Folder" span="all" class="emailadmin_header"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description value="Sent folder" for="acc_folder_sent"/>
-					<menulist>
-						<menupopup id="acc_folder_sent" options="Select one ..."/>
-					</menulist>
+					<et2-description  value="Sent folder" for="acc_folder_sent"></et2-description>
+					<et2-select  id="acc_folder_sent" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description value="Trash folder" for="acc_folder_trash"/>
-					<menulist>
-						<menupopup id="acc_folder_trash" options="Select one ..."/>
-					</menulist>
+					<et2-description  value="Trash folder" for="acc_folder_trash"></et2-description>
+					<et2-select  id="acc_folder_trash" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description value="Drafts folder" for="acc_folder_draft"/>
-					<menulist>
-						<menupopup id="acc_folder_draft" options="Select one ..."/>
-					</menulist>
+					<et2-description  value="Drafts folder" for="acc_folder_draft"></et2-description>
+					<et2-select  id="acc_folder_draft" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description value="Templates folder" for="acc_folder_template"/>
-					<menulist>
-						<menupopup id="acc_folder_template" options="Select one ..."/>
-					</menulist>
+					<et2-description  value="Templates folder" for="acc_folder_template"></et2-description>
+					<et2-select  id="acc_folder_template" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description value="Junk folder" for="acc_folder_junk"/>
-					<menulist>
-						<menupopup id="acc_folder_junk" options="Select one ..."/>
-					</menulist>
+					<et2-description  value="Junk folder" for="acc_folder_junk"></et2-description>
+					<et2-select  id="acc_folder_junk" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description value="Ham folder" for="acc_folder_ham"/>
-					<menulist>
-						<menupopup id="acc_folder_ham" options="Select one ..."/>
-					</menulist>
+					<et2-description  value="Ham folder" for="acc_folder_ham"></et2-description>
+					<et2-select  id="acc_folder_ham" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description value="Archive folder" for="acc_folder_archive"/>
-					<menulist>
-						<menupopup id="acc_folder_archive" options="Select one ..."/>
-					</menulist>
+					<et2-description  value="Archive folder" for="acc_folder_archive"></et2-description>
+					<et2-select  id="acc_folder_archive" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row class="dialogFooterToolbar">
-					<hbox span="all">
-						<button label="Continue" id="button[continue]" image="continue" background_image="1"/>
-						<button label="Back" id="button[back]" image="back" background_image="1"/>
-						<button label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Continue" id="button[continue]" image="continue"></et2-button>
+						<et2-button  label="Back" id="button[back]" image="back"></et2-button>
+						<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<textbox multiline="true" id="folder_output" readonly="true" span="all"/>
+					<et2-textarea  id="folder_output" readonly="true" span="all"></et2-textarea>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/mailwizard.sieve.xet b/admin/templates/default/mailwizard.sieve.xet
index 18e4404778..f962bd6540 100644
--- a/admin/templates/default/mailwizard.sieve.xet
+++ b/admin/templates/default/mailwizard.sieve.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.mailwizard.sieve" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,44 +9,40 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader">
-					<description value="Step 3: Sieve - server side mail filtering" span="all" class="emailadmin_header"/>
-					<description/>
+					<et2-description  value="Step 3: Sieve - server side mail filtering" span="all" class="emailadmin_header"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description value="Enable Sieve" for="acc_sieve_enabled"/>
-					<menulist>
-						<menupopup type="select-bool" id="acc_sieve_enabled"/>
-					</menulist>
+					<et2-description  value="Enable Sieve" for="acc_sieve_enabled"></et2-description>
+					<et2-select-bool  id="acc_sieve_enabled"></et2-select-bool>
 				</row>
 				<row class="@manual_class">
-					<description value="Sieve server" for="acc_sieve_host"/>
-					<textbox blur="Hostname or IP" id="acc_sieve_host" onchange="app.admin.wizard_sieve_onchange" size="32" maxlength="128"/>
+					<et2-description  value="Sieve server" for="acc_sieve_host"></et2-description>
+					<et2-textbox  id="acc_sieve_host" onchange="app.admin.wizard_sieve_onchange" maxlength="128" placeholder="Hostname or IP"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description value="Secure connection" for="acc_sieve_ssl"/>
-					<hbox>
-						<menulist>
-							<menupopup id="acc_sieve_ssl" onchange="app.admin.wizard_sieve_ssl_onchange" class="emailadmin_ssl"/>
-						</menulist>
-						<textbox type="integer" label="Port" id="acc_sieve_port" onchange="app.admin.wizard_sieve_onchange" class="emailadmin_port"/>
-					</hbox>
+					<et2-description  value="Secure connection" for="acc_sieve_ssl"></et2-description>
+					<et2-hbox>
+						<et2-select  id="acc_sieve_ssl" onchange="app.admin.wizard_sieve_ssl_onchange" class="emailadmin_ssl"></et2-select>
+						<et2-number  label="Port" id="acc_sieve_port" onchange="app.admin.wizard_sieve_onchange" class="emailadmin_port" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row  class="dialogFooterToolbar">
-					<hbox span="all">
-						<button label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue" background_image="1"/>
-						<button label="Back" id="button[back]" image="back" background_image="1"/>
-						<button label="Manual entry" id="button[manual]" onclick="app.admin.wizard_manual" image="edit" background_image="1"/>
-						<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue"></et2-button>
+						<et2-button  label="Back" id="button[back]" image="back"></et2-button>
+						<et2-button  label="Manual entry" id="button[manual]" onclick="app.admin.wizard_manual" image="edit"></et2-button>
+						<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<image src="admin/progress" span="all" class="emailadmin_progress"/>
-					<description/>
+					<et2-image  src="admin/progress" span="all" class="emailadmin_progress"></et2-image>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<textbox multiline="true" id="sieve_output" readonly="true" span="all"/>
+					<et2-textarea  id="sieve_output" readonly="true" span="all"></et2-textarea>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/mailwizard.smtp.xet b/admin/templates/default/mailwizard.smtp.xet
index 83c1bbdf8d..bb52b89283 100644
--- a/admin/templates/default/mailwizard.smtp.xet
+++ b/admin/templates/default/mailwizard.smtp.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.mailwizard.smtp" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,46 +9,44 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader">
-					<description value="Step 4: SMTP - outgoing mail" span="all" class="emailadmin_header"/>
-					<description/>
+					<et2-description  value="Step 4: SMTP - outgoing mail" span="all" class="emailadmin_header"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row class="@manual_class">
-					<description value="Username" for="acc_smtp_username"/>
-					<textbox blur="if authentication required" id="acc_smtp_username" size="32" maxlength="128" autocomplete="off"/>
+					<et2-description  value="Username" for="acc_smtp_username"></et2-description>
+					<et2-textbox  id="acc_smtp_username" maxlength="128" autocomplete="off" placeholder="if authentication required"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description value="Password" for="acc_smtp_password"/>
-					<passwd id="acc_smtp_password" size="32" maxlength="128" autocomplete="off"/>
+					<et2-description  value="Password" for="acc_smtp_password"></et2-description>
+					<et2-password  id="acc_smtp_password" maxlength="128" autocomplete="off"></et2-password>
 				</row>
 				<row class="@manual_class">
-					<description value="SMTP server" for="acc_smtp_host"/>
-					<textbox blur="Hostname or IP" id="acc_smtp_host" size="32" maxlength="128"/>
+					<et2-description  value="SMTP server" for="acc_smtp_host"></et2-description>
+					<et2-textbox  id="acc_smtp_host" maxlength="128" placeholder="Hostname or IP"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description value="Secure connection" for="acc_smtp_ssl"/>
-					<hbox>
-						<menulist>
-							<menupopup id="acc_smtp_ssl" onchange="app.admin.wizard_smtp_ssl_onchange" class="emailadmin_ssl"/>
-						</menulist>
-						<textbox type="integer" label="Port" id="acc_smtp_port" class="emailadmin_port"/>
-					</hbox>
+					<et2-description  value="Secure connection" for="acc_smtp_ssl"></et2-description>
+					<et2-hbox>
+						<et2-select  id="acc_smtp_ssl" onchange="app.admin.wizard_smtp_ssl_onchange" class="emailadmin_ssl"></et2-select>
+						<et2-number  label="Port" id="acc_smtp_port" class="emailadmin_port" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row class="dialogFooterToolbar">
-					<hbox span="all">
-						<button label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue" background_image="1"/>
-						<button label="Back" id="button[back]" image="back" background_image="1"/>
-						<button label="Manual entry" id="button[manual]" onclick="app.admin.wizard_manual" image="edit" background_image="1"/>
-						<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue"></et2-button>
+						<et2-button  label="Back" id="button[back]" image="back"></et2-button>
+						<et2-button  label="Manual entry" id="button[manual]" onclick="app.admin.wizard_manual" image="edit"></et2-button>
+						<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<image src="admin/progress" span="all" class="emailadmin_progress"/>
-					<description/>
+					<et2-image  src="admin/progress" span="all" class="emailadmin_progress"></et2-image>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<textbox multiline="true" id="smtp_output" readonly="true" span="all"/>
+					<et2-textarea  id="smtp_output" readonly="true" span="all"></et2-textarea>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/mailwizard.xet b/admin/templates/default/mailwizard.xet
index c8a024bd8f..62c1ecfa49 100644
--- a/admin/templates/default/mailwizard.xet
+++ b/admin/templates/default/mailwizard.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.mailwizard" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,48 +9,46 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader">
-					<description value="Step 1: IMAP - incoming mail" span="all" class="emailadmin_header"/>
-					<description/>
+					<et2-description  value="Step 1: IMAP - incoming mail" span="all" class="emailadmin_header"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description value="EMail address"/>
-					<url-email id="ident_email" needed="1"  size="32" maxlength="128" autocomplete="off"/>
+					<et2-description  value="EMail address"></et2-description>
+					<et2-url-email  id="ident_email" maxlength="128" autocomplete="off" required="1"></et2-url-email>
 				</row>
 				<row class="@manual_class">
-					<description value="Username" for="acc_imap_username"/>
-					<textbox blur="if different from EMail address" id="acc_imap_username" size="32" maxlength="128" autocomplete="off"/>
+					<et2-description  value="Username" for="acc_imap_username"></et2-description>
+					<et2-textbox  id="acc_imap_username" maxlength="128" autocomplete="off" placeholder="if different from EMail address"></et2-textbox>
 				</row>
 				<row>
-					<description value="Password" for="acc_imap_password"/>
-					<passwd id="acc_imap_password" size="32" maxlength="128" autocomplete="off"  blur="Leave empty to use OAuth, if supported" class="et2_required"/>
+					<et2-description  value="Password" for="acc_imap_password"></et2-description>
+					<et2-password  id="acc_imap_password" maxlength="128" autocomplete="off" class="et2_required" placeholder="Leave empty to use OAuth, if supported"></et2-password>
 				</row>
 				<row class="@manual_class">
-					<description value="IMAP server" for="acc_imap_host"/>
-					<textbox blur="Hostname or IP" id="acc_imap_host" size="32" maxlength="128"/>
+					<et2-description  value="IMAP server" for="acc_imap_host"></et2-description>
+					<et2-textbox  id="acc_imap_host" maxlength="128" placeholder="Hostname or IP"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description value="Secure connection" for="acc_imap_ssl"/>
-					<hbox>
-						<menulist>
-							<menupopup id="acc_imap_ssl" onchange="app.admin.wizard_imap_ssl_onchange" class="emailadmin_ssl"/>
-						</menulist>
-						<textbox type="integer" label="Port" id="acc_imap_port" class="emailadmin_port"/>
-					</hbox>
+					<et2-description  value="Secure connection" for="acc_imap_ssl"></et2-description>
+					<et2-hbox>
+						<et2-select  id="acc_imap_ssl" onchange="app.admin.wizard_imap_ssl_onchange" class="emailadmin_ssl"></et2-select>
+						<et2-number  label="Port" id="acc_imap_port" class="emailadmin_port" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row class="dialogFooterToolbar">
-					<hbox span="all">
-						<button label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue" background_image="1"/>
-						<button label="Manual entry" id="button[manual]" onclick="app.admin.wizard_manual" image="edit" background_image="1"/>
-						<button label="Skip IMAP" id="button[skip_imap]" class="@manual_class" novalidate="1" image="bullet" background_image="1"/>
-						<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue"></et2-button>
+						<et2-button  label="Manual entry" id="button[manual]" onclick="app.admin.wizard_manual" image="edit"></et2-button>
+						<et2-button  label="Skip IMAP" id="button[skip_imap]" class="@manual_class" novalidate="1" image="bullet"></et2-button>
+						<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<image src="admin/progress" span="all" class="emailadmin_progress"/>
-					<description/>
+					<et2-image  src="admin/progress" span="all" class="emailadmin_progress"></et2-image>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<textbox multiline="true" id="output" readonly="true" span="all"/>
+					<et2-textarea  id="output" readonly="true" span="all"></et2-textarea>
 				</row>
 			</rows>
 		</grid>
diff --git a/admin/templates/default/mainscreen_message.xet b/admin/templates/default/mainscreen_message.xet
index c7fdd57f6b..967457facd 100644
--- a/admin/templates/default/mainscreen_message.xet
+++ b/admin/templates/default/mainscreen_message.xet
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id ="admin.mainscreen_message.mainscreen" version="18.1">
-		<vbox>
+		<et2-vbox>
 			<htmlarea id="html_mainscreen" height="500" width="100%" disabled="!$cont[html]" valid_children="+body[style]"/>
-			<textbox id="text_mainscreen" disabled="$cont[html]" rows="25" cols="70" class="et2_fullWidth" multiline="true" height="500"/>
-		</vbox>
+			<et2-textarea  id="text_mainscreen" disabled="$cont[html]" rows="25" cols="70" height="500"></et2-textarea>
+		</et2-vbox>
 	</template>
 	<template id ="admin.mainscreen_message.loginscreen" version="18.1">
-		<vbox>
+		<et2-vbox>
 			<htmlarea id="html_loginscreen" height="500" width="100%" disabled="!$cont[html]" valid_children="+body[style]"/>
-			<textbox id="text_loginscreen" disabled="$cont[html]" rows="25" cols="70" class="et2_fullWidth" multiline="true" height="500"/>
-		</vbox>
+			<et2-textarea  id="text_loginscreen" disabled="$cont[html]" rows="25" cols="70" height="500"></et2-textarea>
+		</et2-vbox>
 	</template>
 	<template id="admin.mainscreen_message" template="" lang="" group="0" version="18.1">
 		<grid width="100%" height="600">
@@ -23,11 +22,11 @@
 			</columns>
 			<rows>
 				<row>
-					<select id="lang" onchange="widget.getInstanceManager().submit()" statustext="Select language to define language based message. Language 'english' is default page for all languages therefore for setting a general message across all languages you only need to set the 'english' page."/>
-					<checkbox id="html" onchange="widget.getInstanceManager().submit()" label="html/plaintext"/>
+					<et2-select  id="lang" onchange="widget.getInstanceManager().submit()" statustext="Select language to define language based message. Language 'english' is default page for all languages therefore for setting a general message across all languages you only need to set the 'english' page."></et2-select>
+					<et2-checkbox  id="html" onchange="widget.getInstanceManager().submit()" label="html/plaintext"></et2-checkbox>
 				</row>
 				<row>
-					<tabbox id="tabs" class="et2_nowrap" width="100%" span="all" tab_height="550">
+					<et2-tabbox  id="tabs" class="et2_nowrap" width="100%" span="all" tabHeight="550">
 						<tabs>
 							<tab id="loginscreen" label="Login screen"/>
 							<tab id="mainscreen" label="Home screen"/>
@@ -36,14 +35,14 @@
 							<template id="admin.mainscreen_message.loginscreen"/>
 							<template id="admin.mainscreen_message.mainscreen"/>
 						</tabpanels>
-					</tabbox>
+					</et2-tabbox>
 				</row>
 				<row>
-					<hbox span="all">
-						<button statustext="Save changes" label="Save" id="button[save]" image="save" background_image="1"/>
-						<button statustext="Apply changes" label="Apply" id="button[apply]" image="check" background_image="1"/>
-						<button statustext="Cancel changes" label="Cancel" id="button[cancel]" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  statustext="Save changes" label="Save" id="button[save]" image="save"></et2-button>
+						<et2-button  statustext="Apply changes" label="Apply" id="button[apply]" image="check"></et2-button>
+						<et2-button  statustext="Cancel changes" label="Cancel" id="button[cancel]" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
diff --git a/admin/templates/default/passwordreset.xet b/admin/templates/default/passwordreset.xet
index 946553967b..87625b122c 100644
--- a/admin/templates/default/passwordreset.xet
+++ b/admin/templates/default/passwordreset.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.passwordreset" template="" lang="" group="0" version="14.1">
 		<grid>
@@ -11,48 +10,40 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Select users"/>
-					<description/>
+					<et2-description  value="Select users"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<listbox type="select-account" id="users" rows="15"/>
-					<description/>
+					<et2-select-account  id="users" rows="15" multiple="1"></et2-select-account>
+					<et2-description></et2-description>
 				</row>
 				<row>
 					<groupbox id="actions">
 						<caption label="Actions"/>
-						<checkbox label="Set a random password" id="random_pw"/>
-						<menulist>
-							<menupopup type="select-bool" label="Must change password upon next login" id="mustchangepassword" options="Leave unchanged"/>
-						</menulist>
-						<menulist>
-							<menupopup type="select-bool" label="Can change password" id="changepassword" onchange="var mustchange=document.getElementById(form::name('mustchangepassword')); if (this.value=='0' &amp;&amp; mustchange.value) mustchange.value='0';" options="Leave unchanged"/>
-						</menulist>
-						<hbox>
-							<menulist>
-								<menupopup label="Change password hash to" id="hash" options="Leave unchanged"/>
-							</menulist>
-							<textbox label="Current hash" id="current_hash" readonly="true" class="leftPad5"/>
-						</hbox>
-						<checkbox label="Notify user by email" id="notify"/>
-						<hbox>
-							<menulist>
-								<menupopup label="Mail account" id="mail[activate]" options="Leave unchanged"/>
-							</menulist>
-							<textbox type="integer" statustext="empty to NOT change" label="Quota (MB)" id="mail[quota]"/>
-							<textbox statustext="change domain of email address and aliases" label="Domain" id="mail[domain]" validator="/^([a-z0-9]+([._-]{1}[a-z0-9]+)+)?$/i"/>
-						</hbox>
+						<et2-checkbox  label="Set a random password" id="random_pw"></et2-checkbox>
+						<et2-select-bool  label="Must change password upon next login" id="mustchangepassword" emptyLabel="Leave unchanged"></et2-select-bool>
+						<et2-select-bool  label="Can change password" id="changepassword" onchange="var mustchange=document.getElementById(form::name('mustchangepassword')); if (this.value=='0' &amp;&amp; mustchange.value) mustchange.value='0';" emptyLabel="Leave unchanged"></et2-select-bool>
+						<et2-hbox>
+							<et2-select  label="Change password hash to" id="hash" emptyLabel="Leave unchanged"></et2-select>
+							<et2-textbox  label="Current hash" id="current_hash" readonly="true" class="leftPad5"></et2-textbox>
+						</et2-hbox>
+						<et2-checkbox  label="Notify user by email" id="notify"></et2-checkbox>
+						<et2-hbox>
+							<et2-select  label="Mail account" id="mail[activate]" emptyLabel="Leave unchanged"></et2-select>
+							<et2-number  statustext="empty to NOT change" label="Quota (MB)" id="mail[quota]" precision="0"></et2-number>
+							<et2-textbox  statustext="change domain of email address and aliases" label="Domain" id="mail[domain]" validator="/^([a-z0-9]+([._-]{1}[a-z0-9]+)+)?$/i"></et2-textbox>
+						</et2-hbox>
 					</groupbox>
-					<description/>
+					<et2-description></et2-description>
 				</row>
 				<row valign="top">
 					<groupbox>
 						<caption label="Notification mail"/>
-						<textbox blur="Subject" id="subject" size="64" class="et2_fullWidth"/>
-						<textbox multiline="true" id="body" rows="15" cols="64" class="et2_fullWidth"/>
+						<et2-textbox  id="subject" placeholder="Subject"></et2-textbox>
+						<et2-textarea  id="body" rows="15" cols="64"></et2-textarea>
 					</groupbox>
-					<vbox>
-						<description value="Available placeholders" class="gray"/>
+					<et2-vbox>
+						<et2-description  value="Available placeholders" class="gray"></et2-description>
 						<grid id="replacements">
 							<columns>
 								<column/>
@@ -60,18 +51,18 @@
 							</columns>
 							<rows>
 								<row>
-									<description id="${row}[name]"/>
-									<description id="${row}[label]"/>
+									<et2-description  id="${row}[name]"></et2-description>
+									<et2-description  id="${row}[label]"></et2-description>
 								</row>
 							</rows>
 						</grid>
-					</vbox>
+					</et2-vbox>
 				</row>
 				<row>
-					<button label="Start" id="start"/>
-					<buttononly label="Download CSV" id="download_csv" onclick="widget.getInstanceManager().postSubmit()"/>
+					<et2-button  label="Start" id="start"></et2-button>
+					<et2-button  label="Download CSV" id="download_csv" onclick="widget.getInstanceManager().postSubmit()" noSubmit="true"></et2-button>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/remotes.xet b/admin/templates/default/remotes.xet
index 60e19acef5..31b8630775 100644
--- a/admin/templates/default/remotes.xet
+++ b/admin/templates/default/remotes.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.remotes.edit" template="" lang="" group="0" version="1.5.001">
 		<grid>
@@ -10,39 +9,39 @@
 			</columns>
 			<rows>
 				<row disabled="@remote_id">
-					<description span="all" class="redItalic" value="Remote administration need to be enabled in the remote instance under Admin &gt; Site configuration!"/>
-					<description/>
+					<et2-description  span="all" class="redItalic" value="Remote administration need to be enabled in the remote instance under Admin &gt; Site configuration!"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row class="th">
-					<description options=",,,remote_name" value="Name" needed="1"/>
-					<textbox size="64" maxlength="64" id="remote_name" needed="1"/>
+					<et2-description  value="Name" labelFor="remote_name" required="1"></et2-description>
+					<et2-textbox  maxlength="64" id="remote_name" required="1"></et2-textbox>
 				</row>
 				<row class="row">
-					<description options=",,,install_id" value="Install ID"/>
-					<textbox size="40" maxlength="32" validator="/^[a-f0-9]{0,32}$/" id="install_id" statustext="The install ID of an instance can be found under Admin &gt; Site configuration"/>
+					<et2-description  value="Install ID" labelFor="install_id"></et2-description>
+					<et2-textbox  maxlength="32" validator="/^[a-f0-9]{0,32}$/" id="install_id" statustext="The install ID of an instance can be found under Admin &gt; Site configuration"></et2-textbox>
 				</row>
 				<row class="row">
-					<description options=",,,config_passwd" value="Password"/>
-					<textbox size="40" maxlength="32" id="config_passwd" statustext="Config password or md5 hash from the header.inc.php"/>
+					<et2-description  value="Password" labelFor="config_passwd"></et2-description>
+					<et2-textbox  maxlength="32" id="config_passwd" statustext="Config password or md5 hash from the header.inc.php"></et2-textbox>
 				</row>
 				<row class="row" disabled="!@remote_hash">
-					<description value="Hash"/>
-					<description id="remote_hash"/>
+					<et2-description  value="Hash"></et2-description>
+					<et2-description  id="remote_hash"></et2-description>
 				</row>
 				<row class="row">
-					<description options=",,,remote_url" value="URL"/>
-					<textbox size="64" maxlength="128" validator="/^https?:\/\/[a-z0-9._-]+(\:[0-9]+)?(\/[a-z0-9._-]+)*$/" id="remote_url" needed="1" statustext="URL of the eGroupWare installation, eg. http://domain.com/egroupware"/>
+					<et2-description  value="URL" labelFor="remote_url"></et2-description>
+					<et2-textbox  maxlength="128" validator="/^https?:\/\/[a-z0-9._-]+(\:[0-9]+)?(\/[a-z0-9._-]+)*$/" id="remote_url" statustext="URL of the eGroupWare installation, eg. http://domain.com/egroupware" required="1"></et2-textbox>
 				</row>
 				<row class="row">
-					<description options=",,,remote_domain" value="Instance"/>
-					<textbox size="64" maxlength="64" id="remote_domain" statustext="Name of the eGroupWare instance, eg. default"/>
+					<et2-description  value="Instance" labelFor="remote_domain"></et2-description>
+					<et2-textbox  maxlength="64" id="remote_domain" statustext="Name of the eGroupWare instance, eg. default"></et2-textbox>
 				</row>
 				<row>
-					<hbox span="all">
-						<button label="Save" id="button[save]" statustext="Saves this entry"/>
-						<button id="button[apply]" label="Apply" statustext="Apply the changes"/>
-						<button label="Cancel" id="button[cancel]" statustext="leave without saveing the entry" novalidate="true"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Save" id="button[save]" statustext="Saves this entry"></et2-button>
+						<et2-button  id="button[apply]" label="Apply" statustext="Apply the changes"></et2-button>
+						<et2-button  label="Cancel" id="button[cancel]" statustext="leave without saveing the entry" novalidate="true"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -61,15 +60,15 @@
 					<nextmatch-sortheader label="Instance" id="remote_domain"/>
 				</row>
 				<row class="row">
-					<description id="${row}[remote_name]"/>
-					<description options=",$row_cont[remote_url]/?domain=$row_cont[remote_domain],,,_blank" id="${row}[remote_url]"/>
-					<description id="${row}[remote_domain]" no_lang="1"/>
+					<et2-description  id="${row}[remote_name]"></et2-description>
+					<et2-description  link="$row_cont[remote_url]/?domain=$row_cont[remote_domain]" id="${row}[remote_url]" linkTarget="_blank"></et2-description>
+					<et2-description  id="${row}[remote_domain]" noLang="1"></et2-description>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="admin.remotes.header_left" template="" lang="" group="0" version="1.5.001">
-		<button id="add" label="Add" statustext="Add a new remote instance"/>
+		<et2-button  id="add" label="Add" statustext="Add a new remote instance"></et2-button>
 	</template>
 	<template id="admin.remotes" template="" lang="" group="0" version="1.5.001">
 		<grid width="100%">
@@ -89,4 +88,4 @@
 			.border { border: black solid 2px; }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/site-config.xet b/admin/templates/default/site-config.xet
index eb1bffddd2..d0f23cb33c 100644
--- a/admin/templates/default/site-config.xet
+++ b/admin/templates/default/site-config.xet
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.site-config" template="" lang="" group="0" version="16.1">
-		<description value="Site configuration" class="subHeader"/>
-		<tabbox id="tabs2" width="100%">
+		<et2-description  value="Site configuration" class="subHeader"></et2-description>
+		<et2-tabbox  id="tabs2" width="100%">
 			<tabs>
 				<tab id="config" label="Configuration"/>
 			</tabs>
 			<tabpanels>
 				<template template="@template" width="99%"/>
 			</tabpanels>
-		</tabbox>
-		<hbox class="dialogFooterToolbar">
-			<button id="save" label="Save"/>
-			<button id="apply" label="Apply"/>
-			<button id="cancel" label="Cancel"/>
-		</hbox>
+		</et2-tabbox>
+		<et2-hbox  class="dialogFooterToolbar">
+			<et2-button  id="save" label="Save"></et2-button>
+			<et2-button  id="apply" label="Apply"></et2-button>
+			<et2-button  id="cancel" label="Cancel"></et2-button>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/smimeCertGen.xet b/admin/templates/default/smimeCertGen.xet
index 741a528a4a..bf7d3e5488 100644
--- a/admin/templates/default/smimeCertGen.xet
+++ b/admin/templates/default/smimeCertGen.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.smimeCertGen" template="" lang="" group="0" version="17.1">
 		<grid width="100%">
@@ -11,29 +10,29 @@
 				<row>
 					<groupbox>
 						<caption label="Certificate details"/>
-						<vbox>
-							<textbox id="countryName" class="et2_fullWidth" blur="Country name"/>
-							<textbox id="stateOrProvinceName" class="et2_fullWidth" blur="State or province name"/>
-							<textbox id="localityName" class="et2_fullWidth" blur="Locality name"/>
-							<textbox id="organizationName" class="et2_fullWidth" blur="Organization name"/>
-							<textbox id="organizationalUnitName" class="et2_fullWidth" blur="Organizational unit name"/>
-							<textbox id="commonName" class="et2_fullWidth" blur="Common name"/>
-							<textbox id="emailAddress" class="et2_fullWidth" blur="Email address"/>
-							<textbox id="validation" type="integer" label="Certificate validation in days" blur="365"/>
-						</vbox>
+						<et2-vbox>
+							<et2-textbox  id="countryName" placeholder="Country name"></et2-textbox>
+							<et2-textbox  id="stateOrProvinceName" placeholder="State or province name"></et2-textbox>
+							<et2-textbox  id="localityName" placeholder="Locality name"></et2-textbox>
+							<et2-textbox  id="organizationName" placeholder="Organization name"></et2-textbox>
+							<et2-textbox  id="organizationalUnitName" placeholder="Organizational unit name"></et2-textbox>
+							<et2-textbox  id="commonName" placeholder="Common name"></et2-textbox>
+							<et2-textbox  id="emailAddress" placeholder="Email address"></et2-textbox>
+							<et2-textbox  id="validation" type="integer" label="Certificate validation in days" placeholder="365"></et2-textbox>
+						</et2-vbox>
 					</groupbox>
 				</row>
 				<row>
 					<groupbox>
 						<caption label="passphrase"/>
-						<description value="Enter a passphrase if you would like to protect your private key by password."/>
-						<vbox>
-							<passwd id="passphrase" blur="Enter a passphrase" class="et2_fullWidth"/>
-							<passwd id="passphraseConf" blur="Repeat the passphrase" class="et2_fullWidth"/>
-						</vbox>
+						<et2-description  value="Enter a passphrase if you would like to protect your private key by password."></et2-description>
+						<et2-vbox>
+							<et2-password  id="passphrase" placeholder="Enter a passphrase"></et2-password>
+							<et2-password  id="passphraseConf" placeholder="Repeat the passphrase"></et2-password>
+						</et2-vbox>
 					</groupbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/default/statistics.xet b/admin/templates/default/statistics.xet
index 6defdb000a..0ab488be88 100644
--- a/admin/templates/default/statistics.xet
+++ b/admin/templates/default/statistics.xet
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.statistics" template="" lang="" group="0" version="1.7.001">
 		<groupbox span="all" class="bigger">
 			<caption label="Official EGroupware usage statistic"/>
-			<vbox>
-				<description value="We ask for the data to improve our profile in the press and to get a better understanding of EGroupware's user base and it's needs."/>
-				<url label="The cumulated and anonymised data will be publically available:" id="statistic_url" readonly="true"/>
-				<description value="We hope you understand the importance for this voluntary statistic and not deny it lightly." class="bold"/>
-				<description label="Only below displayed information is directly submitted to %s." id="submit_host"/>
-				<textbox label="To allow us to track the growth of your individual installation use this submit ID, otherwise delete it:" id="submit_id" size="42" maxlength="40"/>
-			</vbox>
+			<et2-vbox>
+				<et2-description  value="We ask for the data to improve our profile in the press and to get a better understanding of EGroupware's user base and it's needs."></et2-description>
+				<et2-url  label="The cumulated and anonymised data will be publically available:" id="statistic_url" readonly="true"></et2-url>
+				<et2-description  value="We hope you understand the importance for this voluntary statistic and not deny it lightly." class="bold"></et2-description>
+				<et2-description  label="Only below displayed information is directly submitted to %s." id="submit_host"></et2-description>
+				<et2-textbox  label="To allow us to track the growth of your individual installation use this submit ID, otherwise delete it:" id="submit_id" maxlength="40"></et2-textbox>
+			</et2-vbox>
 		</groupbox>
 		<grid>
 			<columns>
@@ -20,61 +19,59 @@
 			</columns>
 			<rows>
 				<row>
-					<description/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description options=",,,country" value="Country"/>
-					<select type="select-country" id="country" options="International use"/>
+					<et2-description  value="Country" labelFor="country"></et2-description>
+					<et2-select-country  id="country" emptyLabel="International use"></et2-select-country>
 				</row>
 				<row>
-					<description value="Usage" options=",,,usage_type"/>
-					<select id="usage_type"/>
+					<et2-description  value="Usage" labelFor="usage_type"></et2-description>
+					<et2-select  id="usage_type"></et2-select>
 				</row>
 				<row>
-					<description value="Number of users" options=",,,users"/>
-					<textbox id="users" statustext="number of active users" size="-8" readonly="true"/>
+					<et2-description  value="Number of users" labelFor="users"></et2-description>
+					<et2-textbox  id="users" statustext="number of active users" readonly="true"></et2-textbox>
 				</row>
 				<row>
-					<description options=",,,sessions" value="Sessions last 30 days"/>
-					<textbox id="sessions" statustext="Number of sessions / EGroupware logins in the last 30 days" size="-8" readonly="true"/>
+					<et2-description  value="Sessions last 30 days" labelFor="sessions"></et2-description>
+					<et2-textbox  id="sessions" statustext="Number of sessions / EGroupware logins in the last 30 days" readonly="true"></et2-textbox>
 				</row>
 				<row>
-					<description value="EGroupware Version"/>
-					<textbox id="version" size="-64" readonly="true"/>
+					<et2-description  value="EGroupware Version"></et2-description>
+					<et2-textbox  id="version" readonly="true"></et2-textbox>
 				</row>
 				<row>
-					<description value="Operating System"/>
-					<textbox id="os" size="-64" readonly="true"/>
+					<et2-description  value="Operating System"></et2-description>
+					<et2-textbox  id="os" readonly="true"></et2-textbox>
 				</row>
 				<row>
-					<description value="PHP Version"/>
-					<textbox id="php" size="-64" readonly="true"/>
+					<et2-description  value="PHP Version"></et2-description>
+					<et2-textbox  id="php" readonly="true"></et2-textbox>
 				</row>
 				<row>
-					<description value="Installation Type"/>
-					<menulist>
-						<menupopup id="install_type"/>
-					</menulist>
+					<et2-description  value="Installation Type"></et2-description>
+					<et2-select  id="install_type"></et2-select>
 				</row>
 				<row valign="top">
-					<description value="Applications"/>
-					<textbox multiline="true" rows="10" cols="40" id="apps" statustext="Installed applications, percentage of allowed users and total number of entries."/>
+					<et2-description  value="Applications"></et2-description>
+					<et2-textarea  rows="10" cols="40" id="apps" statustext="Installed applications, percentage of allowed users and total number of entries."></et2-textarea>
 				</row>
 				<row disabled="!@last_submitted">
-					<description value="Last submission:"/>
-					<date-time readonly="true" id="last_submitted"/>
+					<et2-description  value="Last submission:"></et2-description>
+					<et2-date-time  readonly="true" id="last_submitted"></et2-date-time>
 				</row>
 				<row disabled="!@msg">
-					<description span="all" class="redItalic" align="center" id="msg"/>
-					<description/>
+					<et2-description  span="all" class="redItalic" align="center" id="msg"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<button label="Submit" statustext="Submit to egroupware.org" onclick="$cont[onclick]" id="submit"/>
-					<hbox>
-						<select id="postpone" options="Postpone for" onchange="1"/>
-						<button id="cancel" label="Cancel" statustext="Go directly to admin menu, returning here the next time you click on administration." align="right"/>
-					</hbox>
+					<et2-button  label="Submit" statustext="Submit to egroupware.org" onclick="$cont[onclick]" id="submit"></et2-button>
+					<et2-hbox>
+						<et2-select  id="postpone" onchange="1" emptyLabel="Postpone for"></et2-select>
+						<et2-button  id="cancel" label="Cancel" statustext="Go directly to admin menu, returning here the next time you click on administration." align="right"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -88,4 +85,4 @@ fieldset.bigger legend {
 }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/mobile/account.xet b/admin/templates/mobile/account.xet
index 777b257a74..773378ae25 100644
--- a/admin/templates/mobile/account.xet
+++ b/admin/templates/mobile/account.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.account" template="" lang="" group="0" version="1.9.003">
 		<grid width="100%">
@@ -10,66 +9,66 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Login ID" for="account_lid"/>
-					<textbox id="account_lid" class="et2_fullWidth" onchange="app.addressbook.account_change" needed="true"/>
+					<et2-description  value="Login ID" for="account_lid"></et2-description>
+					<et2-textbox  id="account_lid" onchange="app.addressbook.account_change" required="true"></et2-textbox>
 				</row>
 				<row>
-					<description value="Expires" for="account_expires"/>
-					<vbox>
-						<date id="account_expires"/>
-						<checkbox id="account_status" selected_value="A" label="Account active"/>
-					</vbox>
+					<et2-description  value="Expires" for="account_expires"></et2-description>
+					<et2-vbox>
+						<et2-date  id="account_expires"></et2-date>
+						<et2-checkbox  id="account_status" label="Account active" selectedValue="A"></et2-checkbox>
+					</et2-vbox>
 				</row>
 				<row>
-					<description value="Password" for="account_passwd"/>
-					<passwd id="account_passwd" class="et2_fullWidth"/>
+					<et2-description  value="Password" for="account_passwd"></et2-description>
+					<et2-password  id="account_passwd"></et2-password>
 				</row>
 				<row>
-					<description value="Re-enter password" for="account_passwd_2"/>
-					<passwd id="account_passwd_2" class="et2_fullWidth" onchange="app.addressbook.account_change"/>
+					<et2-description  value="Re-enter password" for="account_passwd_2"></et2-description>
+					<et2-password  id="account_passwd_2" onchange="app.addressbook.account_change"></et2-password>
 				</row>
 				<row valign="top">
-					<description/>
-					<hbox>
-						<vbox span="3">
-							<checkbox id="mustchangepassword" label="Must change password upon next login"/>
-							<checkbox id="changepassword" label="Can change password"/>
-						</vbox>
-					</hbox>
+					<et2-description></et2-description>
+					<et2-hbox>
+						<et2-vbox  span="3">
+							<et2-checkbox  id="mustchangepassword" label="Must change password upon next login"></et2-checkbox>
+							<et2-checkbox  id="changepassword" label="Can change password"></et2-checkbox>
+						</et2-vbox>
+					</et2-hbox>
 				</row>
 				<row>
-					<description/>
-					<checkbox id="anonymous" label="Anonymous user. Not shown in list sessions."/>
+					<et2-description></et2-description>
+					<et2-checkbox  id="anonymous" label="Anonymous user. Not shown in list sessions."></et2-checkbox>
 				</row>
 				<row disabled="!@ldap_extra_attributes">
-					<description value="Home directory" for="homedirectory"/>
-					<textbox id="homedirectory" class="et2_fullWidth"/>
+					<et2-description  value="Home directory" for="homedirectory"></et2-description>
+					<et2-textbox  id="homedirectory"></et2-textbox>
 				</row>
 				<row disabled="!@ldap_extra_attributes">
-					<description value="Login shell" for="loginshell"/>
-					<textbox id="loginshell" class="et2_fullWidth"/>
+					<et2-description  value="Login shell" for="loginshell"></et2-description>
+					<et2-textbox  id="loginshell"></et2-textbox>
 				</row>
 
 				<row>
-					<description value="Primary group" for="account_primary_group"/>
-					<select-account id="account_primary_group" account_type="groups" class="et2_fullWidth"/>
+					<et2-description  value="Primary group" for="account_primary_group"></et2-description>
+					<et2-select-account  id="account_primary_group" accountType="groups"></et2-select-account>
 				</row>
 				<row>
-					<description value="Groups" for="groups"/>
-					<select-account account_type="groups" id="memberships" multiple="true" class="et2_fullWidth" span="4" tags="true"/>
+					<et2-description  value="Groups" for="groups"></et2-description>
+					<et2-select-account  id="memberships" multiple="true" span="4" accountType="groups"></et2-select-account>
 				</row>
 				<row disabled="!@account_id">
-					<description value="Last login"/>
-					<hbox>
-						<date-time id="account_lastlogin" readonly="true"/>
-						<description id="account_lastloginfrom" readonly="true" align="right"/>
-					</hbox>
+					<et2-description  value="Last login"></et2-description>
+					<et2-hbox>
+						<et2-date-time  id="account_lastlogin" readonly="true"></et2-date-time>
+						<et2-description  id="account_lastloginfrom" readonly="true" align="right"></et2-description>
+					</et2-hbox>
 				</row>
 				<row disabled="!@account_id">
-					<description value="Last password change"/>
-					<date-time id="account_lastpwd_change" readonly="true"/>
+					<et2-description  value="Last password change"></et2-description>
+					<et2-date-time  id="account_lastpwd_change" readonly="true"></et2-date-time>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/mobile/categories.edit.xet b/admin/templates/mobile/categories.edit.xet
index 9e06578d04..7731cd0d66 100644
--- a/admin/templates/mobile/categories.edit.xet
+++ b/admin/templates/mobile/categories.edit.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.categories.edit" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,59 +9,53 @@
 			</columns>
 			<rows>
 				<row class="dialogHeadbar" >
-					<hbox span="all">
-						<button id="button[save]" onclick="return app.admin.check_owner(widget);" image="save"/>
-						<button  id="button[apply]" onclick="return app.admin.check_owner(widget);" image="apply"/>
-						<buttononly id="button[cancel]" onclick="window.close();" image="cancel"/>
-						<buttononly statustext="Delete this category"  id="button[delete]" onclick="egw.open_link('admin.admin_categories.delete','_browser','450x400');window.close();" image="delete"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button-icon  id="button[save]" onclick="return app.admin.check_owner(widget);" image="save"></et2-button-icon>
+						<et2-button-icon  id="button[apply]" onclick="return app.admin.check_owner(widget);" image="apply"></et2-button-icon>
+						<et2-button-icon  id="button[cancel]" onclick="window.close();" image="cancel" noSubmit="true"></et2-button-icon>
+						<et2-button-icon  statustext="Delete this category" id="button[delete]" onclick="egw.open_link('admin.admin_categories.delete','_browser','450x400');window.close();" image="delete" noSubmit="true"></et2-button-icon>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Name" for="name"/>
-					<textbox id="name" needed="1" size="50" maxlength="150" class="et2_fullWidth"/>
+					<et2-description  value="Name" for="name"></et2-description>
+					<et2-textbox  id="name" maxlength="150" required="1"></et2-textbox>
 				</row>
 				<row>
-					<description value="Parent category" for="parent"/>
-					<menulist>
-						<menupopup type="select-cat" id="parent" options="None,$cont[all_cats],,$cont[appname]"/>
-					</menulist>
+					<et2-description  value="Parent category" for="parent"></et2-description>
+					<et2-select-cat  id="parent" application="$cont[appname]" emptyLabel="None" globalCategories="$cont[all_cats]"></et2-select-cat>
 				</row>
 				<row valign="top">
-					<description value="Description" for="description"/>
-					<textbox multiline="true" id="description" rows="5" cols="10" class="et2_fullWidth" resize_ratio="0" height="200"/>
+					<et2-description  value="Description" for="description"></et2-description>
+					<et2-textarea  id="description" rows="5" cols="10" height="200" resizeRatio="0"></et2-textarea>
 				</row>
 				<row class="nmr" disabled="@no_private">
-					<description value="Private"/>
-					<checkbox id="access" options="private,public"/>
+					<et2-description  value="Private"></et2-description>
+					<et2-checkbox  id="access" selectedValue="private" unselectedValue="public" ></et2-checkbox>
 				</row>
 				<row>
-					<description value="Color" for="cat_data[color]"/>
-					<colorpicker id="data[color]"/>
+					<et2-description  value="Color" for="cat_data[color]"></et2-description>
+					<et2-colorpicker  id="data[color]"></et2-colorpicker>
 				</row>
 				<row>
-					<description value="Icon" for="data[icon]"/>
-					<hbox options="0,0">
-						<menulist>
-							<menupopup id="data[icon]" onchange="app.admin.change_icon(widget);" options="None"/>
-						</menulist>
-						<image src="icon_url" id="icon_url"/>
-					</hbox>
+					<et2-description  value="Icon" for="data[icon]"></et2-description>
+					<et2-hbox  cellpadding="0" cellspacing="0" >
+						<et2-select  id="data[icon]" onchange="app.admin.change_icon(widget);" emptyLabel="None"></et2-select>
+						<et2-image  src="icon_url" id="icon_url"></et2-image>
+					</et2-hbox>
 				</row>
 				<row disabled="@appname=phpgw" height="30">
-					<description value="Application"/>
-					<menulist>
-						<menupopup type="select-app" id="appname" readonly="true" options="All applications"/>
-					</menulist>
+					<et2-description  value="Application"></et2-description>
+					<et2-select-app  id="appname" readonly="true" emptyLabel="All applications"></et2-select-app>
 				</row>
 				<row>
-					<description value="Category owner" for="owner"/>
-					<listbox statustext="Limit global category to members of a certain group" id="owner" needed="1" rows="6" height="150"/>
+					<et2-description  value="Category owner" for="owner"></et2-description>
+					<et2-select  statustext="Limit global category to members of a certain group" id="owner" rows="6" height="150" multiple="1" required="1"></et2-select>
 				</row>
 				<row disabled="!@last_mod">
-					<description value="Modified"/>
-					<date-time id="last_mod" readonly="true"/>
+					<et2-description  value="Modified"></et2-description>
+					<et2-date-time  id="last_mod" readonly="true"></et2-date-time>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/mobile/categories.index.xet b/admin/templates/mobile/categories.index.xet
index 106e8793a2..e7fecbdc46 100644
--- a/admin/templates/mobile/categories.index.xet
+++ b/admin/templates/mobile/categories.index.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.categories.index.rows" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%">
@@ -13,58 +12,54 @@
 				<row class="th">
 				</row>
 				<row class="$row_cont[id] $row_cont[class]">
-					<description class=" cat_$row_cont[cat_id] mobile_cat_col"/>
-					<vbox>
-						<hbox options="0,0">
+					<et2-description  class="cat_$row_cont[cat_id] mobile_cat_col"></et2-description>
+					<et2-vbox>
+						<et2-hbox  cellpadding="0" cellspacing="0" >
 							<html id="${row}[level_spacer]"/>
-							<description id="${row}[name]" class="$row_cont[class]"/>
+							<et2-description  id="${row}[name]" class="$row_cont[class]"></et2-description>
 
-						</hbox>
-						<description id="${row}[description]"/>
-						<hbox>
-							<hbox>
-								<menulist>
-									<menupopup type="select-account" id="${row}[owner]" readonly="true" options="All users,groups"/>
-								</menulist>
-							</hbox>
+						</et2-hbox>
+						<et2-description  id="${row}[description]"></et2-description>
+						<et2-hbox>
+							<et2-hbox>
+								<et2-select-account  id="${row}[owner]" readonly="true" emptyLabel="All users" accountType="groups"></et2-select-account>
+							</et2-hbox>
 
-							<hbox align="right">
-								<menulist>
-									<menupopup id="${row}[appname]" readonly="true"/>
-								</menulist>
-							</hbox>
+							<et2-hbox  align="right">
+								<et2-select  id="${row}[appname]" readonly="true"></et2-select>
+							</et2-hbox>
 
-						</hbox>
+						</et2-hbox>
 
-					</vbox>
-					<vbox>
-						<image align="center" label="{$row_cont[data][icon]}" src="${row}[icon_url]"/>
-						<checkbox align="center" id="${row}[access]" readonly="true" options="private,public" disabled="@no_access"/>
-						<date-time id="${row}[last_mod]" readonly="true"/>
-						<description align="center" id="${row}[subs]"/>
-					</vbox>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-image  align="center" label="{$row_cont[data][icon]}" src="${row}[icon_url]"></et2-image>
+						<et2-checkbox  align="center" id="${row}[access]" readonly="true" disabled="@no_access" selectedValue="private" unselectedValue="public"></et2-checkbox>
+						<et2-date-time  id="${row}[last_mod]" readonly="true"></et2-date-time>
+						<et2-description  align="center" id="${row}[subs]"></et2-description>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="admin.categories.index.add" template="" lang="" group="0" version="1.9.001">
-		<buttononly lable="Add" id="add" onclick="window.open('$cont[add_link]','_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;"/>
+		<et2-button  lable="Add" id="add" onclick="window.open('$cont[add_link]','_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;" noSubmit="true"></et2-button>
 	</template>
 	<template id="admin.categories.index" template="" lang="" group="0" version="1.9.001">
 		<nextmatch id="nm" options="admin.categories.index.rows" span="all" header_left="admin.categories.index.add"/>
-		<box class="action_popup prompt" id="owner_popup">
-			<vbox>
-				<description value="Change owner" class="promptheader"/>
-				<description value="Select owner"/>
-				<listbox id="owner" no_lang="1" rows="4" class="action_popup-content"/>
-				<hbox>
-					<button label="Add" id="owner_action[add]" onclick="nm_submit_popup(this); return false;"/>
-					<button label="Delete" id="owner_action[delete]" onclick="nm_submit_popup(this); return false;"/>
-					<button disabled="true" label="OK" onclick="nm_submit_popup(this); return false;"/>
-					<buttononly label="Cancel" onclick="nm_hide_popup(this,'owner_popup');"/>
-				</hbox>
-			</vbox>
-		</box>
+		<et2-box  class="action_popup prompt" id="owner_popup">
+			<et2-vbox>
+				<et2-description  value="Change owner" class="promptheader"></et2-description>
+				<et2-description  value="Select owner"></et2-description>
+				<et2-select  id="owner" rows="4" class="action_popup-content" multiple="1" noLang="1"></et2-select>
+				<et2-hbox>
+					<et2-button  label="Add" id="owner_action[add]" onclick="nm_submit_popup(this); return false;"></et2-button>
+					<et2-button  label="Delete" id="owner_action[delete]" onclick="nm_submit_popup(this); return false;"></et2-button>
+					<et2-button  disabled="true" label="OK" onclick="nm_submit_popup(this); return false;"></et2-button>
+					<et2-button  label="Cancel" onclick="nm_hide_popup(this,'owner_popup');" noSubmit="true"></et2-button>
+				</et2-hbox>
+			</et2-vbox>
+		</et2-box>
 		<styles>
 			.level0 { font-weight: bold; }
 
@@ -97,4 +92,4 @@
 }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/mobile/index.xet b/admin/templates/mobile/index.xet
index 4c2b719358..ccdc25a12b 100644
--- a/admin/templates/mobile/index.xet
+++ b/admin/templates/mobile/index.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -13,25 +12,25 @@
 
 				</row>
 				<row class="$row_cont[status_class]">
-					<vbox>
-						<description id="${row}[account_lid]" no_lang="1"/>
-						<hbox>
-							<description id="${row}[account_lastname]" no_lang="1"/>
-							<description id="${row}[account_firstname]" no_lang="1"/>
-						</hbox>
-						<url-email id="${row}[account_email]" readonly="true" class="adminOverflowEllipsis"/>
-					</vbox>
-					<vbox class="adminCol2">
-						<hbox>
-							<time_or_date id="${row}[account_created]" readonly="true"/>
-						</hbox>
-						<hbox>
-							<description id="${row}[status]" no_lang="1" class="adminStatus"/>
-						</hbox>
-						<hbox>
-							<time_or_date id="${row}[account_modified]" readonly="true"/>
-						</hbox>
-					</vbox>
+					<et2-vbox>
+						<et2-description  id="${row}[account_lid]" noLang="1"></et2-description>
+						<et2-hbox>
+							<et2-description  id="${row}[account_lastname]" noLang="1"></et2-description>
+							<et2-description  id="${row}[account_firstname]" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-url-email  id="${row}[account_email]" readonly="true" class="adminOverflowEllipsis"></et2-url-email>
+					</et2-vbox>
+					<et2-vbox  class="adminCol2">
+						<et2-hbox>
+							<et2-date-time-today  id="${row}[account_created]" readonly="true"></et2-date-time-today>
+						</et2-hbox>
+						<et2-hbox>
+							<et2-description  id="${row}[status]" class="adminStatus" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-hbox>
+							<et2-date-time-today  id="${row}[account_modified]" readonly="true"></et2-date-time-today>
+						</et2-hbox>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
@@ -47,28 +46,28 @@
 
 				</row>
 				<row class="$row_cont[status_class]">
-					<vbox>
-						<description id="${row}[account_lid]" no_lang="1"/>
-						<hbox>
-							<description id="${row}[account_description]" no_lang="1"/>
-						</hbox>
-						<url-email id="${row}[account_email]" readonly="true" no_lang="1" class="adminOverflowEllipsis"/>
-					</vbox>
-					<vbox class="adminCol2">
-						<date id="${row}[account_created]" readonly="true"/>
-						<date id="${row}[account_modified]" readonly="true"/>
-					</vbox>
+					<et2-vbox>
+						<et2-description  id="${row}[account_lid]" noLang="1"></et2-description>
+						<et2-hbox>
+							<et2-description  id="${row}[account_description]" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-url-email  id="${row}[account_email]" readonly="true" class="adminOverflowEllipsis" noLang="1"></et2-url-email>
+					</et2-vbox>
+					<et2-vbox  class="adminCol2">
+						<et2-date  id="${row}[account_created]" readonly="true"></et2-date>
+						<et2-date  id="${row}[account_modified]" readonly="true"></et2-date>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="admin.index" template="" lang="" group="0" version="1.9.001">
 		<tree autoloading="admin_ui::ajax_tree" id="tree" onclick="app.admin.run" parent_node="admin_tree_target" std_images="bullet"/>
-		<description id="plus_button_container"/>
-		<buttononly class="plus_button" id="add" onclick='app.admin.account({id:"add"})'/>
+		<et2-description  id="plus_button_container"></et2-description>
+		<et2-button  class="plus_button" id="add" onclick="app.admin.account({id:&quot;add&quot;})" noSubmit="true"></et2-button>
 		<nextmatch id="nm" template="admin.index.rows"/>
 		<nextmatch id="groups" template="admin.index.group"/>
 		<iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%" disabled="true"/>
-		<box id="ajax_target" height="99%" disabled="true"/>
+		<et2-box  id="ajax_target" height="99%" disabled="true"></et2-box>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/mobile/mailaccount.xet b/admin/templates/mobile/mailaccount.xet
index fea689e5de..4deb7b87e3 100644
--- a/admin/templates/mobile/mailaccount.xet
+++ b/admin/templates/mobile/mailaccount.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.mailaccount.identity" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,33 +9,31 @@
 			</columns>
 			<rows>
 				<row>
-					<description for="ident_id" value="Identity"/>
-					<menulist>
-						<menupopup id="ident_id" no_lang="1" onchange="1" class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  for="ident_id" value="Identity"></et2-description>
+					<et2-select  id="ident_id" onchange="1" noLang="1"></et2-select>
 				</row>
 				<row>
-					<description/>
-					<checkbox label="allow users to create further identities" id="acc_further_identities" class="emailadmin_no_user"/>
+					<et2-description></et2-description>
+					<et2-checkbox  label="allow users to create further identities" id="acc_further_identities" class="emailadmin_no_user"></et2-checkbox>
 				</row>
 				<row>
-					<description for="ident_name" value="Name"/>
-					<textbox id="ident_name" maxlength="128" blur="default your name and email" class="et2_fullWidth"/>
+					<et2-description  for="ident_name" value="Name"></et2-description>
+					<et2-textbox  id="ident_name" maxlength="128" placeholder="default your name and email"></et2-textbox>
 				</row>
 				<row>
-					<description for="ident_realname" value="Your name"/>
-					<hbox>
-						<textbox id="ident_realname" maxlength="128" width="96%"/>
-						<buttononly label="Placeholders" id="button[placeholders]" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_merge.show_replacements&amp;nonavbar=1'),'_blank','dependent=yes,width=860,height=620,scrollbars=yes,status=yes'); return false;" options="dialog_help"/>
-					</hbox>
+					<et2-description  for="ident_realname" value="Your name"></et2-description>
+					<et2-hbox>
+						<et2-textbox  id="ident_realname" maxlength="128" width="96%"></et2-textbox>
+						<et2-button  label="Placeholders" id="button[placeholders]" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_merge.show_replacements&amp;nonavbar=1'),'_blank','dependent=yes,width=860,height=620,scrollbars=yes,status=yes'); return false;" image="dialog_help" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<description for="ident_org" value="Organisation"/>
-					<textbox id="ident_org" maxlength="128" span="all" class="et2_fullWidth"/>
+					<et2-description  for="ident_org" value="Organisation"></et2-description>
+					<et2-textbox  id="ident_org" maxlength="128" span="all"></et2-textbox>
 				</row>
 				<row>
-					<description for="ident_email" value="EMail address"/>
-					<url-email id="ident_email" options="80,128" width="96%"/>
+					<et2-description  for="ident_email" value="EMail address"></et2-description>
+					<et2-url-email  id="ident_email" options="80,128" width="96%"></et2-url-email>
 				</row>
 				<row>
 					<htmlarea expand_toolbar="false" height="125px" id="ident_signature" span="all" width="100%"/>
@@ -52,44 +49,38 @@
 			</columns>
 			<rows>
 				<row class="emailadmin_no_single">
-					<description for="acc_imap_logintype" value="Type"/>
-					<menulist>
-						<menupopup id="acc_imap_type" class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  for="acc_imap_logintype" value="Type"></et2-description>
+					<et2-select  id="acc_imap_type"></et2-select>
 				</row>
 				<row class="emailadmin_no_single">
-					<description for="acc_imap_logintype" value="Login" class="emailadmin_no_single"/>
-					<menulist>
-						<menupopup class="emailadmin_no_single et2_fullWidth" statustext="How username get constructed" id="acc_imap_logintype"/>
-					</menulist>
+					<et2-description  for="acc_imap_logintype" value="Login" class="emailadmin_no_single"></et2-description>
+					<et2-select  class="emailadmin_no_single" statustext="How username get constructed" id="acc_imap_logintype"></et2-select>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_imap_username" value="Username"/>
-					<textbox id="acc_imap_username" maxlength="128" autocomplete="off" class="et2_fullWidth"/>
+					<et2-description  for="acc_imap_username" value="Username"></et2-description>
+					<et2-textbox  id="acc_imap_username" maxlength="128" autocomplete="off"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_domain" value="Domain" class="emailadmin_no_single"/>
-					<textbox id="acc_domain" maxlength="128" class="emailadmin_no_single et2_fullWidth"/>
+					<et2-description  for="acc_domain" value="Domain" class="emailadmin_no_single"></et2-description>
+					<et2-textbox  id="acc_domain" maxlength="128" class="emailadmin_no_single"></et2-textbox>
 				</row>
 				<row>
-					<description for="acc_imap_password" value="Password"/>
-					<hbox>
-						<passwd id="acc_imap_password" maxlength="128" autocomplete="off" width="96%"/>
-						<description id="acc_imap_account_id" class="emailadmin_diagnostic"/>
-					</hbox>
+					<et2-description  for="acc_imap_password" value="Password"></et2-description>
+					<et2-hbox>
+						<et2-password  id="acc_imap_password" maxlength="128" autocomplete="off" width="96%"></et2-password>
+						<et2-description  id="acc_imap_account_id" class="emailadmin_diagnostic"></et2-description>
+					</et2-hbox>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_imap_host" value="IMAP server"/>
-					<textbox blur="Hostname or IP" id="acc_imap_host" maxlength="128" class="et2_fullWidth"/>
+					<et2-description  for="acc_imap_host" value="IMAP server"></et2-description>
+					<et2-textbox  id="acc_imap_host" maxlength="128" placeholder="Hostname or IP"></et2-textbox>
 				</row>
 				<row>
-					<description for="acc_imap_ssl" value="Secure connection"/>
-					<hbox>
-						<menulist>
-							<menupopup class="emailadmin_ssl" id="acc_imap_ssl" needed="1" onchange="app.admin.wizard_imap_ssl_onchange" width="30%"/>
-						</menulist>
-						<textbox type="integer" label="Port" id="acc_imap_port" needed="1" class="emailadmin_port"/>
-					</hbox>
+					<et2-description  for="acc_imap_ssl" value="Secure connection"></et2-description>
+					<et2-hbox>
+						<et2-select  class="emailadmin_ssl" id="acc_imap_ssl" onchange="app.admin.wizard_imap_ssl_onchange" width="30%" required="1"></et2-select>
+						<et2-number  label="Port" id="acc_imap_port" class="emailadmin_port" precision="0" required="1"></et2-number>
+					</et2-hbox>
 				</row>
 				<row class="emailadmin_no_single">
 					<groupbox span="all" class="emailadmin_imap_admin">
@@ -101,12 +92,12 @@
 							</columns>
 							<rows>
 								<row>
-									<description for="acc_imap_admin_username" value="Admin user"/>
-									<textbox id="acc_imap_admin_username" maxlength="128" autocomplete="off" class="et2_fullWidth"/>
+									<et2-description  for="acc_imap_admin_username" value="Admin user"></et2-description>
+									<et2-textbox  id="acc_imap_admin_username" maxlength="128" autocomplete="off"></et2-textbox>
 								</row>
 								<row>
-									<description for="acc_imap_admin_password" value="Password"/>
-									<passwd id="acc_imap_admin_password" maxlength="128" autocomplete="off" class="et2_fullWidth"/>
+									<et2-description  for="acc_imap_admin_password" value="Password"></et2-description>
+									<et2-password  id="acc_imap_admin_password" maxlength="128" autocomplete="off"></et2-password>
 								</row>
 							</rows>
 						</grid>
@@ -123,32 +114,32 @@
 			</columns>
 			<rows>
 				<row>
-					<description for="acc_folder_sent" value="Sent folder"/>
-					<taglist id="acc_folder_sent" empty_label="Select one ..." maxSelection="1" autocomplete_url="" class="et2_fullWidth"/>
+					<et2-description  for="acc_folder_sent" value="Sent folder"></et2-description>
+					<et2-select  id="acc_folder_sent" allowFreeEntries="true" editModeEnabled="true" searchUrl="" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description for="acc_folder_trash" value="Trash folder"/>
-					<taglist id="acc_folder_trash" empty_label="Select one ..." maxSelection="1" autocomplete_url="" class="et2_fullWidth"/>
+					<et2-description  for="acc_folder_trash" value="Trash folder"></et2-description>
+					<et2-select  id="acc_folder_trash" allowFreeEntries="true" editModeEnabled="true" searchUrl="" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description for="acc_folder_draft" value="Drafts folder"/>
-					<taglist id="acc_folder_draft" empty_label="Select one ..." maxSelection="1" autocomplete_url="" class="et2_fullWidth"/>
+					<et2-description  for="acc_folder_draft" value="Drafts folder"></et2-description>
+					<et2-select  id="acc_folder_draft" allowFreeEntries="true" editModeEnabled="true" searchUrl="" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description for="acc_folder_template" value="Templates folder"/>
-					<taglist id="acc_folder_template" empty_label="Select one ..." maxSelection="1" autocomplete_url="" class="et2_fullWidth"/>
+					<et2-description  for="acc_folder_template" value="Templates folder"></et2-description>
+					<et2-select  id="acc_folder_template" allowFreeEntries="true" editModeEnabled="true" searchUrl="" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description for="acc_folder_junk" value="Junk folder"/>
-					<taglist id="acc_folder_junk" empty_label="Select one ..." maxSelection="1" autocomplete_url="" class="et2_fullWidth"/>
+					<et2-description  for="acc_folder_junk" value="Junk folder"></et2-description>
+					<et2-select  id="acc_folder_junk" allowFreeEntries="true" editModeEnabled="true" searchUrl="" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description for="acc_folder_junk" value="Notify about new mail in this folders"/>
-					<vbox>
-						<taglist id="notify_folders" empty_label="Select one ..." autocomplete_url="" onchange="app.admin.change_folders" class="et2_fullWidth"/>
-						<checkbox id="notify_save_default" label="save as default"/>
-						<checkbox id="notify_use_default" label="use default"/>
-					</vbox>
+					<et2-description  for="acc_folder_junk" value="Notify about new mail in this folders"></et2-description>
+					<et2-vbox>
+						<et2-select  id="notify_folders" onchange="app.admin.change_folders" multiple="true" allowFreeEntries="true" editModeEnabled="true" searchUrl="" placeholder="Select one ..."></et2-select>
+						<et2-checkbox  id="notify_save_default" label="save as default"></et2-checkbox>
+						<et2-checkbox  id="notify_use_default" label="use default"></et2-checkbox>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
@@ -161,26 +152,22 @@
 			</columns>
 			<rows>
 				<row>
-					<description for="acc_sieve_enabled" value="Enable Sieve"/>
-					<menulist>
-						<menupopup type="select-bool" id="acc_sieve_enabled" needed="1" class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  for="acc_sieve_enabled" value="Enable Sieve"></et2-description>
+					<et2-select-bool  id="acc_sieve_enabled" required="1"></et2-select-bool>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_sieve_host" value="Sieve server"/>
-					<textbox blur="Hostname or IP" id="acc_sieve_host" onchange="app.admin.wizard_sieve_onchange" maxlength="128" class="et2_fullWidth"/>
+					<et2-description  for="acc_sieve_host" value="Sieve server"></et2-description>
+					<et2-textbox  id="acc_sieve_host" onchange="app.admin.wizard_sieve_onchange" maxlength="128" placeholder="Hostname or IP"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_sieve_ssl" value="Secure connection"/>
-					<hbox>
-						<menulist>
-							<menupopup class="emailadmin_ssl" id="acc_sieve_ssl" onchange="app.admin.wizard_sieve_ssl_onchange" width="30%"/>
-						</menulist>
-						<textbox type="integer" label="Port" id="acc_sieve_port" onchange="app.admin.wizard_sieve_onchange" class="emailadmin_port"/>
-					</hbox>
+					<et2-description  for="acc_sieve_ssl" value="Secure connection"></et2-description>
+					<et2-hbox>
+						<et2-select  class="emailadmin_ssl" id="acc_sieve_ssl" onchange="app.admin.wizard_sieve_ssl_onchange" width="30%"></et2-select>
+						<et2-number  label="Port" id="acc_sieve_port" onchange="app.admin.wizard_sieve_onchange" class="emailadmin_port" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Vacation messages with start and end date require an admin account to be set!" span="all" class="emailadmin_no_single"/>
+					<et2-description  value="Vacation messages with start and end date require an admin account to be set!" span="all" class="emailadmin_no_single"></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -193,38 +180,34 @@
 			</columns>
 			<rows>
 				<row class="emailadmin_no_single">
-					<description for="acc_smtp_type" value="Type"/>
-					<menulist>
-						<menupopup id="acc_smtp_type" onchange="1" class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  for="acc_smtp_type" value="Type"></et2-description>
+					<et2-select  id="acc_smtp_type" onchange="1"></et2-select>
 				</row>
 				<row class="emailadmin_no_single">
-					<description for="acc_smtp_auth_session" value="Authentication"/>
-					<checkbox label="Use username+password from current user" id="acc_smtp_auth_session"/>
+					<et2-description  for="acc_smtp_auth_session" value="Authentication"></et2-description>
+					<et2-checkbox  label="Use username+password from current user" id="acc_smtp_auth_session"></et2-checkbox>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_smtp_username" value="Username"/>
-					<textbox blur="if authentication required" id="acc_smtp_username" maxlength="128" autocomplete="off" class="et2_fullWidth"/>
+					<et2-description  for="acc_smtp_username" value="Username"></et2-description>
+					<et2-textbox  id="acc_smtp_username" maxlength="128" autocomplete="off" placeholder="if authentication required"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_smtp_password" value="Password"/>
-					<hbox>
-						<passwd id="acc_smtp_password" maxlength="128" autocomplete="off" class="et2_fullWidth"/>
-						<description id="acc_smtp_account_id" class="emailadmin_diagnostic"/>
-					</hbox>
+					<et2-description  for="acc_smtp_password" value="Password"></et2-description>
+					<et2-hbox>
+						<et2-password  id="acc_smtp_password" maxlength="128" autocomplete="off"></et2-password>
+						<et2-description  id="acc_smtp_account_id" class="emailadmin_diagnostic"></et2-description>
+					</et2-hbox>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_smtp_host" value="SMTP server"/>
-					<textbox blur="Hostname or IP" id="acc_smtp_host" needed="1" maxlength="128" class="et2_fullWidth"/>
+					<et2-description  for="acc_smtp_host" value="SMTP server"></et2-description>
+					<et2-textbox  id="acc_smtp_host" maxlength="128" placeholder="Hostname or IP" required="1"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description for="acc_smtp_ssl" value="Secure connection"/>
-					<hbox>
-						<menulist>
-							<menupopup class="emailadmin_ssl" id="acc_smtp_ssl" needed="1" onchange="app.admin.wizard_smtp_ssl_onchange" width="30%"/>
-						</menulist>
-						<textbox type="integer" label="Port" id="acc_smtp_port" needed="1" class="emailadmin_port"/>
-					</hbox>
+					<et2-description  for="acc_smtp_ssl" value="Secure connection"></et2-description>
+					<et2-hbox>
+						<et2-select  class="emailadmin_ssl" id="acc_smtp_ssl" onchange="app.admin.wizard_smtp_ssl_onchange" width="30%" required="1"></et2-select>
+						<et2-number  label="Port" id="acc_smtp_port" class="emailadmin_port" precision="0" required="1"></et2-number>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -237,42 +220,42 @@
 			</columns>
 			<rows>
 				<row>
-					<description for="mailLocalAddress" value="EMail address"/>
-					<url-email id="mailLocalAddress" options="32,128" class="et2_fullWidth"/>
+					<et2-description  for="mailLocalAddress" value="EMail address"></et2-description>
+					<et2-url-email  id="mailLocalAddress" options="32,128"></et2-url-email>
 				</row>
 				<row>
-					<description/>
-					<checkbox label="Email account active" id="accountStatus" selected_value="active"/>
+					<et2-description></et2-description>
+					<et2-checkbox  label="Email account active" id="accountStatus" selectedValue="active"></et2-checkbox>
 				</row>
 				<row>
-					<description for="mailAlternateAddress" value="Alternate email address"/>
-					<taglist id="mailAlternateAddress" autocomplete_url="" class="et2_fullWidth"/>
+					<et2-description  for="mailAlternateAddress" value="Alternate email address"></et2-description>
+					<et2-select  id="mailAlternateAddress" multiple="true" allowFreeEntries="true" editModeEnabled="true" searchUrl=""></et2-select>
 				</row>
 				<row disabled="@no_forward_available">
-					<description for="mailForwardingAddress" value="Forward email's to"/>
-					<taglist id="mailForwardingAddress" autocomplete_url="" class="et2_fullWidth"/>
+					<et2-description  for="mailForwardingAddress" value="Forward email's to"></et2-description>
+					<et2-select  id="mailForwardingAddress" multiple="true" allowFreeEntries="true" editModeEnabled="true" searchUrl=""></et2-select>
 				</row>
 				<row disabled="@no_forward_available">
-					<description/>
-					<vbox>
-						<checkbox label="Forward only" id="deliveryMode" selected_value="forwardOnly" onchange="if (widget.getValue()) et2_dialog.alert('Forward only disables IMAP mailbox / storing of mails and just forwards them to given address.','Forward only');"/>
-						<checkbox label="Allow users to change forwards" id="acc_user_forward"/>
-					</vbox>
+					<et2-description></et2-description>
+					<et2-vbox>
+						<et2-checkbox  label="Forward only" id="deliveryMode" onchange="if (widget.getValue()) et2_dialog.alert('Forward only disables IMAP mailbox / storing of mails and just forwards them to given address.','Forward only');" selectedValue="forwardOnly"></et2-checkbox>
+						<et2-checkbox  label="Allow users to change forwards" id="acc_user_forward"></et2-checkbox>
+					</et2-vbox>
 				</row>
 				<row>
-					<description for="quotaLimit" value="Quota (MB)"/>
-					<hbox>
-						<textbox type="integer" id="quotaLimit"/>
-						<description value="Leave empty for no quota"/>
-					</hbox>
+					<et2-description  for="quotaLimit" value="Quota (MB)"></et2-description>
+					<et2-hbox>
+						<et2-number  id="quotaLimit" precision="0"></et2-number>
+						<et2-description  value="Leave empty for no quota"></et2-description>
+					</et2-hbox>
 				</row>
 				<row>
-					<description for="quotaUsed" value="Currently:"/>
-					<textbox type="integer" id="quotaUsed" readonly="true"/>
+					<et2-description  for="quotaUsed" value="Currently:"></et2-description>
+					<et2-number  id="quotaUsed" readonly="true" precision="0"></et2-number>
 				</row>
 				<row disabled="!@admin_actions">
-					<description value="Administration"/>
-					<description/>
+					<et2-description  value="Administration"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row disabled="!@admin_actions">
 					<toolbar id="admin_actions" colspan="2" default_execute="app.admin.account_edit_action"/>
@@ -288,21 +271,21 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="SMIME"/>
+					<et2-description  value="SMIME"></et2-description>
 				</row>
 				<row disabled="@hide_smime_upload">
-					<description value="Upload your certificate .p12/.pfx file"/>
-					<vbox>
+					<et2-description  value="Upload your certificate .p12/.pfx file"></et2-description>
+					<et2-vbox>
 						<file id="smimeKeyUpload" accept=".p12,.pfx"/>
-						<passwd id="smime_pkcs12_password" size="32" maxlength="128"  blur="Password to unlock encrypted p12" autocomplete="off"/>
-					</vbox>
+						<et2-password  id="smime_pkcs12_password" maxlength="128" autocomplete="off" placeholder="Password to unlock encrypted p12"></et2-password>
+					</et2-vbox>
 				</row>
 				<row disabled="!@hide_smime_upload">
-					<description value="Current certificate"/>
-					<hbox>
-						<buttononly id="smime_export_p12" label="export certificate as p12" onclick="app.admin.smime_exportCert" image="export"/>
-						<buttononly id="smime_delete_p12" label="Delete certificate" onclick="app.admin.change_account" image="delete"/>
-					</hbox>
+					<et2-description  value="Current certificate"></et2-description>
+					<et2-hbox>
+						<et2-button  id="smime_export_p12" label="export certificate as p12" onclick="app.admin.smime_exportCert" image="export" noSubmit="true"></et2-button>
+						<et2-button  id="smime_delete_p12" label="Delete certificate" onclick="app.admin.change_account" image="delete" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -315,64 +298,63 @@
 			</columns>
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
-					<hbox span="all">
-						<button id="button[save]"/>
-						<button id="button[apply]" />
-						<button statustext="Use wizard to detect or verify configuration" id="button[wizard]" image="magicwand"/>
-						<button id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this account','Delete')"/>
-						<button label="Delete identity" id="button[delete_identity]" onclick="et2_dialog.confirm(widget,'Delete identity','Delete')"  image="delete"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  id="button[save]"></et2-button>
+						<et2-button  id="button[apply]"></et2-button>
+						<et2-button-icon  statustext="Use wizard to detect or verify configuration" id="button[wizard]" image="magicwand"></et2-button-icon>
+						<et2-button  id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this account','Delete')"></et2-button>
+						<et2-button  label="Delete identity" id="button[delete_identity]" onclick="et2_dialog.confirm(widget,'Delete identity','Delete')" image="delete"></et2-button>
+					</et2-hbox>
 				</row>
 				<row disabled="!@accounts" class="dialogHeader">
-					<description for="acc_id" value="Mail account"/>
-					<menulist>
-						<menupopup id="acc_id" onchange="app.admin.change_account" class="et2_fullWidth"/>
-					</menulist>
-					<description/>
+					<et2-description  for="acc_id" value="Mail account"></et2-description>
+					<et2-select  id="acc_id" onchange="app.admin.change_account"></et2-select>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description for="acc_name" value="Name of account"/>
-					<hbox>
-						<textbox id="acc_name" needed="1" class="et2_fullWidth"/>
-						<description align="right" value="$cont[acc_id]" class="emailadmin_diagnostic"/>
-					</hbox>
+					<et2-description  for="acc_name" value="Name of account"></et2-description>
+					<et2-hbox>
+						<et2-textbox  id="acc_name" required="1"></et2-textbox>
+						<et2-description  align="right" value="$cont[acc_id]" class="emailadmin_diagnostic"></et2-description>
+					</et2-hbox>
 				</row>
 				<row class="emailadmin_no_user">
-					<description for="account_id" value="Valid for"/>
-					<hbox>
-						<menulist>
-							<menupopup type="select-account" id="account_id" onchange="app.admin.account_hide_not_applying" options="Everyone,both" width="96%"/>
-						</menulist>
-						<buttononly label="Select multiple" id="button[multiple]" onclick="app.admin.edit_multiple" options="users"/>
-					</hbox>
+					<et2-description  for="account_id" value="Valid for"></et2-description>
+					<et2-hbox>
+						<et2-select-account  id="account_id" onchange="app.admin.account_hide_not_applying" width="96%" emptyLabel="Everyone" accountType="both"></et2-select-account>
+						<et2-button  label="Select multiple" id="button[multiple]" onclick="app.admin.edit_multiple" image="users" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<description/>
-					<checkbox label="account editable by user" id="acc_user_editable"/>
+					<et2-description></et2-description>
+					<et2-checkbox  label="account editable by user" id="acc_user_editable"></et2-checkbox>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" width="100%" align_tabs="v">
-						<tabs>
-							<tab id="admin.mailaccount.identity" label="Identity+Signature" statustext="Identity&amp;Signature"/>
-							<tab id="admin.mailaccount.imap" label="IMAP" statustext="incoming mail"/>
-							<tab id="admin.mailaccount.folder" label="Folder" statustext="Folder"/>
-							<tab id="admin.mailaccount.sieve" label="Sieve" statustext="serverside filtering"/>
-							<tab id="admin.mailaccount.smtp" label="SMTP" statustext="outgoing mail"/>
-							<tab id="admin.mailaccount.aliases" label="Aliases+Forwards" statustext="Aliases, Forwarding, Quota, ..."/>
-							<tab id="admin.mailaccount.encryption" label="Encryption" statustext="Encryption settings"/>
-						</tabs>
-						<tabpanels>
+					<et2-vbox  id="tabs" span="all" width="100%">
+						<et2-details  id="admin.mailaccount.identity" summary="Identity+Signature" title="Identity&amp;Signature">
 							<template id="admin.mailaccount.identity"/>
+						</et2-details>
+						<et2-details  id="admin.mailaccount.imap" summary="IMAP" title="incoming mail">
 							<template id="admin.mailaccount.imap"/>
+						</et2-details>
+						<et2-details  id="admin.mailaccount.folder" summary="Folder" title="Folder">
 							<template id="admin.mailaccount.folder"/>
+						</et2-details>
+						<et2-details  id="admin.mailaccount.sieve" summary="Sieve" title="serverside filtering">
 							<template id="admin.mailaccount.sieve"/>
+						</et2-details>
+						<et2-details  id="admin.mailaccount.smtp" summary="SMTP" title="outgoing mail">
 							<template id="admin.mailaccount.smtp"/>
+						</et2-details>
+						<et2-details  id="admin.mailaccount.aliases" summary="Aliases+Forwards" title="Aliases, Forwarding, Quota, ...">
 							<template id="admin.mailaccount.aliases"/>
+						</et2-details>
+						<et2-details  id="admin.mailaccount.encryption" summary="Encryption" title="Encryption settings">
 							<template id="admin.mailaccount.encryption"/>
-						</tabpanels>
-					</tabbox>
+						</et2-details>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/mobile/mailwizard.folder.xet b/admin/templates/mobile/mailwizard.folder.xet
index ca05feb3a0..d253263f32 100644
--- a/admin/templates/mobile/mailwizard.folder.xet
+++ b/admin/templates/mobile/mailwizard.folder.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.mailwizard.folder" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,55 +9,45 @@
 			</columns>
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
-					<hbox span="all">
-						<button label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue" background_image="1"/>
-						<button label="Back" id="button[back]" image="back" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue"></et2-button>
+						<et2-button  label="Back" id="button[back]" image="back"></et2-button>
+					</et2-hbox>
 				</row>
 				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
-					<hbox span="all" width="100%">
-						<button label="Search" id="button[search]" image="search" background_image="1"/>
-						<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  label="Search" id="button[search]" image="search"></et2-button>
+						<et2-button  label="Cancel" id="button[cancelsearch]" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Step 2: Folder" span="all" class="emailadmin_header"/>
-					<description/>
+					<et2-description  value="Step 2: Folder" span="all" class="emailadmin_header"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description value="Sent folder" for="acc_folder_sent"/>
-					<menulist>
-						<menupopup id="acc_folder_sent" options="Select one ..." class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  value="Sent folder" for="acc_folder_sent"></et2-description>
+					<et2-select  id="acc_folder_sent" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description value="Trash folder" for="acc_folder_trash"/>
-					<menulist>
-						<menupopup id="acc_folder_trash" options="Select one ..." class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  value="Trash folder" for="acc_folder_trash"></et2-description>
+					<et2-select  id="acc_folder_trash" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description value="Drafts folder" for="acc_folder_draft"/>
-					<menulist>
-						<menupopup id="acc_folder_draft" options="Select one ..." class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  value="Drafts folder" for="acc_folder_draft"></et2-description>
+					<et2-select  id="acc_folder_draft" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description value="Templates folder" for="acc_folder_template"/>
-					<menulist>
-						<menupopup id="acc_folder_template" options="Select one ..." class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  value="Templates folder" for="acc_folder_template"></et2-description>
+					<et2-select  id="acc_folder_template" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<description value="Junk folder" for="acc_folder_junk"/>
-					<menulist>
-						<menupopup id="acc_folder_junk" options="Select one ..." class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  value="Junk folder" for="acc_folder_junk"></et2-description>
+					<et2-select  id="acc_folder_junk" emptyLabel="Select one ..."></et2-select>
 				</row>
 				<row>
-					<textbox multiline="true" id="folder_output" readonly="true" span="all"/>
+					<et2-textarea  id="folder_output" readonly="true" span="all"></et2-textarea>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/mobile/mailwizard.sieve.xet b/admin/templates/mobile/mailwizard.sieve.xet
index d1b980b7ca..885689babd 100644
--- a/admin/templates/mobile/mailwizard.sieve.xet
+++ b/admin/templates/mobile/mailwizard.sieve.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.mailwizard.sieve" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,49 +9,45 @@
 			</columns>
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
-					<hbox span="all">
-						<button label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue" background_image="1"/>
-						<button label="Back" id="button[back]" image="back" background_image="1"/>
-						<button label="Manual entry" id="button[manual]" onclick="app.admin.wizard_manual" image="manual" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue"></et2-button>
+						<et2-button  label="Back" id="button[back]" image="back"></et2-button>
+						<et2-button  label="Manual entry" id="button[manual]" onclick="app.admin.wizard_manual" image="manual"></et2-button>
+					</et2-hbox>
 				</row>
 				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
-					<hbox span="all" width="100%">
-						<button label="Search" id="button[search]" image="search" background_image="1"/>
-						<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  label="Search" id="button[search]" image="search"></et2-button>
+						<et2-button  label="Cancel" id="button[cancelsearch]" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Step 3: Sieve - server side mail filtering" span="all" class="emailadmin_header"/>
-					<description/>
+					<et2-description  value="Step 3: Sieve - server side mail filtering" span="all" class="emailadmin_header"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description value="Enable Sieve" for="acc_sieve_enabled"/>
-					<menulist>
-						<menupopup type="select-bool" id="acc_sieve_enabled" class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  value="Enable Sieve" for="acc_sieve_enabled"></et2-description>
+					<et2-select-bool  id="acc_sieve_enabled"></et2-select-bool>
 				</row>
 				<row class="@manual_class">
-					<description value="Sieve server" for="acc_sieve_host"/>
-					<textbox blur="Hostname or IP" id="acc_sieve_host" onchange="app.admin.wizard_sieve_onchange" maxlength="128" class="et2_fullWidth"/>
+					<et2-description  value="Sieve server" for="acc_sieve_host"></et2-description>
+					<et2-textbox  id="acc_sieve_host" onchange="app.admin.wizard_sieve_onchange" maxlength="128" placeholder="Hostname or IP"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description value="Secure connection" for="acc_sieve_ssl"/>
-					<hbox>
-						<menulist>
-							<menupopup id="acc_sieve_ssl" onchange="app.admin.wizard_sieve_ssl_onchange" class="emailadmin_ssl"/>
-						</menulist>
-						<textbox type="integer" label="Port" id="acc_sieve_port" onchange="app.admin.wizard_sieve_onchange" class="emailadmin_port"/>
-					</hbox>
+					<et2-description  value="Secure connection" for="acc_sieve_ssl"></et2-description>
+					<et2-hbox>
+						<et2-select  id="acc_sieve_ssl" onchange="app.admin.wizard_sieve_ssl_onchange" class="emailadmin_ssl"></et2-select>
+						<et2-number  label="Port" id="acc_sieve_port" onchange="app.admin.wizard_sieve_onchange" class="emailadmin_port" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row>
-					<image src="admin/progress" span="all" class="emailadmin_progress"/>
-					<description/>
+					<et2-image  src="admin/progress" span="all" class="emailadmin_progress"></et2-image>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<textbox multiline="true" id="sieve_output" readonly="true" span="all"/>
+					<et2-textarea  id="sieve_output" readonly="true" span="all"></et2-textarea>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/mobile/mailwizard.smtp.xet b/admin/templates/mobile/mailwizard.smtp.xet
index 2bb654b2da..5c7af839ef 100644
--- a/admin/templates/mobile/mailwizard.smtp.xet
+++ b/admin/templates/mobile/mailwizard.smtp.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.mailwizard.smtp" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,51 +9,49 @@
 			</columns>
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
-					<hbox span="all">
-						<button label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue" background_image="1"/>
-						<button label="Back" id="button[back]" image="back" background_image="1"/>
-						<button label="Manual entry" id="button[manual]" onclick="app.admin.wizard_manual" image="manual" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue"></et2-button>
+						<et2-button  label="Back" id="button[back]" image="back"></et2-button>
+						<et2-button  label="Manual entry" id="button[manual]" onclick="app.admin.wizard_manual" image="manual"></et2-button>
+					</et2-hbox>
 				</row>
 				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
-					<hbox span="all" width="100%">
-						<button label="Search" id="button[search]" image="search" background_image="1"/>
-						<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  label="Search" id="button[search]" image="search"></et2-button>
+						<et2-button  label="Cancel" id="button[cancelsearch]" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Step 4: SMTP - outgoing mail" span="all" class="emailadmin_header"/>
-					<description/>
+					<et2-description  value="Step 4: SMTP - outgoing mail" span="all" class="emailadmin_header"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row class="@manual_class">
-					<description value="Username" for="acc_smtp_username"/>
-					<textbox blur="if authentication required" id="acc_smtp_username" maxlength="128" autocomplete="off" class="et2_fullWidth"/>
+					<et2-description  value="Username" for="acc_smtp_username"></et2-description>
+					<et2-textbox  id="acc_smtp_username" maxlength="128" autocomplete="off" placeholder="if authentication required"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description value="Password" for="acc_smtp_password"/>
-					<passwd id="acc_smtp_password" maxlength="128" autocomplete="off" class="et2_fullWidth"/>
+					<et2-description  value="Password" for="acc_smtp_password"></et2-description>
+					<et2-password  id="acc_smtp_password" maxlength="128" autocomplete="off"></et2-password>
 				</row>
 				<row class="@manual_class">
-					<description value="SMTP server" for="acc_smtp_host"/>
-					<textbox blur="Hostname or IP" id="acc_smtp_host" maxlength="128" class="et2_fullWidth"/>
+					<et2-description  value="SMTP server" for="acc_smtp_host"></et2-description>
+					<et2-textbox  id="acc_smtp_host" maxlength="128" placeholder="Hostname or IP"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description value="Secure connection" for="acc_smtp_ssl"/>
-					<hbox>
-						<menulist>
-							<menupopup id="acc_smtp_ssl" onchange="app.admin.wizard_smtp_ssl_onchange" class="emailadmin_ssl"/>
-						</menulist>
-						<textbox type="integer" label="Port" id="acc_smtp_port" class="emailadmin_port"/>
-					</hbox>
+					<et2-description  value="Secure connection" for="acc_smtp_ssl"></et2-description>
+					<et2-hbox>
+						<et2-select  id="acc_smtp_ssl" onchange="app.admin.wizard_smtp_ssl_onchange" class="emailadmin_ssl"></et2-select>
+						<et2-number  label="Port" id="acc_smtp_port" class="emailadmin_port" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row>
-					<image src="admin/progress" span="all" class="emailadmin_progress"/>
-					<description/>
+					<et2-image  src="admin/progress" span="all" class="emailadmin_progress"></et2-image>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<textbox multiline="true" id="smtp_output" readonly="true" span="all"/>
+					<et2-textarea  id="smtp_output" readonly="true" span="all"></et2-textarea>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/mobile/mailwizard.xet b/admin/templates/mobile/mailwizard.xet
index 5fbe9fe0ec..071b17975e 100644
--- a/admin/templates/mobile/mailwizard.xet
+++ b/admin/templates/mobile/mailwizard.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.mailwizard" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,55 +9,53 @@
 			</columns>
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
-					<hbox span="all">
-						<button label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue" background_image="1"/>
-						<button label="Manual entry" id="button[manual]" onclick="app.admin.wizard_manual" image="edit" background_image="1"/>
-						<button label="Skip IMAP" id="button[skip_imap]" class="@manual_class" novalidate="1" image="bullet" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue"></et2-button>
+						<et2-button  label="Manual entry" id="button[manual]" onclick="app.admin.wizard_manual" image="edit"></et2-button>
+						<et2-button  label="Skip IMAP" id="button[skip_imap]" class="@manual_class" novalidate="1" image="bullet"></et2-button>
+					</et2-hbox>
 				</row>
 				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
-					<hbox span="all" width="100%">
-						<button label="Search" id="button[search]" image="search" background_image="1"/>
-						<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  label="Search" id="button[search]" image="search"></et2-button>
+						<et2-button  label="Cancel" id="button[cancelsearch]" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Step 1: IMAP - incoming mail" span="all" class="emailadmin_header"/>
-					<description/>
+					<et2-description  value="Step 1: IMAP - incoming mail" span="all" class="emailadmin_header"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description value="EMail address"/>
-					<url-email id="ident_email" needed="1"  maxlength="128" autocomplete="off" class="et2_fullWidth"/>
+					<et2-description  value="EMail address"></et2-description>
+					<et2-url-email  id="ident_email" maxlength="128" autocomplete="off" required="1"></et2-url-email>
 				</row>
 				<row class="@manual_class">
-					<description value="Username" for="acc_imap_username"/>
-					<textbox blur="if different from EMail address" id="acc_imap_username" maxlength="128" autocomplete="off" class="et2_fullWidth"/>
+					<et2-description  value="Username" for="acc_imap_username"></et2-description>
+					<et2-textbox  id="acc_imap_username" maxlength="128" autocomplete="off" placeholder="if different from EMail address"></et2-textbox>
 				</row>
 				<row>
-					<description value="Password" for="acc_imap_password"/>
-					<passwd id="acc_imap_password" needed="1"  maxlength="128" autocomplete="off" class="et2_fullWidth"/>
+					<et2-description  value="Password" for="acc_imap_password"></et2-description>
+					<et2-password  id="acc_imap_password" maxlength="128" autocomplete="off" required="1"></et2-password>
 				</row>
 				<row class="@manual_class">
-					<description value="IMAP server" for="acc_imap_host"/>
-					<textbox blur="Hostname or IP" id="acc_imap_host" maxlength="128" class="et2_fullWidth"/>
+					<et2-description  value="IMAP server" for="acc_imap_host"></et2-description>
+					<et2-textbox  id="acc_imap_host" maxlength="128" placeholder="Hostname or IP"></et2-textbox>
 				</row>
 				<row class="@manual_class">
-					<description value="Secure connection" for="acc_imap_ssl"/>
-					<hbox>
-						<menulist>
-							<menupopup id="acc_imap_ssl" onchange="app.admin.wizard_imap_ssl_onchange" class="emailadmin_ssl"/>
-						</menulist>
-						<textbox type="integer" label="Port" id="acc_imap_port" class="emailadmin_port"/>
-					</hbox>
+					<et2-description  value="Secure connection" for="acc_imap_ssl"></et2-description>
+					<et2-hbox>
+						<et2-select  id="acc_imap_ssl" onchange="app.admin.wizard_imap_ssl_onchange" class="emailadmin_ssl"></et2-select>
+						<et2-number  label="Port" id="acc_imap_port" class="emailadmin_port" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row>
-					<image src="admin/progress" span="all" class="emailadmin_progress"/>
-					<description/>
+					<et2-image  src="admin/progress" span="all" class="emailadmin_progress"></et2-image>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<textbox multiline="true" id="output" readonly="true" span="all"/>
+					<et2-textarea  id="output" readonly="true" span="all"></et2-textarea>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/admin/templates/mobile/site-config.xet b/admin/templates/mobile/site-config.xet
index 434e311450..5b37efabef 100644
--- a/admin/templates/mobile/site-config.xet
+++ b/admin/templates/mobile/site-config.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.site-config" template="" lang="" group="0" version="16.1">
 		<grid border="1" width="100%">
@@ -10,10 +9,10 @@
 			</columns>
 			<rows>
 				<row class="dialogHeadbar" >
-					<hbox span="all" width="100%">
-						<button id="save"/>
-						<button id="cancel" />
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  id="save"></et2-button>
+						<et2-button  id="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
 					<template template="@template" width="100%"/>
@@ -21,4 +20,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/about.index.xet b/api/templates/default/about.index.xet
index e6e8d633fc..1809adf261 100644
--- a/api/templates/default/about.index.xet
+++ b/api/templates/default/about.index.xet
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!-- $Id$ -->
 <overlay>
 	<template id="api.about.index.general" template="" lang="" group="0" version="1.8.001">
 		<grid width="600" height="100%" spacing="5" overflow="auto">
@@ -8,7 +7,7 @@
 			</columns>
 			<rows>
 				<row>
-					<image src="logo"/>
+					<et2-image  src="logo"></et2-image>
 				</row>
 				<row>
 					<html id="apiVersion"/>
@@ -43,20 +42,20 @@
 						</columns>
 						<rows>
 							<row class="th">
-								<description id="applications"/>
-								<description value="name"/>
-								<description value="author"/>
-								<description value="maintainer"/>
-								<description value="version"/>
-								<description value="license"/>
+								<et2-description  id="applications"></et2-description>
+								<et2-description  value="name"></et2-description>
+								<et2-description  value="author"></et2-description>
+								<et2-description  value="maintainer"></et2-description>
+								<et2-description  value="version"></et2-description>
+								<et2-description  value="license"></et2-description>
 							</row>
 							<row class="row" valign="top">
-								<appicon align="center" src="$row_cont[app]" id="${row}[app]"/>
-								<description id="${row}[title]"/>
+								<et2-appicon  align="center" src="$row_cont[app]" id="${row}[app]"></et2-appicon>
+								<et2-description  id="${row}[title]"></et2-description>
 								<html id="${row}[author]" no_lang="1"/>
 								<html id="${row}[maintainer]" no_lang="1"/>
-								<description id="${row}[version]" no_lang="1"/>
-								<description id="${row}[license]" statustext="$row_cont[license_title]" href="$row_cont[license_url]" extra_link_target="_blank" no_lang="1"/>
+								<et2-description  id="${row}[version]" noLang="1"></et2-description>
+								<et2-description  id="${row}[license]" statustext="$row_cont[license_title]" href="$row_cont[license_url]" extraLinkTarget="_blank" noLang="1"></et2-description>
 							</row>
 						</rows>
 					</grid>
@@ -71,13 +70,13 @@
 			</columns>
 			<rows>
 				<row>
-					<textbox multiline="true" id="changelog" readonly="true"/>
+					<et2-textarea  id="changelog" readonly="true"></et2-textarea>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="api.about.index" template="" lang="" group="0" version="1.8.001">
-		<tabbox id="general|applications|templates|languages|changelog">
+		<et2-tabbox  id="general|applications|templates|languages|changelog">
 			<tabs>
 				<tab id="changelog" label="Changelog"/>
 				<tab id="general" label="About EGroupware"/>
@@ -88,6 +87,6 @@
 				<template id="api.about.index.general"/>
 				<template id="api.about.index.applications"/>
 			</tabpanels>
-		</tabbox>
+		</et2-tabbox>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/api/templates/default/add_favorite.xet b/api/templates/default/add_favorite.xet
index e170f62554..7b71bdad5c 100644
--- a/api/templates/default/add_favorite.xet
+++ b/api/templates/default/add_favorite.xet
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
     <template id="nm_print_dialog" template="" lang="" group="0" version="22.1">
-        <vbox>
-            <et2-textbox id="name" label="Name" class="et2-label-fixed"/>
-            <et2-select-account id="group" label="Groups" empty_label="Just me" account_type="groups"
-                                class="et2-label-fixed"/>
-            <et2-details summary="Details">
+        <et2-vbox>
+            <et2-textbox  id="name" label="Name" class="et2-label-fixed"/>
+            <et2-select-account  id="group" label="Groups" class="et2-label-fixed" emptyLabel="Just me" accountType="groups"/>
+            <et2-details  summary="Details">
                 <grid id="current_filters">
                     <columns>
                         <column/>
@@ -15,12 +13,12 @@
                     </columns>
                     <rows>
                         <row>
-                            <et2-description id="${row}[label]"/>
-                            <et2-description id="${row}[value]"/>
+                            <et2-description  id="${row}[label]"/>
+                            <et2-description  id="${row}[value]"/>
                         </row>
                     </rows>
                 </grid>
             </et2-details>
-        </vbox>
+        </et2-vbox>
     </template>
 </overlay>
\ No newline at end of file
diff --git a/api/templates/default/audio_player.xet b/api/templates/default/audio_player.xet
index 8bdadc9704..e9e3eb3fdf 100644
--- a/api/templates/default/audio_player.xet
+++ b/api/templates/default/audio_player.xet
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="etemplate.audio_player" template="" lang="" group="0" version="16.2">
-		<vbox>
+		<et2-vbox>
 			<audio src="@src" autoplay="true"/>
-		</vbox>
+		</et2-vbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/avatar_edit.xet b/api/templates/default/avatar_edit.xet
index 6a57fb9601..7c42e104ae 100644
--- a/api/templates/default/avatar_edit.xet
+++ b/api/templates/default/avatar_edit.xet
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="etemplate.avatar_edit" template="" lang="" group="0" version="16.2">
-		<vbox>
-			<avatar crop="true" id="cropper_image" contactId="$cont[contact_id]" src="$cont[src]" size="8em" shape="square"/>
-			<hbox>
-				<buttononly id="rotate_reset" label="Reset"  image="recur" background_image="1"/>
-				<buttononly id="rotate_l" label="Rotate Left"  image="rotate_l" background_image="1"/>
-				<buttononly id="rotate_r" label= "Rotate Right" image="reload" background_image="1"/>
-				<hbox>
-					<file id='upload_photo' label="upload new photo" onFinishOne="Et2Avatar.uploadAvatar_onFinish"/>
-				</hbox>
-			</hbox>
-		</vbox>
+		<et2-vbox>
+			<et2-avatar  crop="true" id="cropper_image" contactId="$cont[contact_id]" src="$cont[src]" size="8em" shape="square"></et2-avatar>
+			<et2-hbox>
+				<et2-button  id="rotate_reset" label="Reset" image="recur" noSubmit="true"></et2-button>
+				<et2-button  id="rotate_l" label="Rotate Left" image="rotate_l" noSubmit="true"></et2-button>
+				<et2-button  id="rotate_r" image="reload" noSubmit="true"></et2-button>
+				<et2-hbox>
+					<file id="upload_photo" label="upload new photo" onFinishOne="Et2Avatar.uploadAvatar_onFinish"/>
+				</et2-hbox>
+			</et2-hbox>
+		</et2-vbox>
 		<styles>
 			#_cropper_image {
 				display: inline-flex;
@@ -21,4 +20,4 @@
 			}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/dtd.xet b/api/templates/default/dtd.xet
index 063c6ecb2c..7fba2ed76c 100644
--- a/api/templates/default/dtd.xet
+++ b/api/templates/default/dtd.xet
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="etemplate.dtd" template="" lang="" group="0" version="1.9.001">
-		<vbox>
-			<label id="message"/>
-			<textbox multiline="true" id="value" rows="20" class="dtdContent"/>
-		</vbox>
+		<et2-vbox>
+			<et2-label  id="message"></et2-label>
+			<et2-textarea  id="value" rows="20" class="dtdContent"></et2-textarea>
+		</et2-vbox>
 		<styles>
 			.dtdContent {
 				width: 550px;
@@ -15,4 +14,4 @@
 			}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/insert_merge_placeholder.xet b/api/templates/default/insert_merge_placeholder.xet
index 30155344af..605965b113 100644
--- a/api/templates/default/insert_merge_placeholder.xet
+++ b/api/templates/default/insert_merge_placeholder.xet
@@ -1,32 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
     <template id="etemplate.insert_merge_placeholder" template="" lang="" group="0" version="21.1.001">
-        <vbox id="outer_box">
-            <hbox id="selects">
-                <vbox>
-                    <select id="app"/>
-                    <select id="group"/>
+        <et2-vbox  id="outer_box">
+            <et2-hbox  id="selects">
+                <et2-vbox>
+                    <et2-select  id="app"></et2-select>
+                    <et2-select  id="group"></et2-select>
 
-                </vbox>
-                <et2-listbox id="placeholder_list" rows="10"/>
-            </hbox>
-            <hbox class="preview">
-                <description id="preview_placeholder"/>
-                <button background_image="true" id="insert_placeholder" label="Insert" statustext="Insert placeholder"
-                        align="right" image="export"></button>
-            </hbox>
+                </et2-vbox>
+                <et2-listbox  id="placeholder_list" rows="10"/>
+            </et2-hbox>
+            <et2-hbox  class="preview">
+                <et2-description  id="preview_placeholder"></et2-description>
+                <et2-button  id="insert_placeholder" label="Insert" statustext="Insert placeholder" align="right" image="export"></et2-button>
+            </et2-hbox>
             <hrule/>
-            <link-entry id="entry" label="Preview with entry"/>
-            <hbox class="preview">
-                <description id="preview_content"/>
-                <buttononly background_image="true" id="insert_content" label="Insert"
-                            statustext="Insert merged content"
-                            align="right"
-                            image="export"></buttononly>
-            </hbox>
-        </vbox>
+            <et2-link-entry  id="entry" label="Preview with entry"></et2-link-entry>
+            <et2-hbox  class="preview">
+                <et2-description  id="preview_content"></et2-description>
+                <et2-button  id="insert_content" label="Insert" statustext="Insert merged content" align="right" image="export" noSubmit="true"></et2-button>
+            </et2-hbox>
+        </et2-vbox>
         <styles>
             /** Structural stuff **/
             #insert_merge_placeholder #_outer_box > #api\.insert_merge_placeholder_selects {
@@ -91,4 +86,4 @@
             }
         </styles>
     </template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/long_task.xet b/api/templates/default/long_task.xet
index 7fdaa3ae42..6c37182c6d 100644
--- a/api/templates/default/long_task.xet
+++ b/api/templates/default/long_task.xet
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="etemplate.long_task" template="" lang="" group="0" version="1.9.001">
-		<hbox class="long_task">
-			<image class="dialog_icon"/>
-			<vbox class="ui-dialog-content">
-				<label id="message"/>
+		<et2-hbox  class="long_task">
+			<et2-image  class="dialog_icon"></et2-image>
+			<et2-vbox  class="ui-dialog-content">
+				<et2-label  id="message"></et2-label>
 				<progress id="progressbar"/>
-				<label id="totals"/>
-				<vbox class="log" id="log"/>
-			</vbox>
-		</hbox>
+				<et2-label  id="totals"></et2-label>
+				<et2-vbox  class="log" id="log"></et2-vbox>
+			</et2-vbox>
+		</et2-hbox>
 		<styles>
 			.long_task .ui-dialog-content {
 				width: 90%;
@@ -26,4 +25,4 @@
 			}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/nm_column_selection.xet b/api/templates/default/nm_column_selection.xet
index 413aab1416..173acc08b1 100644
--- a/api/templates/default/nm_column_selection.xet
+++ b/api/templates/default/nm_column_selection.xet
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
     <template id="nm_column_selection" template="" lang="" group="0" version="16.1">
-        <et2-nextmatch-columnselection id="columns"></et2-nextmatch-columnselection>
-        <hbox>
-            <et2-select id="autoRefresh" emptyLabel="Refresh" statustext="Automatically refresh list">
+        <et2-nextmatch-columnselection  id="columns"></et2-nextmatch-columnselection>
+        <et2-hbox>
+            <et2-select  id="autoRefresh" emptyLabel="Refresh" statustext="Automatically refresh list">
                 <option value="30">30 seconds</option>
                 <option value="180">3 Minutes</option>
                 <option value="300">5 Minutes</option>
                 <option value="900">15 Minutes</option>
                 <option value="1800">30 Minutes</option>
             </et2-select>
-            <et2-select id="default_preference" emptyLabel="Preference">
+            <et2-select  id="default_preference" emptyLabel="Preference">
                 <option value="default" title="Set these columns as the default">Default</option>,
                 <option value="reset" title="Reset all user's column preferences">Reset</option>,
                 <option value="force" title="Force column preference so users cannot change it">Force</option>
             </et2-select>
-        </hbox>
+        </et2-hbox>
     </template>
 </overlay>
\ No newline at end of file
diff --git a/api/templates/default/nm_print_dialog.xet b/api/templates/default/nm_print_dialog.xet
index fe541f5c2c..29ca5c255e 100644
--- a/api/templates/default/nm_print_dialog.xet
+++ b/api/templates/default/nm_print_dialog.xet
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="nm_print_dialog" template="" lang="" group="0" version="16.1">
-		<vbox>
-			<description value="Columns to print"/>
-            <et2-nextmatch-columnselection id="columns"></et2-nextmatch-columnselection>
-			<integer id="row_count" label="How many rows to print"/>
-			<checkbox id="orientation" toggle_on="Portrait" toggle_off="Landscape" selected_value="portrait" unselected_value="landscape"/>
-		</vbox>
+		<et2-vbox>
+			<et2-description  value="Columns to print"></et2-description>
+            <et2-nextmatch-columnselection  id="columns"></et2-nextmatch-columnselection>
+			<et2-number  id="row_count" label="How many rows to print" precision="0"></et2-number>
+			<et2-checkbox  id="orientation" toggleOn="Portrait" toggleOff="Landscape" selectedValue="portrait" unselectedValue="landscape"></et2-checkbox>
+		</et2-vbox>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/api/templates/default/password.xet b/api/templates/default/password.xet
index f9c030ab22..ce7d13661d 100644
--- a/api/templates/default/password.xet
+++ b/api/templates/default/password.xet
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="etemplate.password" template="" lang="" group="0" version="16.1">
-		<vbox  width="400px" class="ui-dialog-content">
-			<label class="et2_fullWidth" id="message"/>
-			<vbox>
-				<hbox>
-					<image src="password" class="dialog_icon"/>
-					<passwd id="value" blur="enter your passphrase"/>
-				</hbox>
-				<hbox>
-					<textbox id="pass_exp" type="integer" label="Remeber this password for" blur="10" min="1" max="60"/>
-				</hbox>
-			</vbox>
-		</vbox>
+		<et2-vbox  width="400px" class="ui-dialog-content">
+			<et2-label  id="message"></et2-label>
+			<et2-vbox>
+				<et2-hbox>
+					<et2-image  src="password" class="dialog_icon"></et2-image>
+					<et2-password  id="value" placeholder="enter your passphrase"></et2-password>
+				</et2-hbox>
+				<et2-hbox>
+					<et2-textbox  id="pass_exp" type="integer" label="Remeber this password for" min="1" max="60" placeholder="10"></et2-textbox>
+				</et2-hbox>
+			</et2-vbox>
+		</et2-vbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/pgp_backup_restore.xet b/api/templates/default/pgp_backup_restore.xet
index e79940a609..4f1eec0e50 100644
--- a/api/templates/default/pgp_backup_restore.xet
+++ b/api/templates/default/pgp_backup_restore.xet
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="etemplate.pgp_backup_restore" template="" lang="" group="" version="15.1">
-		<hbox width="700" height="300">
+		<et2-hbox  width="700" height="300">
 			<grid id="menu" class="egwGridView_grid " width="200px">
 				<columns>
 					<column/>
@@ -10,16 +10,16 @@
 				</columns>
 				<rows>
 					<row class="th" part="header">
-						<description align="center" value="Menu"/>
+						<et2-description  align="center" value="Menu"></et2-description>
 					</row>
 					<row>
-						<image src="$row_cont[image]"/>
-						<description value= "$row_cont[label]" onclick="$row_cont[onclick]" class="click"/>
+						<et2-image  src="$row_cont[image]"></et2-image>
+						<et2-description  onclick="$row_cont[onclick]" class="click"></et2-description>
 					</row>
 				</rows>
 			</grid>
-			<hbox id="mvelo" width="500px" height="300" class="mveloFrame"/>
-		</hbox>
+			<et2-hbox  id="mvelo" width="500px" height="300" class="mveloFrame"></et2-hbox>
+		</et2-hbox>
 		<styles>
 			#_mvelo.mveloFrame {
 				border:1px solid silver;
@@ -44,4 +44,4 @@
 			}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/pgp_installation.xet b/api/templates/default/pgp_installation.xet
index 43bded5f5c..3af08a1f1f 100644
--- a/api/templates/default/pgp_installation.xet
+++ b/api/templates/default/pgp_installation.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="etemplate.pgp_installation" template="" lang="" group="" version="15.1">
 		<grid height="300" width="450">
@@ -8,13 +8,13 @@
 			</columns>
 			<rows>
 				<row part="header">
-					<description value="You need to install Mailvelope plugin available for Chrome and Firefox from www.mailvelope.com or by clicking on install button."/>
+					<et2-description  value="You need to install Mailvelope plugin available for Chrome and Firefox from www.mailvelope.com or by clicking on install button."></et2-description>
 				</row>
 				<row>
-					<description value="$row_cont[domain]"/>
+					<et2-description  value="$row_cont[domain]"></et2-description>
 				</row>
 				<row>
-					<description value="Before proceeding further, we do highly recommend you to watch this short video, to see how mailvelope plugin works with EGroupware."/>
+					<et2-description  value="Before proceeding further, we do highly recommend you to watch this short video, to see how mailvelope plugin works with EGroupware."></et2-description>
 				</row>
 				<row>
 					<video video_src="https://www.egroupware.org/videos/pgp/mailvelope_only_EN.mp4" controls="true" height="260" width="60%"/>
@@ -28,4 +28,4 @@
 			}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/placeholder_snippet.xet b/api/templates/default/placeholder_snippet.xet
index 12f52411b0..2ab89f67f6 100644
--- a/api/templates/default/placeholder_snippet.xet
+++ b/api/templates/default/placeholder_snippet.xet
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
     <template id="etemplate.placeholder_snippet" template="" lang="" group="0" version="21.1.001">
-        <vbox id="outer_box">
-            <vbox id="selects">
-                <select id="app"/>
-                <et2-listbox id="placeholder_list" rows="10"/>
-            </vbox>
+        <et2-vbox  id="outer_box">
+            <et2-vbox  id="selects">
+                <et2-select  id="app"></et2-select>
+                <et2-listbox  id="placeholder_list" rows="10"/>
+            </et2-vbox>
             <hrule/>
-            <link-entry id="entry" label="Select entry" only_app="addressbook"/>
-            <hbox class="preview">
-                <description id="preview_content"/>
-            </hbox>
-        </vbox>
+            <et2-link-entry  id="entry" label="Select entry" onlyApp="addressbook"></et2-link-entry>
+            <et2-hbox  class="preview">
+                <et2-description  id="preview_content"></et2-description>
+            </et2-hbox>
+        </et2-vbox>
         <styles>
             #placeholder_snippet {
             min-width: 500px;
@@ -41,4 +40,4 @@
             }
         </styles>
     </template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/prompt.xet b/api/templates/default/prompt.xet
index ae6d6f350e..44aa1da6cd 100644
--- a/api/templates/default/prompt.xet
+++ b/api/templates/default/prompt.xet
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="api.prompt" template="" lang="" group="0" version="1.9.001">
-		<hbox class="et2_prompt">
-			<image src="dialog_help" class="dialog_icon"/>
-			<vbox class="ui-dialog-content">
-				<label id="message"/>
-				<textbox id="value" width="90%"/>
-			</vbox>
-		</hbox>
+		<et2-hbox  class="et2_prompt">
+			<et2-image  src="dialog_help" class="dialog_icon"></et2-image>
+			<et2-vbox  class="ui-dialog-content">
+				<et2-label  id="message"></et2-label>
+				<et2-textbox  id="value" width="90%"></et2-textbox>
+			</et2-vbox>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/promptOpenedDialog.xet b/api/templates/default/promptOpenedDialog.xet
index 2875c73b50..7b86867576 100644
--- a/api/templates/default/promptOpenedDialog.xet
+++ b/api/templates/default/promptOpenedDialog.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="api.promptOpenedDialog" template="" lang="" group="0" version="17.1">
 		<grid id="grid">
@@ -12,10 +11,10 @@
 			<rows>
 				<row>
 					<radio id="index" set_value="$row_cont[index]"/>
-					<description/>
-					<description id="${row}[label]"/>
+					<et2-description></et2-description>
+					<et2-description  id="${row}[label]"></et2-description>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/show_replacements.xet b/api/templates/default/show_replacements.xet
index f5568fc1f0..8321146385 100644
--- a/api/templates/default/show_replacements.xet
+++ b/api/templates/default/show_replacements.xet
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay legacy="true">
     <template id="api.show_replacements.placeholder_list">
-        <description id="title" class="title"/>
+        <et2-description  id="title" class="title"></et2-description>
         <grid id="placeholders" width="100%">
             <columns>
                 <column width="30%"/>
@@ -11,28 +10,28 @@
             </columns>
             <rows>
                 <row>
-                    <description id="${row}[value]"/>
-                    <description id="${row}[label]"/>
+                    <et2-description  id="${row}[value]"></et2-description>
+                    <et2-description  id="${row}[label]"></et2-description>
                 </row>
             </rows>
         </grid>
     </template>
     <template id="api.show_replacements" template="" lang="" group="0" version="21.1.001">
         <vbox>
-            <description value="Placeholders" class="group title"/>
+            <et2-description  value="Placeholders" class="group title"></et2-description>
             <old-box id="placeholders">
                 <box id="${row}">
                     <template template="api.show_replacements.placeholder_list"/>
                 </box>
             </old-box>
             <template template="@extra_template"/>
-            <description value="Common" class="group title"/>
+            <et2-description  value="Common" class="group title"></et2-description>
             <old-box id="common">
                 <box id="${row}">
                     <template template="api.show_replacements.placeholder_list"/>
                 </box>
             </old-box>
-            <description value="Current user" class="group title"/>
+            <et2-description  value="Current user" class="group title"></et2-description>
             <old-box id="user">
                 <box id="${row}">
                     <template template="api.show_replacements.placeholder_list"/>
@@ -69,4 +68,4 @@
             }
         </styles>
     </template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/toolbarAdminSettings.xet b/api/templates/default/toolbarAdminSettings.xet
index de794ffc05..cbecdb1d46 100644
--- a/api/templates/default/toolbarAdminSettings.xet
+++ b/api/templates/default/toolbarAdminSettings.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="api.toolbarAdminSettings" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,14 +9,12 @@
 			</columns>
 			<rows>
                 <row>
-                    <description value="default visible actions" label="%s:"/>
-                    <taglist id="actions" editModeEnabled="false" allowFreeEntries="false" autocomplete_url=' '
-                             class="et2_fullWidth"/>
+                    <et2-description  value="default visible actions" label="%s:"></et2-description>
+                    <et2-select  id="actions" editModeEnabled="false" allowFreeEntries="false" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_search"></et2-select>
                 </row>
                 <row>
-                    <description value="reset all to default" label="%s:"/>
-                    <checkbox id="reset"
-                              statustext="This will reset toolbar preferences for all users and set them to configured default prefs."/>
+                    <et2-description  value="reset all to default" label="%s:"></et2-description>
+                    <et2-checkbox  id="reset" statustext="This will reset toolbar preferences for all users and set them to configured default prefs."></et2-checkbox>
                 </row>
             </rows>
         </grid>
@@ -28,4 +25,4 @@
             }
         </styles>
     </template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/default/vfsSelectUI.xet b/api/templates/default/vfsSelectUI.xet
index 486db9d446..af23269be0 100644
--- a/api/templates/default/vfsSelectUI.xet
+++ b/api/templates/default/vfsSelectUI.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="api.vfsSelectUI" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%" class="vfs-select-container" resize_ratio="0">
@@ -9,24 +8,24 @@
 			</columns>
 			<rows >
 				<row class="et2_toolbar" disabled="@mode=/(open-multiple|select-dir)/">
-					<textbox id="name" class="et2_fullWidth" blur="enter your file name"/>
+					<et2-textbox  id="name" placeholder="enter your file name"></et2-textbox>
 				</row>
 				<row class="nextmatch_header_row">
-					<vbox>
-						<box class="et2_toolbar">
-							<buttononly statustext="Go to your home directory" id="home" onclick="app.vfsSelectUI.do_action('home', widget)" image="filemanager/gohome" background_image="1"/>
-							<buttononly statustext="Up" id="up" onclick="app.vfsSelectUI.change_dir('..', widget);" image="filemanager/goup" background_image="1"/>
-							<buttononly statustext="Favorites" id="favorites" onclick="app.vfsSelectUI.change_dir('/apps/favorites', widget);" image="filemanager/fav_filter" background_image="1"/>
-							<select width="175" id="app" empty_label="Applications" no_lang="1" onchange="app.vfsSelectUI.do_action('app', widget)"/>
-							<buttononly statustext="Create directory" id="createdir" class="createDir" onclick="app.vfsSelectUI.createdir" image="filemanager/button_createdir" ro_image="filemanager/createdir_disabled" background_image="1"/>
-							<file id='upload_file' statustext="upload file" progress_dropdownlist = "true" multiple="true" onFinish="app.vfsSelectUI.storeFile"/>
-							<searchbox id="search" onchange="app.vfsSelectUI.search"/>
-						</box>
+					<et2-vbox>
+						<et2-box  class="et2_toolbar">
+							<et2-button  statustext="Go to your home directory" id="home" onclick="app.vfsSelectUI.do_action('home', widget)" image="filemanager/gohome" noSubmit="true"></et2-button>
+							<et2-button  statustext="Up" id="up" onclick="app.vfsSelectUI.change_dir('..', widget);" image="filemanager/goup" noSubmit="true"></et2-button>
+							<et2-button  statustext="Favorites" id="favorites" onclick="app.vfsSelectUI.change_dir('/apps/favorites', widget);" image="filemanager/fav_filter" noSubmit="true"></et2-button>
+							<et2-select  width="175" id="app" onchange="app.vfsSelectUI.do_action('app', widget)" emptyLabel="Applications" noLang="1"></et2-select>
+							<et2-button  statustext="Create directory" id="createdir" class="createDir" onclick="app.vfsSelectUI.createdir" image="filemanager/button_createdir" noSubmit="true" roImage="filemanager/createdir_disabled"></et2-button>
+							<file id="upload_file" statustext="upload file" progress_dropdownlist = "true" multiple="true" onFinish="app.vfsSelectUI.storeFile"/>
+							<et2-searchbox  id="search" onchange="app.vfsSelectUI.search"></et2-searchbox>
+						</et2-box>
 						<vfs-path id="path" class="et2_fullWidth selectPath" align="left" onchange="app.vfsSelectUI.do_action('path', widget)" width="99.2%"/>
-					</vbox>
+					</et2-vbox>
 				</row>
 				<row>
-					<hbox class="selectFiles">
+					<et2-hbox  class="selectFiles">
 						<grid width="100%" id="dir">
 							<columns>
 								<column width="20"/>
@@ -35,16 +34,16 @@
 							</columns>
 							<rows>
 								<row class="row">
-									<vfs-mime align="center" id="$row" width="16px" class="selectIcon"/>
+									<et2-vfs-mime  align="center" id="$row" width="16px" class="selectIcon"></et2-vfs-mime>
 									<vfs id="$row" onclick="app.vfsSelectUI.select_clicked"/>
-									<checkbox align="right" id="selected[]" selected_value="$row_cont[name]"/>
+									<et2-checkbox  align="right" id="selected[]" selectedValue="$row_cont[name]"></et2-checkbox>
 								</row>
 							</rows>
 						</grid>
-					</hbox>
+					</et2-hbox>
 				</row>
 				<row disabled="!@showmime">
-					<select id="mime" onchange="app.vfsSelectUI.do_action('mime', widget)" empty_label="All files" class="et2_fullWidth"/>
+					<et2-select  id="mime" onchange="app.vfsSelectUI.do_action('mime', widget)" emptyLabel="All files"></et2-select>
 				</row>
 			</rows>
 		</grid>
diff --git a/api/templates/test/date_test.xet b/api/templates/test/date_test.xet
index 674470f9e2..61905d30ff 100644
--- a/api/templates/test/date_test.xet
+++ b/api/templates/test/date_test.xet
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- This template is used in automated testing -->
 <overlay>
 	<template id="api.date_test" template="" lang="" group="0" version="16.1">
-		<date id="date"/>
-		<date-time id="date_time"/>
-		<date-timeonly id="date_timeonly"/>
+		<et2-date  id="date"></et2-date>
+		<et2-date-time  id="date_time"></et2-date-time>
+		<et2-date-timeonly  id="date_timeonly"></et2-date-timeonly>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/api/templates/test/email_test.xet b/api/templates/test/email_test.xet
index b69d9860ba..a0f991c208 100644
--- a/api/templates/test/email_test.xet
+++ b/api/templates/test/email_test.xet
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- This template is used in automated testing -->
 <overlay>
 	<template id="api.email_test" template="test" lang="" group="0" version="16.1">
-		<url-email id="widget"/>
+		<et2-url-email  id="widget"></et2-url-email>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/api/templates/test/entry_test.xet b/api/templates/test/entry_test.xet
index c52bf96db3..6e665316e7 100644
--- a/api/templates/test/entry_test.xet
+++ b/api/templates/test/entry_test.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!--
 This template is used in automated testing
 
diff --git a/api/templates/test/entry_test_contact.xet b/api/templates/test/entry_test_contact.xet
index d4967324cb..c72e326c1d 100644
--- a/api/templates/test/entry_test_contact.xet
+++ b/api/templates/test/entry_test_contact.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!--
 This template is used in automated testing
 
diff --git a/api/templates/test/float_test.xet b/api/templates/test/float_test.xet
index f28b0936bd..5de96efee1 100644
--- a/api/templates/test/float_test.xet
+++ b/api/templates/test/float_test.xet
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- This template is used in automated testing -->
 <overlay>
 	<template id="api.float_test" template="" lang="" group="0" version="16.1">
-		<float id="widget"/>
+		<et2-number  id="widget"></et2-number>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/api/templates/test/integer_test.xet b/api/templates/test/integer_test.xet
index feaa37e4a2..5a33d3c62a 100644
--- a/api/templates/test/integer_test.xet
+++ b/api/templates/test/integer_test.xet
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- This template is used in automated testing -->
 <overlay>
 	<template id="api.integer_test" template="" lang="" group="0" version="16.1">
-		<integer id="widget"/>
-		<integer id="widget_readonly" readonly="true"/>
+		<et2-number  id="widget" precision="0"></et2-number>
+		<et2-number  id="widget_readonly" readonly="true" precision="0"></et2-number>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/api/templates/test/nested.xet b/api/templates/test/nested.xet
index 93b38722b2..e4d40ea763 100644
--- a/api/templates/test/nested.xet
+++ b/api/templates/test/nested.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- This template is used in automated testing -->
 <overlay>
 	<template id="api.nested.sub_template" template="" lang="" group="0" version="16.1">
@@ -9,4 +9,4 @@
 		<widget id="only_child"/>
 		<template id="api.nested.sub_template"/>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/api/templates/test/select_test.xet b/api/templates/test/select_test.xet
index ced5fe3113..0344183d7e 100644
--- a/api/templates/test/select_test.xet
+++ b/api/templates/test/select_test.xet
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- This template is used in automated testing -->
 <overlay>
 	<template id="api.select_test" template="" lang="" group="0" version="16.1">
-		<select id="widget"/>
-		<select id="widget_readonly" readonly="true"/>
-		<select id="widget_multiple" multiple="true"/>
+		<et2-select  id="widget"></et2-select>
+		<et2-select  id="widget_readonly" readonly="true"></et2-select>
+		<et2-select  id="widget_multiple" multiple="true"></et2-select>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/api/templates/test/textbox_test.xet b/api/templates/test/textbox_test.xet
index 9dc327fb9c..89bbc4965d 100644
--- a/api/templates/test/textbox_test.xet
+++ b/api/templates/test/textbox_test.xet
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- This template is used in automated testing -->
 <overlay>
 	<template id="api.textbox_test" template="" lang="" group="0" version="16.1">
-		<textbox id="widget"/>
-		<textbox id="widget_readonly" readonly="true"/>
+		<et2-textbox  id="widget"></et2-textbox>
+		<et2-textbox  id="widget_readonly" readonly="true"></et2-textbox>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/api/templates/test/url_test.xet b/api/templates/test/url_test.xet
index e40a8d2ce6..3346cbe09b 100644
--- a/api/templates/test/url_test.xet
+++ b/api/templates/test/url_test.xet
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- This template is used in automated testing -->
 <overlay>
 	<template id="api.url_test" template="test" lang="" group="0" version="16.1">
-		<url id="widget"/>
+		<et2-url  id="widget"></et2-url>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/add.xet b/calendar/templates/default/add.xet
index fefe743acc..e450cd68b0 100644
--- a/calendar/templates/default/add.xet
+++ b/calendar/templates/default/add.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.add" template="" lang="" group="0" version="19.1.000">
 		<grid width="100%">
@@ -13,31 +12,21 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader" height="28">
-					<appicon/>
-					<textbox id="title" maxlength="255" tabindex="1" class="et2_required" span="4" blur="Title"/>
+					<et2-appicon></et2-appicon>
+					<et2-textbox  id="title" maxlength="255" tabindex="1" class="et2_required" span="4" placeholder="Title"></et2-textbox>
 				</row>
 				<row class="dialogHeader2" height="28">
-                    <description for="start" value="Start" width="88"/>
-                    <date-time id="start" needed="1" class="required" onchange="app.calendar.edit_start_change"/>
-                    <description for="duration" value="Duration" id="calendar_edit_duration"/>
-                    <menulist>
-                        <menupopup statustext="Duration of the meeting" class="et2_fullWidth" id="duration" no_lang="1"
-                                   onchange="app.calendar.set_enddate_visibility" options="Use end date,,,,,,,false"/>
-                    </menulist>
-                    <date-time id="end" onchange="app.calendar.edit_update_participant" freeMinuteEntry="true"/>
+                    <et2-description  for="start" value="Start" width="88"></et2-description>
+                    <et2-date-time  id="start" class="required" onchange="app.calendar.edit_start_change" required="1"></et2-date-time>
+                    <et2-description  for="duration" value="Duration" id="calendar_edit_duration"></et2-description>
+                    <et2-select  statustext="Duration of the meeting" id="duration" onchange="app.calendar.set_enddate_visibility" noLang="1" emptyLabel="Use end date"></et2-select>
+                    <et2-date-time  id="end" onchange="app.calendar.edit_update_participant" freeMinuteEntry="true"></et2-date-time>
                 </row>
             </rows>
         </grid>
-        <button statustext="saves the changes made" label="Save" id="button[save]" image="save" background_image="1"
-                onclick="return app.calendar.add_dialog_save(ev, widget); " slot="footer" default="true"/>
-        <button statustext="Full edit dialog" label="Edit" id="button[edit]" image="edit" background_image="1"
-                onclick="return app.calendar.add_dialog_edit(ev, widget);" slot="footer"/>
-        <button statustext="Close the window" label="Cancel" id="button[cancel]"
-                onclick="document.querySelector('et2-dialog#quick_add').hide()" image="cancel"
-                background_image="1" slot="footer"/>
-        <checkbox label="Always use full edit dialog" id="new_event_dialog"
-                  statustext="Always use the full edit dialog, not this little dialog"
-                  onchange="egw.set_preference('calendar',widget.id,widget.get_value() ? 'edit' : 'add');"
-                  slot="footer"/>
+        <et2-button  statustext="saves the changes made" label="Save" id="button[save]" image="save" onclick="return app.calendar.add_dialog_save(ev, widget); " slot="footer" default="true"></et2-button>
+        <et2-button  statustext="Full edit dialog" label="Edit" id="button[edit]" image="edit" onclick="return app.calendar.add_dialog_edit(ev, widget);" slot="footer"></et2-button>
+        <et2-button  statustext="Close the window" label="Cancel" id="button[cancel]" onclick="document.querySelector('et2-dialog#quick_add').hide()" image="cancel" slot="footer"></et2-button>
+        <et2-checkbox  label="Always use full edit dialog" id="new_event_dialog" statustext="Always use the full edit dialog, not this little dialog" onchange="egw.set_preference('calendar',widget.id,widget.get_value() ? 'edit' : 'add');" slot="footer"></et2-checkbox>
     </template>
 </overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/cat_acl.xet b/calendar/templates/default/cat_acl.xet
index d54181c142..3087fda76f 100644
--- a/calendar/templates/default/cat_acl.xet
+++ b/calendar/templates/default/cat_acl.xet
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.cat_acl" template="" lang="" group="0" version="1.7.001">
 		<groupbox>
 			<caption label="Category ACL"/>
-			<description value="Category ACL only restrict adding a category to an event or changing status of a participant. It does NOT change the visibility of an event!"/>
+			<et2-description  value="Category ACL only restrict adding a category to an event or changing status of a participant. It does NOT change the visibility of an event!"></et2-description>
 		</groupbox>
 		<grid>
 			<columns>
@@ -15,23 +14,21 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description value="Category"/>
-					<description value="Restrict add category to"/>
-					<description value="Restrict set status to"/>
+					<et2-description  value="Category"></et2-description>
+					<et2-description  value="Restrict add category to"></et2-description>
+					<et2-description  value="Restrict set status to"></et2-description>
 				</row>
 				<row class="row" valign="top">
-					<menulist>
-						<menupopup type="select-cat" id="${row}[cat_id]" options="Select one"/>
-					</menulist>
-					<listbox type="select-account" rows="5" options="both" id="${row}[add]"/>
-					<listbox type="select-account" rows="5" options="both" id="${row}[status]"/>
+					<et2-select-cat  id="${row}[cat_id]" emptyLabel="Select one"></et2-select-cat>
+					<et2-select-account  rows="5" id="${row}[add]" multiple="1" placeholder="both"></et2-select-account>
+					<et2-select-account  rows="5" id="${row}[status]" multiple="1" placeholder="both"></et2-select-account>
 				</row>
 			</rows>
 		</grid>
-		<hbox>
-			<button label="Save" id="button[save]"/>
-			<button id="button[apply]" label="Apply"/>
-			<button id="button[cancel]" label="Cancel"/>
-		</hbox>
+		<et2-hbox>
+			<et2-button  label="Save" id="button[save]"></et2-button>
+			<et2-button  id="button[apply]" label="Apply"></et2-button>
+			<et2-button  id="button[cancel]" label="Cancel"></et2-button>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/category_report.xet b/calendar/templates/default/category_report.xet
index 6a8e98bc17..8959963ec9 100644
--- a/calendar/templates/default/category_report.xet
+++ b/calendar/templates/default/category_report.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!--
 Egroupware
 @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
@@ -11,9 +11,9 @@ Egroupware
 -->
 <overlay>
 	<template id="calendar.category_report" template="" lang="" group="0" version="16.2">
-		<hbox class="dialogHeader" height="28">
-			<description value="Category Report"/>
-		</hbox>
+		<et2-hbox  class="dialogHeader" height="28">
+			<et2-description  value="Category Report"></et2-description>
+		</et2-hbox>
 		<grid width="100%" class="Category_report_cats">
 			<columns>
 				<column width="10%"/>
@@ -22,7 +22,7 @@ Egroupware
 			<rows>
 
 				<row>
-					<description value="Categories"/>
+					<et2-description  value="Categories"></et2-description>
 					<grid id="grid" width="100%">
 						<columns>
 							<column width="60"/>
@@ -34,40 +34,38 @@ Egroupware
 						</columns>
 						<rows>
 							<row class="th">
-								<checkbox id="cat_all" label="Select" onchange="app.calendar.category_report_selectAll"/>
-								<description value="Category"/>
-								<description align="center" statustext="Exclude weekend events from counting" value="Exclude Weekend"/>
-								<description align="center" statustext="Include holidays as counting days" value="Holidays"/>
-								<description align="center" statustext="Minimum days to count as a week" value="Min days"/>
-								<description align="center" statustext="Output unit" value="Output unit"/>
+								<et2-checkbox  id="cat_all" label="Select" onchange="app.calendar.category_report_selectAll"></et2-checkbox>
+								<et2-description  value="Category"></et2-description>
+								<et2-description  align="center" statustext="Exclude weekend events from counting" value="Exclude Weekend"></et2-description>
+								<et2-description  align="center" statustext="Include holidays as counting days" value="Holidays"></et2-description>
+								<et2-description  align="center" statustext="Minimum days to count as a week" value="Min days"></et2-description>
+								<et2-description  align="center" statustext="Output unit" value="Output unit"></et2-description>
 							</row>
 							<row class="row">
-								<checkbox id="${row}[enable]" onchange="app.calendar.category_report_enable"/>
-								<taglist-cat id="${row}[cat_id]" readonly="true" width="500" class="select-cat"/>
-								<checkbox align="center" id="${row}[weekend]"/>
-								<checkbox align="center" id="${row}[holidays]"/>
-								<textbox type="integer" align="center" id="${row}[min_days]"/>
-								<menulist>
-									<menupopup  align="center" id="${row}[unit]"/>
-								</menulist>
+								<et2-checkbox  id="${row}[enable]" onchange="app.calendar.category_report_enable"></et2-checkbox>
+								<et2-select-cat  id="${row}[cat_id]" readonly="true" width="500" class="select-cat" multiple="true"></et2-select-cat>
+								<et2-checkbox  align="center" id="${row}[weekend]"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[holidays]"></et2-checkbox>
+								<et2-number  align="center" id="${row}[min_days]" precision="0"></et2-number>
+								<et2-select  align="center" id="${row}[unit]"></et2-select>
 							</row>
 						</rows>
 					</grid>
 				</row>
 			</rows>
 		</grid>
-		<hbox class="dialogFooterToolbar">
-			<description value="Date range"/>
-			<date id="start" label="Start"/>
-			<date id="end" label="End"/>
-			<hbox>
-				<description value="sort by" label="%s:"/>
-				<vbox>
-					<radio id="sort_key" label="Last name" options="n_family"/>
-					<radio id="sort_key" label="First name" options="n_given"/>
-				</vbox>
-			</hbox>
-			<button id="button[report]" label="Report" onclick="app.calendar.category_report_submit" background_image="1" image="template"/>
-		</hbox>
+		<et2-hbox  class="dialogFooterToolbar">
+			<et2-description  value="Date range"></et2-description>
+			<et2-date  id="start" label="Start"></et2-date>
+			<et2-date  id="end" label="End"></et2-date>
+			<et2-hbox>
+				<et2-description  value="sort by" label="%s:"></et2-description>
+				<et2-vbox>
+					<radio id="sort_key" label="Last name" set_value="n_family" />
+					<radio id="sort_key" label="First name" set_value="n_given" />
+				</et2-vbox>
+			</et2-hbox>
+			<et2-button  id="button[report]" label="Report" onclick="app.calendar.category_report_submit" image="template"></et2-button>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/config.xet b/calendar/templates/default/config.xet
index 9e3917cdea..b9f830738f 100644
--- a/calendar/templates/default/config.xet
+++ b/calendar/templates/default/config.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.config" template="" lang="" group="0" version="16.1">
 		<grid width="100%" class="admin-config egwGridView_grid">
@@ -10,68 +9,68 @@
 			</columns>
 			<rows>
 				<row>
-					<vbox>
-						<description value="Custom URL for iCal with holidays for all users" label="%s:"/>
-						<description label="(Without a custom URL we use nation of user preference to load holidays from %s)" href="https://www.mozilla.org/en-US/projects/calendar/holidays/" value="Mozilla Holiday Calendars" extra_link_target="_blank"/>
-					</vbox>
-					<url id="newsettings[ical_holiday_url]" size="64"/>
+					<et2-vbox>
+						<et2-description  value="Custom URL for iCal with holidays for all users" label="%s:"></et2-description>
+						<et2-description  label="(Without a custom URL we use nation of user preference to load holidays from %s)" href="https://www.mozilla.org/en-US/projects/calendar/holidays/" value="Mozilla Holiday Calendars" extraLinkTarget="_blank"></et2-description>
+					</et2-vbox>
+					<et2-url  id="newsettings[ical_holiday_url]"></et2-url>
 				</row>
 				<row>
-					<description value="setting lock time calender" label="%s:"/>
-					<textbox id="newsettings[Lock_Time_Calender]" size="40"/>
+					<et2-description  value="setting lock time calender" label="%s:"></et2-description>
+					<et2-textbox  id="newsettings[Lock_Time_Calender]"></et2-textbox>
 				</row>
 				<row>
-					<description value="Deny Resources reservation for private events" label="%s:"/>
-					<select id="newsettings[no_ressources_private]">
+					<et2-description  value="Deny Resources reservation for private events" label="%s:"></et2-description>
+					<et2-select  id="newsettings[no_ressources_private]">
 						<option value="">No</option>
 						<option value="yes">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Require an ACL grant to invite other users and groups" label="%s:"/>
-					<select id="newsettings[require_acl_invite]">
+					<et2-description  value="Require an ACL grant to invite other users and groups" label="%s:"></et2-description>
+					<et2-select  id="newsettings[require_acl_invite]">
 						<option value="">{No}: {Every user can invite other users and groups}</option>
 						<option value="groups">Groups: other users can always be invited, only groups require an invite grant</option>
 						<option value="all">Users + groups: inviting both always requires an invite grant</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Allow users to prevent change notifications ('Do not notify')" label="%s:"/>
-					<select id="newsettings[calendar_allow_no_notification]">
+					<et2-description  value="Allow users to prevent change notifications ('Do not notify')" label="%s:"></et2-description>
+					<et2-select  id="newsettings[calendar_allow_no_notification]">
 						<option value="">No</option>
 						<option value="True">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Use range-views to optimise calendar queries?"/>
-					<select id="newsettings[no_timerange_views]">
+					<et2-description  value="Use range-views to optimise calendar queries?"></et2-description>
+					<et2-select  id="newsettings[no_timerange_views]">
 						<option value="">Yes</option>
 						<option value="true">No</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Security" span="all" class="subHeader"/>
+					<et2-description  value="Security" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<vbox>
-						<description value="How many appointments should non-admins be able to export"/>
-						<description value="(empty = use global limit, no = no export at all)"/>
-					</vbox>
-					<textbox id="newsettings[calendar_export_limit]" size="5"/>
+					<et2-vbox>
+						<et2-description  value="How many appointments should non-admins be able to export"></et2-description>
+						<et2-description  value="(empty = use global limit, no = no export at all)"></et2-description>
+					</et2-vbox>
+					<et2-textbox  id="newsettings[calendar_export_limit]"></et2-textbox>
 				</row>
 				<row>
-					<description value="History logging" span="all" class="subHeader"/>
+					<et2-description  value="History logging" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Prevent deleting of entries"/>
-					<select id="newsettings[calendar_delete_history]">
+					<et2-description  value="Prevent deleting of entries"></et2-description>
+					<et2-select  id="newsettings[calendar_delete_history]">
 						<option value="">Yes, only admins can purge deleted items</option>
 						<option value="userpurge">Yes, users can purge their deleted items</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Automatically purge old events after"/>
-					<select id="newsettings[calendar_purge_old]">
+					<et2-description  value="Automatically purge old events after"></et2-description>
+					<et2-select  id="newsettings[calendar_purge_old]">
 						<option value="0ff">No automatic purging</option>
 						<option value=".5">0.5 {years}</option>
 						<option value="1">1 {year}</option>
@@ -80,56 +79,56 @@
 						<option value="4">4 {years}</option>
 						<option value="5">5 {years}</option>
 						<option value="10">10 {years}</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Addressbook" span="all" class="subHeader"/>
+					<et2-description  value="Addressbook" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Show birthdays from addressbook" label="%s:"/>
-					<select id="newsettings[hide_birthdays]">
+					<et2-description  value="Show birthdays from addressbook" label="%s:"></et2-description>
+					<et2-select  id="newsettings[hide_birthdays]">
 						<option value="">Yes</option>
 						<option value="dateonly">Show only the date, not the year</option>
 						<option value="age">Show year and age</option>
 						<option value="yes">No</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Create links for participants from addressbook" label="%s:"/>
-					<select id="newsettings[link_contacts]">
+					<et2-description  value="Create links for participants from addressbook" label="%s:"></et2-description>
+					<et2-select  id="newsettings[link_contacts]">
 						<option value="">No</option>
 						<option value="yes">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Recurrences and conflict check" span="all" class="subHeader"/>
+					<et2-description  value="Recurrences and conflict check" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Calendar recurrence horizont in days (default 1000)"/>
-					<textbox id="newsettings[calendar_horizont]" size="5"/>
+					<et2-description  value="Calendar recurrence horizont in days (default 1000)"></et2-description>
+					<et2-textbox  id="newsettings[calendar_horizont]"></et2-textbox>
 				</row>
 				<row>
-					<description value="Please note: conflict check is never done in the past and always limited by above recurrence horizont." span="all"/>
+					<et2-description  value="Please note: conflict check is never done in the past and always limited by above recurrence horizont." span="all"></et2-description>
 				</row>
 				<row>
-					<description value="Limit search for conflicts in recurrences to given time in seconds (default 3)"/>
-					<float id="newsettings[conflict_max_check_time]" min="1" max="30"/>
+					<et2-description  value="Limit search for conflicts in recurrences to given time in seconds (default 3)"></et2-description>
+					<et2-number  id="newsettings[conflict_max_check_time]" min="1" max="30"></et2-number>
 				</row>
 				<row>
-					<description value="Limit search for conflicts in recurrences to given number of recurrences"/>
-					<float id="newsettings[conflict_max_checked]"/>
+					<et2-description  value="Limit search for conflicts in recurrences to given number of recurrences"></et2-description>
+					<et2-number  id="newsettings[conflict_max_checked]"></et2-number>
 				</row>
 				<row>
-					<description value="Email address migration" span="all" class="subHeader"/>
+					<et2-description  value="Email address migration" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Change domain of participants in CalDAV requests"/>
-					<hbox>
-						<textbox id="newsettings[calendar_domain_replace]" blur="replace" size="48"/>
-						<textbox id="newsettings[calendar_domain_replace_with]" blur="with" size="48"/>
-					</hbox>
+					<et2-description  value="Change domain of participants in CalDAV requests"></et2-description>
+					<et2-hbox>
+						<et2-textbox  id="newsettings[calendar_domain_replace]" placeholder="replace"></et2-textbox>
+						<et2-textbox  id="newsettings[calendar_domain_replace_with]" placeholder="with"></et2-textbox>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/conflicts.xet b/calendar/templates/default/conflicts.xet
index 11999bb4ac..d185fff01a 100644
--- a/calendar/templates/default/conflicts.xet
+++ b/calendar/templates/default/conflicts.xet
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.conflicts" template="" lang="" group="0" version="1.0.1.001">
-		<description value="Scheduling conflict" class="calendar_size120b"/>
-		<box class="calendar_conflicts">
+		<et2-description  value="Scheduling conflict" class="calendar_size120b"></et2-description>
+		<et2-box  class="calendar_conflicts">
 			<grid>
 				<columns>
 					<column/>
@@ -14,11 +13,11 @@
 				</columns>
 				<rows>
 					<row valign="top">
-						<image src="conflicts[$row][icon_participants]" statustext_html="true" statustext="@conflicts[$row][tooltip_participants]" no_lang="1"/>
-						<image src="conflicts[$row][icon_recur]" label="@conflicts[$row][text_recur]" no_lang="1"/>
-						<description id="conflicts[$row][time]" no_lang="1"/>
-						<vbox statustext="conflict[$row][tooltip]" statustext_html="true" orient=",0,0">
-							<description id="conflicts[$row][title]" no_lang="1" options="b"/>
+						<et2-image  src="conflicts[$row][icon_participants]" statustext="@conflicts[$row][tooltip_participants]" statustextHtml="true" noLang="1"></et2-image>
+						<et2-image  src="conflicts[$row][icon_recur]" label="@conflicts[$row][text_recur]" noLang="1"></et2-image>
+						<et2-description  id="conflicts[$row][time]" noLang="1"></et2-description>
+						<et2-vbox  statustext="conflict[$row][tooltip]" orient=",0,0" statustextHtml="true">
+							<et2-description  id="conflicts[$row][title]" noLang="1" boldItalic="b"></et2-description>
 							<grid id="conflicts[$row][conflicting_participants]">
 								<columns>
 									<column width="30"/>
@@ -26,23 +25,23 @@
 								</columns>
 								<rows>
 									<row class="$row_cont[type]">
-										<hbox>
-											<appicon src="$row_cont[app]" disabled="$row_cont[type]=u"/>
-										</hbox>
-										<description value="$row_cont[name]"  no_lang="1"/>
+										<et2-hbox>
+											<et2-appicon  src="$row_cont[app]" disabled="$row_cont[type]=u"></et2-appicon>
+										</et2-hbox>
+										<et2-description  value="$row_cont[name]" noLang="1"></et2-description>
 
 									</row>
 								</rows>
 							</grid>
-						</vbox>
+						</et2-vbox>
 					</row>
 				</rows>
 			</grid>
-		</box>
-		<hbox class="dialogFooterToolbar">
-			<button label="Ignore conflict" id="button[ignore]" image="check" background_image="1" statustext="Saves the event ignoring the conflict"/>
-			<button id="button[reedit]" label="Re-Edit event" image="edit" background_image="1" statustext="Allows to edit the event again"/>
-			<button label="Freetime search" id="button[freetime]" image="search" background_image="1" statustext="Find free timeslots where the selected participants are available for the given timespan"/>
-		</hbox>
+		</et2-box>
+		<et2-hbox  class="dialogFooterToolbar">
+			<et2-button  label="Ignore conflict" id="button[ignore]" image="check" statustext="Saves the event ignoring the conflict"></et2-button>
+			<et2-button  id="button[reedit]" label="Re-Edit event" image="edit" statustext="Allows to edit the event again"></et2-button>
+			<et2-button  label="Freetime search" id="button[freetime]" image="search" statustext="Find free timeslots where the selected participants are available for the given timespan"></et2-button>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/edit.alarms.xet b/calendar/templates/default/edit.alarms.xet
index c46adfe2d6..7ccd6f67e8 100755
--- a/calendar/templates/default/edit.alarms.xet
+++ b/calendar/templates/default/edit.alarms.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.edit.alarms" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%" height="210" overflow="auto">
@@ -10,30 +9,20 @@
 			</columns>
 			<rows>
 				<row class="row" height="20" disabled="@no_add_alarm">
-					<menulist>
-						<menupopup label="%s the event" id="before_after"/>
-					</menulist>
-					<hbox>
-						<menulist>
-							<menupopup type="select-number" statustext="days" id="new_alarm[days]" options=",0,7"/>
-						</menulist>
-						<description value="days" for="new_alarm[days]"/>
-						<menulist>
-							<menupopup type="select-number" statustext="hours" id="new_alarm[hours]" options=",0,23"/>
-						</menulist>
-						<description value="hours" for="new_alarm[hours]"/>
-						<menulist>
-							<menupopup type="select-number" statustext="Minutes" id="new_alarm[mins]" options=",0,55,5"/>
-						</menulist>
-						<description value="Minutes" for="new_alarm[mins]"/>
-						<menulist>
-							<menupopup statustext="Select who should get the alarm" label="for" id="new_alarm[owner]" no_lang="1"/>
-						</menulist>
-						<button label="Add alarm" id="button[add_alarm]"/>
-					</hbox>
+					<et2-select  label="%s the event" id="before_after"></et2-select>
+					<et2-hbox>
+						<et2-select-number  statustext="days" id="new_alarm[days]" min="0" max="7"></et2-select-number>
+						<et2-description  value="days" for="new_alarm[days]"></et2-description>
+						<et2-select-number  statustext="hours" id="new_alarm[hours]" min="0" max="23"></et2-select-number>
+						<et2-description  value="hours" for="new_alarm[hours]"></et2-description>
+						<et2-select-number  statustext="Minutes" id="new_alarm[mins]" min="0" max="55" interval="5"></et2-select-number>
+						<et2-description  value="Minutes" for="new_alarm[mins]"></et2-description>
+						<et2-select  statustext="Select who should get the alarm" label="for" id="new_alarm[owner]" noLang="1"></et2-select>
+						<et2-button  label="Add alarm" id="button[add_alarm]"></et2-button>
+					</et2-hbox>
 				</row>
 				<row valign="top" disabled="!@alarm">
-					<description value="Alarms"/>
+					<et2-description  value="Alarms"></et2-description>
 					<grid id="alarm">
 						<columns>
 							<column/>
@@ -44,20 +33,18 @@
 						</columns>
 						<rows>
 							<row class="th">
-								<description value="Time"/>
-								<description value="before the event"/>
-								<description value="All participants"/>
-								<description value="Owner"/>
-								<description value="Action"/>
+								<et2-description  value="Time"></et2-description>
+								<et2-description  value="before the event"></et2-description>
+								<et2-description  value="All participants"></et2-description>
+								<et2-description  value="Owner"></et2-description>
+								<et2-description  value="Action"></et2-description>
 							</row>
 							<row class="row">
-								<date-time id="${row}[time]" readonly="true"/>
-								<description id="${row}[offset]" no_lang="1"/>
-								<checkbox align="center" id="${row}[all]" readonly="true"/>
-								<menulist>
-									<menupopup type="select-account" id="${row}[owner]" readonly="true"/>
-								</menulist>
-								<button align="center" statustext="Delete this sdf" label="sdf" id="delete_alarm[$row_cont[id]]" onclick="return confirm('Delete this alarm');" image="delete"/>
+								<et2-date-time  id="${row}[time]" readonly="true"></et2-date-time>
+								<et2-description  id="${row}[offset]" noLang="1"></et2-description>
+								<et2-checkbox  align="center" id="${row}[all]" readonly="true"></et2-checkbox>
+								<et2-select-account  id="${row}[owner]" readonly="true"></et2-select-account>
+								<et2-button  align="center" statustext="Delete this sdf" label="sdf" id="delete_alarm[$row_cont[id]]" onclick="return confirm('Delete this alarm');" image="delete"></et2-button>
 							</row>
 						</rows>
 					</grid>
@@ -65,4 +52,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index a0e67e06e4..bd675727d7 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.edit.description" template="" lang="" group="0" version="1.0.1.001">
-		<textbox multiline="true" id="description" cols="70"/>
-		<hbox disabled="@no_add_alarm" height="35">
-			<button label="Add new alarm" id="button[add_alarm]" image="add" background_image="1"/>
-			<menulist>
-				<menupopup type="select" statustext="" id="new_alarm[options]" onchange="app.calendar.alarm_custom_date"/>
-			</menulist>
-			<date-time id="new_alarm[date]" class="calendar_alarm_date_display"/>
-			<menulist>
-				<menupopup statustext="Select who should get the alarm" label="for" id="new_alarm[owner]" no_lang="1"/>
-			</menulist>
-		</hbox>
+		<et2-textarea  id="description" cols="70"></et2-textarea>
+		<et2-hbox  disabled="@no_add_alarm" height="35">
+			<et2-button  label="Add new alarm" id="button[add_alarm]" image="add"></et2-button>
+			<et2-select  statustext="" id="new_alarm[options]" onchange="app.calendar.alarm_custom_date"></et2-select>
+			<et2-date-time  id="new_alarm[date]" class="calendar_alarm_date_display"></et2-date-time>
+			<et2-select  statustext="Select who should get the alarm" label="for" id="new_alarm[owner]" noLang="1"></et2-select>
+		</et2-hbox>
         <grid id="alarm" width="100%">
             <columns>
                 <column/>
@@ -24,20 +19,18 @@
             </columns>
             <rows>
                 <row class="th thb">
-                    <description value="Time"/>
-					<description value="before the event"/>
-					<description value="All participants"/>
-					<description value="Owner"/>
-					<description value="Action"/>
+                    <et2-description  value="Time"></et2-description>
+					<et2-description  value="before the event"></et2-description>
+					<et2-description  value="All participants"></et2-description>
+					<et2-description  value="Owner"></et2-description>
+					<et2-description  value="Action"></et2-description>
 				</row>
 				<row>
-					<date-time id="${row}[time]" readonly="true"/>
-					<description id="${row}[offset]" no_lang="1"/>
-					<checkbox align="center" id="${row}[all]" readonly="true"/>
-					<menulist>
-						<menupopup type="select-account" id="${row}[owner]" readonly="true"/>
-					</menulist>
-					<button align="left" disabled="!$row_cont[time]" statustext="Delete this alarm" label="Delete" id="delete_alarm[$row_cont[id]]" onclick="et2_dialog.confirm(widget,'Delete this alarm','Delete')" image="delete"/>
+					<et2-date-time  id="${row}[time]" readonly="true"></et2-date-time>
+					<et2-description  id="${row}[offset]" noLang="1"></et2-description>
+					<et2-checkbox  align="center" id="${row}[all]" readonly="true"></et2-checkbox>
+					<et2-select-account  id="${row}[owner]" readonly="true"></et2-select-account>
+					<et2-button  align="left" disabled="!$row_cont[time]" statustext="Delete this alarm" label="Delete" id="delete_alarm[$row_cont[id]]" onclick="et2_dialog.confirm(widget,'Delete this alarm','Delete')" image="delete"></et2-button>
 				</row>
 			</rows>
 		</grid>
@@ -57,38 +50,33 @@
                     <calendar-owner id="participant" allowFreeEntries="true" span="4"
                                     empty_label="Add new participants or resource"
                                     onchange="app.calendar.participantOnChange"/>
-                    <hbox width="100%">
-                        <textbox type="integer" id="quantity" min="1" size="3"
-                                 statustext="Number of resources to be booked"/>
-                        <select class="selectRole" id="role"/>
-                        <button id="add" align="right" image="add" novalidate="1"
-                                statustext="Please first select participants on the left and then use plus button to add them"
-                                background_image="1" disabled="true" ro_image="add"/>
-                    </hbox>
+                    <et2-hbox  width="100%">
+                        <et2-textbox  type="integer" id="quantity" min="1" statustext="Number of resources to be booked"></et2-textbox>
+                        <et2-select  class="selectRole" id="role"></et2-select>
+                        <et2-button  id="add" align="right" image="add" novalidate="1" statustext="Please first select participants on the left and then use plus button to add them" disabled="true" roImage="add"></et2-button>
+                    </et2-hbox>
                 </row>
 				<row>
-					<hbox span="all">
-						<description width="20%"/>
-						<select label="Notify externals" id="notify_externals"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-description  width="20%"></et2-description>
+						<et2-select  label="Notify externals" id="notify_externals"></et2-select>
+					</et2-hbox>
 				</row>
 				<row class="th thb">
-					<description value="Type"/>
-					<description value="Participants"/>
-					<description align="center" value="Quantity"/>
-					<description value="Role"/>
-					<description value="Status"/>
-					<description value="Actions"/>
+					<et2-description  value="Type"></et2-description>
+					<et2-description  value="Participants"></et2-description>
+					<et2-description  align="center" value="Quantity"></et2-description>
+					<et2-description  value="Role"></et2-description>
+					<et2-description  value="Status"></et2-description>
+					<et2-description  value="Actions"></et2-description>
 				</row>
 				<row valign="top">
-					<description id="${row}[app]"/>
-					<description id="${row}[title]" no_lang="1"/>
-					<textbox type="integer" align="center" id="${row}[quantity]" readonly="true" min="1" size="3"/>
-					<description id="${row}[role_label]"/>
-					<menulist>
-						<menupopup id="${row}[status]" onchange="1"/>
-					</menulist>
-					<button align="right" label="Delete" id="delete[$row_cont[delete_id]]" image="delete"/>
+					<et2-description  id="${row}[app]"></et2-description>
+					<et2-description  id="${row}[title]" noLang="1"></et2-description>
+					<et2-number  align="center" id="${row}[quantity]" readonly="true" min="1" precision="0"></et2-number>
+					<et2-description  id="${row}[role_label]"></et2-description>
+					<et2-select  id="${row}[status]" onchange="1"></et2-select>
+					<et2-button  align="right" label="Delete" id="delete[$row_cont[delete_id]]" image="delete"></et2-button>
 				</row>
 			</rows>
 		</grid>
@@ -107,42 +95,36 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description value="Repeating Event Information" span="all"/>
+					<et2-description  value="Repeating Event Information" span="all"></et2-description>
 				</row>
 				<row disabled="!@reference">
-					<description value="Exception"/>
-					<date-time id="recurrence" readonly="true"/>
-					<description id="reference" />
-					<description id="uid" />
-					<label/>
+					<et2-description  value="Exception"></et2-description>
+					<et2-date-time  id="recurrence" readonly="true"></et2-date-time>
+					<et2-description  id="reference"></et2-description>
+					<et2-description  id="uid"></et2-description>
+					<et2-label></et2-label>
 				</row>
 				<row height="12">
-					<description for="recur_type" value="Repeat type"/>
-					<menulist class="et2_fullWidth">
-						<menupopup id="recur_type" onchange="app.calendar.check_recur_type"/>
-					</menulist>
-					<description for="recur_interval" value="Interval"/>
-					<menulist class="et2_fullWidth">
-						<menupopup type="select-number" statustext="repeating interval, eg. 2 to repeat every second week" id="recur_interval" options="None,2,31"/>
-					</menulist>
-					<label/>
+					<et2-description  for="recur_type" value="Repeat type"></et2-description>
+					<et2-select  id="recur_type" onchange="app.calendar.check_recur_type"></et2-select>
+					<et2-description  for="recur_interval" value="Interval"></et2-description>
+					<et2-select-number  statustext="repeating interval, eg. 2 to repeat every second week" id="recur_interval" min="2" max="31" emptyLabel="None"></et2-select-number>
+					<et2-label></et2-label>
 				</row>
 				<row height="12">
-					<description for="recur_enddate" value="End date"/>
-					<date statustext="repeat the event until which date (empty means unlimited)" id="recur_enddate" class="et2_fullWidth"/>
-					<description for="tzid" value="Timezone"/>
-					<menulist class="et2_fullWidth">
-						<menupopup type="select-timezone" statustext="Timezone in which recurrences have identical time" id="tzid"/>
-					</menulist>
-					<label/>
+					<et2-description  for="recur_enddate" value="End date"></et2-description>
+					<et2-date  statustext="repeat the event until which date (empty means unlimited)" id="recur_enddate"></et2-date>
+					<et2-description  for="tzid" value="Timezone"></et2-description>
+					<et2-select-timezone  statustext="Timezone in which recurrences have identical time" id="tzid"></et2-select-timezone>
+					<et2-label></et2-label>
 				</row>
 				<row valign="top">
-					<description for="recur_data" value="Repeat days"/>
-					<listbox type="select-dow" class="et2_fullWidth" tags="true" statustext="Days of the week for a weekly repeated event" id="recur_data" rows="6" options="1"/>
-					<vbox>
-						<description value="Exceptions"/>
-						<button statustext="Create an exception for the given date" label="@exception_label" id="button[exception]" no_lang="1" />
-					</vbox>
+					<et2-description  for="recur_data" value="Repeat days"></et2-description>
+					<et2-select-dow  statustext="Days of the week for a weekly repeated event" id="recur_data" rows="6" multiple="1" placeholder="1"></et2-select-dow>
+					<et2-vbox>
+						<et2-description  value="Exceptions"></et2-description>
+						<et2-button  statustext="Create an exception for the given date" label="@exception_label" id="button[exception]" noLang="1"></et2-button>
+					</et2-vbox>
 					<grid id="recur_exception">
 						<columns>
 							<column/>
@@ -150,12 +132,12 @@
 						</columns>
 						<rows>
 							<row>
-								<date-time id="$row" readonly="true"/>
-								<button statustext="Delete this exception" label="Delete" id="delete_exception[$row_cont]" onclick="et2_dialog.confirm(widget,'Delete this exception','Delete')" image="delete"/>
+								<et2-date-time  id="$row" readonly="true"></et2-date-time>
+								<et2-button  statustext="Delete this exception" label="Delete" id="delete_exception[$row_cont]" onclick="et2_dialog.confirm(widget,'Delete this exception','Delete')" image="delete"></et2-button>
 							</row>
 						</rows>
 					</grid>
-					<label/>
+					<et2-label></et2-label>
 				</row>
 			</rows>
 		</grid>
@@ -180,13 +162,13 @@
 			</columns>
 			<rows>
 				<row disabled="@view">
-					<link-to id="link_to" span="all"/>
+					<et2-link-to  id="link_to" span="all"></et2-link-to>
 				</row>
 				<row class="th">
-					<description value="Existing links" span="all" />
+					<et2-description  value="Existing links" span="all"></et2-description>
 				</row>
 				<row class="row_off" valign="top">
-					<link-list id="link_to" span="all"/>
+					<et2-link-list  id="link_to" span="all"></et2-link-list>
 				</row>
 			</rows>
 		</grid>
@@ -208,48 +190,39 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader">
-					<description value="Title"/>
-					<textbox id="title" needed="1" maxlength="255" tabindex="1" class="et2_fullWidth" span="5"/>
-					<description font_style="n" id="id"/>
-					<appicon/>
+					<et2-description  value="Title"></et2-description>
+					<et2-textbox  id="title" maxlength="255" tabindex="1" span="5" required="1"></et2-textbox>
+					<et2-description  id="id" fontStyle="n"></et2-description>
+					<et2-appicon></et2-appicon>
 				</row>
 				<row class="dialogHeader2">
-                    <description for="start" value="Start"/>
-                    <date-time id="start" needed="1" class="required" onchange="app.calendar.edit_start_change"
-                               span="2"/>
-                    <description for="duration" value="Duration" id="calendar_edit_duration"/>
-                    <menulist>
-                        <menupopup statustext="Duration of the meeting" id="duration" no_lang="1"
-                                   onchange="app.calendar.set_enddate_visibility" options="Use end date,,,,,,,false"/>
-                    </menulist>
-                    <date-time id="end" onchange="app.calendar.edit_update_participant" freeMinuteEntry="true"/>
+                    <et2-description  for="start" value="Start"></et2-description>
+                    <et2-date-time  id="start" class="required" onchange="app.calendar.edit_start_change" span="2" required="1"></et2-date-time>
+                    <et2-description  for="duration" value="Duration" id="calendar_edit_duration"></et2-description>
+                    <et2-select  statustext="Duration of the meeting" id="duration" onchange="app.calendar.set_enddate_visibility" noLang="1" emptyLabel="Use end date"></et2-select>
+                    <et2-date-time  id="end" onchange="app.calendar.edit_update_participant" freeMinuteEntry="true"></et2-date-time>
                 </row>
                 <row class="dialogHeader2">
-                    <label value="Options"/>
-                    <checkbox statustext="Event will occupy the whole day" label="whole day" id="whole_day"
-                              onchange="app.calendar.set_alarmOptions_WD"/>
-                    <checkbox label="Private" id="public" selectedValue="0" unselectedValue="1"
-                              statustext="Mark event as private to hide title and description"/>
-                    <checkbox statustext="A non blocking event will not conflict with other events" label="non blocking"
-                              id="non_blocking" options="1,0, ," span="2"/>
-                    <hbox>
-                        <label for="priority" value="Priority"/>
-                        <menulist class="et2_fullWidth">
-                            <menupopup type="select-priority" id="priority"/>
-                        </menulist>
-                    </hbox>
-                    <description/>
+                    <et2-label  value="Options"></et2-label>
+                    <et2-checkbox  statustext="Event will occupy the whole day" label="whole day" id="whole_day" onchange="app.calendar.set_alarmOptions_WD"></et2-checkbox>
+                    <et2-checkbox  label="Private" id="public" selectedValue="0" unselectedValue="1" statustext="Mark event as private to hide title and description"></et2-checkbox>
+                    <et2-checkbox  statustext="A non blocking event will not conflict with other events" label="non blocking" id="non_blocking" span="2" selectedValue="1" unselectedValue="0" roTrue=" "></et2-checkbox>
+                    <et2-hbox>
+                        <et2-label  for="priority" value="Priority"></et2-label>
+                        <et2-select-priority  id="priority"></et2-select-priority>
+                    </et2-hbox>
+                    <et2-description></et2-description>
                 </row>
 				<row class="dialogHeader3">
-					<label for="location" value="Location"/>
-					<hbox span="2">
-						<textbox id="location" maxlength="255" class="et2_fullWidth"/>
-					</hbox>
-					<checkbox label="Video Conference" id="videoconference" onchange="app.calendar.videoconferenceOnChange"/>
-					<taglist-cat id="category" height="190" empty_label="Categories" multiple="toggle" class="et2_fullWidth" rows="1" />
+					<et2-label  for="location" value="Location"></et2-label>
+					<et2-hbox  span="2">
+						<et2-textbox  id="location" maxlength="255"></et2-textbox>
+					</et2-hbox>
+					<et2-checkbox  label="Video Conference" id="videoconference" onchange="app.calendar.videoconferenceOnChange"></et2-checkbox>
+					<et2-select-cat  id="category" height="190" multiple="true" placeholder="Categories"></et2-select-cat>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" tab_height="300">
+					<et2-tabbox  id="tabs" span="all" tabHeight="300">
 						<tabs>
 							<tab id="description" label="Description" statustext="Full description"/>
 							<tab id="participants" label="Participants" statustext="Participants, Resources, ..."/>
@@ -266,37 +239,29 @@
 							<template id="calendar.edit.links"/>
 							<template id="calendar.edit.history"/>
 						</tabpanels>
-					</tabbox>
+					</et2-tabbox>
 				</row>
                 <row disabled="!@id" class="dialogOperators">
-                    <hbox span="4">
-                        <date-time label="created" id="created" no_lang="1" readonly="true"/>
-                        <menulist>
-                            <menupopup label="by" type="select-account" id="owner" readonly="true"/>
-                        </menulist>
-                    </hbox>
-                    <hbox align="right">
-                        <date-time label="Updated" id="modified" no_lang="1" readonly="true"/>
-                        <menulist>
-                            <menupopup type="select-account" label="by" class="et2_nowrap" id="modifier" align="right"
-                                       readonly="true"/>
-                        </menulist>
-                    </hbox>
+                    <et2-hbox  span="4">
+                        <et2-date-time  label="created" id="created" readonly="true" noLang="1"></et2-date-time>
+                        <et2-select-account  label="by" id="owner" readonly="true"></et2-select-account>
+                    </et2-hbox>
+                    <et2-hbox  align="right">
+                        <et2-date-time  label="Updated" id="modified" readonly="true" noLang="1"></et2-date-time>
+                        <et2-select-account  label="by" class="et2_nowrap" id="modifier" align="right" readonly="true"></et2-select-account>
+                    </et2-hbox>
                 </row>
 			</rows>
 		</grid>
-		<hbox class="dialogFooterToolbar">
-			<button statustext="saves the changes made" label="Save" id="button[save]" image="save" background_image="1" onclick="app.calendar.move_edit_series"/>
-			<button statustext="apply the changes" label="Apply" id="button[apply]" image="apply" background_image="1" onclick="app.calendar.move_edit_series"/>
-			<button statustext="Close the window" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-			<menulist>
-				<menupopup statustext="Execute a further action for this entry" id="action"
-                           onchange="app.calendar.actions_change" empty_label="Actions..." class="@action_class"/>
-			</menulist>
-			<checkbox label="Do not notify" id="no_notifications" statustext="Do not notify of these changes"/>
-			<buttononly statustext="Find free timeslots where the selected participants are available for the given timespan" label="Freetime search" id="freetime" onclick="app.calendar.freetime_search" image="timesheet" background_image="1" span="all"/>
-			<button align="right" statustext="Delete this event" label="Delete" id="button[delete]" onclick="app.calendar.delete_btn(widget,$cont[query_delete_exceptions]);" image="delete" background_image="1"/>
-			<textbox type="hidden" id="delete_exceptions"/>
-		</hbox>
+		<et2-hbox  class="dialogFooterToolbar">
+			<et2-button  statustext="saves the changes made" label="Save" id="button[save]" image="save" onclick="app.calendar.move_edit_series"></et2-button>
+			<et2-button  statustext="apply the changes" label="Apply" id="button[apply]" image="apply" onclick="app.calendar.move_edit_series"></et2-button>
+			<et2-button  statustext="Close the window" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel"></et2-button>
+			<et2-select  statustext="Execute a further action for this entry" id="action" onchange="app.calendar.actions_change" class="@action_class" emptyLabel="Actions..."></et2-select>
+			<et2-checkbox  label="Do not notify" id="no_notifications" statustext="Do not notify of these changes"></et2-checkbox>
+			<et2-button  statustext="Find free timeslots where the selected participants are available for the given timespan" label="Freetime search" id="freetime" onclick="app.calendar.freetime_search" image="timesheet" span="all" noSubmit="true"></et2-button>
+			<et2-button  align="right" statustext="Delete this event" label="Delete" id="button[delete]" onclick="app.calendar.delete_btn(widget,$cont[query_delete_exceptions]);" image="delete"></et2-button>
+			<et2-textbox  type="hidden" id="delete_exceptions"></et2-textbox>
+		</et2-hbox>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/edit_series.xet b/calendar/templates/default/edit_series.xet
index 63c5d7156f..3e9e3c6d08 100644
--- a/calendar/templates/default/edit_series.xet
+++ b/calendar/templates/default/edit_series.xet
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.edit_series" template="" lang="" group="0" version="1.7.003">
-		<vbox rows="1" cols="1" id="edit_series">
-			<hbox id="dialogHeader" class="promptheader">
-				<description value="This event is part of a series"/>
-			</hbox>
-			<vbox class="prompt" id="dialog-content">
-				<description value="Do you want to edit this event as an exception or the whole series?"/>
-				<hbox align="center">
-					<buttononly label="Edit exception" onclick="app.calendar.open_edit(false);" image="edit" background_image="1"/>
-					<buttononly label="Edit series" onclick="app.calendar.open_edit(true);" image="edit" background_image="1"/>
-					<buttononly label="Cancel" onclick="document.getElementById('edit_series').style.display = 'none';" image="cancel" background_image="1"/>
-				</hbox>
-			</vbox>
-		</vbox>
+		<et2-vbox  rows="1" cols="1" id="edit_series">
+			<et2-hbox  id="dialogHeader" class="promptheader">
+				<et2-description  value="This event is part of a series"></et2-description>
+			</et2-hbox>
+			<et2-vbox  class="prompt" id="dialog-content">
+				<et2-description  value="Do you want to edit this event as an exception or the whole series?"></et2-description>
+				<et2-hbox  align="center">
+					<et2-button  label="Edit exception" onclick="app.calendar.open_edit(false);" image="edit" noSubmit="true"></et2-button>
+					<et2-button  label="Edit series" onclick="app.calendar.open_edit(true);" image="edit" noSubmit="true"></et2-button>
+					<et2-button  label="Cancel" onclick="document.getElementById('edit_series').style.display = 'none';" image="cancel" noSubmit="true"></et2-button>
+				</et2-hbox>
+			</et2-vbox>
+		</et2-vbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/export.xet b/calendar/templates/default/export.xet
index 61d6fabf94..853eb3b5df 100644
--- a/calendar/templates/default/export.xet
+++ b/calendar/templates/default/export.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.export" template="" lang="" group="0" version="1.0.1.001">
 		<grid>
@@ -10,34 +9,32 @@
 			</columns>
 			<rows>
 				<row>
-					<description span="all"/>
+					<et2-description  span="all"></et2-description>
 				</row>
 				<row>
-					<description options=",,,start" value="Start"/>
-					<date id="start" statustext="Startdate of the export"/>
+					<et2-description  value="Start" labelFor="start"></et2-description>
+					<et2-date  id="start" statustext="Startdate of the export"></et2-date>
 				</row>
 				<row>
-					<description options=",,,end" value="End"/>
-					<date id="end" statustext="Enddate of the export"/>
+					<et2-description  value="End" labelFor="end"></et2-description>
+					<et2-date  id="end" statustext="Enddate of the export"></et2-date>
 				</row>
 				<row>
-					<description options=",,,file" value="Filename"/>
-					<textbox id="file" statustext="Filename of the download"/>
+					<et2-description  value="Filename" labelFor="file"></et2-description>
+					<et2-textbox  id="file" statustext="Filename of the download"></et2-textbox>
 				</row>
 				<row disabled="1">
-					<description options=",,,version" value="Version"/>
-					<menulist>
-						<menupopup id="version"/>
-					</menulist>
+					<et2-description  value="Version" labelFor="version"></et2-description>
+					<et2-select  id="version"></et2-select>
 				</row>
 				<row>
-					<description/>
-					<button label="Download" id="download" image="download" background_image="1"/>
+					<et2-description></et2-description>
+					<et2-button  label="Download" id="download" image="download"></et2-button>
 				</row>
 				<row>
-					<description span="all"/>
+					<et2-description  span="all"></et2-description>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/export_csv_select.xet b/calendar/templates/default/export_csv_select.xet
index 2c8ea70a79..78810c0baa 100644
--- a/calendar/templates/default/export_csv_select.xet
+++ b/calendar/templates/default/export_csv_select.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.export_csv_select" template="" lang="" group="0" version="1.9.003">
 		<grid>
@@ -10,17 +9,17 @@
 			</columns>
 			<rows>
 				<row disabled="!@msg">
-					<description id="msg" span="all" class="message"/>
-					<description/>
+					<et2-description  id="msg" span="all" class="message"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<radio label="Use search results" id="selection" onclick="jQuery('.criteria').hide();jQuery('div.filters').hide();"  options="search_results" span="all"/>
+					<radio label="Use search results" id="selection" onclick="jQuery('.criteria').hide();jQuery('div.filters').hide();"  set_value="search_results"  span="all"/>
 				</row>
 				<row disabled="@no_filter">
-					<radio label="Use definition filter" id="selection" onclick="jQuery('div.filters').show();jQuery('.criteria').hide();" options="filter" span="all"/>
+					<radio label="Use definition filter" id="selection" onclick="jQuery('div.filters').show();jQuery('.criteria').hide();" set_value="filter"  span="all"/>
 				</row>
 				<row>
-					<radio label="Use given criteria:" id="selection" onchange="jQuery('.criteria').show();jQuery('div.filters').hide();" options="criteria" span="all"/>
+					<radio label="Use given criteria:" id="selection" onchange="jQuery('.criteria').show();jQuery('div.filters').hide();" set_value="criteria"  span="all"/>
 				</row>
 				<row>
 					<grid class="criteria" id="criteria">
@@ -30,12 +29,12 @@
 						</columns>
 						<rows>
 							<row>
-								<description value="Start" font_style="1"/>
-								<date statustext="Startdate of the export" id="start"/>
+								<et2-description  value="Start" fontStyle="1"></et2-description>
+								<et2-date  statustext="Startdate of the export" id="start"></et2-date>
 							</row>
 							<row>
-								<description value="End"/>
-								<date statustext="Enddate of the export" id="end"/>
+								<et2-description  value="End"></et2-description>
+								<et2-date  statustext="Enddate of the export" id="end"></et2-date>
 							</row>
 							<row>
 								<calendar-owner id="owner" empty_label="Owner" span="2" class="shorter" allowFreeEntries="false" autocomplete_url="calendar.calendar_owner_etemplate_widget.ajax_owner"/>
@@ -44,8 +43,8 @@
 					</grid>
 				</row>
 				<row>
-					<description/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -55,4 +54,4 @@
 }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/freetimesearch.xet b/calendar/templates/default/freetimesearch.xet
index 5bf7e0e504..9b7113df3a 100644
--- a/calendar/templates/default/freetimesearch.xet
+++ b/calendar/templates/default/freetimesearch.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.freetimesearch.rows" template="" lang="" group="0" version="1.0.1.001">
 		<grid width="100%">
@@ -12,18 +11,16 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description value="Date"/>
-					<description value="Time"/>
-					<description value="Select"/>
-					<description value="Enddate"/>
+					<et2-description  value="Date"></et2-description>
+					<et2-description  value="Time"></et2-description>
+					<et2-description  value="Select"></et2-description>
+					<et2-description  value="Enddate"></et2-description>
 				</row>
 				<row class="row">
-					<date options=",16" id="${row}[start]" readonly="true"/>
-					<menulist>
-						<menupopup no_lang="1" id="{$row}start" statustext="select a time"/>
-					</menulist>
-					<button label="Select" id="select[$row]" statustext="use the selected time and close the popup" onclick="app.calendar.freetime_select" />
-					<date-time id="${row}[end]" readonly="true"/>
+					<et2-date  id="${row}[start]" readonly="true"></et2-date>
+					<et2-select  id="{$row}start" statustext="select a time" noLang="1"></et2-select>
+					<et2-button  label="Select" id="select[$row]" statustext="use the selected time and close the popup" onclick="app.calendar.freetime_select"></et2-button>
+					<et2-date-time  id="${row}[end]" readonly="true"></et2-date-time>
 				</row>
 			</rows>
 		</grid>
@@ -36,42 +33,38 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader">
-					<description class="calendar_freetime_header" value="Freetime Search" span="all"/>
+					<et2-description  class="calendar_freetime_header" value="Freetime Search" span="all"></et2-description>
 				</row>
 				<row >
-					<description value="Startdate / -time"/>
-					<date-time id="start" statustext="Startdate and -time of the search"/>
+					<et2-description  value="Startdate / -time"></et2-description>
+					<et2-date-time  id="start" statustext="Startdate and -time of the search"></et2-date-time>
 				</row>
 				<row>
-					<description value="Duration"/>
-					<hbox>
-						<menulist>
-							<menupopup no_lang="1" id="duration" statustext="Duration of the meeting" onchange="app.calendar.set_enddate_visibility" options="Use end date"/>
-						</menulist>
-						<date-time id="end" statustext="Enddate / -time of the meeting, eg. for more then one day"/>
-					</hbox>
+					<et2-description  value="Duration"></et2-description>
+					<et2-hbox>
+						<et2-select  id="duration" statustext="Duration of the meeting" onchange="app.calendar.set_enddate_visibility" noLang="1" emptyLabel="Use end date"></et2-select>
+						<et2-date-time  id="end" statustext="Enddate / -time of the meeting, eg. for more then one day"></et2-date-time>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Timeframe"/>
-					<hbox class="calendar_freetime_timeframe">
-						<date-timeonly id="start_time" statustext="Timeframe to search"/>
-						<description value="til"/>
-						<date-timeonly id="end_time" statustext="Timeframe to search"/>
+					<et2-description  value="Timeframe"></et2-description>
+					<et2-hbox  class="calendar_freetime_timeframe">
+						<et2-date-timeonly  id="start_time" statustext="Timeframe to search"></et2-date-timeonly>
+						<et2-description  value="til"></et2-description>
+						<et2-date-timeonly  id="end_time" statustext="Timeframe to search"></et2-date-timeonly>
 
-					</hbox>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Weekdays"/>
-					<select-dow rows="10" id="weekdays" statustext="Weekdays to use in search" class="calendar_freetime_dow"/>
+					<et2-description  value="Weekdays"></et2-description>
+					<et2-select-dow  rows="10" id="weekdays" statustext="Weekdays to use in search" class="calendar_freetime_dow" multiple="1"></et2-select-dow>
 				</row>
 				<row class="dialogFooterToolbar">
-					<button label="New search" id="search" image="search" background_image="1" statustext="new search with the above parameters"/>
-					<hbox>
-						<menulist>
-							<menupopup no_lang="1" id="search_window" statustext="how far to search (from startdate)"/>
-						</menulist>
-						<button id="cancel" label="Cancel" statustext="Close the window" onclick="window.close();"/>
-					</hbox>
+					<et2-button  label="New search" id="search" image="search" statustext="new search with the above parameters"></et2-button>
+					<et2-hbox>
+						<et2-select  id="search_window" statustext="how far to search (from startdate)" noLang="1"></et2-select>
+						<et2-button  id="cancel" label="Cancel" statustext="Close the window" onclick="window.close();"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
 					<template content="freetime" span="all" id="calendar.freetimesearch.rows"/>
@@ -82,4 +75,4 @@
 			body { background-color: white; }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/import.conditions.xet b/calendar/templates/default/import.conditions.xet
index 5168dd0228..c4bfd2e9d7 100644
--- a/calendar/templates/default/import.conditions.xet
+++ b/calendar/templates/default/import.conditions.xet
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.import.conditions" template="" lang="" group="0" version="16.1">
 		<template id="importexport.wizard_basic_import_csv.conditions" disabled="@no_conditions"/>
-		<hbox>
-			<description value="Do not import conflicting events"/>
-			<checkbox id="skip_conflicts" />
-		</hbox>
+		<et2-hbox>
+			<et2-description  value="Do not import conflicting events"></et2-description>
+			<et2-checkbox  id="skip_conflicts" ></et2-checkbox>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/import.ical_conditions.xet b/calendar/templates/default/import.ical_conditions.xet
index de5de205fc..8f99368a48 100644
--- a/calendar/templates/default/import.ical_conditions.xet
+++ b/calendar/templates/default/import.ical_conditions.xet
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.import.ical_conditions" template="" lang="" group="0" version="16.1">
-		<vbox>
+		<et2-vbox>
 			<template id="importexport.wizard_basic_import_csv.conditions" disabled="@no_conditions"/>
-			<hbox>
-				<description value="Do not import conflicting events"/>
-				<checkbox id="skip_conflicts"/>
-			</hbox>
-			<description/>
-			<hbox>
-				<description id="delete_title" value="Empty target calendar before importing" font_style="b" class="et2_bold"/>
-				<checkbox id="empty_before_import" onchange="var enabled = widget.getValue() == 'true'; var past = widget.getRoot().getWidgetById('remove_past'); var future = widget.getRoot().getWidgetById('remove_future');past.set_disabled(!enabled);future.set_disabled(!enabled);return true;"/>
-			</hbox>
-			<integer label="How many days to be removed in the past (default 100)" id="remove_past" disabled="!@empty_before_import"/>
-			<integer label="How many days to be removed in the future (default 365)" id="remove_future" disabled="!@empty_before_import"/>
-			<select-cat id="override_values[category][value]" label="Category" empty_label="From file" options=",,,@application"/>
-		</vbox>
+			<et2-hbox>
+				<et2-description  value="Do not import conflicting events"></et2-description>
+				<et2-checkbox  id="skip_conflicts"></et2-checkbox>
+			</et2-hbox>
+			<et2-description></et2-description>
+			<et2-hbox>
+				<et2-description  id="delete_title" value="Empty target calendar before importing" class="et2_bold" fontStyle="b"></et2-description>
+				<et2-checkbox  id="empty_before_import" onchange="var enabled = widget.getValue() == 'true'; var past = widget.getRoot().getWidgetById('remove_past'); var future = widget.getRoot().getWidgetById('remove_future');past.set_disabled(!enabled);future.set_disabled(!enabled);return true;"></et2-checkbox>
+			</et2-hbox>
+			<et2-number  label="How many days to be removed in the past (default 100)" id="remove_past" disabled="!@empty_before_import" precision="0"></et2-number>
+			<et2-number  label="How many days to be removed in the future (default 365)" id="remove_future" disabled="!@empty_before_import" precision="0"></et2-number>
+			<et2-select-cat  id="override_values[category][value]" label="Category" application="@application" emptyLabel="From file"></et2-select-cat>
+		</et2-vbox>
 		<styles>
 			#importexport-wizardbox_delete_title {
 				margin-top: 1em;
 			}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/import.xet b/calendar/templates/default/import.xet
index 6ca3adc399..88e40deb13 100644
--- a/calendar/templates/default/import.xet
+++ b/calendar/templates/default/import.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.import" template="" lang="" group="0" version="1.0.1.001">
 		<grid>
@@ -10,21 +9,21 @@
 			</columns>
 			<rows>
 				<row>
-					<description span="all" class="message" id="msg" no_lang="1" align="center"/>
-					<description/>
+					<et2-description  span="all" class="message" id="msg" align="center" noLang="1"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description value="iCal file"/>
+					<et2-description  value="iCal file"></et2-description>
 					<file id="ical_file" needed="1"/>
 				</row>
 				<row>
-					<description/>
-					<button label="Import" id="import"/>
+					<et2-description></et2-description>
+					<et2-button  label="Import" id="import"></et2-button>
 				</row>
 				<row>
-					<description span="all"/>
+					<et2-description  span="all"></et2-description>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/import_ical.xet b/calendar/templates/default/import_ical.xet
index 08b0b03128..6f433223a3 100644
--- a/calendar/templates/default/import_ical.xet
+++ b/calendar/templates/default/import_ical.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.import_ical" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -10,10 +9,8 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Charset of file"/>
-					<menulist class="width180">
-						<menupopup id="charset" no_lang="1"/>
-					</menulist>
+					<et2-description  value="Charset of file"></et2-description>
+					<et2-select  class="width180" id="charset" noLang="1"></et2-select>
 				</row>
 			</rows>
 		</grid>
@@ -21,4 +18,4 @@
 			.width180 select { width:150px;}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/importexport_wizard_ical_chooseowner.xet b/calendar/templates/default/importexport_wizard_ical_chooseowner.xet
index a375897f12..f1f72d39e3 100644
--- a/calendar/templates/default/importexport_wizard_ical_chooseowner.xet
+++ b/calendar/templates/default/importexport_wizard_ical_chooseowner.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.importexport_wizard_ical_chooseowner" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -9,21 +8,21 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="msg" no_lang="1"/>
+					<et2-description  id="msg" noLang="1"></et2-description>
 				</row>
 				<row>
-					<select-account id="cal_owner" empty_label="Select"/>
+					<et2-select-account  id="cal_owner" emptyLabel="Select"></et2-select-account>
 				</row>
 				<row>
-					<description/>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<checkbox label="Skip notifications" id="no_notification"/>
+					<et2-checkbox  label="Skip notifications" id="no_notification"></et2-checkbox>
 				</row>
 				<row>
-					<description/>
+					<et2-description></et2-description>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/list.dates.xet b/calendar/templates/default/list.dates.xet
index 9ce69ee03d..7aae2dae59 100755
--- a/calendar/templates/default/list.dates.xet
+++ b/calendar/templates/default/list.dates.xet
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.list.dates" template="" lang="" group="0" version="1.3.001">
-		<hbox>
-			<description value="Start"/>
-			<date id="startdate"/>
-			<description value="End"/>
-			<date id="enddate"/>
-		</hbox>
+		<et2-hbox>
+			<et2-description  value="Start"></et2-description>
+			<et2-date  id="startdate"></et2-date>
+			<et2-description  value="End"></et2-description>
+			<et2-date  id="enddate"></et2-date>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/list.rows.xet b/calendar/templates/default/list.rows.xet
index 4ac6fd4383..e270c2506c 100644
--- a/calendar/templates/default/list.rows.xet
+++ b/calendar/templates/default/list.rows.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.list.rows" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%">
@@ -19,57 +18,51 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Start" id="cal_start"/>
 						<nextmatch-sortheader id="cal_end" label="End"/>
-					</vbox>
-					<vbox>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Title" id="cal_title"/>
 						<nextmatch-sortheader label="Description" id="cal_description"/>
-					</vbox>
+					</et2-vbox>
 					<nextmatch-sortheader label="Title" id="cal_title"/>
 					<nextmatch-sortheader label="Description" id="cal_description"/>
 					<nextmatch-sortheader label="Recurrence" id="recure"/>
 					<nextmatch-header label="Project" id="pm_id"/>
 					<nextmatch-header label="Category" id="cat_id"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-sortheader id="cal_owner" label="Owner" readonly="true"/>
 						<nextmatch-sortheader id="cal_location" label="Location"/>
-					</vbox>
+					</et2-vbox>
 					<nextmatch-sortheader id="cal_owner" label="Owner" readonly="true"/>
 					<nextmatch-sortheader id="cal_location" label="Location"/>
-					<nextmatch-accountfilter options="All" id="participant" label="Participants"/>
+					<et2-nextmatch-header-account  id="participant" label="Participants" emptyLabel="All"/>
 				</row>
 				<row class="row" valign="top">
-					<vbox id="start">
-						<date-time id="${row}[start]" readonly="true" options=",$cont[format]" class="noWrap"/>
-						<date-time id="${row}[end]" readonly="true" options=",$cont[format]" class="noWrap"/>
-					</vbox>
-					<vbox>
-						<description id="${row}[title]" readonly="true" no_lang="1" options="b"/>
-						<description id="${row}[description]" no_lang="1"/>
-						<description id="${row}[recure]" no_lang="1"/>
-					</vbox>
-					<description id="${row}[title]"/>
-					<description id="${row}[description]" no_lang="1"/>
-					<description id="${row}[recure]"/>
-					<link-string options="calendar,projectmanager" id="${row}[id]"/>
-					<menulist>
-						<menupopup type="select-cat" id="${row}[category]" readonly="true"/>
-					</menulist>
-					<vbox>
-						<menulist class="noWrap">
-							<menupopup type="select-account" id="${row}[owner]" readonly="true"/>
-						</menulist>
-						<description id="${row}[location]" no_lang="1"/>
-					</vbox>
-					<menulist class="noWrap">
-						<menupopup type="select-account" id="${row}[owner]" readonly="true"/>
-					</menulist>
-					<description id="${row}[location]" no_lang="1"/>
+					<et2-vbox  id="start">
+						<et2-date-time  id="${row}[start]" readonly="true" class="noWrap"></et2-date-time>
+						<et2-date-time  id="${row}[end]" readonly="true" class="noWrap"></et2-date-time>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-description  id="${row}[title]" readonly="true" noLang="1" boldItalic="b"></et2-description>
+						<et2-description  id="${row}[description]" noLang="1"></et2-description>
+						<et2-description  id="${row}[recure]" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-description  id="${row}[title]"></et2-description>
+					<et2-description  id="${row}[description]" noLang="1"></et2-description>
+					<et2-description  id="${row}[recure]"></et2-description>
+					<et2-link-string  app="calendar,projectmanager" id="${row}[id]"></et2-link-string>
+					<et2-select-cat  id="${row}[category]" readonly="true"></et2-select-cat>
+					<et2-vbox>
+						<et2-select-account  class="noWrap" id="${row}[owner]" readonly="true"></et2-select-account>
+						<et2-description  id="${row}[location]" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-select-account  class="noWrap" id="${row}[owner]" readonly="true"></et2-select-account>
+					<et2-description  id="${row}[location]" noLang="1"></et2-description>
 					<html id="${row}[parts]" readonly="true" no_lang="1"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/list.xet b/calendar/templates/default/list.xet
index 16f60a3572..709a189c68 100644
--- a/calendar/templates/default/list.xet
+++ b/calendar/templates/default/list.xet
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.list.dates" template="" lang="" group="0" version="1.3.001">
-		<hbox>
-			<description value="Start"/>
-			<date id="startdate" onchange="widget.getParent().getWidgetById('enddate').set_min(widget.getValue()); app.calendar.update_state({date: widget.getValue()}); return false;"/>
-			<description value="End"/>
-			<date id="enddate" onchange="widget.getParent().getWidgetById('startdate').set_max(widget.getValue()); app.calendar.update_state({end_date: widget.getValue()}); return false;"/>
-		</hbox>
+		<et2-hbox>
+			<et2-description  value="Start"></et2-description>
+			<et2-date  id="startdate" onchange="widget.getParent().getWidgetById('enddate').set_min(widget.getValue()); app.calendar.update_state({date: widget.getValue()}); return false;"></et2-date>
+			<et2-description  value="End"></et2-description>
+			<et2-date  id="enddate" onchange="widget.getParent().getWidgetById('startdate').set_max(widget.getValue()); app.calendar.update_state({end_date: widget.getValue()}); return false;"></et2-date>
+		</et2-hbox>
 	</template>
 	<template id="calendar.list.rows" template="" lang="" group="0" version="1.9.004">
 		<grid>
@@ -28,74 +27,66 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Start" id="cal_start"/>
 						<nextmatch-sortheader label="End" id="cal_end"/>
-					</vbox>
-					<vbox>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Title" id="cal_title"/>
 						<nextmatch-sortheader label="Description" id="cal_description"/>
-					</vbox>
+					</et2-vbox>
 					<nextmatch-sortheader label="Title" id="cal_title"/>
 					<nextmatch-sortheader label="Description" id="cal_description"/>
 					<nextmatch-sortheader label="Recurrence" id="recure"/>
 					<nextmatch-header label="Category" id="cat_id"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Owner" id="cal_owner" readonly="true"/>
 						<nextmatch-sortheader label="Location" id="cal_location"/>
-					</vbox>
+					</et2-vbox>
 					<nextmatch-sortheader label="Owner" id="cal_owner" readonly="true"/>
 					<nextmatch-sortheader label="Location" id="cal_location"/>
 					<nextmatch-header label="Participants" id="participant" statustext="Use side menu to filter participants"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Created" id="cal_created" sortmode="DESC"/>
 						<nextmatch-header label="Creator" id="cal_creator" options="Creator"/>
-						<description value="Last changed"/>
-					</vbox>
+						<et2-description  value="Last changed"></et2-description>
+					</et2-vbox>
 					<nextmatch-customfields label="Custom fields" id="cfs" readonly="true"/>
 				</row>
 				<row class="$row_cont[category] $row_cont[class]" valign="top">
-					<vbox id="start">
-						<date-time id="${row}[start]" readonly="true" options=",$cont[format]" class="noWrap"/>
-						<date-time id="${row}[end]" readonly="true" options=",$cont[format]" class="noWrap"/>
-					</vbox>
-					<vbox class="listVbox">
-						<hbox no_lang="1" readonly="true">
-							<description id="${row}[title]" no_lang="1" readonly="true" font_style="b"/>
-							<description align="right" value="#%s" id="${row}[id]" font_style="b"/>
-						</hbox>
-						<box no_lang="1" class="listDescription">
-							<description id="${row}[description]" no_lang="1" activate_links="1"/>
-						</box>
-						<description id="${row}[recure]" no_lang="1"/>
-					</vbox>
-					<hbox>
-						<description id="${row}[title]"/>
-						<description align="right" value="#%s" id="${row}[id]" font_style="b"/>
-					</hbox>
-					<description id="${row}[description]" no_lang="1" activate_links="1"/>
-					<description id="${row}[recure]"/>
-					<menulist>
-						<menupopup type="select-cat" id="${row}[category]" readonly="true"/>
-					</menulist>
-					<vbox>
-						<menulist>
-							<menupopup type="select-account" class="noWrap" id="${row}[owner]" readonly="true"/>
-						</menulist>
-						<description id="${row}[location]" no_lang="1" activate_links="1"/>
-					</vbox>
-					<menulist>
-						<menupopup type="select-account" class="noWrap" id="${row}[owner]" readonly="true"/>
-					</menulist>
-					<description id="${row}[location]" no_lang="1" activate_links="1"/>
+					<et2-vbox  id="start">
+						<et2-date-time  id="${row}[start]" readonly="true" class="noWrap"></et2-date-time>
+						<et2-date-time  id="${row}[end]" readonly="true" class="noWrap"></et2-date-time>
+					</et2-vbox>
+					<et2-vbox  class="listVbox">
+						<et2-hbox  readonly="true" noLang="1">
+							<et2-description  id="${row}[title]" readonly="true" noLang="1" fontStyle="b"></et2-description>
+							<et2-description  align="right" value="#%s" id="${row}[id]" fontStyle="b"></et2-description>
+						</et2-hbox>
+						<et2-box  class="listDescription" noLang="1">
+							<et2-description  id="${row}[description]" noLang="1" activateLinks="1"></et2-description>
+						</et2-box>
+						<et2-description  id="${row}[recure]" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-hbox>
+						<et2-description  id="${row}[title]"></et2-description>
+						<et2-description  align="right" value="#%s" id="${row}[id]" fontStyle="b"></et2-description>
+					</et2-hbox>
+					<et2-description  id="${row}[description]" noLang="1" activateLinks="1"></et2-description>
+					<et2-description  id="${row}[recure]"></et2-description>
+					<et2-select-cat  id="${row}[category]" readonly="true"></et2-select-cat>
+					<et2-vbox>
+						<et2-select-account  class="noWrap" id="${row}[owner]" readonly="true"></et2-select-account>
+						<et2-description  id="${row}[location]" noLang="1" activateLinks="1"></et2-description>
+					</et2-vbox>
+					<et2-select-account  class="noWrap" id="${row}[owner]" readonly="true"></et2-select-account>
+					<et2-description  id="${row}[location]" noLang="1" activateLinks="1"></et2-description>
 					<html id="${row}[parts]" no_lang="1" readonly="true"/>
-					<vbox>
-						<date-time id="${row}[created]" readonly="true"/>
-						<menulist>
-							<menupopup type="select-account" id="${row}[creator]" readonly="true"/>
-						</menulist>
-						<date-time id="${row}[modified]" readonly="true"/>
-					</vbox>
+					<et2-vbox>
+						<et2-date-time  id="${row}[created]" readonly="true"></et2-date-time>
+						<et2-select-account  id="${row}[creator]" readonly="true"></et2-select-account>
+						<et2-date-time  id="${row}[modified]" readonly="true"></et2-date-time>
+					</et2-vbox>
 					<customfields-list id="$row"/>
 				</row>
 			</rows>
@@ -109,38 +100,38 @@
 			</columns>
 			<rows>
 				<row disabled="!@css">
-					<description/>
+					<et2-description></et2-description>
 					<html id="css" span="all"/>
 				</row>
 				<row>
 					<nextmatch id="nm" template="calendar.list.rows" header_right="calendar.list.dates" span="all"/>
 				</row>
 				<row>
-					<hbox>
-						<box class="action_popup prompt" id="delete_popup">
-							<vbox>
-								<description value="Delete" class="promptheader"/>
-								<description value="This is a recurring event. Do you want to delete just this recurrence or the whole series?"/>
-								<hbox>
-									<button label="Delete this recurrence" id="delete" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Delete series" id="delete_series" onclick="nm_popup_action.id = 'delete_series'; nm_submit_popup(this); return false;"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'delete_popup');"/>
-								</hbox>
-							</vbox>
-						</box>
-						<box class="action_popup prompt" id="undelete_popup">
-							<vbox>
-								<description value="Un-delete" class="promptheader"/>
-								<description value="This is a recurring event. Do you want to Un-delete just this recurrence or the whole series?"/>
-								<hbox>
-									<button label="Un-delete this recurrence" id="undelete" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Un-delete series" id="undelete_series" onclick="nm_popup_action.id = 'undelete_series'; nm_submit_popup(this); return false;"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'undelete_popup');"/>
-								</hbox>
-							</vbox>
-						</box>
-					</hbox>
-					<description/>
+					<et2-hbox>
+						<et2-box  class="action_popup prompt" id="delete_popup">
+							<et2-vbox>
+								<et2-description  value="Delete" class="promptheader"></et2-description>
+								<et2-description  value="This is a recurring event. Do you want to delete just this recurrence or the whole series?"></et2-description>
+								<et2-hbox>
+									<et2-button  label="Delete this recurrence" id="delete" onclick="nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Delete series" id="delete_series" onclick="nm_popup_action.id = 'delete_series'; nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Cancel" onclick="nm_hide_popup(this,'delete_popup');" noSubmit="true"></et2-button>
+								</et2-hbox>
+							</et2-vbox>
+						</et2-box>
+						<et2-box  class="action_popup prompt" id="undelete_popup">
+							<et2-vbox>
+								<et2-description  value="Un-delete" class="promptheader"></et2-description>
+								<et2-description  value="This is a recurring event. Do you want to Un-delete just this recurrence or the whole series?"></et2-description>
+								<et2-hbox>
+									<et2-button  label="Un-delete this recurrence" id="undelete" onclick="nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Un-delete series" id="undelete_series" onclick="nm_popup_action.id = 'undelete_series'; nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Cancel" onclick="nm_hide_popup(this,'undelete_popup');" noSubmit="true"></et2-button>
+								</et2-hbox>
+							</et2-vbox>
+						</et2-box>
+					</et2-hbox>
+					<et2-description></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -158,4 +149,4 @@
 
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/meeting.xet b/calendar/templates/default/meeting.xet
index b1e0f32c31..0026a93cb4 100644
--- a/calendar/templates/default/meeting.xet
+++ b/calendar/templates/default/meeting.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.meeting" template="" lang="" group="0" version="1.9.002">
 		<grid border="0" width="100%">
@@ -16,45 +16,42 @@
 						</columns>
 						<rows>
 							<row class="th">
-								<description value="Attention"/>
+								<et2-description  value="Attention"></et2-description>
 							</row>
 							<row class="row">
-								<description id="sender_warning" class="meetingRequestError"/>
+								<et2-description  id="sender_warning" class="meetingRequestError"></et2-description>
 							</row>
 						</rows>
 					</grid>
 				</row>
 				<row disabled="!@ics_method=request">
-					<description value="This mail contains a meeting request" class="meetingRequestMessage"/>
-					<hbox>
-						<button label="Apply" id="button[apply]" class="leftPad5" hideOnReadonly="true"/>
-						<button label="Accept" id="button[accept]" class="leftPad5" background_image="true" image="calendar/accepted"/>
-						<button label="Tentative" id="button[tentativ]" class="leftPad5" background_image="true" image="calendar/tentative"/>
-						<button label="Reject" id="button[reject]" class="leftPad5" background_image="true" image="calendar/rejected"/>
-						<buttononly statustext="Edit event in calendar" label="Edit" id="button[edit]"  background_image="true" image="edit" hideOnReadonly="true"
-							onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.edit&amp;cal_id=$cont[id]'),'_blank','dependent=yes,width=750,height=410,scrollbars=yes,status=yes'); return false;" class="leftPad5"/>
-					</hbox>
-					<description id="error" class="meetingRequestError" align="right"/>
+					<et2-description  value="This mail contains a meeting request" class="meetingRequestMessage"></et2-description>
+					<et2-hbox>
+						<et2-button  label="Apply" id="button[apply]" class="leftPad5" hideOnReadonly="true"></et2-button>
+						<et2-button  label="Accept" id="button[accept]" class="leftPad5" image="calendar/accepted"></et2-button>
+						<et2-button  label="Tentative" id="button[tentativ]" class="leftPad5" image="calendar/tentative"></et2-button>
+						<et2-button  label="Reject" id="button[reject]" class="leftPad5" image="calendar/rejected"></et2-button>
+						<et2-button  statustext="Edit event in calendar" label="Edit" id="button[edit]" image="edit" hideOnReadonly="true" onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.edit&amp;cal_id=$cont[id]'),'_blank','dependent=yes,width=750,height=410,scrollbars=yes,status=yes'); return false;" class="leftPad5" noSubmit="true"></et2-button>
+					</et2-hbox>
+					<et2-description  id="error" class="meetingRequestError" align="right"></et2-description>
 				</row>
 				<row disabled="!@ics_method=reply">
-					<description value="This mail contains a reply to a meeting request" class="meetingRequestMessage"/>
-					<button label="Apply" id="button[apply]" class="leftPad5"/>
-					<description id="error" class="meetingRequestError" align="right"/>
+					<et2-description  value="This mail contains a reply to a meeting request" class="meetingRequestMessage"></et2-description>
+					<et2-button  label="Apply" id="button[apply]" class="leftPad5"></et2-button>
+					<et2-description  id="error" class="meetingRequestError" align="right"></et2-description>
 				</row>
 				<row disabled="!@ics_method=cancel">
-					<description value="This mail cancels a meeting" class="meetingRequestMessage"/>
-					<hbox>
-						<button label="Apply" statustext="Removes the event from my calendar" id="button[cancel]" class="leftPad5"/>
-						<button label="Delete" statustext="Delete this meeting for all participants" id="button[delete]" class="leftPad5"
-								onclick="et2_dialog.confirm(widget,'Delete this meeting for all participants','Delete')"/>
-						<button statustext="Edit event in calendar" label="Edit" id="button[edit]" background_image="true" image="edit"
-									onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.edit&amp;cal_id=$cont[id]'),'_blank','dependent=yes,width=750,height=410,scrollbars=yes,status=yes'); return false;" class="leftPad5"/>
-					</hbox>
-					<description id="error" class="meetingRequestError" align="right"/>
+					<et2-description  value="This mail cancels a meeting" class="meetingRequestMessage"></et2-description>
+					<et2-hbox>
+						<et2-button  label="Apply" statustext="Removes the event from my calendar" id="button[cancel]" class="leftPad5"></et2-button>
+						<et2-button  label="Delete" statustext="Delete this meeting for all participants" id="button[delete]" class="leftPad5" onclick="et2_dialog.confirm(widget,'Delete this meeting for all participants','Delete')"></et2-button>
+						<et2-button  statustext="Edit event in calendar" label="Edit" id="button[edit]" image="edit" onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.edit&amp;cal_id=$cont[id]'),'_blank','dependent=yes,width=750,height=410,scrollbars=yes,status=yes'); return false;" class="leftPad5"></et2-button>
+					</et2-hbox>
+					<et2-description  id="error" class="meetingRequestError" align="right"></et2-description>
 				</row>
 			</rows>
 		</grid>
-		<description/>
+		<et2-description></et2-description>
 		<grid width="100%" class="meetingRequest">
 			<columns>
 				<column width="100"/>
@@ -62,42 +59,42 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description id="ics_method_label" span="all"/>
+					<et2-description  id="ics_method_label" span="all"></et2-description>
 				</row>
 				<row class="row">
-					<description value="Title"/>
-					<description id="title" no_lang="1"/>
+					<et2-description  value="Title"></et2-description>
+					<et2-description  id="title" noLang="1"></et2-description>
 				</row>
 				<row class="row">
-					<description value="Location"/>
-					<hbox>
-						<description id="location" no_lang="1"/>
-						<description class="et2_link" value="Videoconference" disabled="!@##videoconference" onclick="app.calendar.joinVideoConference(widget.getArrayMgr('content').getEntry('##videoconference'), widget.getArrayMgr('content').data);"/>
-						<image src="videoconference" disabled="!@##videoconference"/>
-					</hbox>
+					<et2-description  value="Location"></et2-description>
+					<et2-hbox>
+						<et2-description  id="location" noLang="1"></et2-description>
+						<et2-description  class="et2_link" value="Videoconference" disabled="!@##videoconference" onclick="app.calendar.joinVideoConference(widget.getArrayMgr('content').getEntry('##videoconference'), widget.getArrayMgr('content').data);"></et2-description>
+						<et2-image  src="videoconference" disabled="!@##videoconference"></et2-image>
+					</et2-hbox>
 				</row>
 				<row class="row">
-					<description value="Date"/>
-					<hbox>
-						<date-time id="start" readonly="true"/>
-						<date-time label="-" id="end" readonly="true" class="leftPad5"/>
-					</hbox>
+					<et2-description  value="Date"></et2-description>
+					<et2-hbox>
+						<et2-date-time  id="start" readonly="true"></et2-date-time>
+						<et2-date-time  label="-" id="end" readonly="true" class="leftPad5"></et2-date-time>
+					</et2-hbox>
 				</row>
 				<row class="row" disabled="!@recure">
-					<description value="Recurrence"/>
-					<description id="recure" no_lang="1"/>
+					<et2-description  value="Recurrence"></et2-description>
+					<et2-description  id="recure" noLang="1"></et2-description>
 				</row>
 				<row class="row">
-					<description value="Organizer"/>
-					<url-email id="organizer" readonly="true"/>
+					<et2-description  value="Organizer"></et2-description>
+					<et2-url-email  id="organizer" readonly="true"></et2-url-email>
 				</row>
 				<row class="row" valign="top">
-					<description value="Description"/>
-					<description id="description" no_lang="ture" activate_links="true"/>
+					<et2-description  value="Description"></et2-description>
+					<et2-description  id="description" noLang="ture" activateLinks="true"></et2-description>
 				</row>
 				<row class="row" valign="top">
-					<description value="Participants"/>
-					<description id="all_participants"/>
+					<et2-description  value="Participants"></et2-description>
+					<et2-description  id="all_participants"></et2-description>
 				</row>
 			</rows>
 		</grid>
diff --git a/calendar/templates/default/notify_dialog.xet b/calendar/templates/default/notify_dialog.xet
index cb1ff08a90..f46c8e9657 100644
--- a/calendar/templates/default/notify_dialog.xet
+++ b/calendar/templates/default/notify_dialog.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.notify_dialog" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -12,18 +12,18 @@
 			</columns>
 			<rows>
 			<row class="dialogHeader" height="28">
-				<description id="title" class="et2_fullWidth" span="4"/>
-				<hbox>
-					<description font_style="n" id="id"/>
-					<appicon/>
-				</hbox>
+				<et2-description  id="title" span="4"></et2-description>
+				<et2-hbox>
+					<et2-description  id="id" fontStyle="n"></et2-description>
+					<et2-appicon></et2-appicon>
+				</et2-hbox>
 			</row>
 			<row class="dialogHeader2" height="28" >
-				<description for="start" value="Start" width="88"/>
-				<date-time id="start" readonly="true"/>
-				<description for="duration" value="Duration" id="calendar_edit_duration" />
-				<select statustext="Duration of the meeting" class="et2_fullWidth" id="duration" no_lang="1" readonly="true" options="Use end date,,,,,,,false"/>
-				<date-time id="end" readonly="true"/>
+				<et2-description  for="start" value="Start" width="88"></et2-description>
+				<et2-date-time  id="start" readonly="true"></et2-date-time>
+				<et2-description  for="duration" value="Duration" id="calendar_edit_duration"></et2-description>
+				<et2-select  statustext="Duration of the meeting" id="duration" readonly="true" noLang="1" emptyLabel="Use end date"></et2-select>
+				<et2-date-time  id="end" readonly="true"></et2-date-time>
 			</row>
 			</rows>
 		</grid>
@@ -39,25 +39,25 @@
 				<row></row>
 				<row></row>
 				<row class="th thb">
-					<description value="Type"/>
-					<description value="Participants"/>
-					<description value="Role"/>
-					<description value="Status"/>
-					<description/>
+					<et2-description  value="Type"></et2-description>
+					<et2-description  value="Participants"></et2-description>
+					<et2-description  value="Role"></et2-description>
+					<et2-description  value="Status"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row valign="top">
-					<description id="${row}[app]"/>
-					<description id="${row}[title]" no_lang="1"/>
-					<description id="${row}[role_label]"/>
-					<select id="${row}[status]" readonly="true"/>
-					<checkbox align="center" label="Notify" id="notify[$row_cont[delete_id]]"/>
+					<et2-description  id="${row}[app]"></et2-description>
+					<et2-description  id="${row}[title]" noLang="1"></et2-description>
+					<et2-description  id="${row}[role_label]"></et2-description>
+					<et2-select  id="${row}[status]" readonly="true"></et2-select>
+					<et2-checkbox  align="center" label="Notify" id="notify[$row_cont[delete_id]]"></et2-checkbox>
 				</row>
 			</rows>
 		</grid>
-		<hbox class="dialogFooterToolbar">
-			<button label="OK" id="button[save]" image="mail" background_image="1"/>
-			<button statustext="Close the window" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-		</hbox>
+		<et2-hbox  class="dialogFooterToolbar">
+			<et2-button  label="OK" id="button[save]" image="mail"></et2-button>
+			<et2-button  statustext="Close the window" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel"></et2-button>
+		</et2-hbox>
 		<styles>
 			.selectRole select { width: 100%; }
 		</styles>
diff --git a/calendar/templates/default/planner.xet b/calendar/templates/default/planner.xet
index f549687e8f..b6541df2ea 100644
--- a/calendar/templates/default/planner.xet
+++ b/calendar/templates/default/planner.xet
@@ -9,7 +9,7 @@ Egroupware
 @version $Id$
 -->
 
-<!DOCTYPE overlay PUBLIC '-//EGroupware GmbH//eTemplate 2//EN' 'http://www.egroupware.org/etemplate2.dtd'>
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 
 <overlay>
     <template id="calendar.planner">
@@ -19,4 +19,4 @@ Egroupware
 		>
 		</calendar-planner>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/print.xet b/calendar/templates/default/print.xet
index e73beed01b..2c1e29ca55 100644
--- a/calendar/templates/default/print.xet
+++ b/calendar/templates/default/print.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.print.participants" template="" lang="" group="0" version="1.6.001">
 		<grid width="100%" overflow="auto" id="participants">
@@ -13,24 +12,24 @@
 			</columns>
 			<rows>
 				<row>
-					<description span="all"/>
+					<et2-description  span="all"></et2-description>
 				</row>
 				<row>
-					<description span="all"/>
+					<et2-description  span="all"></et2-description>
 				</row>
 				<row class="th">
-					<description value="Type"/>
-					<description value="Participants"/>
-					<description value="Quantity"/>
-					<description value="All future"/>
-					<description value="Status"/>
+					<et2-description  value="Type"></et2-description>
+					<et2-description  value="Participants"></et2-description>
+					<et2-description  value="Quantity"></et2-description>
+					<et2-description  value="All future"></et2-description>
+					<et2-description  value="Status"></et2-description>
 				</row>
 				<row>
-					<description id="${row}[app]"/>
-					<description rows="1" cols="2" id="${row}[title]" no_lang="1"/>
-					<int id="${row}[quantity]" options="1,,3" readonly="true"/>
-					<checkbox id="${row}[status_recurrence]" align="center" readonly="true"/>
-					<select id="${row}[status]"  onchange="app.calendar.print_participants_status" readonly="true"/>
+					<et2-description  id="${row}[app]"></et2-description>
+					<et2-description  rows="1" cols="2" id="${row}[title]" noLang="1"></et2-description>
+					<et2-number  id="${row}[quantity]" options="1,,3" readonly="true" precision="0"></et2-number>
+					<et2-checkbox  id="${row}[status_recurrence]" align="center" readonly="true"></et2-checkbox>
+					<et2-select  id="${row}[status]" onchange="app.calendar.print_participants_status" readonly="true"></et2-select>
 				</row>
 			</rows>
 		</grid>
@@ -43,10 +42,10 @@
 			</columns>
 			<rows>
 				<row class="th" height="28">
-					<description span="all" value="Existing links"/>
+					<et2-description  span="all" value="Existing links"></et2-description>
 				</row>
 				<row class="row_off" valign="top">
-					<link-list span="all" id="link_to"/>
+					<et2-link-list  span="all" id="link_to"></et2-link-list>
 				</row>
 			</rows>
 		</grid>
@@ -59,62 +58,56 @@
 			</columns>
 			<rows>
 				<row>
-					<hbox>
-						<image src="print" onclick="window.print();" class="calendar_print_button"/>
-						<appicon class="calendar_print_appicon"/>
-					</hbox>
+					<et2-hbox>
+						<et2-image  src="print" onclick="window.print();" class="calendar_print_button"></et2-image>
+						<et2-appicon  class="calendar_print_appicon"></et2-appicon>
+					</et2-hbox>
 				</row>
 				<row class="th" height="28">
-					<description value="Title" class="bold" options="bold"/>
-					<textbox id="title" size="80" maxlength="255" readonly="true" span="all" class="bold"/>
+					<et2-description  value="Title" class="bold" boldItalic="bold"></et2-description>
+					<et2-textbox  id="title" maxlength="255" readonly="true" span="all" class="bold"></et2-textbox>
 				</row>
 				<row class="row">
-					<description width="95" options=",,,start" value="Start"/>
-					<date-time id="start" readonly="true"/>
+					<et2-description  width="95" value="Start" labelFor="start"></et2-description>
+					<et2-date-time  id="start" readonly="true"></et2-date-time>
 				</row>
 				<row class="row">
-					<description width="0" options=",,,whole_day" value="whole day"/>
-					<checkbox id="whole_day" options=",, ," statustext="Event will occupy the whole day" readonly="true"/>
+					<et2-description  width="0" value="whole day" labelFor="whole_day"></et2-description>
+					<et2-checkbox  id="whole_day" statustext="Event will occupy the whole day" readonly="true" roTrue=" "></et2-checkbox>
 				</row>
 				<row class="row">
-					<description width="0" options=",,,duration" value="Duration"/>
-					<hbox options="0,0">
-						<menulist>
-							<menupopup no_lang="1" onchange="set_style_by_class('table','end_hide','visibility',this.value == '' ? 'visible' : 'hidden'); if (this.value == '') document.getElementById(form::name('end[str]')).value = document.getElementById(form::name('start[str]')).value;" id="duration" options="Use end date" statustext="Duration of the meeting" readonly="true"/>
-						</menulist>
-						<date-time id="end" class="end_hide" readonly="true"/>
-					</hbox>
+					<et2-description  width="0" value="Duration" labelFor="duration"></et2-description>
+					<et2-hbox  cellpadding="0" cellspacing="0" >
+						<et2-select  onchange="set_style_by_class('table','end_hide','visibility',this.value == '' ? 'visible' : 'hidden'); if (this.value == '') document.getElementById(form::name('end[str]')).value = document.getElementById(form::name('start[str]')).value;" id="duration" statustext="Duration of the meeting" readonly="true" noLang="1" emptyLabel="Use end date"></et2-select>
+						<et2-date-time  id="end" class="end_hide" readonly="true"></et2-date-time>
+					</et2-hbox>
 				</row>
 				<row class="row">
-					<description options=",,,location" value="Location" width="0"/>
-					<textbox maxlength="255" id="location" class="calendar_inputFullWidth" readonly="true"/>
+					<et2-description  value="Location" width="0" labelFor="location"></et2-description>
+					<et2-textbox  maxlength="255" id="location" class="calendar_inputFullWidth" readonly="true"></et2-textbox>
 				</row>
 				<row class="row">
-					<description options=",,,priority" value="Priority" width="0"/>
-					<menulist>
-						<menupopup type="select-priority" id="priority" readonly="true"/>
-					</menulist>
+					<et2-description  value="Priority" width="0" labelFor="priority"></et2-description>
+					<et2-select-priority  id="priority" readonly="true"></et2-select-priority>
 				</row>
 				<row class="row">
-					<description value="Non blocking" width="0"/>
-					<checkbox id="non_blocking" options="1,0, ," statustext="A non blocking event will not conflict with other events" readonly="true"/>
+					<et2-description  value="Non blocking" width="0"></et2-description>
+					<et2-checkbox  id="non_blocking" statustext="A non blocking event will not conflict with other events" readonly="true" selectedValue="1" unselectedValue="0" roTrue=" "></et2-checkbox>
 				</row>
 				<row class="row">
-					<description value="Private"/>
-					<checkbox id="public" options="0,1" readonly="true"/>
+					<et2-description  value="Private"></et2-description>
+					<et2-checkbox  id="public" readonly="true" selectedValue="0" unselectedValue="1"></et2-checkbox>
 				</row>
 				<row class="row calendar_print_cat">
-					<description value="Categories"/>
-					<menulist>
-						<menupopup type="select-cat" id="category" readonly="true"/>
-					</menulist>
+					<et2-description  value="Categories"></et2-description>
+					<et2-select-cat  id="category" readonly="true"></et2-select-cat>
 				</row>
 				<row valign="top">
-					<description value="Description"/>
-					<textbox multiline="true" id="description" readonly="true"/>
+					<et2-description  value="Description"></et2-description>
+					<et2-textarea  id="description" readonly="true"></et2-textarea>
 				</row>
 				<row class="th">
-					<description value="custom fields" span="all"/>
+					<et2-description  value="custom fields" span="all"></et2-description>
 				</row>
 				<row>
 					<customfields span="all" readonly="true"/>
@@ -128,4 +121,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/sidebox.xet b/calendar/templates/default/sidebox.xet
index 5ebe87b959..451614b3b2 100644
--- a/calendar/templates/default/sidebox.xet
+++ b/calendar/templates/default/sidebox.xet
@@ -9,26 +9,21 @@ Egroupware
 @version $Id$
 -->
 
-<!DOCTYPE overlay PUBLIC '-//EGroupware GmbH//eTemplate 2//EN' 'http://www.egroupware.org/etemplate2.dtd'>
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 
 <overlay>
     <template id="calendar.sidebox">
-		<vbox parent_node="calendar-et2_target">
+		<et2-vbox  parentId="calendar-et2_target">
             <calendar-date id="date"></calendar-date>
-            <textbox type="hidden" id="first"/>
-            <textbox type="hidden" id="last"/>
+            <et2-textbox  type="hidden" id="first"></et2-textbox>
+            <et2-textbox  type="hidden" id="last"></et2-textbox>
             <hrule/>
-            <select-cat id="cat_id" placeholder="All categories" empty_label="All categories"
-                        onchange="app.calendar.update_state({cat_id: widget.getValue()});"/>
-            <select id="status_filter" no_lang="true" class="et2_fullWidth"
-                    onchange="app.calendar.update_state({status_filter: widget.getValue()});"/>
+            <et2-select-cat  id="cat_id" placeholder="All categories" onchange="app.calendar.update_state({cat_id: widget.getValue()});" emptyLabel="All categories"></et2-select-cat>
+            <et2-select  id="status_filter" onchange="app.calendar.update_state({status_filter: widget.getValue()});" noLang="true"></et2-select>
             <hrule/>
-            <et2-calendar-owner id="owner" class="et2_fullWidth"
-                                onchange="app.calendar.update_state({owner: widget.getValue()}); return false;"
-                                multiple="true" allowFreeEntries="false"
-                                autocomplete_params="{&quot;checkgrants&quot;: true}"/>
+            <et2-calendar-owner  id="owner" onchange="app.calendar.update_state({owner: widget.getValue()}); return false;" multiple="true" allowFreeEntries="false" autocompleteParams="{&quot;checkgrants&quot;: true}"/>
             <hrule/>
-            <box>
+            <et2-box>
                 <grid id="integration" disabled="!@integration" width="100%">
                     <columns>
                         <column/>
@@ -39,10 +34,9 @@ Egroupware
                         </row>
                     </rows>
                 </grid>
-            </box>
-            <select id="merge" empty_label="Insert in document" onchange="app.calendar.sidebox_merge"
-                    class="et2_fullWidth"/>
-        </vbox>
+            </et2-box>
+            <et2-select  id="merge" onchange="app.calendar.sidebox_merge" emptyLabel="Insert in document"></et2-select>
+        </et2-vbox>
         <iframe id="iframe" width="100%" height="100%"/>
         <styles>
             #calendar-sidebox_integration: {
diff --git a/calendar/templates/default/todo.xet b/calendar/templates/default/todo.xet
index 6e67fd3b5b..a60b1f889f 100644
--- a/calendar/templates/default/todo.xet
+++ b/calendar/templates/default/todo.xet
@@ -9,16 +9,16 @@ Egroupware
 @version $Id$
 -->
 
-<!DOCTYPE overlay PUBLIC '-//EGroupware GmbH//eTemplate 2//EN' 'http://www.egroupware.org/etemplate2.dtd'>
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 
 <overlay>
 	<template id="calendar.todo" width="30%">
-		<box class="calendar_calDayTodos">
-			<box class="calendar_calDayTodosHeader" width="100%">
-				<button align="left" statustext="Add" id="add" image="add" background_image="true" onclick="egw.open('','infolog','add',{action: 'new',type:'task'});"/>
-				<label id="label" class="calendar_calDayTodosHeader" width="100%" />
-			</box>
-			<box class="calendar_calDayTodosTable">
+		<et2-box  class="calendar_calDayTodos">
+			<et2-box  class="calendar_calDayTodosHeader" width="100%">
+				<et2-button  align="left" statustext="Add" id="add" image="add" onclick="egw.open('','infolog','add',{action: 'new',type:'task'});"></et2-button>
+				<et2-label  id="label" class="calendar_calDayTodosHeader" width="100%" ></et2-label>
+			</et2-box>
+			<et2-box  class="calendar_calDayTodosTable">
 				<grid id="todos" width="100%">
 					<columns>
 						<column/>
@@ -28,11 +28,11 @@ Egroupware
 						<row class="todo_row">
 							<html id="{$row}[icons]" />
 
-							<description value="$row_cont[title]" href="$row_cont[edit]" extra_link_popup="$row_cont[edit_size]"/>
+							<et2-description  value="$row_cont[title]" href="$row_cont[edit]" extraLinkPopup="$row_cont[edit_size]"></et2-description>
 						</row>
 					</rows>
 				</grid>
-			</box>
-		</box>
+			</et2-box>
+		</et2-box>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/toolbar.xet b/calendar/templates/default/toolbar.xet
index d9bb9fcae0..49b8599454 100644
--- a/calendar/templates/default/toolbar.xet
+++ b/calendar/templates/default/toolbar.xet
@@ -9,22 +9,21 @@ Egroupware
 @version $Id$
 -->
 
-<!DOCTYPE overlay PUBLIC '-//EGroupware GmbH//eTemplate 2//EN' 'http://www.egroupware.org/etemplate2.dtd'>
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 
 <overlay>
 	<template id="calendar.toolbar">
-		<box>
-			<box class="et2_toolbar_actionlist">
-                <buttononly id="add" background_image="true" image="add" class="imageOnly" label="add new event"
-                            onclick="app.calendar.toolbar_action(widget);"/>
-            </box>
-		</box>
-		<searchbox id="keywords" blur="Search" overlay="false" onchange="app.calendar.update_state({view: 'listview',search: widget.getValue()});return false;"/>
+		<et2-box>
+			<et2-box  class="et2_toolbar_actionlist">
+                <et2-button  id="add" image="add" class="imageOnly" label="add new event" onclick="app.calendar.toolbar_action(widget);" noSubmit="true"></et2-button>
+            </et2-box>
+		</et2-box>
+		<et2-searchbox  id="keywords" overlay="false" onchange="app.calendar.update_state({view: 'listview',search: widget.getValue()});return false;" placeholder="Search"></et2-searchbox>
 		<toolbar id="toolbar" width="100%" flat_list="false"/>
 		<!-- Fake an app header inside the toolbar -->
-		<box class="egw_fw_ui_app_header_container">
-			<favorites app="calendar"/>
-		</box>
-		<description id="app_header"/>
+		<et2-box  class="egw_fw_ui_app_header_container">
+			<et2-favorites  app="calendar"></et2-favorites>
+		</et2-box>
+		<et2-description  id="app_header"></et2-description>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/view.xet b/calendar/templates/default/view.xet
index e7f50869b6..7d1c79f822 100644
--- a/calendar/templates/default/view.xet
+++ b/calendar/templates/default/view.xet
@@ -9,7 +9,7 @@ Egroupware
 @version $Id$
 -->
 
-<!DOCTYPE overlay PUBLIC '-//EGroupware GmbH//eTemplate 2//EN' 'http://www.egroupware.org/etemplate2.dtd'>
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 
 <overlay>
     <template id="calendar.view">
@@ -29,4 +29,4 @@ Egroupware
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/mobile/edit.xet b/calendar/templates/mobile/edit.xet
index 62bfadb57b..b3a86648e5 100644
--- a/calendar/templates/mobile/edit.xet
+++ b/calendar/templates/mobile/edit.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- $Id: edit.xet 54465 2015-12-04 17:37:26Z nathangray $ -->
 <overlay>
 	<template id="calendar.edit.details" template="" lang="" group="0" version="1.9.001">
@@ -10,25 +10,19 @@
 			</columns>
 			<rows>
 				<row>
-					<description for="priority" value="Priority"/>
-					<menulist>
-						<menupopup type="select-priority" id="priority" class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  for="priority" value="Priority"></et2-description>
+					<et2-select-priority  id="priority"></et2-select-priority>
 				</row>
 				<row class="row add_alarm_action" valign="top" disabled="@no_add_alarm">
-					<button id="button[add_alarm]" label="Alarm" image="add" background_image="1"/>
-					<vbox>
-						<menulist>
-							<menupopup type="select" statustext="" id="new_alarm[options]" class="et2_fullWidth" onchange="app.calendar.alarm_custom_date"/>
-						</menulist>
-						<date-time id="new_alarm[date]" class="calendar_alarm_date_display et2_fullWidth"/>
-					</vbox>
+					<et2-button  id="button[add_alarm]" label="Alarm" image="add"></et2-button>
+					<et2-vbox>
+						<et2-select  statustext="" id="new_alarm[options]" onchange="app.calendar.alarm_custom_date"></et2-select>
+						<et2-date-time  id="new_alarm[date]" class="calendar_alarm_date_display"></et2-date-time>
+					</et2-vbox>
 				</row>
 				<row>
-					<description value="for"/>
-					<menulist>
-						<menupopup statustext="Select who should get the alarm" id="new_alarm[owner]" no_lang="1" class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  value="for"></et2-description>
+					<et2-select  statustext="Select who should get the alarm" id="new_alarm[owner]" noLang="1"></et2-select>
 				</row>
 				<row disabled="!@alarm">
 					<grid id="alarm" width="100%"  class="egwGridView_grid calendar_alarm_grid">
@@ -39,19 +33,17 @@
 						</columns>
 						<rows>
 							<row class="th">
-								<description value="Time"/>
-								<description value="Owner"/>
-								<description value="Action"/>
+								<et2-description  value="Time"></et2-description>
+								<et2-description  value="Owner"></et2-description>
+								<et2-description  value="Action"></et2-description>
 							</row>
 							<row>
-								<date-time id="${row}[time]" readonly="true"/>
-								<hbox>
-									<checkbox align="center" id="${row}[all]" label="all" readonly="true"/>
-									<menulist>
-										<menupopup type="select-account" id="${row}[owner]" readonly="true"/>
-									</menulist>
-								</hbox>
-								<button align="center" statustext="Delete this alarm" id="delete_alarm[$row_cont[id]]" onclick="et2_dialog.confirm(widget,'Delete this alarm','Delete')" image="delete"/>
+								<et2-date-time  id="${row}[time]" readonly="true"></et2-date-time>
+								<et2-hbox>
+									<et2-checkbox  align="center" id="${row}[all]" label="all" readonly="true"></et2-checkbox>
+									<et2-select-account  id="${row}[owner]" readonly="true"></et2-select-account>
+								</et2-hbox>
+								<et2-button-icon  align="center" statustext="Delete this alarm" id="delete_alarm[$row_cont[id]]" onclick="et2_dialog.confirm(widget,'Delete this alarm','Delete')" image="delete"></et2-button-icon>
 							</row>
 						</rows>
 					</grid>
@@ -60,7 +52,7 @@
 		</grid>
 	</template>
 	<template id="calendar.edit.description" template="" lang="" group="0" version="1.0.1.001">
-		<textbox multiline="true"  id="description" no_lang="1" width="99.7%" height="250" resize_ratio="0"/>
+		<et2-textarea  id="description" width="99.7%" height="250" noLang="1" resizeRatio="0"></et2-textarea>
 	</template>
 	<template id="calendar.edit.participants" template="" lang="" group="0" version="1.9.001">
 		<grid width="99%" id="participants">
@@ -74,29 +66,25 @@
 					<calendar-owner id="participant" allowFreeEntries="true"  empty_label="Add new participants or resource"/>
 				</row>
 				<row disabled="@no_add">
-					<menulist>
-						<menupopup class="selectRole" id="role"/>
-					</menulist>
-					<hbox>
-                        <textbox label="Quantity" type="integer" class="quantity" id="quantity" min="1" size="3"/>
-                    </hbox>
-					<button align="center" id="add" image="add" background_image="1" novalidate="1"/>
+					<et2-select  class="selectRole" id="role"></et2-select>
+					<et2-hbox>
+                        <et2-textbox  label="Quantity" type="integer" class="quantity" id="quantity" min="1"></et2-textbox>
+                    </et2-hbox>
+					<et2-button  align="center" id="add" image="add" novalidate="1"></et2-button>
 				</row>
 				<row class="th">
-					<description value="Participants"/>
-					<description value="Status"/>
-					<description value="Actions"/>
+					<et2-description  value="Participants"></et2-description>
+					<et2-description  value="Status"></et2-description>
+					<et2-description  value="Actions"></et2-description>
 				</row>
 				<row >
-					<description id="${row}[title]" no_lang="1"/>
-					<hbox>
-						<menulist>
-							<menupopup id="${row}[status]" onchange="1"/>
-						</menulist>
-						<textbox type="integer" align="center" id="${row}[quantity]" readonly="true" min="1" size="3"/>
-						<description id="${row}[role_label]"/>
-					</hbox>
-					<button align="center" id="delete[$row_cont[delete_id]]" image="delete"/>
+					<et2-description  id="${row}[title]" noLang="1"></et2-description>
+					<et2-hbox>
+						<et2-select  id="${row}[status]" onchange="1"></et2-select>
+						<et2-number  align="center" id="${row}[quantity]" readonly="true" min="1" precision="0"></et2-number>
+						<et2-description  id="${row}[role_label]"></et2-description>
+					</et2-hbox>
+					<et2-button-icon  align="center" id="delete[$row_cont[delete_id]]" image="delete"></et2-button-icon>
 				</row>
 			</rows>
 		</grid>
@@ -112,33 +100,27 @@
 			</columns>
 			<rows>
 				<row height="12">
-					<description for="recur_type" value="Repeat type"/>
-					<menulist>
-						<menupopup id="recur_type" onchange="app.calendar.check_recur_type" class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  for="recur_type" value="Repeat type"></et2-description>
+					<et2-select  id="recur_type" onchange="app.calendar.check_recur_type"></et2-select>
 				</row>
 				<row>
-					<description for="recur_interval" value="Interval"/>
-					<menulist>
-						<menupopup type="select-number" statustext="repeating interval, eg. 2 to repeat every second week" id="recur_interval" options="None,2,31" class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  for="recur_interval" value="Interval"></et2-description>
+					<et2-select-number  statustext="repeating interval, eg. 2 to repeat every second week" id="recur_interval" min="2" max="31" emptyLabel="None"></et2-select-number>
 				</row>
 				<row>
-					<description for="tzid" value="Timezone"/>
-					<menulist>
-						<menupopup type="select-timezone" statustext="Timezone in which recurrences have identical time" id="tzid" class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  for="tzid" value="Timezone"></et2-description>
+					<et2-select-timezone  statustext="Timezone in which recurrences have identical time" id="tzid"></et2-select-timezone>
 				</row>
 				<row>
-					<description for="recur_enddate" value="End date"/>
-					<date statustext="repeat the event until which date (empty means unlimited)" id="recur_enddate"/>
+					<et2-description  for="recur_enddate" value="End date"></et2-description>
+					<et2-date  statustext="repeat the event until which date (empty means unlimited)" id="recur_enddate"></et2-date>
 				</row>
 				<row>
-					<description for="recur_data" value="Repeat days"/>
-					<listbox type="select-dow" tags="true" statustext="Days of the week for a weekly repeated event" id="recur_data" rows="6" options="1"/>
+					<et2-description  for="recur_data" value="Repeat days"></et2-description>
+					<et2-select-dow  statustext="Days of the week for a weekly repeated event" id="recur_data" rows="6" multiple="1" placeholder="1"></et2-select-dow>
 				</row>
 				<row class="th">
-					<description value="Exceptions" span="all"/>
+					<et2-description  value="Exceptions" span="all"></et2-description>
 				</row>
 				<row>
 					<grid id="recur_exception">
@@ -148,8 +130,8 @@
 						</columns>
 						<rows>
 							<row>
-								<date-time id="$row" readonly="true"/>
-								<button statustext="Delete this exception" label="Delete" id="delete_exception[$row_cont]" onclick="et2_dialog.confirm(widget,'Delete this exception','Delete')" image="delete"/>
+								<et2-date-time  id="$row" readonly="true"></et2-date-time>
+								<et2-button  statustext="Delete this exception" label="Delete" id="delete_exception[$row_cont]" onclick="et2_dialog.confirm(widget,'Delete this exception','Delete')" image="delete"></et2-button>
 							</row>
 						</rows>
 					</grid>
@@ -167,13 +149,13 @@
 			</columns>
 			<rows>
 				<row disabled="@view">
-					<link-to id="link_to"/>
+					<et2-link-to  id="link_to"></et2-link-to>
 				</row>
 				<row class="th">
-					<description value="Existing links"/>
+					<et2-description  value="Existing links"></et2-description>
 				</row>
 				<row>
-					<link-list id="link_to"/>
+					<et2-link-list  id="link_to"></et2-link-list>
 				</row>
 			</rows>
 		</grid>
@@ -186,22 +168,18 @@
 			</columns>
 			<rows>
 				<row disabled="!@id">
-					<description value="Created"/>
-					<hbox height="46">
-						<menulist>
-							<menupopup type="select-account" id="owner" readonly="true"/>
-						</menulist>
-						<date-time id="created" no_lang="1" readonly="true"/>
-					</hbox>
+					<et2-description  value="Created"></et2-description>
+					<et2-hbox  height="46">
+						<et2-select-account  id="owner" readonly="true"></et2-select-account>
+						<et2-date-time  id="created" readonly="true" noLang="1"></et2-date-time>
+					</et2-hbox>
 				</row>
 				<row disabled="!@modified">
-					<description value="Updated"/>
-					<hbox height="46">
-						<menulist>
-							<menupopup type="select-account"   class="et2_nowrap" id="modifier" readonly="true"/>
-						</menulist>
-						<date-time id="modified" no_lang="1" readonly="true"/>
-					</hbox>
+					<et2-description  value="Updated"></et2-description>
+					<et2-hbox  height="46">
+						<et2-select-account  class="et2_nowrap" id="modifier" readonly="true"></et2-select-account>
+						<et2-date-time  id="modified" readonly="true" noLang="1"></et2-date-time>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -214,79 +192,80 @@
 			</columns>
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
-					<hbox  span="all" width="100%">
-						<button statustext="Apply the changes" id="button[apply]" image="apply" background_image="1"/>
-						<button statustext="delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" background_image="1" span="all"/>
-						<buttononly statustext="Find free timeslots where the selected participants are available for the given timespan" id="freetime" label="Freetime" onclick="app.calendar.freetime_search" image="add" background_image="1"/>
-						<checkbox toggle_on=" " toggle_off=" " id="no_notifications" class="notification_check"/>
-						<textbox type="hidden" id="delete_exceptions"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  statustext="Apply the changes" id="button[apply]" image="apply"></et2-button>
+						<et2-button  statustext="delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" span="all"></et2-button>
+						<et2-button  statustext="Find free timeslots where the selected participants are available for the given timespan" id="freetime" label="Freetime" onclick="app.calendar.freetime_search" image="add" noSubmit="true"></et2-button>
+						<et2-checkbox  id="no_notifications" class="notification_check" toggleOn=" " toggleOff=" "></et2-checkbox>
+						<et2-textbox  type="hidden" id="delete_exceptions"></et2-textbox>
+					</et2-hbox>
 				</row>
 				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
-					<hbox span="all" width="100%">
-						<button label="Search" id="button[search]" image="search" background_image="1"/>
-						<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  label="Search" id="button[search]" image="search"></et2-button>
+						<et2-button  label="Cancel" id="button[cancelsearch]" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Title"/>
-					<textbox id="title" needed="1" maxlength="255" tabindex="1" class="et2_fullWidth"/>
+					<et2-description  value="Title"></et2-description>
+					<et2-textbox  id="title" maxlength="255" tabindex="1" required="1"></et2-textbox>
 				</row>
 				<row>
-					<description for="start" value="Start" width="88"/>
-					<date-time id="start" needed="1" class="required"/>
+					<et2-description  for="start" value="Start" width="88"></et2-description>
+					<et2-date-time  id="start" class="required" required="1"></et2-date-time>
 				</row>
 
 				<row>
-					<description for="duration" value="Duration" width="0" id="calendar_edit_duration" />
-					<hbox>
-						<menulist >
-							<menupopup statustext="Duration of the meeting" class="et2_fullWidth" id="duration" no_lang="1" onchange="app.calendar.set_enddate_visibility" options="Use end date,,,,,,,false"/>
-						</menulist>
-						<date-time id="end"/>
-					</hbox>
+					<et2-description  for="duration" value="Duration" width="0" id="calendar_edit_duration"></et2-description>
+					<et2-hbox>
+						<et2-select  statustext="Duration of the meeting" id="duration" onchange="app.calendar.set_enddate_visibility" noLang="1" emptyLabel="Use end date"></et2-select>
+						<et2-date-time  id="end"></et2-date-time>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Options"/>
-					<vbox>
-						<checkbox  statustext="Event will occupy the whole day" label="whole day" id="whole_day" onchange="app.calendar.set_alarmOptions_WD"/>
-						<checkbox statustext="A non blocking event will not conflict with other events" label="non blocking" id="non_blocking" options="1,0, ,"/>
-						<checkbox label="Private" id="public" options="0,1"/>
-					</vbox>
+					<et2-description  value="Options"></et2-description>
+					<et2-vbox>
+						<et2-checkbox  statustext="Event will occupy the whole day" label="whole day" id="whole_day" onchange="app.calendar.set_alarmOptions_WD"></et2-checkbox>
+						<et2-checkbox  statustext="A non blocking event will not conflict with other events" label="non blocking" id="non_blocking" selectedValue="1" unselectedValue="0" roTrue=" " ></et2-checkbox>
+						<et2-checkbox  label="Private" id="public" selectedValue="0" unselectedValue="1" ></et2-checkbox>
+					</et2-vbox>
 				</row>
 				<row>
-				    <description value="Video Conference"/>
-				    <checkbox id="videoconference" onchange="app.calendar.videoconferenceOnChange"/>
+				    <et2-description  value="Video Conference"></et2-description>
+				    <et2-checkbox  id="videoconference" onchange="app.calendar.videoconferenceOnChange"></et2-checkbox>
 				</row>
 				<row>
-					<description for="location" value="Location"/>
-					<textbox id="location" maxlength="255" class="et2_fullWidth"/>
+					<et2-description  for="location" value="Location"></et2-description>
+					<et2-textbox  id="location" maxlength="255"></et2-textbox>
 				</row>
 				<row>
-					<description for="category" value="Categories"/>
-					<taglist-cat id="category" class="et2_fullWidth" rows="1" multiple="toggle"/>
+					<et2-description  for="category" value="Categories"></et2-description>
+					<et2-select-cat  id="category" multiple="true"></et2-select-cat>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" width="100%" align_tabs="v">
-						<tabs>
-							<tab id="description" label="Description" />
-							<tab id="participants" label="Participants" />
-							<tab id="details" label="Details" />
-							<tab id="recurrence" label="Recurrence" />
-							<tab id="custom" label="Custom"/>
-							<tab id="links" label="Links"/>
-							<tab id="ownership" label="Ownership"/>
-						</tabs>
-						<tabpanels>
+					<et2-vbox  id="tabs" span="all" width="100%">
+						<et2-details  id="description" summary="Description" title="">
 							<template id="calendar.edit.description"/>
+						</et2-details>
+						<et2-details  id="participants" summary="Participants" title="">
 							<template id="calendar.edit.participants"/>
+						</et2-details>
+						<et2-details  id="details" summary="Details" title="">
 							<template id="calendar.edit.details"/>
+						</et2-details>
+						<et2-details  id="recurrence" summary="Recurrence" title="">
 							<template id="calendar.edit.recurrence"/>
+						</et2-details>
+						<et2-details  id="custom" summary="Custom" title="">
 							<template id="calendar.edit.custom"/>
+						</et2-details>
+						<et2-details  id="links" summary="Links" title="">
 							<template id="calendar.edit.links"/>
+						</et2-details>
+						<et2-details  id="ownership" summary="Ownership" title="">
 							<template id="calendar.edit.ownership"/>
-						</tabpanels>
-					</tabbox>
+						</et2-details>
+					</et2-vbox>
 				</row>
 				<row>
 
@@ -294,4 +273,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/mobile/freetimesearch.xet b/calendar/templates/mobile/freetimesearch.xet
index f868172608..db75a2c72c 100644
--- a/calendar/templates/mobile/freetimesearch.xet
+++ b/calendar/templates/mobile/freetimesearch.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="calendar.freetimesearch.rows" template="" lang="" group="0" version="1.0.1.001">
 		<grid>
@@ -12,18 +11,16 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description value="Date"/>
-					<description value="Time"/>
-					<description value="Select"/>
-					<description value="Enddate"/>
+					<et2-description  value="Date"></et2-description>
+					<et2-description  value="Time"></et2-description>
+					<et2-description  value="Select"></et2-description>
+					<et2-description  value="Enddate"></et2-description>
 				</row>
 				<row class="row">
-					<date options=",16" id="${row}[start]" readonly="true"/>
-					<menulist>
-						<menupopup no_lang="1" id="{$row}start" statustext="select a time"/>
-					</menulist>
-					<button label="Select" id="select[$row]" statustext="use the selected time and close the popup" onclick="app.calendar.freetime_select" />
-					<date-time id="${row}[end]" readonly="true"/>
+					<et2-date  id="${row}[start]" readonly="true"></et2-date>
+					<et2-select  id="{$row}start" statustext="select a time" noLang="1"></et2-select>
+					<et2-button  label="Select" id="select[$row]" statustext="use the selected time and close the popup" onclick="app.calendar.freetime_select"></et2-button>
+					<et2-date-time  id="${row}[end]" readonly="true"></et2-date-time>
 				</row>
 			</rows>
 		</grid>
@@ -39,20 +36,18 @@
 
 				</row>
 				<row>
-					<description class="calendar_freetime_header" value="Freetime Search" span="all"/>
+					<et2-description  class="calendar_freetime_header" value="Freetime Search" span="all"></et2-description>
 				</row>
 				<row>
-					<description value="Duration"/>
-					<hbox>
-						<menulist>
-							<menupopup no_lang="1" id="duration" statustext="Duration of the meeting" onchange="app.calendar.set_enddate_visibility" options="Use end date"/>
-						</menulist>
-						<date-time id="end" statustext="Enddate / -time of the meeting, eg. for more then one day"/>
-					</hbox>
+					<et2-description  value="Duration"></et2-description>
+					<et2-hbox>
+						<et2-select  id="duration" statustext="Duration of the meeting" onchange="app.calendar.set_enddate_visibility" noLang="1" emptyLabel="Use end date"></et2-select>
+						<et2-date-time  id="end" statustext="Enddate / -time of the meeting, eg. for more then one day"></et2-date-time>
+					</et2-hbox>
 				</row>
 				<row >
-					<description value="Startdate / -time"/>
-					<date-time id="start" statustext="Startdate and -time of the search"/>
+					<et2-description  value="Startdate / -time"></et2-description>
+					<et2-date-time  id="start" statustext="Startdate and -time of the search"></et2-date-time>
 				</row>
 			</rows>
 		</grid>
@@ -69,23 +64,21 @@
 
 				</row>
 				<row>
-					<description value="Timeframe"/>
-					<hbox class="calendar_freetime_timeframe">
-						<date-timeonly id="start_time" statustext="Timeframe to search"/>
-						<description value="til"/>
-						<date-timeonly id="end_time" statustext="Timeframe to search"/>
-						<description value="Weekdays"/>
-						<select-dow rows="10" id="weekdays" statustext="Weekdays to use in search" class="calendar_freetime_dow"/>
-					</hbox>
+					<et2-description  value="Timeframe"></et2-description>
+					<et2-hbox  class="calendar_freetime_timeframe">
+						<et2-date-timeonly  id="start_time" statustext="Timeframe to search"></et2-date-timeonly>
+						<et2-description  value="til"></et2-description>
+						<et2-date-timeonly  id="end_time" statustext="Timeframe to search"></et2-date-timeonly>
+						<et2-description  value="Weekdays"></et2-description>
+						<et2-select-dow  rows="10" id="weekdays" statustext="Weekdays to use in search" class="calendar_freetime_dow" multiple="1"></et2-select-dow>
+					</et2-hbox>
 				</row>
 				<row>
-					<button label="New search" id="search" statustext="new search with the above parameters"/>
-					<hbox>
-						<menulist>
-							<menupopup no_lang="1" id="search_window" statustext="how far to search (from startdate)"/>
-						</menulist>
-						<button id="cancel" label="Cancel" statustext="Close the window" onclick="window.close();"/>
-					</hbox>
+					<et2-button  label="New search" id="search" statustext="new search with the above parameters"></et2-button>
+					<et2-hbox>
+						<et2-select  id="search_window" statustext="how far to search (from startdate)" noLang="1"></et2-select>
+						<et2-button  id="cancel" label="Cancel" statustext="Close the window" onclick="window.close();"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
 					<template content="freetime" span="all" id="calendar.freetimesearch.rows"/>
@@ -96,4 +89,4 @@
 			body { background-color: white; }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/mobile/list.xet b/calendar/templates/mobile/list.xet
index 72971a22c1..943dbe26e9 100644
--- a/calendar/templates/mobile/list.xet
+++ b/calendar/templates/mobile/list.xet
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- $Id: list.xet 54765 2016-01-19 00:48:21Z nathangray $ -->
 <overlay>
 	<template id="calendar.list.add" template="" lang="" group="0" version="16.1.001">
-		<button id="add" parent_node="calendar-list_plus_button_container"  class="plus_button"  onclick="egw.open('calendar');"/>
+		<et2-button  id="add" class="plus_button" onclick="egw.open('calendar');" parentId="calendar-list_plus_button_container"></et2-button>
 	</template>
 	<template id="calendar.list.dates" template="" lang="" group="0" version="1.3.001">
-		<hbox>
-			<description value="Start"/>
-			<date id="startdate" onchange="app.calendar.update_state({date: widget.getValue()}); return false;"/>
-			<description value="End"/>
-			<date id="enddate" onchange="app.calendar.update_state({end_date: widget.getValue()}); return false;"/>
-		</hbox>
+		<et2-hbox>
+			<et2-description  value="Start"></et2-description>
+			<et2-date  id="startdate" onchange="app.calendar.update_state({date: widget.getValue()}); return false;"></et2-date>
+			<et2-description  value="End"></et2-description>
+			<et2-date  id="enddate" onchange="app.calendar.update_state({end_date: widget.getValue()}); return false;"></et2-date>
+		</et2-hbox>
 	</template>
 	<template id="calendar.list.rows" template="" lang="" group="0" version="1.9.004">
 		<grid width="100%" >
@@ -25,18 +25,18 @@
 
 				</row>
 				<row class="$row_cont[class]" valign="top">
-					<description class=" cat_$row_cont[cat_id] mobile_cat_col"/>
-					<vbox class="calendar_fullWidth">
+					<et2-description  class="cat_$row_cont[cat_id] mobile_cat_col"></et2-description>
+					<et2-vbox  class="calendar_fullWidth">
 						<customfields-list id="$row" class="customfields" app="calendar" disabled="true"/>
-						<hbox class="calTitleRow">
-							<description id="${row}[title]" no_lang="1" class="$row_cont[sub_class] et2_ellipsis" overflow="hidden" width="100%" />
-						</hbox>
-						<hbox class="calDates">
-							<time_or_date id="${row}[start]" readonly="true" options=",$cont[format]" class="noWrap"/>
-							<description class="dash" value="-"/>
-							<time_or_date id="${row}[end]" readonly="true" options=",$cont[format]" class="noWrap"/>
-						</hbox>
-					</vbox>
+						<et2-hbox  class="calTitleRow">
+							<et2-description  id="${row}[title]" class="$row_cont[sub_class] et2_ellipsis" overflow="hidden" width="100%" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-hbox  class="calDates">
+							<et2-date-time-today  id="${row}[start]" readonly="true" options=",$cont[format]" class="noWrap"></et2-date-time-today>
+							<et2-description  class="dash" value="-"></et2-description>
+							<et2-date-time-today  id="${row}[end]" readonly="true" options=",$cont[format]" class="noWrap"></et2-date-time-today>
+						</et2-hbox>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
@@ -52,40 +52,40 @@
 					<html id="css" span="all"/>
 				</row>
 				<row>
-					<description align="center" id="msg" no_lang="1" span="all" class="message"/>
+					<et2-description  align="center" id="msg" span="all" class="message" noLang="1"></et2-description>
 				</row>
 				<row>
-					<description id="plus_button_container"/>
+					<et2-description  id="plus_button_container"></et2-description>
 				</row>
 				<row>
 					<nextmatch id="nm" template="calendar.list.rows" header_right="calendar.list.add" header_left="calendar.list.dates" span="all"/>
 				</row>
 				<row>
-					<hbox>
-						<box class="action_popup prompt" id="delete_popup">
-							<vbox>
-								<description value="Delete" class="promptheader"/>
-								<description value="This is a recurring event. Do you want to delete just this recurrence or the whole series?"/>
-								<hbox>
-									<button label="Delete this recurrence" id="delete" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Delete series" id="delete_series" onclick="nm_popup_action.id = 'delete_series'; nm_submit_popup(this); return false;"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'delete_popup');"/>
-								</hbox>
-							</vbox>
-						</box>
-						<box class="action_popup prompt" id="undelete_popup">
-							<vbox>
-								<description value="Un-delete" class="promptheader"/>
-								<description value="This is a recurring event. Do you want to Un-delete just this recurrence or the whole series?"/>
-								<hbox>
-									<button label="Un-delete this recurrence" id="undelete" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Un-delete series" id="undelete_series" onclick="nm_popup_action.id = 'undelete_series'; nm_submit_popup(this); return false;"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'undelete_popup');"/>
-								</hbox>
-							</vbox>
-						</box>
-					</hbox>
-					<description/>
+					<et2-hbox>
+						<et2-box  class="action_popup prompt" id="delete_popup">
+							<et2-vbox>
+								<et2-description  value="Delete" class="promptheader"></et2-description>
+								<et2-description  value="This is a recurring event. Do you want to delete just this recurrence or the whole series?"></et2-description>
+								<et2-hbox>
+									<et2-button  label="Delete this recurrence" id="delete" onclick="nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Delete series" id="delete_series" onclick="nm_popup_action.id = 'delete_series'; nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Cancel" onclick="nm_hide_popup(this,'delete_popup');" noSubmit="true"></et2-button>
+								</et2-hbox>
+							</et2-vbox>
+						</et2-box>
+						<et2-box  class="action_popup prompt" id="undelete_popup">
+							<et2-vbox>
+								<et2-description  value="Un-delete" class="promptheader"></et2-description>
+								<et2-description  value="This is a recurring event. Do you want to Un-delete just this recurrence or the whole series?"></et2-description>
+								<et2-hbox>
+									<et2-button  label="Un-delete this recurrence" id="undelete" onclick="nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Un-delete series" id="undelete_series" onclick="nm_popup_action.id = 'undelete_series'; nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Cancel" onclick="nm_hide_popup(this,'undelete_popup');" noSubmit="true"></et2-button>
+								</et2-hbox>
+							</et2-vbox>
+						</et2-box>
+					</et2-hbox>
+					<et2-description></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -103,4 +103,4 @@
 
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/mobile/toolbar.xet b/calendar/templates/mobile/toolbar.xet
index 290c17952a..8ded78b817 100644
--- a/calendar/templates/mobile/toolbar.xet
+++ b/calendar/templates/mobile/toolbar.xet
@@ -9,15 +9,15 @@ Egroupware
 @version $Id$
 -->
 
-<!DOCTYPE overlay PUBLIC '-//EGroupware GmbH//eTemplate 2//EN' 'http://www.egroupware.org/etemplate2.dtd'>
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 
 <overlay>
 	<template id="calendar.toolbar">
-		<hbox class="et2_nextmatch" >
-			<box class="search nm-mob-header" width="100%">
-				<searchbox id="keywords" blur="Search" overlay="false" size="large" fix="false" onchange="app.calendar.update_state({view: 'listview',search: widget.getValue()});return false;"/>
+		<et2-hbox  class="et2_nextmatch" >
+			<et2-box  class="search nm-mob-header" width="100%">
+				<et2-searchbox  id="keywords" overlay="false" size="large" fix="false" onchange="app.calendar.update_state({view: 'listview',search: widget.getValue()});return false;" placeholder="Search"></et2-searchbox>
 				<toolbar id="toolbar" flat_list="false"/>
-			</box>
-		</hbox>
+			</et2-box>
+		</et2-hbox>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/calendar/templates/mobile/view.xet b/calendar/templates/mobile/view.xet
index 717224521b..213c0a1fe5 100644
--- a/calendar/templates/mobile/view.xet
+++ b/calendar/templates/mobile/view.xet
@@ -9,11 +9,11 @@ Egroupware
 @version $Id$
 -->
 
-<!DOCTYPE overlay PUBLIC '-//EGroupware GmbH//eTemplate 2//EN' 'http://www.egroupware.org/etemplate2.dtd'>
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 
 <overlay>
     <template id="calendar.view">
-		<label id="header_dateIndicator"/>
+		<et2-label  id="header_dateIndicator"></et2-label>
 		<grid id="view" width="100%">
 			<columns>
 				<column/>
@@ -30,6 +30,6 @@ Egroupware
 
 			</rows>
 		</grid>
-		<button class="plus_button" id="add" onclick="egw.open(null,'calendar','add')"/>
+		<et2-button  class="plus_button" id="add" onclick="egw.open(null,'calendar','add')"></et2-button>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/filemanager/templates/default/admin.xet b/filemanager/templates/default/admin.xet
index b55c9c0b23..024d6ea3e6 100644
--- a/filemanager/templates/default/admin.xet
+++ b/filemanager/templates/default/admin.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="filemanager.admin" template="" lang="" group="0" version="1.7.001">
 		<groupbox disabled="!@percent_size">
@@ -13,27 +13,27 @@
 				</columns>
 				<rows>
 					<row>
-						<description value="All files"/>
-						<int id="total_files" readonly="true" align="right"/>
-						<description value="Files"/>
+						<et2-description  value="All files"></et2-description>
+						<et2-number  id="total_files" readonly="true" align="right" precision="0"></et2-number>
+						<et2-description  value="Files"></et2-description>
 						<vfs-size id="total_size" class="bold"/>
 					</row>
 					<row>
-						<description value="Older versions or deleted files"/>
-						<int id="version_files" readonly="true" align="right"/>
-						<description value="Files"/>
+						<et2-description  value="Older versions or deleted files"></et2-description>
+						<et2-number  id="version_files" readonly="true" align="right" precision="0"></et2-number>
+						<et2-description  value="Files"></et2-description>
 						<vfs-size id="version_size" align="right" class="bold"/>
 					</row>
 					<row>
-						<description value="Percentage"/>
-						<description id="percent_files" align="right" class="bold"/>
-						<description/>
-						<description id="percent_size" align="right" class="bold"/>
+						<et2-description  value="Percentage"></et2-description>
+						<et2-description  id="percent_files" align="right" class="bold"></et2-description>
+						<et2-description></et2-description>
+						<et2-description  id="percent_size" align="right" class="bold"></et2-description>
 					</row>
 				</rows>
 			</grid>
 		</groupbox>
-		<description value="Mountpoints" class="filemanager_header"/>
+		<et2-description  value="Mountpoints" class="filemanager_header"></et2-description>
 		<grid id="mounts" class="egwGridView_grid">
 			<columns>
 				<column/>
@@ -43,55 +43,53 @@
 			</columns>
 			<rows>
 				<row class="th" part="header">
-					<description value="Path"/>
-					<description value="Backend URL"/>
-					<description value="Versioning" align="center"/>
-					<description value="Mount" align="center"/>
+					<et2-description  value="Path"></et2-description>
+					<et2-description  value="Backend URL"></et2-description>
+					<et2-description  value="Versioning" align="center"></et2-description>
+					<et2-description  value="Mount" align="center"></et2-description>
 				</row>
 				<row disabled="!@@is_root" part="footer" valign="bottom">
-					<textbox id="path" size="48"/>
-					<vbox width="100%">
+					<et2-textbox  id="path"></et2-textbox>
+					<et2-vbox  width="100%">
 						<groupbox>
 							<caption label="Protocols"/>
-							<vbox class="filemanager_protocols">
-								<description value="WebDAVs: mount EGroupware or *Cloud shares"/>
-								<description value="SMB: mount Samba or Windows fileserver shares"/>
-								<description value="{Versioning}: {Versioning requires EGroupware EPL}"
-									extra_link_target="_blank" href="https://www.egroupware.org/EPL"/>
-								<description value="Filesystem: mount directory (inside /var/lib/egroupware!) from host filesystem"
-									extra_link_target="_blank" href="https://github.com/EGroupware/egroupware/blob/master/api/src/Vfs/Filesystem/StreamWrapper.php#L20"/>
-							</vbox>
+							<et2-vbox  class="filemanager_protocols">
+								<et2-description  value="WebDAVs: mount EGroupware or *Cloud shares"></et2-description>
+								<et2-description  value="SMB: mount Samba or Windows fileserver shares"></et2-description>
+								<et2-description  value="{Versioning}: {Versioning requires EGroupware EPL}" href="https://www.egroupware.org/EPL" extraLinkTarget="_blank"></et2-description>
+								<et2-description  value="Filesystem: mount directory (inside /var/lib/egroupware!) from host filesystem" href="https://github.com/EGroupware/egroupware/blob/master/api/src/Vfs/Filesystem/StreamWrapper.php#L20" extraLinkTarget="_blank"></et2-description>
+							</et2-vbox>
 						</groupbox>
-						<hbox width="100%">
-							<select id="url[scheme]" statustext="Protocol to use" onchange="app.filemanager.changeMountScheme"/>
-							<description value="://"/>
-							<textbox id="url[user]" blur="user" statustext="Username for WebDAV and SMB, use $user for name of logged in user" size="12"/>
-							<description id="colon" value=":"/>
-							<passwd id="url[pass]" blur="password" statustext="Password for WebDAV and SMB, use $pass for password of logged in user" class="filemanager_password" size="12"/>
-							<description id="at"/>
-							<textbox id="url[host]" blur="host" statustext="Hostname/IP for WebDAV and SMB"/>
-							<textbox id="url[path]" blur="Path and query-parameters, SMB: share and optional path (with /)" size="64"/>
-						</hbox>
-					</vbox>
-					<button label="Enable" id="enable" statustext="Enable versioning for given mountpoint" class="filemanager_smallButton" align="center"/>
-					<button label="Mount" id="mount" class="filemanager_smallButton" align="center"/>
+						<et2-hbox  width="100%">
+							<et2-select  id="url[scheme]" statustext="Protocol to use" onchange="app.filemanager.changeMountScheme"></et2-select>
+							<et2-description  value="://"></et2-description>
+							<et2-textbox  id="url[user]" statustext="Username for WebDAV and SMB, use $user for name of logged in user" placeholder="user"></et2-textbox>
+							<et2-description  id="colon" value=":"></et2-description>
+							<et2-password  id="url[pass]" statustext="Password for WebDAV and SMB, use $pass for password of logged in user" class="filemanager_password" placeholder="password"></et2-password>
+							<et2-description  id="at"></et2-description>
+							<et2-textbox  id="url[host]" statustext="Hostname/IP for WebDAV and SMB" placeholder="host"></et2-textbox>
+							<et2-textbox  id="url[path]" placeholder="Path and query-parameters, SMB: share and optional path (with /)"></et2-textbox>
+						</et2-hbox>
+					</et2-vbox>
+					<et2-button  label="Enable" id="enable" statustext="Enable versioning for given mountpoint" class="filemanager_smallButton" align="center"></et2-button>
+					<et2-button  label="Mount" id="mount" class="filemanager_smallButton" align="center"></et2-button>
 				</row>
 				<row class="row">
-					<description id="${row}[path]"/>
-					<description id="${row}[url]"/>
-					<button label="Disable" id="disable[$row_cont[path]]" statustext="Disable versioning for this mountpoint" class="filemanager_smallButton" align="center"/>
-					<button label="Unmount" id="umount[$row_cont[path]]" class="filemanager_smallButton" align="center"/>
+					<et2-description  id="${row}[path]"></et2-description>
+					<et2-description  id="${row}[url]"></et2-description>
+					<et2-button  label="Disable" id="disable[$row_cont[path]]" statustext="Disable versioning for this mountpoint" class="filemanager_smallButton" align="center"></et2-button>
+					<et2-button  label="Unmount" id="umount[$row_cont[path]]" class="filemanager_smallButton" align="center"></et2-button>
 				</row>
 			</rows>
 		</grid>
-		<vbox class="filemanager_config">
-			<button label="Mount /etemplates to allow customizing of eTemplates" id="etemplates" class="et2_buttonFitContent"/>
-			<select id="allow_delete_versions" onchange="1" label="Who should be allowed to finally delete deleted files or old versions of a file:" empty_label="Noone" disabled="!@versioning"/>
-			<hbox disabled="!@versioning">
-				<integer id="mtime" label="Delete all older versions and deleted files older then %s days" statustext="0 means all, -N newer then N days"/>
-				<textbox size="30" label="under directory" id="versionedpath" statustext="/ = everywhere"/>
-				<button id="delete-versions" label="Finally delete" onclick="et2_dialog.confirm(widget,'Finally delete all older versions and deleted files under given directory.\n\nThis can NOT be undone!','Confirm final delete');" image="delete" background_image="1"/>
-			</hbox>
+		<et2-vbox  class="filemanager_config">
+			<et2-button  label="Mount /etemplates to allow customizing of eTemplates" id="etemplates" class="et2_buttonFitContent"></et2-button>
+			<et2-select  id="allow_delete_versions" onchange="1" label="Who should be allowed to finally delete deleted files or old versions of a file:" disabled="!@versioning" emptyLabel="Noone"></et2-select>
+			<et2-hbox  disabled="!@versioning">
+				<et2-number  id="mtime" label="Delete all older versions and deleted files older then %s days" statustext="0 means all, -N newer then N days" precision="0"></et2-number>
+				<et2-textbox  label="under directory" id="versionedpath" statustext="/ = everywhere"></et2-textbox>
+				<et2-button  id="delete-versions" label="Finally delete" onclick="et2_dialog.confirm(widget,'Finally delete all older versions and deleted files under given directory.\n\nThis can NOT be undone!','Confirm final delete');" image="delete"></et2-button>
+			</et2-hbox>
 			<grid>
 				<columns>
 					<column/>
@@ -99,23 +97,23 @@
 				</columns>
 				<rows>
 					<row disabled="@is_root">
-						<description span="all" value="Some functionalities require superuser permissions, please login here as filemanager superuser - allowed users are defined in setup."/>
+						<et2-description  span="all" value="Some functionalities require superuser permissions, please login here as filemanager superuser - allowed users are defined in setup."></et2-description>
 					</row>
 					<row disabled="@is_root">
-						<description value="User"/>
-						<textbox id="user"/>
+						<et2-description  value="User"></et2-description>
+						<et2-textbox  id="user"></et2-textbox>
 					</row>
 					<row disabled="@is_root">
-						<description value="Password"/>
-						<passwd id="password" autocomplete="on"/>
+						<et2-description  value="Password"></et2-description>
+						<et2-password  id="password" autocomplete="on"></et2-password>
 					</row>
 					<row disabled="@is_root">
-						<description/>
-						<button label="Submit" id="sudo"/>
+						<et2-description></et2-description>
+						<et2-button  label="Submit" id="sudo"></et2-button>
 					</row>
 				</rows>
 			</grid>
-			<button id="logout" label="Logout" statustext="Log out as superuser"/>
-		</vbox>
+			<et2-button  id="logout" label="Logout" statustext="Log out as superuser"></et2-button>
+		</et2-vbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/filemanager/templates/default/editor.xet b/filemanager/templates/default/editor.xet
index 9d9535b023..580fac9d59 100644
--- a/filemanager/templates/default/editor.xet
+++ b/filemanager/templates/default/editor.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="filemanager.editor" template="" lang="" group="0" version="16.1">
 		<grid width="100%" height="100%">
@@ -9,10 +8,10 @@
 			</columns>
 			<rows>
 				<row height="45">
-					<box height="30">
+					<et2-box  height="30">
 						<toolbar id="tools"/>
-						<textbox id="file_path" readonly="true"/>
-					</box>
+						<et2-textbox  id="file_path" readonly="true"></et2-textbox>
+					</et2-box>
 				</row>
 				<row>
 					<grid height="700" width="100%" resize_ratio="1">
@@ -21,7 +20,7 @@
 						</columns>
 						<rows>
 							<row>
-								<box id = "odfEditor" height="100%" width="100%"></box>
+								<et2-box  height="100%" width="100%"></et2-box>
 							</row>
 						</rows>
 					</grid>
@@ -29,4 +28,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/filemanager/templates/default/file.xet b/filemanager/templates/default/file.xet
index cd397aa5a2..b269a7103f 100644
--- a/filemanager/templates/default/file.xet
+++ b/filemanager/templates/default/file.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="filemanager.file.general" template="" lang="" group="0" version="1.7.002">
 		<grid width="100%" spacing="10">
@@ -10,39 +9,39 @@
 			</columns>
 			<rows>
 				<row height="30">
-					<image align="center" src="icon" class="mimeIcon"/>
+					<et2-image  align="center" src="icon" class="mimeIcon"></et2-image>
 					<vfs-name id="name" needed="1" class="fileName et2_fullWidth"/>
 				</row>
 				<row>
 					<hrule span="all"/>
 				</row>
 				<row disabled="!@is_link">
-					<description for="symlink" value="Link"/>
-					<textbox id="symlink" readonly="true" class="fileName"/>
+					<et2-description  for="symlink" value="Link"></et2-description>
+					<et2-textbox  id="symlink" readonly="true" class="fileName"></et2-textbox>
 				</row>
 				<row>
-					<description value="Type"/>
-					<description id="mime"/>
+					<et2-description  value="Type"></et2-description>
+					<et2-description  id="mime"></et2-description>
 				</row>
 				<row>
-					<description value="Directory"/>
-					<description id="dir"/>
+					<et2-description  value="Directory"></et2-description>
+					<et2-description  id="dir"></et2-description>
 				</row>
 				<row disabled="@is_link">
-					<description value="Size"/>
+					<et2-description  value="Size"></et2-description>
 					<vfs-size id="size" options="1"/>
 				</row>
 				<row>
-					<description value="Created"/>
-					<date-time id="ctime" readonly="true"/>
+					<et2-description  value="Created"></et2-description>
+					<et2-date-time  id="ctime" readonly="true"></et2-date-time>
 				</row>
 				<row>
-					<description value="Modified"/>
-					<date-time id="mtime" readonly="true"/>
+					<et2-description  value="Modified"></et2-description>
+					<et2-date-time  id="mtime" readonly="true"></et2-date-time>
 				</row>
 				<row>
-					<description for="comment" value="Comment"/>
-					<textbox multiline="true" id="comment" class="et2_fullWidth" height="100"/>
+					<et2-description  for="comment" value="Comment"></et2-description>
+					<et2-textarea  id="comment" height="100"></et2-textarea>
 				</row>
 			</rows>
 		</grid>
@@ -63,30 +62,24 @@
                             </columns>
                             <rows>
                                 <row>
-                                    <description value="Owner"/>
-                                    <menulist>
-                                        <menupopup id="perms[owner]"/>
-                                    </menulist>
+                                    <et2-description  value="Owner"></et2-description>
+                                    <et2-select  id="perms[owner]"></et2-select>
 								</row>
 								<row>
-									<description value="Group"/>
-									<menulist>
-										<menupopup id="perms[group]"/>
-									</menulist>
+									<et2-description  value="Group"></et2-description>
+									<et2-select  id="perms[group]"></et2-select>
 								</row>
 								<row>
-									<description value="Other"/>
-									<menulist>
-										<menupopup id="perms[other]"/>
-									</menulist>
+									<et2-description  value="Other"></et2-description>
+									<et2-select  id="perms[other]"></et2-select>
 								</row>
 								<row disabled="@is_dir">
-									<description/>
-									<checkbox label="Executable" id="perms[executable]"/>
+									<et2-description></et2-description>
+									<et2-checkbox  label="Executable" id="perms[executable]"></et2-checkbox>
 								</row>
 								<row disabled="1">
-									<description/>
-									<checkbox label="Only owner can rename or delete the content" id="perms[sticky]"/>
+									<et2-description></et2-description>
+									<et2-checkbox  label="Only owner can rename or delete the content" id="perms[sticky]"></et2-checkbox>
 								</row>
 							</rows>
 						</grid>
@@ -102,19 +95,19 @@
 							</columns>
 							<rows>
 								<row>
-									<description value="User"/>
-									<select-account label="@ro_uid_root" id="uid" empty_label="root" account_type="accounts"/>
+									<et2-description  value="User"></et2-description>
+									<et2-select-account  label="@ro_uid_root" id="uid" emptyLabel="root" accountType="accounts"></et2-select-account>
 								</row>
 								<row>
-									<description value="Group"/>
-									<select-account label="@ro_gid_root" id="gid" empty_label="root" account_type="groups"/>
+									<et2-description  value="Group"></et2-description>
+									<et2-select-account  label="@ro_gid_root" id="gid" emptyLabel="root" accountType="groups"></et2-select-account>
 								</row>
 							</rows>
 						</grid>
 					</groupbox>
 				</row>
 				<row disabled="!@is_dir">
-					<checkbox label="Modify all Subdirectories and their content" id="modify_subs"/>
+					<et2-checkbox  label="Modify all Subdirectories and their content" id="modify_subs"></et2-checkbox>
 				</row>
 			</rows>
 		</grid>
@@ -139,31 +132,25 @@
 							</columns>
 							<rows>
 								<row class="th">
-									<description value="Owner"/>
-									<description value="Rights"/>
-									<description value="Inherited"/>
-									<description/>
+									<et2-description  value="Owner"></et2-description>
+									<et2-description  value="Rights"></et2-description>
+									<et2-description  value="Inherited"></et2-description>
+									<et2-description></et2-description>
 								</row>
 								<row class="row" disabled="!@1">
-									<menulist>
-										<menupopup type="select-account" id="${row}[owner]" readonly="true"/>
-									</menulist>
-									<menulist>
-										<menupopup id="${row}[rights]" readonly="true"/>
-									</menulist>
-									<description id="${row}[path]"/>
-									<button label="Delete" id="delete[$row_cont[ino]-$row_cont[owner]]" onclick="et2_dialog.confirm(widget,'Delete this extended ACL?','Delete')" image="delete"/>
+									<et2-select-account  id="${row}[owner]" readonly="true"></et2-select-account>
+									<et2-select  id="${row}[rights]" readonly="true"></et2-select>
+									<et2-description  id="${row}[path]"></et2-description>
+									<et2-button  label="Delete" id="delete[$row_cont[ino]-$row_cont[owner]]" onclick="et2_dialog.confirm(widget,'Delete this extended ACL?','Delete')" image="delete"></et2-button>
 								</row>
 							</rows>
 						</grid>
 					</groupbox>
 				</row>
 				<row valign="bottom" disabled="!@is_owner">
-						<select-account class="filemanager-file_filemanager-file-eaclowner eaclAccount" label="Owner" id="eacl_owner" empty_label="select one" account_type="both"/>
-						<menulist>
-							<menupopup class="eaclRights" statustext="You can only grant additional rights, you can NOT take rights away!" label="Rights" id="eacl[rights]"/>
-						</menulist>
-					<button label="Add" id="button[eacl]" image="add" background_image="1"/>
+						<et2-select-account  class="filemanager-file_filemanager-file-eaclowner eaclAccount" label="Owner" id="eacl_owner" emptyLabel="select one" accountType="both"></et2-select-account>
+						<et2-select  class="eaclRights" statustext="You can only grant additional rights, you can NOT take rights away!" label="Rights" id="eacl[rights]"></et2-select>
+					<et2-button  label="Add" id="button[eacl]" image="add"></et2-button>
 				</row>
 			</rows>
 		</grid>
@@ -175,13 +162,13 @@
 			</columns>
 			<rows>
 				<row valign="top" disabled="!@mime=/^image/">
-					<image src="link" class="previewImage"/>
+					<et2-image  src="link" class="previewImage"></et2-image>
 				</row>
 				<row valign="top" height="280" disabled="!@text_content">
-					<textbox multiline="true" id="text_content" readonly="true" class="previewText"/>
+					<et2-textarea  id="text_content" readonly="true" class="previewText"></et2-textarea>
 				</row>
 				<row disabled="@mime=/^(image|text)/">
-					<description value="No preview available"/>
+					<et2-description  value="No preview available"></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -205,9 +192,9 @@
 			</columns>
 			<rows>
 				<row disabled="@mergeapp_itempicker_disabled">
-					<hbox>
+					<et2-hbox>
 						<itempicker id="itempicker_merge" application="@mergeapp_effective" action="itempickerDocumentAction" action_label="Merge"/>
-					</hbox>
+					</et2-hbox>
 				</row>
 				<row>
 					<groupbox>
@@ -219,16 +206,12 @@
 							</columns>
 							<rows>
 								<row disabled="@is_dir">
-									<description value="Items of the selected application can be inserted into this document"/>
-									<menulist>
-										<menupopup id="mergeapp"/>
-									</menulist>
+									<et2-description  value="Items of the selected application can be inserted into this document"></et2-description>
+									<et2-select  id="mergeapp"></et2-select>
 								</row>
 								<row disabled="!@is_dir">
-									<description value="Items of the selected application can be inserted into files of this directory"/>
-									<menulist>
-										<menupopup id="mergeapp"/>
-									</menulist>
+									<et2-description  value="Items of the selected application can be inserted into files of this directory"></et2-description>
+									<et2-select  id="mergeapp"></et2-select>
 								</row>
 							</rows>
 						</grid>
@@ -244,10 +227,10 @@
 			</columns>
 			<rows>
 				<row disabled="!@msg">
-					<description id="msg" span="all" class="redItalic"/>
+					<et2-description  id="msg" span="all" class="redItalic"></et2-description>
 				</row>
 				<row class="dialogTabs">
-					<tabbox id="tabs" span="all" tab_height="330">
+					<et2-tabbox  id="tabs" span="all" tabHeight="330">
 						<tabs>
 							<tab id="filemanager.file.general" label="General"/>
 							<tab id="filemanager.file.perms" label="Permissions"/>
@@ -262,17 +245,17 @@
 							<template id="filemanager.file.preview"/>
 							<template id="filemanager.file.custom"/>
 						</tabpanels>
-					</tabbox>
+					</et2-tabbox>
 				</row>
 				<row class="dialogFooterToolbar">
-					<hbox>
-						<hbox>
-							<button label="Save" id="button[save]" image="save" background_image="1"/>
-							<button label="Apply" id="button[apply]" image="apply" background_image="1"/>
-							<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-						</hbox>
-						<buttononly align="right" statustext="Enter setup user and password to get root rights" label="Superuser" id="sudouser" onclick="jQuery('.superuser').css('display','inline'); document.getElementById(form::name('sudo[user]')).focus();" image="superuser" background_image="1"/>
-					</hbox>
+					<et2-hbox>
+						<et2-hbox>
+							<et2-button  label="Save" id="button[save]" image="save"></et2-button>
+							<et2-button  label="Apply" id="button[apply]" image="apply"></et2-button>
+							<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" noSubmit="true"></et2-button>
+						</et2-hbox>
+						<et2-button  align="right" statustext="Enter setup user and password to get root rights" label="Superuser" id="sudouser" onclick="jQuery('.superuser').css('display','inline'); document.getElementById(form::name('sudo[user]')).focus();" image="superuser" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
 					<groupbox class="superuser">
@@ -284,19 +267,19 @@
 							</columns>
 							<rows>
 								<row>
-									<description for="sudo[user]" value="User"/>
-									<textbox id="sudo[user]"/>
+									<et2-description  for="sudo[user]" value="User"></et2-description>
+									<et2-textbox  id="sudo[user]"></et2-textbox>
 								</row>
 								<row>
-									<description for="sudo[passwd]" value="Password"/>
-									<passwd id="sudo[passwd]" autocomplete="on"/>
+									<et2-description  for="sudo[passwd]" value="Password"></et2-description>
+									<et2-password  id="sudo[passwd]" autocomplete="on"></et2-password>
 								</row>
 								<row>
-									<description/>
-									<hbox>
-										<button label="Submit" id="button[setup]"/>
-										<buttononly label="Cancel" onclick="jQuery('.superuser').hide();"/>
-									</hbox>
+									<et2-description></et2-description>
+									<et2-hbox>
+										<et2-button  label="Submit" id="button[setup]"></et2-button>
+										<et2-button  label="Cancel" onclick="jQuery('.superuser').hide();" noSubmit="true"></et2-button>
+									</et2-hbox>
 
 								</row>
 							</rows>
@@ -318,4 +301,4 @@
 }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/filemanager/templates/default/file_share_received.xet b/filemanager/templates/default/file_share_received.xet
index 2459a717a9..2b036d896b 100644
--- a/filemanager/templates/default/file_share_received.xet
+++ b/filemanager/templates/default/file_share_received.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="filemanager.file_share_received" template="" lang="" group="0" version="20.1">
 		<grid width="100%">
@@ -10,21 +9,21 @@
 			</columns>
 			<rows>
 				<row>
-					<label value="Location"/>
-					<description id="share_root" />
+					<et2-label  value="Location"></et2-label>
+					<et2-description  id="share_root"></et2-description>
 				</row>
 				<row>
-					<label value="Name"/>
-					<textbox id="mount_location"/>
+					<et2-label  value="Name"></et2-label>
+					<et2-textbox  id="mount_location"></et2-textbox>
 				</row>
 				<row>
-				 	<label value="Mount permanently" for="permanent"/>
-					<checkbox id="permanent"/>
+				 	<et2-label  value="Mount permanently" for="permanent"></et2-label>
+					<et2-checkbox  id="permanent"></et2-checkbox>
 				</row>
 				<row class="dialogFooterToolbar">
-					<hbox>
-						<button label="Ok" id="ok" image="ok" background_image="1" align="center"/>
-					</hbox>
+					<et2-hbox>
+						<et2-button  label="Ok" id="ok" image="ok" align="center"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
diff --git a/filemanager/templates/default/home.header_left.xet b/filemanager/templates/default/home.header_left.xet
index 8754f2b310..9eb9ecf235 100644
--- a/filemanager/templates/default/home.header_left.xet
+++ b/filemanager/templates/default/home.header_left.xet
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- This template is in a seperate file so etemplate can find it for home -->
 <overlay>
 	<template id="filemanager.home.header_left" template="" lang="" group="0" version="1.9.002">
-		<hbox span="all" class="filemanager_navigation">
-			<image label="Up" src="goup" onclick="app.filemanager.change_dir('..',widget);" id="up"/>
-			<image label="Go to your home directory" src="gohome" onclick="app.filemanager.change_dir('~',widget);" id="home"/>
+		<et2-hbox  span="all" class="filemanager_navigation">
+			<et2-image  label="Up" src="goup" onclick="app.filemanager.change_dir('..',widget);" id="up"></et2-image>
+			<et2-image  label="Go to your home directory" src="gohome" onclick="app.filemanager.change_dir('~',widget);" id="home"></et2-image>
 			<vfs-name label="Path" id="path" onchange="if(widget.getValue() == '') { app.filemanager.change_dir('~',widget);} return true;" size="80" class="address"/>
-		</hbox>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/filemanager/templates/default/home.rows.xet b/filemanager/templates/default/home.rows.xet
index 0c1a6e39c1..9f03d09bae 100644
--- a/filemanager/templates/default/home.rows.xet
+++ b/filemanager/templates/default/home.rows.xet
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- This template is in a seperate file so etemplate can find it for home -->
 <overlay>
 	<template id="filemanager.home.header_left" template="" lang="" group="0" version="1.9.002">
-		<hbox span="all" class="filemanager_navigation">
-			<image label="Up" src="goup" onclick="app.filemanager.change_dir('..',widget);" id="up"/>
-			<image label="Go to your home directory" src="gohome" onclick="app.filemanager.change_dir('~',widget);" id="home"/>
+		<et2-hbox  span="all" class="filemanager_navigation">
+			<et2-image  label="Up" src="goup" onclick="app.filemanager.change_dir('..',widget);" id="up"></et2-image>
+			<et2-image  label="Go to your home directory" src="gohome" onclick="app.filemanager.change_dir('~',widget);" id="home"></et2-image>
 			<vfs-name label="Path" id="path" onchange="if(widget.getValue() == '') { app.filemanager.change_dir('~',widget);} return true;" size="80" class="address"/>
-		</hbox>
+		</et2-hbox>
 	</template>
 	<template id="filemanager.home.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -38,18 +37,18 @@
 					<nextmatch-customfields id="customfields" readonly="true"/>
 				</row>
 				<row class="row $row_cont[class]">
-					<vfs-mime align="center" id="$row"/>
+					<et2-vfs-mime  align="center" id="$row"></et2-vfs-mime>
 					<vfs-name id="${row}[name]" no_lang="1" readonly="true"/>
 					<vfs-size align="right" id="${row}[size]"/>
-					<date-time id="${row}[mtime]" readonly="true"/>
-					<date-time id="${row}[ctime]" readonly="true"/>
+					<et2-date-time  id="${row}[mtime]" readonly="true"></et2-date-time>
+					<et2-date-time  id="${row}[ctime]" readonly="true"></et2-date-time>
 					<vfs-mode id="${row}[mode]"/>
-					<vfs-uid id="${row}[uid]" no_lang="1"/>
-					<vfs-gid id="${row}[gid]" no_lang="1"/>
-					<description id="${row}[comment]"/>
+					<et2-vfs-uid  id="${row}[uid]" noLang="1"></et2-vfs-uid>
+					<et2-vfs-gid  id="${row}[gid]" noLang="1"></et2-vfs-gid>
+					<et2-description  id="${row}[comment]"></et2-description>
 					<customfields-list id="$row" class="customfields"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/filemanager/templates/default/index.xet b/filemanager/templates/default/index.xet
index d733c02def..18129e86a6 100644
--- a/filemanager/templates/default/index.xet
+++ b/filemanager/templates/default/index.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="filemanager.index.rows" template="" lang="" group="0" version="1.7.002">
 		<grid width="100%">
@@ -32,16 +31,16 @@
 					<nextmatch-customfields id="customfields" readonly="true"/>
 				</row>
 				<row class="row $row_cont[class]">
-					<vfs-mime align="center" id="$row"/>
-                    <image src="${row}[locked]" statustext="$row_cont[locked_status]"/>
+					<et2-vfs-mime  align="center" id="$row"></et2-vfs-mime>
+                    <et2-image  src="${row}[locked]" statustext="$row_cont[locked_status]"></et2-image>
 					<vfs id="$row" no_lang="1"/>
 					<vfs-size align="right" id="${row}[size]"/>
-					<date-time id="${row}[mtime]" readonly="true"/>
-					<date-time id="${row}[ctime]" readonly="true"/>
+					<et2-date-time  id="${row}[mtime]" readonly="true"></et2-date-time>
+					<et2-date-time  id="${row}[ctime]" readonly="true"></et2-date-time>
 					<vfs-mode id="${row}[mode]"/>
-					<vfs-uid id="${row}[uid]" no_lang="1"/>
-					<vfs-gid id="${row}[gid]" no_lang="1"/>
-					<description id="${row}[comment]"/>
+					<et2-vfs-uid  id="${row}[uid]" noLang="1"></et2-vfs-uid>
+					<et2-vfs-gid  id="${row}[gid]" noLang="1"></et2-vfs-gid>
+					<et2-description  id="${row}[comment]"></et2-description>
 					<customfields-list id="$row" class="customfields"/>
 				</row>
 			</rows>
@@ -49,32 +48,29 @@
 	</template>
 	<template id="filemanager.index.header_left" template="" lang="" group="0" version="1.9.002">
         <!-- Anonymous view has some extras - logo & button -->
-        <image src="logo" disabled="!@show_refresh" hideOnReadonly="true" width="150px"/>
-        <buttononly id="reload" statustext="Reload" onclick="app.filemanager.et2.getInstanceManager().refresh()"
-                    disabled="!@show_refresh" hideOnReadonly="true"
-                    background_image="true" image="reload"/>
+        <et2-image  src="logo" disabled="!@show_refresh" hideOnReadonly="true" width="150px"></et2-image>
+        <et2-button  id="reload" statustext="Reload" onclick="app.filemanager.et2.getInstanceManager().refresh()" disabled="!@show_refresh" hideOnReadonly="true" image="reload" noSubmit="true"></et2-button>
         <file label="Upload" statustext="Select file to upload in current directory" id="upload"
               progress_dropdownlist="true" drop_target="filemanager-index" multiple="true"
               onFinishOne="app.filemanager.uploadOnOne"/>
     </template>
 	<template id="filemanager.index.header_row" template="" lang="" group="0" version="1.9.002">
-		<buttononly id="home" statustext="Go to your home directory" image="gohome" background_image="true" onclick="app.filemanager.change_dir('~',widget);"/>
-		<buttononly id="up" statustext="Up" image="goup" background_image="true" onclick="app.filemanager.change_dir('..',widget);"/>
+		<et2-button  id="home" statustext="Go to your home directory" image="gohome" onclick="app.filemanager.change_dir('~',widget);" noSubmit="true"></et2-button>
+		<et2-button  id="up" statustext="Up" image="goup" onclick="app.filemanager.change_dir('..',widget);" noSubmit="true"></et2-button>
 		<vfs-path id="path" onchange="if(widget.getValue() == '') { app.filemanager.change_dir('~',widget);} return true;" size="80" class="address"/>
-		<buttononly statustext="Tile view" id="button[change_view]" onclick="app.filemanager.change_view" image="list_tile" background_image="true"/>
+		<et2-button  statustext="Tile view" id="button[change_view]" onclick="app.filemanager.change_view" image="list_tile" noSubmit="true"></et2-button>
 	</template>
 	<template id="filemanager.index.header_right" template="" lang="" group="0" version="1.9.003">
-		<dropdown_button id="new" onchange="app.filemanager.create_new" label="New"
-                             onclick="app.filemanager.create_new"/>
-		<buttononly statustext="Rename, change permissions or ownership" id="button[edit]" onclick="app.filemanager.editprefs();" image="edit" background_image="true"/>
-		<buttononly statustext="Create directory" id="button[createdir]" onclick="app.filemanager.createdir();" image="button_createdir" background_image="true"/>
-		<buttononly statustext="Create a link" id="button[symlink]" onclick="app.filemanager.symlink();" image="link" background_image="true"/>
+		<et2-dropdown-button  id="new" onchange="app.filemanager.create_new" label="New" onclick="app.filemanager.create_new"></et2-dropdown-button>
+		<et2-button  statustext="Rename, change permissions or ownership" id="button[edit]" onclick="app.filemanager.editprefs();" image="edit" noSubmit="true"></et2-button>
+		<et2-button  statustext="Create directory" id="button[createdir]" onclick="app.filemanager.createdir();" image="button_createdir" noSubmit="true"></et2-button>
+		<et2-button  statustext="Create a link" id="button[symlink]" onclick="app.filemanager.symlink();" image="link" noSubmit="true"></et2-button>
 		<!--
-		<buttononly statustext="Paste" id="button[paste]" onclick="app.filemanager.paste('paste');" image="editpaste" background_image="true"/>
-		<buttononly statustext="Paste link" id="button[linkpaste]" onclick="app.filemanager.paste('linkpaste');" image="linkpaste" background_image="true"/>
-		<buttononly statustext="Mail paste" id="button[mailpaste]" onclick="app.filemanager.paste('mailpaste');" image="mailpaste" background_image="true"/>
+		<et2-button  statustext="Paste" id="button[paste]" onclick="app.filemanager.paste('paste');" image="editpaste" noSubmit="true"></et2-button>
+		<et2-button  statustext="Paste link" id="button[linkpaste]" onclick="app.filemanager.paste('linkpaste');" image="linkpaste" noSubmit="true"></et2-button>
+		<et2-button  statustext="Mail paste" id="button[mailpaste]" onclick="app.filemanager.paste('mailpaste');" image="mailpaste" noSubmit="true"></et2-button>
 		-->
-		<buttononly statustext="File a file" onclick="app.filemanager.fileafile" image="upload" background_image="true"/>
+		<et2-button  statustext="File a file" onclick="app.filemanager.fileafile" image="upload" noSubmit="true"></et2-button>
 	</template>
 	<template id="filemanager.index" template="" lang="" group="0" version="1.9.003">
 		<nextmatch id="nm" template="filemanager.index.rows" header_left="filemanager.index.header_left" header_row="filemanager.index.header_row" header_right="filemanager.index.header_right"/>
diff --git a/filemanager/templates/default/quota.xet b/filemanager/templates/default/quota.xet
index 7941d253c0..48028d8739 100644
--- a/filemanager/templates/default/quota.xet
+++ b/filemanager/templates/default/quota.xet
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
     <template id="filemanager.quota" template="" lang="" group="0" version="1.9.004">
-        <vbox>
-            <textbox label="User home quota" id="quota" blur="(EPL Only)" disabled="true" class="et2-label-fixed"/>
-            <textbox label="Group home quota" id="group_quota" blur="(EPL Only)" disabled="true"
-                     class="et2-label-fixed"
-                     help-text="Enter a file size, e.g. 100K, 200M or 2G"/>
-            <button label="Recalculate" id="button[recalculate]" statustext="Recalculate directory sizes"/>
+        <et2-vbox>
+            <et2-textbox  label="User home quota" id="quota" disabled="true" class="et2-label-fixed" placeholder="(EPL Only)"></et2-textbox>
+            <et2-textbox  label="Group home quota" id="group_quota" disabled="true" class="et2-label-fixed" placeholder="(EPL Only)" helpText="Enter a file size, e.g. 100K, 200M or 2G"></et2-textbox>
+            <et2-button  label="Recalculate" id="button[recalculate]" statustext="Recalculate directory sizes"></et2-button>
             <grid id="oversize" disabled="!@oversize">
                 <columns>
                     <column/>
@@ -18,24 +15,24 @@
                 </columns>
                 <rows>
                     <row class="th">
-                        <description value="Path"/>
-                        <description value="quota"/>
-                        <description value="Size"/>
+                        <et2-description  value="Path"></et2-description>
+                        <et2-description  value="quota"></et2-description>
+                        <et2-description  value="Size"></et2-description>
                     </row>
                     <row>
                         <vfs id="${row}"/>
                         <vfs-size id="${row}[quota]"/>
                         <vfs-size id="${row}[size]"/>
-                        <url-email id="${row}[account_email]" readonly="true" class="adminOverflowEllipsis"/>
+                        <et2-url-email  id="${row}[account_email]" readonly="true" class="adminOverflowEllipsis"></et2-url-email>
                     </row>
                 </rows>
             </grid>
-            <hbox span="2" class="dialogFooterToolbar">
-                <button label="Save" id="button[save]"/>
-                <button label="Apply" id="button[apply]"/>
-                <button label="Cancel" id="button[cancel]"/>
-            </hbox>
-        </vbox>
+            <et2-hbox  span="2" class="dialogFooterToolbar">
+                <et2-button  label="Save" id="button[save]"></et2-button>
+                <et2-button  label="Apply" id="button[apply]"></et2-button>
+                <et2-button  label="Cancel" id="button[cancel]"></et2-button>
+            </et2-hbox>
+        </et2-vbox>
         <styles>
             #filemanager-quota_quota::part(form-control-input),
             #filemanager-quota_group_quota::part(form-control-input){
diff --git a/filemanager/templates/default/replacements.xet b/filemanager/templates/default/replacements.xet
index 3727c045e9..15ed12a4ef 100644
--- a/filemanager/templates/default/replacements.xet
+++ b/filemanager/templates/default/replacements.xet
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- This template adds the extra bits to the replacements list UI -->
 <overlay>
     <template id="filemanager.replacements">
-        <vbox>
-            <description class="title" value="Application fields"/>
-            <description
-                    value="For files linked to an application entry (inside /apps/appname/id/) the placeholders for that application are also available.  See the specific application for a list of available placeholders."/>
-        </vbox>
+        <et2-vbox>
+            <et2-description  class="title" value="Application fields"></et2-description>
+            <et2-description  value="For files linked to an application entry (inside /apps/appname/id/) the placeholders for that application are also available.  See the specific application for a list of available placeholders."></et2-description>
+        </et2-vbox>
     </template>
 </overlay>
\ No newline at end of file
diff --git a/filemanager/templates/default/select.xet b/filemanager/templates/default/select.xet
index 2b1df6525c..5bd44353ff 100644
--- a/filemanager/templates/default/select.xet
+++ b/filemanager/templates/default/select.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="filemanager.select" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%" resize_ratio="1">
@@ -16,10 +15,10 @@
 						</columns>
 						<rows>
 							<row disabled="!@0">
-								<button align="center" label="Favorites" id="favorites" image="favorites"/>
+								<et2-button  align="center" label="Favorites" id="favorites" image="favorites"></et2-button>
 							</row>
 							<row height="40">
-								<button align="center" label="$row_cont" id="${row}" image="$row_cont/navbar"/>
+								<et2-button  align="center" label="$row_cont" id="${row}" image="$row_cont/navbar"></et2-button>
 							</row>
 						</rows>
 					</grid>
@@ -29,15 +28,15 @@
 						</columns>
 						<rows>
 							<row class="dialogHeader">
-								<hbox>
+								<et2-hbox>
 									<html id="js"/>
-									<button label="Up" id="button[up]" onclick="app.filemanager.change_dir('..');" image="goup"/>
-									<button label="Go to your home directory" id="button[home]" image="gohome"/>
-									<box class="selectPathContainer">
+									<et2-button  label="Up" id="button[up]" onclick="app.filemanager.change_dir('..');" image="goup"></et2-button>
+									<et2-button  label="Go to your home directory" id="button[home]" image="gohome"></et2-button>
+									<et2-box  class="selectPathContainer">
 										<vfs-name id="path" class="selectPath" onchange="1"/>
-									</box>
-									<button label="Create directory" id="button[createdir]" onclick="app.filemanager.createdir" image="button_createdir" ro_image="createdir_disabled" class="createDir"/>
-								</hbox>
+									</et2-box>
+									<et2-button  label="Create directory" id="button[createdir]" onclick="app.filemanager.createdir" image="button_createdir" class="createDir" roImage="createdir_disabled"></et2-button>
+								</et2-hbox>
 							</row>
 							<row class="selectFiles file_dir_height" resize_ratio="1">
 								<grid width="100%"  id="dir" resize_ratio="1" >
@@ -48,25 +47,23 @@
 									</columns>
 									<rows>
 										<row class="row">
-											<vfs-mime align="center" id="$row" options="16" class="selectIcon"/>
+											<et2-vfs-mime  align="center" id="$row" options="16" class="selectIcon"></et2-vfs-mime>
 											<vfs id="$row" onclick="app.filemanager.select_clicked"/>
-											<checkbox align="right" id="selected[]" options="&quot;$row_cont[name]&quot;"/>
+											<et2-checkbox  align="right" id="selected[]" selectedValue="&quot;$row_cont[name]&quot;" ></et2-checkbox>
 										</row>
 									</rows>
 								</grid>
 							</row>
 							<row disabled="@mode=/(open-multiple|select-dir)/">
-								<textbox id="name" class="selectName"/>
+								<et2-textbox  id="name" class="selectName"></et2-textbox>
 							</row>
 							<row disabled="!@options-mime">
-								<menulist class="selectMime">
-									<menupopup id="mime" onchange="1" options="All files"/>
-								</menulist>
+								<et2-select  class="selectMime" id="mime" onchange="1" emptyLabel="All files"></et2-select>
 							</row>
 							<row disabled="@no_upload">
 								<groupbox>
 									<caption label="File upload"/>
-									<description value="Choose a file for uploading"/>
+									<et2-description  value="Choose a file for uploading"></et2-description>
 									<file id="file_upload"/>
 								</groupbox>
 							</row>
@@ -74,12 +71,12 @@
 					</grid>
 				</row>
 				<row class="dialogFooterToolbar">
-					<hbox align="right">
-						<button label="@label" id="button[ok]" image="save" background_image="1"/>
-						<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  align="right">
+						<et2-button  label="@label" id="button[ok]" image="save"></et2-button>
+						<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/filemanager/templates/default/share_dialog.xet b/filemanager/templates/default/share_dialog.xet
index b22b5d7b67..65892720ef 100644
--- a/filemanager/templates/default/share_dialog.xet
+++ b/filemanager/templates/default/share_dialog.xet
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
     <template id="filemanager.share_dialog" template="" lang="" group="0" version="1.9.003"
               onload="widget = widget.widgetContainer.getWidgetById('share_link'); app.filemanager.copy_share_link(ev,widget)">
-        <textbox id="share_link" no_lang="1" class="et2_fullWidth"
-                 onclick="app.filemanager.copy_share_link">
+        <et2-textbox  id="share_link" onclick="app.filemanager.copy_share_link" noLang="1">
             <!-- just let this click bubble -->
-            <et2-button slot="suffix" image="copy" noSubmit="true" statustext="Copy to clipboard"/>
-        </textbox>
+            <et2-button  slot="suffix" image="copy" noSubmit="true" statustext="Copy to clipboard"/>
+        </et2-textbox>
         <styles>
             et2-button[slot='suffix'] {
             padding-inline-end: 0;
diff --git a/filemanager/templates/default/shares.xet b/filemanager/templates/default/shares.xet
index 800d80ca17..adbe9a11c5 100644
--- a/filemanager/templates/default/shares.xet
+++ b/filemanager/templates/default/shares.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="filemanager.shares.rows" template="" lang="" group="0" version="14.2.001">
 		<grid width="100%">
@@ -16,21 +15,21 @@
 			<rows>
 				<row class="th">
 					<nextmatch-sortheader label="Path" id="share_path"/>
-					<nextmatch-filterheader id="type" options="All types"/>
+					<et2-nextmatch-header-filter  id="type" emptyLabel="All types"/>
 					<nextmatch-header label="Shared with" id="shared_with"/>
 					<nextmatch-sortheader label="Expiration" id="share_expires"/>
-					<nextmatch-filterheader id="share_passwd" options="Password"/>
+					<et2-nextmatch-header-filter  id="share_passwd" emptyLabel="Password"/>
 					<nextmatch-sortheader label="Created" id="share_created"/>
 					<nextmatch-sortheader label="Last accessed" id="share_last_accessed"/>
 				</row>
 				<row>
 					<vfs id="${row}[share_path]"/>
-					<select id="${row}[type]" readonly="true"/>
-					<description id="${row}[share_with]"/>
-					<date id="${row}[share_expires]" readonly="true"/>
-					<checkbox align="center" id="${row}[share_passwd]" readonly="true"/>
-					<date-time id="${row}[share_created]" readonly="true"/>
-					<date-time id="${row}[share_last_accessed]" readonly="true"/>
+					<et2-select  id="${row}[type]" readonly="true"></et2-select>
+					<et2-description  id="${row}[share_with]"></et2-description>
+					<et2-date  id="${row}[share_expires]" readonly="true"></et2-date>
+					<et2-checkbox  align="center" id="${row}[share_passwd]" readonly="true"></et2-checkbox>
+					<et2-date-time  id="${row}[share_created]" readonly="true"></et2-date-time>
+					<et2-date-time  id="${row}[share_last_accessed]" readonly="true"></et2-date-time>
 				</row>
 			</rows>
 		</grid>
@@ -38,4 +37,4 @@
 	<template id="filemanager.shares" template="" lang="" group="0" version="14.2.001">
 		<nextmatch id="nm" template="filemanager.shares.rows"/>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/filemanager/templates/default/tile.xet b/filemanager/templates/default/tile.xet
index d7ed678dc8..0edd28c78c 100644
--- a/filemanager/templates/default/tile.xet
+++ b/filemanager/templates/default/tile.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<!--
 	This is used as a tiled template for nextmatch.  Note only 1 column, and
@@ -19,13 +18,13 @@
 					<nextmatch-header/>
 				</row>
 				<row class="tile $row_cont[class]">
-					<vbox class="file_tile" width="135px" height="100px" data="mime:$row_cont[mime]">
-						<vfs-mime align="center" id="$row" thumb_mime_size="image,128"/>
+					<et2-vbox  class="file_tile" width="135px" height="100px" data="mime:$row_cont[mime]">
+						<et2-vfs-mime  align="center" id="$row" thumbMimeSize="image,128"></et2-vfs-mime>
 						<vfs-name id="${row}[name]" no_lang="1" readonly="true"/>
-						<description id="${row}[comment]"/>
-					</vbox>
+						<et2-description  id="${row}[comment]"></et2-description>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/filemanager/templates/mobile/editor.xet b/filemanager/templates/mobile/editor.xet
index 52be8e8bea..3d8094e6b7 100644
--- a/filemanager/templates/mobile/editor.xet
+++ b/filemanager/templates/mobile/editor.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="filemanager.editor" template="" lang="" group="0" version="16.1">
 		<grid width="100%" height="100%">
@@ -9,10 +8,10 @@
 			</columns>
 			<rows>
 				<row height="45">
-					<box height="50" class="dialogHeadbar">
+					<et2-box  height="50" class="dialogHeadbar">
 						<toolbar id="tools"/>
-						<textbox id="file_path" readonly="true"/>
-					</box>
+						<et2-textbox  id="file_path" readonly="true"></et2-textbox>
+					</et2-box>
 				</row>
 				<row>
 					<grid height="700" width="100%" resize_ratio="1">
@@ -21,7 +20,7 @@
 						</columns>
 						<rows>
 							<row>
-								<box id = "odfEditor" height="100%" width="100%"></box>
+								<et2-box  height="100%" width="100%"></et2-box>
 							</row>
 						</rows>
 					</grid>
@@ -29,4 +28,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/filemanager/templates/mobile/file.xet b/filemanager/templates/mobile/file.xet
index 68385e7071..8410828741 100644
--- a/filemanager/templates/mobile/file.xet
+++ b/filemanager/templates/mobile/file.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="filemanager.file.general" template="" lang="" group="0">
 		<grid width="100%">
@@ -10,39 +9,39 @@
 			</columns>
 			<rows>
 				<row height="60">
-					<image align="center" src="icon" class="mimeHuge"/>
+					<et2-image  align="center" src="icon" class="mimeHuge"></et2-image>
 					<vfs-name id="name" needed="1" class="fileName"/>
 				</row>
 				<row>
 					<hrule span="all"/>
 				</row>
 				<row disabled="!@is_link">
-					<description for="symlink" value="Link"/>
-					<textbox id="symlink" readonly="true" class="fileName"/>
+					<et2-description  for="symlink" value="Link"></et2-description>
+					<et2-textbox  id="symlink" readonly="true" class="fileName"></et2-textbox>
 				</row>
 				<row>
-					<description value="Type"/>
-					<description id="mime"/>
+					<et2-description  value="Type"></et2-description>
+					<et2-description  id="mime"></et2-description>
 				</row>
 				<row>
-					<description value="Directory"/>
-					<description id="dir"/>
+					<et2-description  value="Directory"></et2-description>
+					<et2-description  id="dir"></et2-description>
 				</row>
 				<row disabled="@is_link">
-					<description value="Size"/>
+					<et2-description  value="Size"></et2-description>
 					<vfs-size id="size" options="1"/>
 				</row>
 				<row>
-					<description value="Created"/>
-					<date-time id="ctime" readonly="true"/>
+					<et2-description  value="Created"></et2-description>
+					<et2-date-time  id="ctime" readonly="true"></et2-date-time>
 				</row>
 				<row>
-					<description value="Modified"/>
-					<date-time id="mtime" readonly="true"/>
+					<et2-description  value="Modified"></et2-description>
+					<et2-date-time  id="mtime" readonly="true"></et2-date-time>
 				</row>
 				<row>
-					<description for="comment" value="Comment"/>
-					<textbox multiline="true" id="comment" class="et2_fullWidth" height="100"/>
+					<et2-description  for="comment" value="Comment"></et2-description>
+					<et2-textarea  id="comment" height="100"></et2-textarea>
 				</row>
 			</rows>
 		</grid>
@@ -63,30 +62,24 @@
 							</columns>
 							<rows>
 								<row>
-									<description value="Owner"/>
-									<menulist>
-										<menupopup id="perms[owner]" class="et2_fullWidth"/>
-									</menulist>
+									<et2-description  value="Owner"></et2-description>
+									<et2-select  id="perms[owner]"></et2-select>
 								</row>
 								<row>
-									<description value="Group"/>
-									<menulist>
-										<menupopup id="perms[group]" class="et2_fullWidth"/>
-									</menulist>
+									<et2-description  value="Group"></et2-description>
+									<et2-select  id="perms[group]"></et2-select>
 								</row>
 								<row>
-									<description value="Other"/>
-									<menulist>
-										<menupopup id="perms[other]" class="et2_fullWidth"/>
-									</menulist>
+									<et2-description  value="Other"></et2-description>
+									<et2-select  id="perms[other]"></et2-select>
 								</row>
 								<row disabled="@is_dir">
-									<description/>
-									<checkbox label="Executable" id="perms[executable]"/>
+									<et2-description></et2-description>
+									<et2-checkbox  label="Executable" id="perms[executable]"></et2-checkbox>
 								</row>
 								<row disabled="1">
-									<description/>
-									<checkbox label="Only owner can rename or delete the content" id="perms[sticky]"/>
+									<et2-description></et2-description>
+									<et2-checkbox  label="Only owner can rename or delete the content" id="perms[sticky]"></et2-checkbox>
 								</row>
 							</rows>
 						</grid>
@@ -102,23 +95,19 @@
 							</columns>
 							<rows>
 								<row>
-									<description value="User"/>
-									<menulist>
-										<menupopup type="select-account" label="@ro_uid_root" id="uid" options="root,accounts" class="et2_fullWidth"/>
-									</menulist>
+									<et2-description  value="User"></et2-description>
+									<et2-select-account  label="@ro_uid_root" id="uid" emptyLabel="root" accountType="accounts"></et2-select-account>
 								</row>
 								<row>
-									<description value="Group"/>
-									<menulist>
-										<menupopup type="select-account" label="@ro_gid_root" id="gid" options="root,groups" class="et2_fullWidth"/>
-									</menulist>
+									<et2-description  value="Group"></et2-description>
+									<et2-select-account  label="@ro_gid_root" id="gid" emptyLabel="root" accountType="groups"></et2-select-account>
 								</row>
 							</rows>
 						</grid>
 					</groupbox>
 				</row>
 				<row disabled="!@is_dir">
-					<checkbox label="Modify all Subdirectories and their content" id="modify_subs"/>
+					<et2-checkbox  label="Modify all Subdirectories and their content" id="modify_subs"></et2-checkbox>
 				</row>
 			</rows>
 		</grid>
@@ -143,33 +132,25 @@
 							</columns>
 							<rows>
 								<row class="th">
-									<description value="Owner"/>
-									<description value="Rights"/>
-									<description value="Inherited"/>
-									<description/>
+									<et2-description  value="Owner"></et2-description>
+									<et2-description  value="Rights"></et2-description>
+									<et2-description  value="Inherited"></et2-description>
+									<et2-description></et2-description>
 								</row>
 								<row class="row" disabled="!@1">
-									<menulist>
-										<menupopup type="select-account" id="${row}[owner]" readonly="true"/>
-									</menulist>
-									<menulist>
-										<menupopup id="${row}[rights]" readonly="true"/>
-									</menulist>
-									<description id="${row}[path]"/>
-									<button label="Delete" id="delete[$row_cont[ino]-$row_cont[owner]]" onclick="et2_dialog.confirm(widget,'Delete this extended ACL?','Delete')" image="delete"/>
+									<et2-select-account  id="${row}[owner]" readonly="true"></et2-select-account>
+									<et2-select  id="${row}[rights]" readonly="true"></et2-select>
+									<et2-description  id="${row}[path]"></et2-description>
+									<et2-button  label="Delete" id="delete[$row_cont[ino]-$row_cont[owner]]" onclick="et2_dialog.confirm(widget,'Delete this extended ACL?','Delete')" image="delete"></et2-button>
 								</row>
 							</rows>
 						</grid>
 					</groupbox>
 				</row>
 				<row valign="bottom" disabled="!@is_owner">
-					<menulist class="filemanager-file_filemanager-file-eaclowner eaclAccount">
-						<menupopup type="select-account" class="eaclAccount" label="Owner" id="eacl_owner" options="select one,both"/>
-					</menulist>
-					<menulist>
-						<menupopup class="eaclRights" statustext="You can only grant additional rights, you can NOT take rights away!" label="Rights" id="eacl[rights]"/>
-					</menulist>
-					<button label="Add" id="button[eacl]" image="add" background_image="1"/>
+					<et2-select-account  class="eaclAccount" label="Owner" id="eacl_owner" emptyLabel="select one" accountType="both"></et2-select-account>
+					<et2-select  class="eaclRights" statustext="You can only grant additional rights, you can NOT take rights away!" label="Rights" id="eacl[rights]"></et2-select>
+					<et2-button  label="Add" id="button[eacl]" image="add"></et2-button>
 				</row>
 			</rows>
 		</grid>
@@ -181,13 +162,13 @@
 			</columns>
 			<rows>
 				<row valign="top" disabled="!@mime=/^image/">
-					<image src="link" class="previewImage"/>
+					<et2-image  src="link" class="previewImage"></et2-image>
 				</row>
 				<row valign="top" height="280" disabled="!@text_content">
-					<textbox multiline="true" id="text_content" readonly="true" class="previewText"/>
+					<et2-textarea  id="text_content" readonly="true" class="previewText"></et2-textarea>
 				</row>
 				<row disabled="@mime=/^(image|text)/">
-					<description value="No preview available"/>
+					<et2-description  value="No preview available"></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -203,34 +184,35 @@
 			</columns>
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
-					<hbox  span="all" width="100%">
-						<button statustext="Saves this entry" id="button[save]" image="save" background_image="1"/>
-						<button statustext="Apply the changes" id="button[apply]" image="apply" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  statustext="Saves this entry" id="button[save]" image="save"></et2-button>
+						<et2-button  statustext="Apply the changes" id="button[apply]" image="apply"></et2-button>
+					</et2-hbox>
 				</row>
 				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
-					<hbox span="all" width="100%">
-						<button label="Search" id="button[search]" image="search" background_image="1"/>
-						<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  label="Search" id="button[search]" image="search"></et2-button>
+						<et2-button  label="Cancel" id="button[cancelsearch]" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 				<row class="dialogTabs">
-					<tabbox id="tabs" span="all" width="100%" align_tabs="v">
-						<tabs>
-							<tab id="filemanager.file.general" label="General"/>
-							<tab id="filemanager.file.perms" label="Permissions"/>
-							<tab id="filemanager.file.eacl" label="Extended ACL"/>
-							<tab id="filemanager.file.preview" label="Preview"/>
-							<tab id="filemanager.file.custom" label="Custom fields"/>
-						</tabs>
-						<tabpanels>
+					<et2-vbox  id="tabs" span="all" width="100%">
+						<et2-details  id="filemanager.file.general" summary="General" title="">
 							<template id="filemanager.file.general"/>
+						</et2-details>
+						<et2-details  id="filemanager.file.perms" summary="Permissions" title="">
 							<template id="filemanager.file.perms"/>
+						</et2-details>
+						<et2-details  id="filemanager.file.eacl" summary="Extended ACL" title="">
 							<template id="filemanager.file.eacl"/>
+						</et2-details>
+						<et2-details  id="filemanager.file.preview" summary="Preview" title="">
 							<template id="filemanager.file.preview"/>
+						</et2-details>
+						<et2-details  id="filemanager.file.custom" summary="Custom fields" title="">
 							<template id="filemanager.file.custom"/>
-						</tabpanels>
-					</tabbox>
+						</et2-details>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
@@ -238,4 +220,4 @@
 
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/filemanager/templates/mobile/index.xet b/filemanager/templates/mobile/index.xet
index aadf8bdcb6..a11c877ec8 100644
--- a/filemanager/templates/mobile/index.xet
+++ b/filemanager/templates/mobile/index.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="filemanager.index.rows" template="" lang="" group="0" version="1.7.002">
 		<grid width="100%">
@@ -14,46 +13,46 @@
 				<row class="th">
 				</row>
 				<row class="row $row_cont[class]">
-					<vbox></vbox>
-					<vbox>
-						<vfs-mime align="center" id="$row"/>
-					</vbox>
-					<vbox>
+					<et2-vbox></et2-vbox>
+					<et2-vbox>
+						<et2-vfs-mime  align="center" id="$row"></et2-vfs-mime>
+					</et2-vbox>
+					<et2-vbox>
 						<vfs-name id="${row}[name]" no_lang="1" readonly="true"/>
-						<description id="${row}[comment]"/>
-					</vbox>
-					<vbox>
+						<et2-description  id="${row}[comment]"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
 						<vfs-size align="right" id="${row}[size]"/>
-						<time_or_date id="${row}[mtime]" readonly="true"/>
-					</vbox>
+						<et2-date-time-today  id="${row}[mtime]" readonly="true"></et2-date-time-today>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="filemanager.index.header_right" template="" lang="" group="0" version="1.9.002">
-		<hbox class="buttons">
-			<buttononly statustext="Rename, change permissions or ownership" label="Edit settings" id="button[edit]" onclick="app.filemanager.editprefs();" options="edit"/>
-			<buttononly label="Create directory" id="button[createdir]" onclick="app.filemanager.createdir();" options="button_createdir,createdir_disabled"/>
-			<buttononly label="Create a link" id="button[symlink]" onclick="app.filemanager.symlink();" options="link,link_disabled"/>
-			<buttononly label="Paste" id="button[paste]" onclick="app.filemanager.paste('paste');" options="editpaste,editpaste_disabled"/>
-			<buttononly label="Paste link" id="button[linkpaste]" onclick="app.filemanager.paste('linkpaste');" options="linkpaste,linkpaste_disabled"/>
-			<buttononly label="Mail paste" id="button[mailpaste]" onclick="app.filemanager.paste('mailpaste');" options="mailpaste,mailpaste_disabled"/>
-			<image label="Go to your home directory" src="gohome" onclick="app.filemanager.change_dir('~',widget);" id="home"/>
-			<buttononly label="Tile view" id="button[change_view]" onclick="app.filemanager.change_view" options="list_tile"/>
-			<button label="File a file" onclick="window.open(egw::link('/index.php','menuaction=stylite.stylite_filemanager.upload'),'_blank','dependent=yes,width=550,height=350,scrollbars=yes,status=yes'); return false;" image="upload"/>
-		</hbox>
-		<dropdown_button id="new" onchange="app.filemanager.create_new" label="New" onclick="app.filemanager.create_new"/>
+		<et2-hbox  class="buttons">
+			<et2-button  statustext="Rename, change permissions or ownership" label="Edit settings" id="button[edit]" onclick="app.filemanager.editprefs();" image="edit" noSubmit="true"></et2-button>
+			<et2-button  label="Create directory" id="button[createdir]" onclick="app.filemanager.createdir();" image="button_createdir" noSubmit="true" roImage="createdir_disabled"></et2-button>
+			<et2-button  label="Create a link" id="button[symlink]" onclick="app.filemanager.symlink();" image="link" noSubmit="true" roImage="link_disabled"></et2-button>
+			<et2-button  label="Paste" id="button[paste]" onclick="app.filemanager.paste('paste');" image="editpaste" noSubmit="true" roImage="editpaste_disabled"></et2-button>
+			<et2-button  label="Paste link" id="button[linkpaste]" onclick="app.filemanager.paste('linkpaste');" image="linkpaste" noSubmit="true" roImage="linkpaste_disabled"></et2-button>
+			<et2-button  label="Mail paste" id="button[mailpaste]" onclick="app.filemanager.paste('mailpaste');" image="mailpaste" noSubmit="true" roImage="mailpaste_disabled"></et2-button>
+			<et2-image  label="Go to your home directory" src="gohome" onclick="app.filemanager.change_dir('~',widget);" id="home"></et2-image>
+			<et2-button  label="Tile view" id="button[change_view]" onclick="app.filemanager.change_view" image="list_tile" noSubmit="true"></et2-button>
+			<et2-button  label="File a file" onclick="window.open(egw::link('/index.php','menuaction=stylite.stylite_filemanager.upload'),'_blank','dependent=yes,width=550,height=350,scrollbars=yes,status=yes'); return false;" image="upload"></et2-button>
+		</et2-hbox>
+		<et2-dropdown-button  id="new" onchange="app.filemanager.create_new" label="New" onclick="app.filemanager.create_new"></et2-dropdown-button>
 	</template>
 	<template id="filemanager.index.header_left" template="" lang="" group="0" version="1.9.002">
-		<hbox span="all" class="filemanager_navigation">
-			<hbox>
-				<image label="Up" src="goup" onclick="app.filemanager.change_dir('..',widget);" id="up"/>
-			</hbox>
+		<et2-hbox  span="all" class="filemanager_navigation">
+			<et2-hbox>
+				<et2-image  label="Up" src="goup" onclick="app.filemanager.change_dir('..',widget);" id="up"></et2-image>
+			</et2-hbox>
 			<vfs-name id="path" onchange="if(widget.getValue() == '') { app.filemanager.change_dir('~',widget);} return true;" size="80" class="address"/>
 			<file label="" statustext="Select file to upload in current directory" class="plus_button" id="upload" progress_dropdownlist = "true" drop_target ="divAppbox" multiple="true" onFinishOne="app.filemanager.uploadOnOne"/>
-		</hbox>
+		</et2-hbox>
 	</template>
 	<template id="filemanager.index" template="" lang="" group="0" version="1.9.003">
 		<nextmatch id="nm" template="filemanager.index.rows" header_left="filemanager.index.header_left" header_right="filemanager.index.header_right" />
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/home/templates/default/birthdays.xet b/home/templates/default/birthdays.xet
index 751b718dd0..539bcbba80 100644
--- a/home/templates/default/birthdays.xet
+++ b/home/templates/default/birthdays.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="home.birthdays" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -9,9 +8,9 @@
 			</columns>
 			<rows>
 				<row>
-					<link id="${row}"/>
+					<et2-link  id="${row}" app=""></et2-link>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/home/templates/default/edit.xet b/home/templates/default/edit.xet
index 9d492132dd..8c8b68c816 100644
--- a/home/templates/default/edit.xet
+++ b/home/templates/default/edit.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="home.edit" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -10,10 +9,10 @@
 			</columns>
 			<rows>
 				<row>
-					<label for="@${row}[name]" value="@${row}[label]"/>
+					<et2-label  for="@${row}[name]" value="@${row}[label]"></et2-label>
 					<widget type="@${row}[type]" id="@${row}[name]" no_lang="1" select_options="@${row}[select_options]"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/home/templates/default/favorite.xet b/home/templates/default/favorite.xet
index 1b72827fe2..4159889141 100644
--- a/home/templates/default/favorite.xet
+++ b/home/templates/default/favorite.xet
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="home.favorite" template="" lang="" group="0" version="1.9.001">
-		<button id="header_toggle" background_image="true" image="egw_action/arrows" class="closed" onclick="app.home.nextmatch_toggle_header" parent_node="@header_node"/>
+		<et2-button  id="header_toggle" image="egw_action/arrows" class="closed" onclick="app.home.nextmatch_toggle_header" parentId="@header_node"></et2-button>
 		<nextmatch id="nm" class="header_hidden" hide_header="true"/>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/home/templates/default/index.xet b/home/templates/default/index.xet
index 0210403daa..54d65f7fac 100644
--- a/home/templates/default/index.xet
+++ b/home/templates/default/index.xet
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="home.set_default" template="" version="1.9.001">
-		<vbox>
-			<description value="Add as default for"/>
-			<listbox type="select-account" id="group" account_type="groups"/>
-		</vbox>
+		<et2-vbox>
+			<et2-description  value="Add as default for"></et2-description>
+			<et2-select-account  id="group" accountType="groups"></et2-select-account>
+		</et2-vbox>
 	</template>
 	<template id="home.index" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -18,12 +17,12 @@
 					<html id="mainscreen_message"/>
 				</row>
 				<row>
-					<box id="portlets">
+					<et2-box  id="portlets">
 						<!-- Box wrapper needed to get box to auto-repeat -->
-						<box id="${row}"><portlet id="${_cont[id]}" title="$_cont[title]" color="@color" parent_node="home-index_portlets" settings="@settings" width="@width" height="@height" row="@row" col="@col" value="@content" class="@class"/></box>
-					</box>
+						<et2-box  id="${row}"><portlet id="${_cont[id]}" title="$_cont[title]" color="@color" parent_node="home-index_portlets" settings="@settings" width="@width" height="@height" row="@row" col="@col" value="@content" class="@class"/></et2-box>
+					</et2-box>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/home/templates/default/legacy.xet b/home/templates/default/legacy.xet
index 8786a67941..7feeac3a05 100644
--- a/home/templates/default/legacy.xet
+++ b/home/templates/default/legacy.xet
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="home.legacy" template="" lang="" group="0" version="1.9.001">
 		<html id="legacy"/>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/home/templates/default/link.xet b/home/templates/default/link.xet
index 66fed49285..688c2c14d1 100644
--- a/home/templates/default/link.xet
+++ b/home/templates/default/link.xet
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="home.link" template="" lang="" group="0" version="1.9.001">
-		<image id="image" src="image"/>
-		<link id="entry"/>
+		<et2-image  id="image" src="image"></et2-image>
+		<et2-link  id="entry" app=""></et2-link>
 		<!--
 			It's the tooltip class that does it, id might cause problems so
 			best to remove it if you're customizing.  The actual widget used is
@@ -12,4 +11,4 @@
 		-->
 		<html class="tooltip" id="tooltip" disabled="true"/>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/home/templates/default/list.xet b/home/templates/default/list.xet
index e85ff05d51..f2fd468081 100644
--- a/home/templates/default/list.xet
+++ b/home/templates/default/list.xet
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="home.list" template="" lang="" group="0" version="1.9.001">
-		<link-list id="list" onchange="app.home.link_change"/>
+		<et2-link-list  id="list" onchange="app.home.link_change"></et2-link-list>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/home/templates/default/note.xet b/home/templates/default/note.xet
index 36bce5568a..79c0ef27e7 100644
--- a/home/templates/default/note.xet
+++ b/home/templates/default/note.xet
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="home.note" template="" lang="" group="0" version="1.9.001">
 		<htmlarea id="note"/>
-		<hbox id="button" class="dialogFooterToolbar">
-			<button statustext="Saves this entry" label="Save" id="save" image="save" background_image="1"/>
-			<button statustext="Apply the changes" label="Apply" id="apply" image="apply" background_image="1"/>
-			<button statustext="leave without saveing the entry" label="Cancel" id="cancel" onclick="window.close();" image="cancel" background_image="1"/>
-		</hbox>
+		<et2-hbox  id="button" class="dialogFooterToolbar">
+			<et2-button  statustext="Saves this entry" label="Save" id="save" image="save"></et2-button>
+			<et2-button  statustext="Apply the changes" label="Apply" id="apply" image="apply"></et2-button>
+			<et2-button  statustext="leave without saveing the entry" label="Cancel" id="cancel" onclick="window.close();" image="cancel"></et2-button>
+		</et2-hbox>
 		<styles>
 			.home_note_portlet .et2_container > div {
 				overflow: auto;
@@ -18,4 +17,4 @@
 			}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/home/templates/default/weather.xet b/home/templates/default/weather.xet
index dc902b34db..69c39a7e48 100644
--- a/home/templates/default/weather.xet
+++ b/home/templates/default/weather.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="home.weather" template="" lang="" group="0" version="1.9.001">
 		<grid id="current" disabled="!@current" width="100%">
@@ -12,40 +11,40 @@
 			</columns>
 			<rows>
 				<row>
-					<image class="weather_icon" src="weather[0][icon]"/>
-					<hbox id="temp">
-						<description class="current temperature" id="temp" no_lang="true"/>
-					</hbox>
-					<vbox id="temp" disabled="@no_current_temp">
-						<description class="high_low temperature" id="max" no_lang="true"/>
-						<description class="high_low temperature" id="min" no_lang="true"/>
-					</vbox>
+					<et2-image  class="weather_icon" src="weather[0][icon]"></et2-image>
+					<et2-hbox  id="temp">
+						<et2-description  class="current temperature" id="temp" noLang="true"></et2-description>
+					</et2-hbox>
+					<et2-vbox  id="temp" disabled="@no_current_temp">
+						<et2-description  class="high_low temperature" id="max" noLang="true"></et2-description>
+						<et2-description  class="high_low temperature" id="min" noLang="true"></et2-description>
+					</et2-vbox>
 				</row>
 				<row disabled="!@weather[0][description]">
-					<description id="weather[0][description]" no_lang="true"/>
+					<et2-description  id="weather[0][description]" noLang="true"></et2-description>
 				</row>
 			</rows>
 		</grid>
-		<box id="list" class="forecast" disabled="!@list" width="100%">
+		<et2-box  id="list" class="forecast" disabled="!@list" width="100%">
 			<!-- Box wrapper needed to get box to auto-repeat -->
-			<box id="${row}">
+			<et2-box  id="${row}">
 				<grid width="100%">
 					<columns>
 						<column/>
 					</columns>
 					<rows>
-						<row><description align="center" id="day"/></row>
-						<row class="weather_icon"><image align="center" class="weather_icon" src="weather[0][icon]"/></row>
+						<row><et2-description  align="center" id="day"></et2-description></row>
+						<row class="weather_icon"><et2-image  align="center" class="weather_icon" src="weather[0][icon]"></et2-image></row>
 						<row>
-							<vbox align="center" id="temp">
-								<description class="high_low temperature" id="max" no_lang="true"/>
-								<description class="high_low temperature" id="min" no_lang="true"/>
-							</vbox>
+							<et2-vbox  align="center" id="temp">
+								<et2-description  class="high_low temperature" id="max" noLang="true"></et2-description>
+								<et2-description  class="high_low temperature" id="min" noLang="true"></et2-description>
+							</et2-vbox>
 						</row>
 					</rows>
 				</grid>
-			</box>
-		</box>
-		<description activate_links="true" align="center" class="attribution" extra_link_target="_blank" href="@attribution" value="openweathermap.org"/>
+			</et2-box>
+		</et2-box>
+		<et2-description  align="center" class="attribution" href="@attribution" value="openweathermap.org" activateLinks="true" extraLinkTarget="_blank"></et2-description>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/config.xet b/importexport/templates/default/config.xet
index 3739ea3b33..067f2cd2c7 100644
--- a/importexport/templates/default/config.xet
+++ b/importexport/templates/default/config.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.config" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -10,18 +9,18 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Users allowed to create their own definitions"/>
-					<checkbox id="newsettings[users_create_definitions]"/>
+					<et2-description  value="Users allowed to create their own definitions"></et2-description>
+					<et2-checkbox  id="newsettings[users_create_definitions]"></et2-checkbox>
 				</row>
 				<row valign="top">
-					<description value="Users allowed to share their own definitions"/>
-					<listbox type="select-account" id="newsettings[share_definition]" rows="5" options="both"/>
+					<et2-description  value="Users allowed to share their own definitions"></et2-description>
+					<et2-select-account  id="newsettings[share_definition]" rows="5" multiple="1" placeholder="both"></et2-select-account>
 				</row>
 				<row valign="top">
-					<description value="Extra charsets for import / export"/>
-					<listbox id="newsettings[import_charsets]" rows="5"/>
+					<et2-description  value="Extra charsets for import / export"></et2-description>
+					<et2-select  id="newsettings[import_charsets]" rows="5" multiple="1"></et2-select>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/definition_index.xet b/importexport/templates/default/definition_index.xet
index 4f833fec91..4afaee43a6 100644
--- a/importexport/templates/default/definition_index.xet
+++ b/importexport/templates/default/definition_index.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.definition_index.row" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%">
@@ -14,23 +13,18 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<nextmatch-filterheader id="type" options="importexport" class="lr_padding"/>
+					<et2-nextmatch-header-filter  id="type" class="lr_padding" emptyLabel="importexport"/>
 					<nextmatch-sortheader label="Name" id="name" class="lr_padding"/>
-					<nextmatch-filterheader id="application" options="Application" class="lr_padding"/>
-					<nextmatch-accountfilter align="center" id="allowed_users" options="Allowed users,groups" class="lr_padding"/>
-					<nextmatch-accountfilter empty_label="Owner" id="owner"/>
+					<et2-nextmatch-header-filter  id="application" class="lr_padding" emptyLabel="Application"/>
+					<et2-nextmatch-header-account  align="center" id="allowed_users" class="lr_padding" emptyLabel="Allowed users" accountType="groups"/>
+					<et2-nextmatch-header-account  id="owner" emptyLabel="Owner"/>
 				</row>
 				<row class="row $row_cont[class]">
-                    <image src="${row_cont[type]}" no_lang="1"
-                           onclick="window.open(egw::link('/index.php','menuaction=importexport.importexport_${row_cont[type]}_ui.${row_cont[type]}_dialog&amp;appname=${row_cont[application]}&amp;definition=${row_cont[definition_id]}'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"
-                           class="lr_padding button"/>
-                    <description id="${row}[name]" no_lang="1" class="lr_padding"/>
-                    <description id="${row}[application]" class="lr_padding"/>
-                    <listbox type="select-account" id="${row}[allowed_users]" no_lang="1" readonly="true" rows="5"
-                             empty_label='Private' class="lr_padding"/>
-                    <menulist>
-                        <menupopup type="select-account" id="${row}[owner]" readonly="true"/>
-                    </menulist>
+                    <et2-image  src="${row_cont[type]}" onclick="window.open(egw::link('/index.php','menuaction=importexport.importexport_${row_cont[type]}_ui.${row_cont[type]}_dialog&amp;appname=${row_cont[application]}&amp;definition=${row_cont[definition_id]}'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;" class="lr_padding button" noLang="1"></et2-image>
+                    <et2-description  id="${row}[name]" class="lr_padding" noLang="1"></et2-description>
+                    <et2-description  id="${row}[application]" class="lr_padding"></et2-description>
+                    <et2-select-account  id="${row}[allowed_users]" readonly="true" rows="5" class="lr_padding" multiple="1" placeholder="Private" noLang="1"></et2-select-account>
+                    <et2-select-account  id="${row}[owner]" readonly="true"></et2-select-account>
                 </row>
 			</rows>
 		</grid>
@@ -43,34 +37,34 @@
 		</styles>
 	</template>
 	<template id="importexport.definition_index.add" template="" lang="" group="0" version="1.9.002">
-		<buttononly statustext="Add a new definition" label="Add" id="add" onclick="egw(window).open_link('importexport.importexport_definitions_ui.edit','_blank','500x500'); return false;"/>
+		<et2-button  statustext="Add a new definition" label="Add" id="add" onclick="egw(window).open_link('importexport.importexport_definitions_ui.edit','_blank','500x500'); return false;" noSubmit="true"></et2-button>
 	</template>
 	<template id="importexport.definition_index" template="" lang="" group="0" version="1.9.002">
 		<nextmatch id="nm" template="importexport.definition_index.row" header_left="importexport.definition_index.add"/>
-		<box id="owner_popup" class="action_popup prompt">
-			<description value="Change owner" class="promptheader"/>
-			<vbox class="action_popup-content">
-				<description value="Select owner"/>
-				<listbox type="select-account" id="owner" options="None,accounts"/>
-			</vbox>
-			<hbox>
-				<button id="save_owner" label="Save" onclick="nm_submit_popup(this); return false;" image="save" background_image="1"/>
-				<buttononly id="cancel_owner" label="Cancel" onclick="nm_hide_popup(this,'owner_popup');" image="cancel" background_image="1"/>
-			</hbox>
-		</box>
-		<box id="allowed_popup" class="action_popup prompt">
-			<description value="Change allowed users" class="promptheader"/>
-			<vbox class="action_popup-content">
-				<description value="Select groups"/>
-				<checkbox label="%s Just me" id="allowed_private"/>
-				<checkbox label="%s All users" id="all_users"/>
-				<listbox type="select-account" id="allowed" rows="5" account_type="groups"/>
-			</vbox>
-			<hbox>
-				<button id="save_allowed" label="Save" onclick="nm_submit_popup(this); return false;" image="save" background_image="1"/>
-				<buttononly id="cancel_allowed" label="Cancel" onclick="nm_hide_popup(this,'allowed_popup');" image="cancel" background_image="1"/>
-			</hbox>
-		</box>
+		<et2-box  id="owner_popup" class="action_popup prompt">
+			<et2-description  value="Change owner" class="promptheader"></et2-description>
+			<et2-vbox  class="action_popup-content">
+				<et2-description  value="Select owner"></et2-description>
+				<et2-select-account  id="owner" emptyLabel="None" accountType="accounts"></et2-select-account>
+			</et2-vbox>
+			<et2-hbox>
+				<et2-button  id="save_owner" label="Save" onclick="nm_submit_popup(this); return false;" image="save"></et2-button>
+				<et2-button  id="cancel_owner" label="Cancel" onclick="nm_hide_popup(this,'owner_popup');" image="cancel" noSubmit="true"></et2-button>
+			</et2-hbox>
+		</et2-box>
+		<et2-box  id="allowed_popup" class="action_popup prompt">
+			<et2-description  value="Change allowed users" class="promptheader"></et2-description>
+			<et2-vbox  class="action_popup-content">
+				<et2-description  value="Select groups"></et2-description>
+				<et2-checkbox  label="%s Just me" id="allowed_private"></et2-checkbox>
+				<et2-checkbox  label="%s All users" id="all_users"></et2-checkbox>
+				<et2-select-account  id="allowed" rows="5" multiple="1" accountType="groups"></et2-select-account>
+			</et2-vbox>
+			<et2-hbox>
+				<et2-button  id="save_allowed" label="Save" onclick="nm_submit_popup(this); return false;" image="save"></et2-button>
+				<et2-button  id="cancel_allowed" label="Cancel" onclick="nm_hide_popup(this,'allowed_popup');" image="cancel" noSubmit="true"></et2-button>
+			</et2-hbox>
+		</et2-box>
 		<styles>
 			td.lr_padding { padding-left: 5px; padding-right: 5px; }
 
@@ -110,4 +104,4 @@
 }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/export_csv_selectors.xet b/importexport/templates/default/export_csv_selectors.xet
index 0e2c4f5f1d..639693c2a3 100644
--- a/importexport/templates/default/export_csv_selectors.xet
+++ b/importexport/templates/default/export_csv_selectors.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.export_csv_selectors" template="" lang="" group="0" version="1.9.002">
 		<grid>
@@ -9,15 +8,15 @@
 			</columns>
 			<rows>
 				<row>
-					<radio label="Use all" id="selection" options="all"/>
+					<radio label="Use all" id="selection" set_value="all" />
 				</row>
 				<row disabled="@no_search">
-					<radio label="Use search results" id="selection" options="search"/>
+					<radio label="Use search results" id="selection" set_value="search" />
 				</row>
 				<row disabled="@no_filter">
-					<radio label="Use definition filter" id="selection" onclick="jQuery('div.filters').show();" options="filter"/>
+					<radio label="Use definition filter" id="selection" onclick="jQuery('div.filters').show();" set_value="filter" />
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/export_dialog.xet b/importexport/templates/default/export_dialog.xet
index 9661644f21..6358a40a09 100644
--- a/importexport/templates/default/export_dialog.xet
+++ b/importexport/templates/default/export_dialog.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.export_dialog.general_tab_content" template="" lang="" group="0" version="">
         <grid width="100%">
@@ -10,31 +9,24 @@
             </columns>
             <rows>
                 <row>
-                    <description span="all"/>
+                    <et2-description  span="all"></et2-description>
                 </row>
                 <row class="select_appname ">
-                    <description value="Select application"/>
-                    <menulist>
-                        <menupopup id="appname" no_lang="1" onchange="1"/>
-                    </menulist>
+                    <et2-description  value="Select application"></et2-description>
+                    <et2-select  id="appname" onchange="1" noLang="1"></et2-select>
                 </row>
                 <row class="select_definition">
-                    <description value="Select definition"/>
-                    <menulist>
-                        <menupopup id="definition" no_lang="1"
-                                   onchange="widget.getInstanceManager().postSubmit(); return false;"/>
-                    </menulist>
+                    <et2-description  value="Select definition"></et2-description>
+                    <et2-select  id="definition" onchange="widget.getInstanceManager().postSubmit(); return false;" noLang="1"></et2-select>
                 </row>
                 <row class="select_plugin">
-                    <description value="Select plugin"/>
-                    <menulist>
-                        <menupopup id="plugin" no_lang="1" onchange="1"/>
-                    </menulist>
+                    <et2-description  value="Select plugin"></et2-description>
+                    <et2-select  id="plugin" onchange="1" noLang="1"></et2-select>
                 </row>
                 <row>
-                    <box id="plugin_description" span="all">
-                        <description id="description" no_lang="1" span="all"/>
-                    </box>
+                    <et2-box  id="plugin_description" span="all">
+                        <et2-description  id="description" span="all" noLang="1"></et2-description>
+                    </et2-box>
                 </row>
             </rows>
         </grid>
@@ -47,7 +39,7 @@
             </columns>
             <rows>
                 <row valign="top">
-                    <image src="export"/>
+                    <et2-image  src="export"></et2-image>
                     <template id="importexport.export_dialog.general_tab_content"/>
                 </row>
             </rows>
@@ -61,24 +53,24 @@
 			</columns>
 			<rows>
 				<row class="th" height="20" disabled="@plugin_selectors_template">
-					<description/>
-					<description value="Definition filter"/>
+					<et2-description></et2-description>
+					<et2-description  value="Definition filter"></et2-description>
 				</row>
 				<row valign="top" disabled="@plugin_selectors_template">
 					<html id="plugin_selectors_html" no_lang="1"/>
-					<box class="filters">
+					<et2-box  class="filters">
 						<filter id="filter_html"/>
-					</box>
+					</et2-box>
 				</row>
 				<row class="th" height="20" disabled="!@plugin_selectors_template">
-					<description/>
-					<description value="Definition filter"/>
+					<et2-description></et2-description>
+					<et2-description  value="Definition filter"></et2-description>
 				</row>
 				<row valign="top" disabled="!@plugin_selectors_template">
 					<template id="@plugin_selectors_template"/>
-					<box onclick="jQuery('input[value=\'filter\']').not(':checked').attr('checked',true).parent().effect('highlight',{},2000);" class="filters">
+					<et2-box  onclick="jQuery('input[value=\'filter\']').not(':checked').attr('checked',true).parent().effect('highlight',{},2000);" class="filters">
 						<filter id="filter_tpl"/>
-					</box>
+					</et2-box>
 				</row>
 			</rows>
 		</grid>
@@ -107,13 +99,11 @@
 						</columns>
 						<rows>
 							<row>
-								<description value="Delimiter"/>
-								<hbox no_lang="1">
-									<menulist>
-										<menupopup id="delimiter" no_lang="1" onchange="var _this = jQuery(this); var text = _this.parent().parent().find('input'); if(_this.val() =='') {text.val('');text.show(); text.focus();} else {text.hide();}"/>
-									</menulist>
-									<textbox id="other_delimiter" size="2" class="hide"/>
-								</hbox>
+								<et2-description  value="Delimiter"></et2-description>
+								<et2-hbox  noLang="1">
+									<et2-select  id="delimiter" onchange="var _this = jQuery(this); var text = _this.parent().parent().find('input'); if(_this.val() =='') {text.val('');text.show(); text.focus();} else {text.hide();}" noLang="1"></et2-select>
+									<et2-textbox  id="other_delimiter" class="hide"></et2-textbox>
+								</et2-hbox>
 							</row>
 						</rows>
 					</grid>
@@ -139,10 +129,10 @@
 			</columns>
             <rows>
                 <row>
-                    <description id="msg"/>
+                    <et2-description  id="msg"></et2-description>
                 </row>
                 <row>
-                    <tabbox id="general_tab|selection_tab|options_tab">
+                    <et2-tabbox  id="general_tab|selection_tab|options_tab">
                         <tabs>
                             <tab id="general_tab" label="General"/>
                             <tab id="selection_tab" label="Selection"/>
@@ -153,30 +143,27 @@
                             <template id="importexport.export_dialog.selection_tab"/>
                             <template id="importexport.export_dialog.options_tab"/>
                         </tabpanels>
-                    </tabbox>
+                    </et2-tabbox>
                 </row>
                 <row class="save_definition dialog-operators high">
-                    <checkbox label="Save as definition" id="save_as_definition"/>
+                    <et2-checkbox  label="Save as definition" id="save_as_definition"></et2-checkbox>
                 </row>
                 <row class="dialog-footer-toolbar">
-                    <hbox span="all">
-                        <hbox>
-                            <button label="Export" id="export" image="export" background_image="1"/>
-                            <button label="Preview" id="preview" onclick="app.importexport.export_preview"
-                                    image="prieview" background_image="1"/>
-                        </hbox>
-                        <button class="cancel" align="right" label="Cancel" id="cancel"
-                                onclick="window.close(); return false;" image="cancel" background_image="1"/>
-                    </hbox>
+                    <et2-hbox  span="all">
+                        <et2-hbox>
+                            <et2-button  label="Export" id="export" image="export"></et2-button>
+                            <et2-button  label="Preview" id="preview" onclick="app.importexport.export_preview" image="prieview"></et2-button>
+                        </et2-hbox>
+                        <et2-button  class="cancel" align="right" label="Cancel" id="cancel" onclick="window.close(); return false;" image="cancel"></et2-button>
+                    </et2-hbox>
                 </row>
                 <row>
-                    <vbox id="preview_box" span="all" class="preview">
+                    <et2-vbox  id="preview_box" span="all" class="preview">
                         <html id="preview-box" class="content"/>
-                        <box align="center" id="preview-box-buttons" class="preview-box-buttons">
-                            <button align="center" label="OK"
-                                    onclick="jQuery(this).parents('.preview').css('display','none'); return false;"/>
-                        </box>
-                    </vbox>
+                        <et2-box  align="center" id="preview-box-buttons" class="preview-box-buttons">
+                            <et2-button  align="center" label="OK" onclick="jQuery(this).parents('.preview').css('display','none'); return false;"></et2-button>
+                        </et2-box>
+                    </et2-vbox>
                 </row>
             </rows>
 		</grid>
@@ -211,4 +198,4 @@
 }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/import_definition.xet b/importexport/templates/default/import_definition.xet
index 1ccae45a79..9a030de4c9 100644
--- a/importexport/templates/default/import_definition.xet
+++ b/importexport/templates/default/import_definition.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.import_definition" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -9,18 +8,18 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Import definitions (Attension: Existing definitions with equal names will be overwritten!!!)"/>
+					<et2-description  value="Import definitions (Attension: Existing definitions with equal names will be overwritten!!!)"></et2-description>
 				</row>
 				<row>
 					<file id="import_file"/>
 				</row>
 				<row>
-					<hbox>
-						<button label="Import" id="import" image="import" background_image="1"/>
-						<button label="Update default-definitions" id="update" image="update" background_image="1"/>
-					</hbox>
+					<et2-hbox>
+						<et2-button  label="Import" id="import" image="import"></et2-button>
+						<et2-button  label="Update default-definitions" id="update" image="update"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/import_dialog.xet b/importexport/templates/default/import_dialog.xet
index 643a303d29..3e5d9dd372 100644
--- a/importexport/templates/default/import_dialog.xet
+++ b/importexport/templates/default/import_dialog.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.import_dialog.csv" template="" lang="" group="0" version="1.9.005">
 		<grid>
@@ -10,13 +9,11 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Delimiter"/>
-					<hbox no_lang="1" options="0,0">
-						<menulist>
-							<menupopup id="delimiter" no_lang="1" onchange="var _this = jQuery(this); var text = _this.parent().parent().find('input'); if(_this.val() =='other') {text.val('');text.show(); text.focus();} else {text.hide();}"/>
-						</menulist>
-						<textbox id="other_delimiter" size="2" maxlength="1" class="hide"/>
-					</hbox>
+					<et2-description  value="Delimiter"></et2-description>
+					<et2-hbox  cellpadding="0" cellspacing="0" noLang="1" >
+						<et2-select  id="delimiter" onchange="var _this = jQuery(this); var text = _this.parent().parent().find('input'); if(_this.val() =='other') {text.val('');text.show(); text.focus();} else {text.hide();}" noLang="1"></et2-select>
+						<et2-textbox  id="other_delimiter" maxlength="1" class="hide"></et2-textbox>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -30,46 +27,41 @@
             <rows>
                 <row disabled="!@message">
                     <html id="message" span="all" class="message"/>
-                    <description/>
+                    <et2-description></et2-description>
                 </row>
                 <row>
-                    <description value="Application"/>
-                    <menulist>
-                        <menupopup id="appname" onchange="1"/>
-                    </menulist>
+                    <et2-description  value="Application"></et2-description>
+                    <et2-select  id="appname" onchange="1"></et2-select>
                 </row>
                 <row>
-                    <description value="Import definition"/>
-                    <menulist>
-                        <menupopup id="definition" onchange="1"/>
-                    </menulist>
+                    <et2-description  value="Import definition"></et2-description>
+                    <et2-select  id="definition" onchange="1"></et2-select>
                 </row>
                 <row>
-                    <description value="Please select file to import"/>
+                    <et2-description  value="Please select file to import"></et2-description>
                     <file id="file" accept="@file_type"/>
                 </row>
                 <row disabled="!@plugin_options_template">
                     <template template="@plugin_options_template"/>
                 </row>
                 <row>
-                    <vbox id="preview_box" span="all" class="preview">
+                    <et2-vbox  id="preview_box" span="all" class="preview">
                         <html id="preview" class="content"/>
-                        <box align="center" id="buttons">
-                            <buttononly align="center" label="OK"
-                                        onclick="jQuery(this).parents('.preview').css('display','none'); return false;"/>
-                        </box>
-                    </vbox>
-					<description/>
+                        <et2-box  align="center" id="buttons">
+                            <et2-button  align="center" label="OK" onclick="jQuery(this).parents('.preview').css('display','none'); return false;" noSubmit="true"></et2-button>
+                        </et2-box>
+                    </et2-vbox>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<hbox span="all">
-						<button label="Import" id="import" onclick="app.importexport.import_preview" image="import" background_image="1"/>
-						<button label="Cancel" id="cancel" onclick="window.close();" image="cancel" background_image="1"/>
-						<checkbox align="right" label="No notifications" id="no_notifications" />
-						<checkbox align="right" label="Test only" id="dry-run"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Import" id="import" onclick="app.importexport.import_preview" image="import"></et2-button>
+						<et2-button  label="Cancel" id="cancel" onclick="window.close();" image="cancel"></et2-button>
+						<et2-checkbox  align="right" label="No notifications" id="no_notifications" ></et2-checkbox>
+						<et2-checkbox  align="right" label="Test only" id="dry-run"></et2-checkbox>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/schedule_edit.xet b/importexport/templates/default/schedule_edit.xet
index e4ef63548e..c97dcce3b0 100644
--- a/importexport/templates/default/schedule_edit.xet
+++ b/importexport/templates/default/schedule_edit.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.schedule_edit" template="" lang="" group="0" version="1.9.004">
 		<grid>
@@ -10,42 +9,34 @@
 			</columns>
 			<rows>
 				<row disabled="!@message">
-					<description id="message" span="all" class="message"/>
-					<description/>
+					<et2-description  id="message" span="all" class="message"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description value="Type"/>
-					<menulist>
-						<menupopup id="type" onchange="1"/>
-					</menulist>
+					<et2-description  value="Type"></et2-description>
+					<et2-select  id="type" onchange="1"></et2-select>
 				</row>
 				<row>
-					<description value="Application"/>
-					<menulist>
-						<menupopup id="appname" onchange="1"/>
-					</menulist>
+					<et2-description  value="Application"></et2-description>
+					<et2-select  id="appname" onchange="1"></et2-select>
 				</row>
 				<row>
-					<description value="Plugin"/>
-					<menulist>
-						<menupopup id="plugin" onchange="1" options="Select..."/>
-					</menulist>
+					<et2-description  value="Plugin"></et2-description>
+					<et2-select  id="plugin" onchange="1" emptyLabel="Select..."></et2-select>
 				</row>
 				<row>
-					<description value="Definition"/>
-					<menulist>
-						<menupopup id="definition" options="Select..."/>
-					</menulist>
+					<et2-description  value="Definition"></et2-description>
+					<et2-select  id="definition" emptyLabel="Select..."></et2-select>
 				</row>
 				<row>
-					<description value="Target"/>
-					<textbox id="target" size="50"/>
+					<et2-description  value="Target"></et2-description>
+					<et2-textbox  id="target"></et2-textbox>
 				</row>
 				<row class="help">
-					<description value="Target examples: vfs://default/home/user/export.csv or http://server.net/prices.csv" span="all"/>
+					<et2-description  value="Target examples: vfs://default/home/user/export.csv or http://server.net/prices.csv" span="all"></et2-description>
 				</row>
 				<row disabled="@no_delete_files">
-					<checkbox label="Delete files after import" id="delete_files" span="all"/>
+					<et2-checkbox  label="Delete files after import" id="delete_files" span="all"></et2-checkbox>
 				</row>
 				<row>
 					<grid id="schedule">
@@ -59,41 +50,41 @@
 						</columns>
 						<rows>
 							<row class="th">
-								<description value="Year"/>
-								<description value="Month"/>
-								<description value="Day"/>
-								<description value="Day of week"/>
-								<description value="Hour"/>
-								<description value="Minute"/>
+								<et2-description  value="Year"></et2-description>
+								<et2-description  value="Month"></et2-description>
+								<et2-description  value="Day"></et2-description>
+								<et2-description  value="Day of week"></et2-description>
+								<et2-description  value="Hour"></et2-description>
+								<et2-description  value="Minute"></et2-description>
 							</row>
 							<row>
-								<textbox id="year" size="5"/>
-								<textbox id="month" size="5"/>
-								<textbox id="day" size="5"/>
-								<textbox align="center" id="dow" size="5"/>
-								<textbox id="hour" size="5"/>
-								<textbox id="min" size="5"/>
+								<et2-textbox  id="year"></et2-textbox>
+								<et2-textbox  id="month"></et2-textbox>
+								<et2-textbox  id="day"></et2-textbox>
+								<et2-textbox  align="center" id="dow"></et2-textbox>
+								<et2-textbox  id="hour"></et2-textbox>
+								<et2-textbox  id="min"></et2-textbox>
 							</row>
 							<row>
-								<description value="(* for all)" span="3"/>
-								<description value="(0-6, 0=Sun)"/>
-								<description value="(0-23)"/>
-								<description/>
+								<et2-description  value="(* for all)" span="3"></et2-description>
+								<et2-description  value="(0-6, 0=Sun)"></et2-description>
+								<et2-description  value="(0-23)"></et2-description>
+								<et2-description></et2-description>
 							</row>
 						</rows>
 					</grid>
 				</row>
 				<row>
-					<date-time label="Schedule times are server time!  Currently %s." id="current_time" readonly="true" span="all" class="message"/>
-					<description/>
+					<et2-date-time  label="Schedule times are server time!  Currently %s." id="current_time" readonly="true" span="all" class="message"></et2-date-time>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<hbox span="all">
-						<button label="Save" id="save"/>
-						<button label="Cancel" id="cancel" onclick="self.close();"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Save" id="save"></et2-button>
+						<et2-button  label="Cancel" id="cancel" onclick="self.close();"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/schedule_index.xet b/importexport/templates/default/schedule_index.xet
index 04aaade92c..7ecadf1cc1 100644
--- a/importexport/templates/default/schedule_index.xet
+++ b/importexport/templates/default/schedule_index.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.schedule_index" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%">
@@ -9,7 +8,7 @@
 			</columns>
 			<rows>
 				<row disabled="!@msg">
-					<description id="@msg" span="all" class="message"/>
+					<et2-description  id="@msg" span="all" class="message"></et2-description>
 				</row>
 				<row>
 					<grid width="100%" id="scheduled">
@@ -25,17 +24,17 @@
 						</columns>
 						<rows>
 							<row class="th">
-								<description value="Type"/>
-								<description value="Application"/>
-								<description value="Plugin"/>
-								<description value="Definition"/>
-								<description value="Target"/>
-								<description value="Last Run"/>
-								<vbox options="0,0">
-									<description value="Next Run"/>
-									<description value="Schedule"/>
-								</vbox>
-								<description/>
+								<et2-description  value="Type"></et2-description>
+								<et2-description  value="Application"></et2-description>
+								<et2-description  value="Plugin"></et2-description>
+								<et2-description  value="Definition"></et2-description>
+								<et2-description  value="Target"></et2-description>
+								<et2-description  value="Last Run"></et2-description>
+								<et2-vbox  cellpadding="0" cellspacing="0" >
+									<et2-description  value="Next Run"></et2-description>
+									<et2-description  value="Schedule"></et2-description>
+								</et2-vbox>
+								<et2-description></et2-description>
 							</row>
 							<row valign="top">
 								<grid width="100%" class="schedule" id="$row">
@@ -51,35 +50,27 @@
 									</columns>
 									<rows>
 										<row valign="top">
-											<menulist>
-												<menupopup id="type" readonly="true"/>
-											</menulist>
-											<menulist>
-												<menupopup type="select-app" id="appname" readonly="true"/>
-											</menulist>
-											<menulist>
-												<menupopup id="plugin" no_lang="1" readonly="true"/>
-											</menulist>
-											<menulist>
-												<menupopup id="definition" readonly="true"/>
-											</menulist>
-											<description id="target" no_lang="1"/>
-											<vbox>
-												<date-time id="last_run" readonly="true"/>
-												<description id="record_count" no_lang="1"/>
-												<date-duration id="run_time" readonly="true" options="m,m"/>
-											</vbox>
-											<vbox options="0,0">
-												<date-time id="next" readonly="true"/>
-												<description id="times" no_lang="1"/>
-											</vbox>
-											<hbox options="0,0">
-												<button id="edit[$_cont[id]]" onclick="window.open(egw::link('/index.php','menuaction=importexport.importexport_schedule_ui.edit&amp;id=$_cont[id]'),'_blank','dependent=yes,width=600,height=450,scrollbars=yes,status=yes'); return false;" image="edit"/>
-												<button id="delete[$_cont[id]]" onclick="1" image="delete"/>
-											</hbox>
+											<et2-select  id="type" readonly="true"></et2-select>
+											<et2-select-app  id="appname" readonly="true"></et2-select-app>
+											<et2-select  id="plugin" readonly="true" noLang="1"></et2-select>
+											<et2-select  id="definition" readonly="true"></et2-select>
+											<et2-description  id="target" noLang="1"></et2-description>
+											<et2-vbox>
+												<et2-date-time  id="last_run" readonly="true"></et2-date-time>
+												<et2-description  id="record_count" noLang="1"></et2-description>
+												<et2-date-duration  id="run_time" readonly="true" dataFormat="m" ></et2-date-duration>
+											</et2-vbox>
+											<et2-vbox  cellpadding="0" cellspacing="0" >
+												<et2-date-time  id="next" readonly="true"></et2-date-time>
+												<et2-description  id="times" noLang="1"></et2-description>
+											</et2-vbox>
+											<et2-hbox  cellpadding="0" cellspacing="0" >
+												<et2-button-icon  id="edit[$_cont[id]]" onclick="window.open(egw::link('/index.php','menuaction=importexport.importexport_schedule_ui.edit&amp;id=$_cont[id]'),'_blank','dependent=yes,width=600,height=450,scrollbars=yes,status=yes'); return false;" image="edit"></et2-button-icon>
+												<et2-button-icon  id="delete[$_cont[id]]" onclick="1" image="delete"></et2-button-icon>
+											</et2-hbox>
 										</row>
 										<row class="th" disabled="!@result">
-											<description value="Results" span="all"/>
+											<et2-description  value="Results" span="all"></et2-description>
 										</row>
 										<row valign="top" disabled="!@result">
 											<grid width="100%" id="result">
@@ -89,14 +80,14 @@
 												</columns>
 												<rows>
 													<row class="nmr" valign="top">
-														<description id="${row}[target]"/>
-														<description id="${row}[message]" no_lang="1"/>
+														<et2-description  id="${row}[target]"></et2-description>
+														<et2-description  id="${row}[message]" noLang="1"></et2-description>
 													</row>
 												</rows>
 											</grid>
 										</row>
 										<row class="th" disabled="!@warnings">
-											<description value="Warnings" span="all"/>
+											<et2-description  value="Warnings" span="all"></et2-description>
 										</row>
 										<row>
 											<grid width="100%" id="warnings">
@@ -106,14 +97,14 @@
 												</columns>
 												<rows>
 													<row class="nmr" valign="top">
-														<description id="${row}[target]" no_lang="1"/>
-														<description id="${row}[message]" no_lang="1"/>
+														<et2-description  id="${row}[target]" noLang="1"></et2-description>
+														<et2-description  id="${row}[message]" noLang="1"></et2-description>
 													</row>
 												</rows>
 											</grid>
 										</row>
 										<row class="th" disabled="!@errors">
-											<description value="Errors" span="all"/>
+											<et2-description  value="Errors" span="all"></et2-description>
 										</row>
 										<row valign="top" disabled="!@errors">
 											<grid width="100%" id="errors">
@@ -123,8 +114,8 @@
 												</columns>
 												<rows>
 													<row class="nmr" valign="top">
-														<description id="${row}[target]" no_lang="1"/>
-														<description id="${row}[message]" no_lang="1"/>
+														<et2-description  id="${row}[target]" noLang="1"></et2-description>
+														<et2-description  id="${row}[message]" noLang="1"></et2-description>
 													</row>
 												</rows>
 											</grid>
@@ -136,9 +127,9 @@
 					</grid>
 				</row>
 				<row>
-					<hbox span="all">
-						<button label="add" id="add" onclick="window.open(egw::link('/index.php','menuaction=importexport.importexport_schedule_ui.edit'),'_blank','dependent=yes,width=600,height=450,scrollbars=yes,status=yes'); return false;"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="add" id="add" onclick="window.open(egw::link('/index.php','menuaction=importexport.importexport_schedule_ui.edit'),'_blank','dependent=yes,width=600,height=450,scrollbars=yes,status=yes'); return false;"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -148,4 +139,4 @@
 }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/wizard_basic_export_csv.choose_fields.xet b/importexport/templates/default/wizard_basic_export_csv.choose_fields.xet
index 2593ffc095..04781beb4c 100644
--- a/importexport/templates/default/wizard_basic_export_csv.choose_fields.xet
+++ b/importexport/templates/default/wizard_basic_export_csv.choose_fields.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.wizard_basic_export_csv.choose_fields" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -9,7 +8,7 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="msg" span="all"/>
+					<et2-description  id="msg" span="all"></et2-description>
 				</row>
 				<row>
 					<grid overflow="auto" id="fields">
@@ -19,17 +18,15 @@
 						</columns>
 						<rows>
 							<row class="th">
-								<description value="Field"/>
-								<hbox>
-                                    <description value="Export"/>
-                                    <buttononly statustext="Check all" label="Check all" id="check_all"
-                                                onclick="jQuery('input:checkbox').attr('checked', !jQuery('input:checkbox').attr('checked')); return false;"
-                                                image="check"/>
-                                </hbox>
+								<et2-description  value="Field"></et2-description>
+								<et2-hbox>
+                                    <et2-description  value="Export"></et2-description>
+                                    <et2-button  statustext="Check all" label="Check all" id="check_all" onclick="jQuery('input:checkbox').attr('checked', !jQuery('input:checkbox').attr('checked')); return false;" image="check" noSubmit="true"></et2-button>
+                                </et2-hbox>
 							</row>
 							<row>
-								<description id="${row}[name]" no_lang="1"/>
-								<checkbox id="export[${row}]" no_lang="1" options="$row_cont[field]"/>
+								<et2-description  id="${row}[name]" noLang="1"></et2-description>
+								<et2-checkbox  id="export[${row}]" noLang="1" selectedValue="$row_cont[field]" ></et2-checkbox>
 							</row>
 						</rows>
 					</grid>
@@ -37,4 +34,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/wizard_basic_export_csv.choosesepncharset.xet b/importexport/templates/default/wizard_basic_export_csv.choosesepncharset.xet
index 7da9d2b2a9..97e01942b7 100644
--- a/importexport/templates/default/wizard_basic_export_csv.choosesepncharset.xet
+++ b/importexport/templates/default/wizard_basic_export_csv.choosesepncharset.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.wizard_basic_export_csv.choosesepncharset" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -10,29 +9,23 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="msg" no_lang="1" span="all"/>
+					<et2-description  id="msg" span="all" noLang="1"></et2-description>
 				</row>
 				<row>
-					<description value="Fieldseperator"/>
-					<textbox id="delimiter" no_lang="1" size="1"/>
+					<et2-description  value="Fieldseperator"></et2-description>
+					<et2-textbox  id="delimiter" noLang="1"></et2-textbox>
 				</row>
 				<row>
-					<description value="Charset of file"/>
-					<menulist class="width180">
-						<menupopup id="charset" no_lang="1"/>
-					</menulist>
+					<et2-description  value="Charset of file"></et2-description>
+					<et2-select  class="width180" id="charset" noLang="1"></et2-select>
 				</row>
 				<row>
-					<description value="Include header"/>
-					<menulist>
-						<menupopup id="begin_with_fieldnames"/>
-					</menulist>
+					<et2-description  value="Include header"></et2-description>
+					<et2-select  id="begin_with_fieldnames"></et2-select>
 				</row>
 				<row>
-					<description value="Export data as"/>
-					<menulist>
-						<menupopup id="convert"/>
-					</menulist>
+					<et2-description  value="Export data as"></et2-description>
+					<et2-select  id="convert"></et2-select>
 				</row>
 			</rows>
 		</grid>
@@ -40,4 +33,4 @@
 			.width180 select { width:150px;}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/wizard_basic_export_csv.filter.xet b/importexport/templates/default/wizard_basic_export_csv.filter.xet
index de2c627806..87066283ae 100644
--- a/importexport/templates/default/wizard_basic_export_csv.filter.xet
+++ b/importexport/templates/default/wizard_basic_export_csv.filter.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.wizard_basic_export_csv.filter" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -9,7 +8,7 @@
 			</columns>
 			<rows>
 				<row disabled="!@msg">
-					<description id="msg"/>
+					<et2-description  id="msg"></et2-description>
 				</row>
 				<row>
 					<filter id="set_filter" relative_dates="true"/>
@@ -20,4 +19,4 @@
   width: 200px;
 }</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/wizard_basic_import_csv.choosesepncharset.xet b/importexport/templates/default/wizard_basic_import_csv.choosesepncharset.xet
index 524cbeb3ed..61f5c3bda4 100644
--- a/importexport/templates/default/wizard_basic_import_csv.choosesepncharset.xet
+++ b/importexport/templates/default/wizard_basic_import_csv.choosesepncharset.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.wizard_basic_import_csv.choosesepncharset" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -10,33 +9,27 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="msg" no_lang="1" span="all"/>
+					<et2-description  id="msg" span="all" noLang="1"></et2-description>
 				</row>
 				<row>
-					<description value="Fieldseperator"/>
-					<textbox id="fieldsep" no_lang="1" size="1"/>
+					<et2-description  value="Fieldseperator"></et2-description>
+					<et2-textbox  id="fieldsep" noLang="1"></et2-textbox>
 				</row>
 				<row>
-					<description value="Charset of file"/>
-					<menulist class="width180">
-						<menupopup id="charset" no_lang="1"/>
-					</menulist>
+					<et2-description  value="Charset of file"></et2-description>
+					<et2-select  class="width180" id="charset" noLang="1"></et2-select>
 				</row>
 				<row>
-					<description value="Header lines to skip"/>
-					<textbox type="integer" id="num_header_lines" min="0"/>
+					<et2-description  value="Header lines to skip"></et2-description>
+					<et2-number  id="num_header_lines" min="0" precision="0"></et2-number>
 				</row>
 				<row disabled="@no_cats">
-					<description value="Update categories"/>
-					<menulist>
-						<menupopup id="update_cats"/>
-					</menulist>
+					<et2-description  value="Update categories"></et2-description>
+					<et2-select  id="update_cats"></et2-select>
 				</row>
 				<row>
-					<description value="Import data is"/>
-					<menulist>
-						<menupopup id="convert"/>
-					</menulist>
+					<et2-description  value="Import data is"></et2-description>
+					<et2-select  id="convert"></et2-select>
 				</row>
 			</rows>
 		</grid>
@@ -44,4 +37,4 @@
 			.width180 select { width:150px;}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/wizard_basic_import_csv.conditions.xet b/importexport/templates/default/wizard_basic_import_csv.conditions.xet
index b8b19588cc..1586a521ea 100644
--- a/importexport/templates/default/wizard_basic_import_csv.conditions.xet
+++ b/importexport/templates/default/wizard_basic_import_csv.conditions.xet
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.wizard_basic_import_csv.conditions" template="" lang="" group="0" version="1.9.002">
-		<vbox cols="4" rows="1">
-			<description value="How to merge with existing data? For each record, all conditions are evaluated from top to bottom, or stop. For blind insert, leave blank." class="condition_help"/>
+		<et2-vbox  cols="4" rows="1">
+			<et2-description  value="How to merge with existing data? For each record, all conditions are evaluated from top to bottom, or stop. For blind insert, leave blank." class="condition_help"></et2-description>
 			<grid id="conditions">
 				<columns>
 					<column/>
@@ -16,50 +15,42 @@
 				</columns>
 				<rows>
 					<row class="th">
-						<description value="Field"/>
-						<description value="Condition"/>
-						<vbox span="2">
-							<description align="center" value="True" span="2"/>
-							<hbox options="2,0">
-								<description value="Action"/>
-								<description align="right" value="Stop"/>
-							</hbox>
-						</vbox>
-						<vbox span="2">
-							<description align="center" value="False" span="2"/>
-							<hbox options="2,0">
-								<description value="Action"/>
-								<description align="right" value="Stop"/>
-							</hbox>
-						</vbox>
+						<et2-description  value="Field"></et2-description>
+						<et2-description  value="Condition"></et2-description>
+						<et2-vbox  span="2">
+							<et2-description  align="center" value="True" span="2"></et2-description>
+							<et2-hbox  cellpadding="2" cellspacing="0" >
+								<et2-description  value="Action"></et2-description>
+								<et2-description  align="right" value="Stop"></et2-description>
+							</et2-hbox>
+						</et2-vbox>
+						<et2-vbox  span="2">
+							<et2-description  align="center" value="False" span="2"></et2-description>
+							<et2-hbox  cellpadding="2" cellspacing="0" >
+								<et2-description  value="Action"></et2-description>
+								<et2-description  align="right" value="Stop"></et2-description>
+							</et2-hbox>
+						</et2-vbox>
 					</row>
 					<row>
-						<menulist>
-							<menupopup id="${row}[string]" no_lang="1" options="Select"/>
-						</menulist>
-						<hbox options="0,0">
-							<menulist>
-								<menupopup id="${row}[type]" no_lang="1"/>
-							</menulist>
-							<textbox id="${row}[op_2]" no_lang="1"/>
-						</hbox>
-						<menulist>
-							<menupopup id="${row}[true][action]" no_lang="1" options="Select"/>
-						</menulist>
-						<checkbox align="center" id="${row}[true][stop]"/>
-						<menulist>
-							<menupopup id="${row}[false][action]" no_lang="1" options="Select"/>
-						</menulist>
-						<checkbox align="center" id="${row}[false][stop]"/>
+						<et2-select  id="${row}[string]" noLang="1" emptyLabel="Select"></et2-select>
+						<et2-hbox  cellpadding="0" cellspacing="0" >
+							<et2-select  id="${row}[type]" noLang="1"></et2-select>
+							<et2-textbox  id="${row}[op_2]" noLang="1"></et2-textbox>
+						</et2-hbox>
+						<et2-select  id="${row}[true][action]" noLang="1" emptyLabel="Select"></et2-select>
+						<et2-checkbox  align="center" id="${row}[true][stop]"></et2-checkbox>
+						<et2-select  id="${row}[false][action]" noLang="1" emptyLabel="Select"></et2-select>
+						<et2-checkbox  align="center" id="${row}[false][stop]"></et2-checkbox>
 					</row>
 				</rows>
 			</grid>
-			<button statustext="Add an additional condition" label="add" id="button[add]"/>
-		</vbox>
+			<et2-button  statustext="Add an additional condition" label="add" id="button[add]"></et2-button>
+		</et2-vbox>
 		<styles>
 			.condition_help {
 	white-space: normal;
 }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/wizard_basic_import_csv.fieldmapping.xet b/importexport/templates/default/wizard_basic_import_csv.fieldmapping.xet
index f2a37e61b3..2379972230 100644
--- a/importexport/templates/default/wizard_basic_import_csv.fieldmapping.xet
+++ b/importexport/templates/default/wizard_basic_import_csv.fieldmapping.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.wizard_basic_import_csv.fieldmapping" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -9,7 +8,7 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="msg" no_lang="1" span="all"/>
+					<et2-description  id="msg" span="all" noLang="1"></et2-description>
 				</row>
 				<row>
 					<grid overflow="auto" id="mapping">
@@ -22,16 +21,16 @@
                         </columns>
                         <rows>
                             <row class="th">
-                                <description/>
-                                <description value="CSV Field"/>
-                                <description value="Target Field"/>
-                                <description value="Translation"/>
+                                <et2-description></et2-description>
+                                <et2-description  value="CSV Field"></et2-description>
+                                <et2-description  value="Target Field"></et2-description>
+                                <et2-description  value="Translation"></et2-description>
                             </row>
                             <row>
-                                <description value="$row_cont[index]" no_lang="1"/>
-                                <description value="$row_cont[title]" no_lang="1"/>
-                                <listbox id="{$row}[field]" no_lang="1"/>
-                                <textbox id="{$row}[conversion]"/>
+                                <et2-description  value="$row_cont[index]" noLang="1"></et2-description>
+                                <et2-description  value="$row_cont[title]" noLang="1"></et2-description>
+                                <et2-select  id="{$row}[field]" noLang="1"></et2-select>
+                                <et2-textbox  id="{$row}[conversion]"></et2-textbox>
                             </row>
                         </rows>
                     </grid>
@@ -44,4 +43,4 @@ display:none;
 }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/wizard_basic_import_csv.overrides.xet b/importexport/templates/default/wizard_basic_import_csv.overrides.xet
index cdce5e5a0d..7904fe8e38 100644
--- a/importexport/templates/default/wizard_basic_import_csv.overrides.xet
+++ b/importexport/templates/default/wizard_basic_import_csv.overrides.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.wizard_basic_import_csv.overrides" template="" lang="" group="0" version="1.9.001">
 		<grid id="override_values">
@@ -10,14 +9,14 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Category"/>
-					<select-cat id="cat_id[value]" empty_label="From file" options=",,,$cont[application]"/>
+					<et2-description  value="Category"></et2-description>
+					<et2-select-cat  id="cat_id[value]" application="$cont[application]" emptyLabel="From file"></et2-select-cat>
 				</row>
 				<row>
-					<description/>
+					<et2-description></et2-description>
 				</row>
 
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/wizard_basic_import_csv.sample_file.xet b/importexport/templates/default/wizard_basic_import_csv.sample_file.xet
index a6469f166e..e7b60ff2f2 100644
--- a/importexport/templates/default/wizard_basic_import_csv.sample_file.xet
+++ b/importexport/templates/default/wizard_basic_import_csv.sample_file.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.wizard_basic_import_csv.sample_file" template="" lang="" group="0" version="0.0.1">
 		<grid>
@@ -9,7 +8,7 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="msg" no_lang="1"/>
+					<et2-description  id="msg" noLang="1"></et2-description>
 				</row>
 				<row>
 					<file id="file"/>
@@ -17,4 +16,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/wizard_chooseallowedusers.xet b/importexport/templates/default/wizard_chooseallowedusers.xet
index 761e053dcb..b957b493ab 100644
--- a/importexport/templates/default/wizard_chooseallowedusers.xet
+++ b/importexport/templates/default/wizard_chooseallowedusers.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.wizard_chooseallowedusers" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -9,12 +8,12 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="msg" no_lang="1"/>
+					<et2-description  id="msg" noLang="1"></et2-description>
 				</row>
 				<row>
-					<listbox type="select-account" id="allowed_users" rows="5" account_type="groups" onchange="app.importexport.allowed_users_change"/>
+					<et2-select-account  id="allowed_users" rows="5" onchange="app.importexport.allowed_users_change" multiple="1" accountType="groups"></et2-select-account>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/wizard_chooseapp.xet b/importexport/templates/default/wizard_chooseapp.xet
index 586ddeed5d..69db2f604a 100644
--- a/importexport/templates/default/wizard_chooseapp.xet
+++ b/importexport/templates/default/wizard_chooseapp.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.wizard_chooseapp" template="" lang="" group="0" version="0.0.1">
 		<grid>
@@ -9,14 +8,12 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="msg" no_lang="1"/>
+					<et2-description  id="msg" noLang="1"></et2-description>
 				</row>
 				<row class="chooseapp">
-					<menulist>
-						<menupopup id="application" no_lang="1"/>
-					</menulist>
+					<et2-select  id="application" noLang="1"></et2-select>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/wizard_choosename.xet b/importexport/templates/default/wizard_choosename.xet
index 3136825a30..f9614dd8a0 100644
--- a/importexport/templates/default/wizard_choosename.xet
+++ b/importexport/templates/default/wizard_choosename.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.wizard_choosename" template="" lang="" group="0" version="0.0.1">
 		<grid>
@@ -9,12 +8,12 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="msg" no_lang="1"/>
+					<et2-description  id="msg" noLang="1"></et2-description>
 				</row>
 				<row>
-					<textbox id="name"/>
+					<et2-textbox  id="name"></et2-textbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/wizard_chooseplugin.xet b/importexport/templates/default/wizard_chooseplugin.xet
index b6704ea666..c279a4cd3f 100644
--- a/importexport/templates/default/wizard_chooseplugin.xet
+++ b/importexport/templates/default/wizard_chooseplugin.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.wizard_chooseplugin" template="" lang="" group="0" version="0.0.1">
 		<grid>
@@ -9,14 +8,12 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="msg" no_lang="1"/>
+					<et2-description  id="msg" noLang="1"></et2-description>
 				</row>
 				<row>
-					<menulist>
-						<menupopup id="plugin" no_lang="1"/>
-					</menulist>
+					<et2-select  id="plugin" noLang="1"></et2-select>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/importexport/templates/default/wizardbox.xet b/importexport/templates/default/wizardbox.xet
index 94aea6f208..dc33fbe504 100644
--- a/importexport/templates/default/wizardbox.xet
+++ b/importexport/templates/default/wizardbox.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="importexport.wizardbox" template="" lang="" group="0" version="0.0.2">
         <grid width="100%" height="600">
@@ -9,24 +8,24 @@
             </columns>
             <rows>
                 <row valign="top">
-                    <hbox no_lang="1">
-                        <vbox width="100%">
-                            <description id="text"/>
-                            <box class="wizard_content">
+                    <et2-hbox  noLang="1">
+                        <et2-vbox  width="100%">
+                            <et2-description  id="text"></et2-description>
+                            <et2-box  class="wizard_content">
                                 <template id="@wizard_content"/>
-                            </box>
-                        </vbox>
-                    </hbox>
+                            </et2-box>
+                        </et2-vbox>
+                    </et2-hbox>
                 </row>
                 <row valign="bottom" class="dialog-footer-toolbar">
-                    <hbox span="all">
-                        <hbox>
-                            <button label="previous" id="button[previous]" image="previous" background_image="1"/>
-                            <button label="next" id="button[next]" image="next" background_image="1"/>
-                            <button label="finish" id="button[finish]" image="finish" background_image="1"/>
-						</hbox>
-						<button align="right" label="cancel" id="button[cancel]" onclick="window.close(); return false;" image="cancel" background_image="1"/>
-					</hbox>
+                    <et2-hbox  span="all">
+                        <et2-hbox>
+                            <et2-button  label="previous" id="button[previous]" image="previous"></et2-button>
+                            <et2-button  label="next" id="button[next]" image="next"></et2-button>
+                            <et2-button  label="finish" id="button[finish]" image="finish"></et2-button>
+						</et2-hbox>
+						<et2-button  align="right" label="cancel" id="button[cancel]" onclick="window.close(); return false;" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -39,4 +38,4 @@
             }
         </styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/infolog/templates/default/admin.types.xet b/infolog/templates/default/admin.types.xet
index 62d25b7660..c4897eace9 100644
--- a/infolog/templates/default/admin.types.xet
+++ b/infolog/templates/default/admin.types.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="infolog.customfields.status" template="" lang="" group="0" version="1.2.001">
 		<grid>
@@ -14,29 +13,29 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description value="Name"/>
-					<description value="Label"/>
-					<description value="Translation"/>
-					<description value="Default"/>
-					<description value="Disabled"/>
-					<description align="center" value="Action"/>
+					<et2-description  value="Name"></et2-description>
+					<et2-description  value="Label"></et2-description>
+					<et2-description  value="Translation"></et2-description>
+					<et2-description  value="Default"></et2-description>
+					<et2-description  value="Disabled"></et2-description>
+					<et2-description  align="center" value="Action"></et2-description>
 				</row>
 				<row class="row">
-					<textbox statustext="the name used internaly (&lt;= 10 chars), changeing it makes existing data unavailible" id="${row}[name]" size="10" maxlength="40"/>
-					<textbox statustext="the text displayed to the user" id="${row}[label]" size="40"/>
-					<description id="${row}[label]"/>
-					<radio align="center" statustext="default status for a new log entry" id="default" options="$row_cont[name]"/>
-					<checkbox align="center" statustext="disables a status without deleting it" id="${row}[disabled]"/>
-					<hbox>
-						<button statustext="deletes this status" label="Delete" id="delete[$row_cont[name]]"/>
-						<button statustext="creates a new status with the given values" label="Create" id="create$row_cont[name]"/>
-					</hbox>
+					<et2-textbox  statustext="the name used internaly (&lt;= 10 chars), changeing it makes existing data unavailible" id="${row}[name]" maxlength="40"></et2-textbox>
+					<et2-textbox  statustext="the text displayed to the user" id="${row}[label]"></et2-textbox>
+					<et2-description  id="${row}[label]"></et2-description>
+					<radio align="center" statustext="default status for a new log entry" id="default" set_value="$row_cont[name]" />
+					<et2-checkbox  align="center" statustext="disables a status without deleting it" id="${row}[disabled]"></et2-checkbox>
+					<et2-hbox>
+						<et2-button  statustext="deletes this status" label="Delete" id="delete[$row_cont[name]]"></et2-button>
+						<et2-button  statustext="creates a new status with the given values" label="Create" id="create$row_cont[name]"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="infolog.admin.types" template="" lang="" group="0" version="">
-		<vbox>
+		<et2-vbox>
 			<template id="admin.customfields.types" content="content_types"/>
 			<grid id="content_type_options">
 				<columns>
@@ -46,27 +45,25 @@
 				</columns>
 				<rows>
 					<row>
-						<hbox span="all">
-							<description value="Group owner for" class="header"/>
-							<description id="type" class="header"/>
-							<menulist class="infolog_lpadding5">
-								<menupopup type="select-account" statustext="If a type has a group owner, all entries of that type will be owned by the given group and NOT the user who created it!" id="group_owner" options="None,groups"/>
-							</menulist>
-						</hbox>
+						<et2-hbox  span="all">
+							<et2-description  value="Group owner for" class="header"></et2-description>
+							<et2-description  id="type" class="header"></et2-description>
+							<et2-select-account  class="infolog_lpadding5" statustext="If a type has a group owner, all entries of that type will be owned by the given group and NOT the user who created it!" id="group_owner" emptyLabel="None" accountType="groups"></et2-select-account>
+						</et2-hbox>
 					</row>
 					<row class="header">
-						<description value="Custom status for typ" id="typ" span="all"/>
+						<et2-description  value="Custom status for typ" id="typ" span="all"></et2-description>
 					</row>
 					<row>
 						<template id="infolog.customfields.status" content="status" span="all"/>
 					</row>
 				</rows>
 			</grid>
-			<button label="Save" id="save"/>
-			<description value="Custom fields" span="all" class="header"/>
-		</vbox>
+			<et2-button  label="Save" id="save"></et2-button>
+			<et2-description  value="Custom fields" span="all" class="header"></et2-description>
+		</et2-vbox>
 		<styles>.header{
 font-weight: bold;
 }</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/infolog/templates/default/config.xet b/infolog/templates/default/config.xet
index 1fe189c5e1..e58405eede 100644
--- a/infolog/templates/default/config.xet
+++ b/infolog/templates/default/config.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="infolog.config.configuration" template="" lang="" group="0" version="">
 		<grid width="100%">
@@ -10,69 +9,65 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description value="Rights for the responsible" span="all"/>
+					<et2-description  value="Rights for the responsible" span="all"></et2-description>
 				</row>
 				<row>
-					<description value="Which implicit ACL rights should the responsible get"/>
-					<menulist>
-						<menupopup id="implicit_rights"/>
-					</menulist>
+					<et2-description  value="Which implicit ACL rights should the responsible get"></et2-description>
+					<et2-select  id="implicit_rights"></et2-select>
 				</row>
 				<row>
-					<vbox>
-						<description value="Which additional fields should the responsible be allowed to edit without having edit rights?"/>
-						<description value="Status, percent and date completed are always allowed."/>
-					</vbox>
-					<listbox id="responsible_edit" rows="6" options=",,,,,,0"/>
+					<et2-vbox>
+						<et2-description  value="Which additional fields should the responsible be allowed to edit without having edit rights?"></et2-description>
+						<et2-description  value="Status, percent and date completed are always allowed."></et2-description>
+					</et2-vbox>
+					<et2-select  id="responsible_edit" rows="6" options=",,,,,,0" multiple="1"></et2-select>
 				</row>
 				<row class="th">
-					<description value="History logging" span="all"/>
+					<et2-description  value="History logging" span="all"></et2-description>
 				</row>
 				<row>
-					<description value="History logging and deleting of items"/>
-					<menulist>
-						<menupopup id="history"/>
-					</menulist>
+					<et2-description  value="History logging and deleting of items"></et2-description>
+					<et2-select  id="history"></et2-select>
 				</row>
 				<row class="th">
-					<description value="Other configurations" span="all"/>
+					<et2-description  value="Other configurations" span="all"></et2-description>
 				</row>
 				<row>
-					<description value="Fields to exclude when copying an infolog:"/>
-					<listbox id="copy_excludefields" rows="6"/>
+					<et2-description  value="Fields to exclude when copying an infolog:"></et2-description>
+					<et2-select  id="copy_excludefields" rows="6" multiple="1"></et2-select>
 				</row>
 				<row>
-					<description value="Load custom fields in index, if filtered by selected types (eg. to display them in a type-specific index template)"/>
-					<listbox id="index_load_cfs" rows="6" options=",,,,,,1"/>
+					<et2-description  value="Load custom fields in index, if filtered by selected types (eg. to display them in a type-specific index template)"></et2-description>
+					<et2-select  id="index_load_cfs" rows="6" options=",,,,,,1" multiple="1"></et2-select>
 				</row>
 				<row>
-					<description value="Prefix for sub-entries (default: Re:)"/>
-					<textbox id="sub_prefix" no_lang="1"/>
+					<et2-description  value="Prefix for sub-entries (default: Re:)"></et2-description>
+					<et2-textbox  id="sub_prefix" noLang="1"></et2-textbox>
 				</row>
 				<row>
-					<description value="Fields to exclude when creating a sub-entry:"/>
-					<listbox id="sub_excludefields" rows="6"/>
+					<et2-description  value="Fields to exclude when creating a sub-entry:"></et2-description>
+					<et2-select  id="sub_excludefields" rows="6" multiple="1"></et2-select>
 				</row>
 				<row>
-					<description value="Allow to save entries with due date in the past" label="%s:"/>
-					<select id="allow_past_due_date">
+					<et2-description  value="Allow to save entries with due date in the past" label="%s:"></et2-description>
+					<et2-select  id="allow_past_due_date">
 						<option value="1">Yes</option>
 						<option value="0">No</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<vbox>
-						<description value="Performance optimization for huge InfoLog tables" label="%s:"/>
-						<description value="Limit list to last N month, if ordering by last-modified and not searching."/>
-						<description value="Can not return an exact number of rows and therefore hides the count."/>
-					</vbox>
-					<select id="limit_modified_n_month">
+					<et2-vbox>
+						<et2-description  value="Performance optimization for huge InfoLog tables" label="%s:"></et2-description>
+						<et2-description  value="Limit list to last N month, if ordering by last-modified and not searching."></et2-description>
+						<et2-description  value="Can not return an exact number of rows and therefore hides the count."></et2-description>
+					</et2-vbox>
+					<et2-select  id="limit_modified_n_month">
 						<option value="">{Disabled} ({Default})</option>
 						<option value="1">1 {Month}</option>
 						<option value="3">3 {Month}</option>
 						<option value="6">6 {Month}</option>
 						<option value="12">12 {Month}</option>
-					</select>
+					</et2-select>
 				</row>
 			</rows>
 		</grid>
@@ -85,26 +80,23 @@
             </columns>
             <rows>
                 <row>
-                    <menulist>
-                        <menupopup label="Type" id="notification_type" onchange="1"/>
-                    </menulist>
-                    <checkbox label="Use custom notification message" id="notification[use_custom]"/>
+                    <et2-select  label="Type" id="notification_type" onchange="1"></et2-select>
+                    <et2-checkbox  label="Use custom notification message" id="notification[use_custom]"></et2-checkbox>
                 </row>
                 <row>
                     <htmlarea id="notification[message]" height="180px" width="100%" toolbar="false" span="all"/>
                 </row>
                 <row>
-                    <description value="Full list of placeholder names" href="infolog.infolog_merge.show_replacements"
-                                 extra_link_target="_blank"/>
-                    <description/>
+                    <et2-description  value="Full list of placeholder names" href="infolog.infolog_merge.show_replacements" extraLinkTarget="_blank"></et2-description>
+                    <et2-description></et2-description>
                 </row>
             </rows>
         </grid>
     </template>
     <template id="infolog.config" template="" lang="" group="0" version="1.9.001">
-        <vbox>
-            <description id="msg" span="all" class="message"/>
-            <tabbox id="configuration|notification">
+        <et2-vbox>
+            <et2-description  id="msg" span="all" class="message"></et2-description>
+            <et2-tabbox  id="configuration|notification">
                 <tabs>
                     <tab id="configuration" label="Configuration"/>
                     <tab id="notification" label="Notification"/>
@@ -113,16 +105,16 @@
                     <template id="infolog.config.configuration"/>
                     <template id="infolog.config.notification"/>
                 </tabpanels>
-            </tabbox>
-            <hbox class="dialogFooterToolbar" id="button">
-                <button statustext="Save the changes made" label="Save" id="save"/>
-                <button statustext="apply the changes" label="Apply" id="apply"/>
-                <button statustext="Exit without saving" label="Cancel" id="cancel" noValidation="true"/>
-            </hbox>
-        </vbox>
+            </et2-tabbox>
+            <et2-hbox  class="dialogFooterToolbar" id="button">
+                <et2-button  statustext="Save the changes made" label="Save" id="save"></et2-button>
+                <et2-button  statustext="apply the changes" label="Apply" id="apply"></et2-button>
+                <et2-button  statustext="Exit without saving" label="Cancel" id="cancel" noValidation="true"></et2-button>
+            </et2-hbox>
+        </et2-vbox>
         <styles>select {
             min-width: 30em;
             }
         </styles>
     </template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/infolog/templates/default/delete.xet b/infolog/templates/default/delete.xet
index a6df8d1f79..585f2828e7 100644
--- a/infolog/templates/default/delete.xet
+++ b/infolog/templates/default/delete.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="infolog.index.rows-noheader" template="" lang="" group="0" version="1.5.004">
 		<grid>
@@ -17,106 +16,102 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<vbox options="0,0">
-						<description value="Type"/>
-						<description value="Status" align="center"/>
-						<description value="Completed" align="right"/>
-					</vbox>
-					<vbox rows="2" cols="1" options="2">
-						<description value="Subject"/>
-						<description value="Description"/>
-					</vbox>
-					<vbox options="0,0">
-						<description id="customfields" options="Custom fields"/>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-description  value="Type"></et2-description>
+						<et2-description  value="Status" align="center"></et2-description>
+						<et2-description  value="Completed" align="right"></et2-description>
+					</et2-vbox>
+					<et2-vbox  rows="2" cols="1" cellpadding="2" >
+						<et2-description  value="Subject"></et2-description>
+						<et2-description  value="Description"></et2-description>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-description  id="customfields" boldItalic="Custom fields"></et2-description>
 						<grid spacing="0" padding="0">
 							<columns>
 								<column disabled="@no_customfields"/>
 							</columns>
 							<rows>
 								<row>
-									<description no_lang="1" id="customfields[$row][label]" options="Custom fields"/>
+									<et2-description  id="customfields[$row][label]" noLang="1" boldItalic="Custom fields"></et2-description>
 								</row>
 							</rows>
 						</grid>
-					</vbox>
-					<vbox options="0,0">
-						<description value="Startdate"/>
-						<description value="Enddate"/>
-						<description value="Date completed"/>
-					</vbox>
-					<vbox>
-						<description value="Times"/>
-						<description class="infolog_planned" value="planned"/>
-						<description class="replanned" value="Re-planned"/>
-					</vbox>
-					<vbox>
-						<description value="Owner"/>
-						<description value="Responsible"/>
-					</vbox>
-					<description value="last changed"/>
-					<description value="Sub" class="noPrint"/>
-					<description value="Action" class="noPrint"/>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-description  value="Startdate"></et2-description>
+						<et2-description  value="Enddate"></et2-description>
+						<et2-description  value="Date completed"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-description  value="Times"></et2-description>
+						<et2-description  class="infolog_planned" value="planned"></et2-description>
+						<et2-description  class="replanned" value="Re-planned"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-description  value="Owner"></et2-description>
+						<et2-description  value="Responsible"></et2-description>
+					</et2-vbox>
+					<et2-description  value="last changed"></et2-description>
+					<et2-description  value="Sub" class="noPrint"></et2-description>
+					<et2-description  value="Action" class="noPrint"></et2-description>
 				</row>
 				<row class="row" valign="top">
-					<hbox options="5" align="center">
-						<image label="$row_cont[info_type]" src="${row}[info_type]"/>
-						<button image="$row_cont[info_status_label]" ro_image="$row_cont[info_status_label]" label="$row_cont[info_status_label]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
-						<button image="$row_cont[info_percent]" label="$row_cont[info_percent]" id="edit_percent[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
-						<image label="$row_cont[info_percent2]" src="{$row}[info_percent2]" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
-					</hbox>
-					<vbox options="0,0" class="infolog_fullWidth">
-						<link label="%s $row_cont[info_from]" id="${row}[info_link]" options="b"/>
-						<hbox options="0,0">
-							<description class="$row_cont[sub_class]" no_lang="1" id="${row}[info_subject]"/>
-							<description no_lang="1" align="right" id="{$row}[info_number]" class="infolog_infoId"/>
-						</hbox>
-						<description options=",,1" no_lang="1" id="${row}[info_des]"/>
-						<link-string id="${row}[filelinks]"/>
-					</vbox>
+					<et2-hbox  cellpadding="5" align="center">
+						<et2-image  label="$row_cont[info_type]" src="${row}[info_type]"></et2-image>
+						<et2-button  image="$row_cont[info_status_label]" label="$row_cont[info_status_label]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;" roImage="$row_cont[info_status_label]"></et2-button>
+						<et2-button  image="$row_cont[info_percent]" label="$row_cont[info_percent]" id="edit_percent[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"></et2-button>
+						<et2-image  label="$row_cont[info_percent2]" src="{$row}[info_percent2]" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"></et2-image>
+					</et2-hbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" class="infolog_fullWidth">
+						<et2-link  label="%s $row_cont[info_from]" id="${row}[info_link]" app=""></et2-link>
+						<et2-hbox  cellpadding="0" cellspacing="0" >
+							<et2-description  class="$row_cont[sub_class]" id="${row}[info_subject]" noLang="1"></et2-description>
+							<et2-description  align="right" id="{$row}[info_number]" class="infolog_infoId" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-description  id="${row}[info_des]" activateLinks="1" noLang="1"></et2-description>
+						<et2-link-string  id="${row}[filelinks]"></et2-link-string>
+					</et2-vbox>
 					<customfields-list class="customfields" id="$row" readonly="true"/>
-					<vbox options="0,0,1" rows="3" cols="1">
-						<date-time options=",8" id="${row}[info_startdate]" readonly="true" class="infolog_fixedHeight"/>
-						<date class="$row_cont[end_class] infolog_fixedHeight" id="${row}[info_enddate]" readonly="true"/>
-						<date-time id="${row}[info_datecompleted]" readonly="true" class="infolog_fixedHeight"/>
-					</vbox>
-					<vbox rows="3" cols="1">
-						<hbox options="1,0" id="l_used_time">
-							<image label="Times" src="timesheet"/>
-							<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
-							<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/>
-						</hbox>
-						<hbox options="1,0" id="lplanified">
-							<image label="planned time" src="k_alarm.png" readonly="true"/>
-							<date-duration id="${row}[info_planned_time]" span="all" class="infolog_planned" readonly="true" options="@duration_format"/>
-						</hbox>
-						<hbox options="1,0" id="replanified">
-							<image label="Re-planned time" src="agt_reload.png"/>
-							<date-duration id="${row}[info_replanned_time]" span="all" class="replanned" readonly="true" options="@duration_format"/>
-						</hbox>
-					</vbox>
-					<vbox options="0,0">
-						<menulist>
-							<menupopup type="select-account" id="${row}[info_owner]" readonly="true"/>
-						</menulist>
-						<listbox type="select-account" id="${row}[info_responsible]" readonly="true" rows="5"/>
-					</vbox>
-					<vbox options="0" orient="0">
-						<date-time id="${row}[info_datemodified]" readonly="true"/>
-						<menulist>
-							<menupopup type="select-account" id="${row}[info_modifier]" readonly="true"/>
-						</menulist>
-					</vbox>
-					<vbox options="0" align="center" class="noPrint" orient="0">
-						<button image="new" label="Add sub" align="center" id="sp[$row_cont[info_id]]" statustext="Add a new sub-task, -note, -call to this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;action=sp&amp;action_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
-						<button image="view.gif" label="View subs" align="center" id="view[$row_cont[info_id]]" statustext="View all subs of this entry"/>
-						<button image="parent.gif" label="View parent" align="center" id="view[$row_cont[info_id_parent]]" statustext="View the parent of this entry and all his subs"/>
-						<button image="timesheet" label="Add timesheet entry" id="timesheet[$row_cont[info_id]]" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit&amp;link_app[]=infolog&amp;link_id[]=$row_cont[info_id]$row_cont[extra_links]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;" align="center"/>
-					</vbox>
-					<hbox class="noPrint">
-						<button image="edit" label="Edit" id="edit[$row_cont[info_id]]" statustext="Edit this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
-						<button image="delete" label="Delete" id="delete[$row_cont[info_id]]" statustext="Delete this entry" onclick="return $row_cont[info_anz_subs] || confirm('Delete this entry');"/>
-						<button image="done" label="Close" id="close[$row_cont[info_id]]" statustext="Sets the status of this entry and its subs to done"/>
-					</hbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" keep="1" rows="3" cols="1">
+						<et2-date-time  id="${row}[info_startdate]" readonly="true" class="infolog_fixedHeight"></et2-date-time>
+						<et2-date  class="$row_cont[end_class] infolog_fixedHeight" id="${row}[info_enddate]" readonly="true"></et2-date>
+						<et2-date-time  id="${row}[info_datecompleted]" readonly="true" class="infolog_fixedHeight"></et2-date-time>
+					</et2-vbox>
+					<et2-vbox  rows="3" cols="1">
+						<et2-hbox  cellpadding="1" cellspacing="0" id="l_used_time">
+							<et2-image  label="Times" src="timesheet"></et2-image>
+							<et2-date-duration  id="${row}[info_used_time]" readonly="true" dataFormat="@duration_format" ></et2-date-duration>
+							<et2-date-duration  id="${row}[info_sum_timesheets]" readonly="true" class="timesheet" dataFormat="@duration_format"></et2-date-duration>
+						</et2-hbox>
+						<et2-hbox  cellpadding="1" cellspacing="0" id="lplanified">
+							<et2-image  label="planned time" src="k_alarm.png" readonly="true"></et2-image>
+							<et2-date-duration  id="${row}[info_planned_time]" span="all" class="infolog_planned" readonly="true" dataFormat="@duration_format" ></et2-date-duration>
+						</et2-hbox>
+						<et2-hbox  cellpadding="1" cellspacing="0" id="replanified">
+							<et2-image  label="Re-planned time" src="agt_reload.png"></et2-image>
+							<et2-date-duration  id="${row}[info_replanned_time]" span="all" class="replanned" readonly="true" dataFormat="@duration_format" ></et2-date-duration>
+						</et2-hbox>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-select-account  id="${row}[info_owner]" readonly="true"></et2-select-account>
+						<et2-select-account  id="${row}[info_responsible]" readonly="true" rows="5" multiple="1"></et2-select-account>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" orient="0">
+						<et2-date-time  id="${row}[info_datemodified]" readonly="true"></et2-date-time>
+						<et2-select-account  id="${row}[info_modifier]" readonly="true"></et2-select-account>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" align="center" class="noPrint" orient="0">
+						<et2-button  image="new" label="Add sub" align="center" id="sp[$row_cont[info_id]]" statustext="Add a new sub-task, -note, -call to this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;action=sp&amp;action_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"></et2-button>
+						<et2-button  image="view.gif" label="View subs" align="center" id="view[$row_cont[info_id]]" statustext="View all subs of this entry"></et2-button>
+						<et2-button  image="parent.gif" label="View parent" align="center" id="view[$row_cont[info_id_parent]]" statustext="View the parent of this entry and all his subs"></et2-button>
+						<et2-button  image="timesheet" label="Add timesheet entry" id="timesheet[$row_cont[info_id]]" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit&amp;link_app[]=infolog&amp;link_id[]=$row_cont[info_id]$row_cont[extra_links]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;" align="center"></et2-button>
+					</et2-vbox>
+					<et2-hbox  class="noPrint">
+						<et2-button  image="edit" label="Edit" id="edit[$row_cont[info_id]]" statustext="Edit this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"></et2-button>
+						<et2-button  image="delete" label="Delete" id="delete[$row_cont[info_id]]" statustext="Delete this entry" onclick="return $row_cont[info_anz_subs] || confirm('Delete this entry');"></et2-button>
+						<et2-button  image="done" label="Close" id="close[$row_cont[info_id]]" statustext="Sets the status of this entry and its subs to done"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -137,11 +132,11 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<vbox options="0,0">
-						<nextmatch-filterheader options="Type" id="info_type" no_lang="1"/>
-						<nextmatch-filterheader options="Status" id="info_status" align="center"/>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-nextmatch-header-filter  id="info_type" emptyLabel="Type" noLang="1"/>
+						<et2-nextmatch-header-filter  id="info_status" align="center" emptyLabel="Status"/>
 						<nextmatch-sortheader label="Completed" id="info_percent" align="right"/>
-					</vbox>
+					</et2-vbox>
 					<grid width="100%" spacing="0" padding="0">
 						<columns>
 							<column/>
@@ -149,7 +144,7 @@
 						</columns>
 						<rows>
 							<row>
-								<description/>
+								<et2-description></et2-description>
 								<nextmatch-sortheader label="Priority" align="right" id="info_priority" options="DESC" class="noPrint"/>
 							</row>
 							<row>
@@ -164,87 +159,81 @@
 					</grid>
 					<nextmatch-customfields id="customfields"/>
 					<nextmatch-header label="Category" id="cat_id"/>
-					<vbox options="0,0">
+					<et2-vbox  cellpadding="0" cellspacing="0" >
 						<nextmatch-sortheader label="Startdate" id="info_startdate"/>
 						<nextmatch-sortheader label="Enddate" id="info_enddate"/>
 						<nextmatch-sortheader id="info_datecompleted" label="Date completed"/>
-					</vbox>
-					<vbox rows="2" cols="1" options="2">
+					</et2-vbox>
+					<et2-vbox  rows="2" cols="1" cellpadding="2" >
 						<nextmatch-sortheader label="Times" id="info_used_time"/>
 						<nextmatch-sortheader id="info_planned_time" class="infolog_planned" label="planned"/>
 						<nextmatch-sortheader id="info_replanned_time" class="replanned" label="Re-planned"/>
-					</vbox>
-					<vbox options="0,0">
-						<nextmatch-accountfilter id="info_owner" options="Owner" statustext="Select to filter by owner" class="infolog_user_filter"/>
-						<nextmatch-accountfilter id="info_responsible" options="Responsible,both" statustext="Select to filter by responsible" class="infolog_user_filter"/>
-					</vbox>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-nextmatch-header-account  id="info_owner" statustext="Select to filter by owner" class="infolog_user_filter" emptyLabel="Owner"/>
+						<et2-nextmatch-header-account  id="info_responsible" statustext="Select to filter by responsible" class="infolog_user_filter" emptyLabel="Responsible" accountType="both"/>
+					</et2-vbox>
 					<nextmatch-sortheader label="last changed" id="info_datemodified" options="DESC"/>
-					<description value="Sub" class="noPrint"/>
-					<description value="Action" class="noPrint"/>
+					<et2-description  value="Sub" class="noPrint"></et2-description>
+					<et2-description  value="Action" class="noPrint"></et2-description>
 				</row>
 				<row class="row" valign="top">
-					<hbox options="5" align="center">
-						<image label="$row_cont[info_type]" src="${row}[info_type]"/>
-						<button image="$row_cont[info_status_label]" ro_image="$row_cont[info_status_label]" label="$row_cont[info_status_label]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
-						<button image="$row_cont[info_percent]" label="$row_cont[info_percent]" id="edit_percent[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
-						<image label="$row_cont[info_percent2]" src="{$row}[info_percent2]" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
-					</hbox>
-					<vbox options="0,0" class="infolog_fullWidth">
-						<link label="%s $row_cont[info_from]" id="${row}[info_link]" options="b"/>
-						<hbox options="0,0">
-							<description class="$row_cont[sub_class]" no_lang="1" id="${row}[info_subject]"/>
-							<description no_lang="1" align="right" id="{$row}[info_number]" class="infolog_infoId"/>
-						</hbox>
-						<description no_lang="1" id="${row}[info_des]" options=",,1"/>
-						<link-string id="${row}[filelinks]"/>
-					</vbox>
+					<et2-hbox  cellpadding="5" align="center">
+						<et2-image  label="$row_cont[info_type]" src="${row}[info_type]"></et2-image>
+						<et2-button  image="$row_cont[info_status_label]" label="$row_cont[info_status_label]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;" roImage="$row_cont[info_status_label]"></et2-button>
+						<et2-button  image="$row_cont[info_percent]" label="$row_cont[info_percent]" id="edit_percent[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"></et2-button>
+						<et2-image  label="$row_cont[info_percent2]" src="{$row}[info_percent2]" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"></et2-image>
+					</et2-hbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" class="infolog_fullWidth">
+						<et2-link  label="%s $row_cont[info_from]" id="${row}[info_link]" app=""></et2-link>
+						<et2-hbox  cellpadding="0" cellspacing="0" >
+							<et2-description  class="$row_cont[sub_class]" id="${row}[info_subject]" noLang="1"></et2-description>
+							<et2-description  align="right" id="{$row}[info_number]" class="infolog_infoId" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-description  id="${row}[info_des]" noLang="1" activateLinks="1"></et2-description>
+						<et2-link-string  id="${row}[filelinks]"></et2-link-string>
+					</et2-vbox>
 					<customfields-list class="customfields" id="$row"/>
-					<menulist>
-						<menupopup type="select-cat" id="${row}[info_cat]" readonly="true"/>
-					</menulist>
-					<vbox options="0,0,1" rows="3" cols="1">
-						<date-time options=",8" id="${row}[info_startdate]" readonly="true" class="infolog_fixedHeight"/>
-						<date class="$row_cont[end_class] infolog_fixedHeight" id="${row}[info_enddate]" readonly="true"/>
-						<date-time id="${row}[info_datecompleted]" readonly="true" class="infolog_fixedHeight"/>
-					</vbox>
-					<vbox rows="3" cols="1">
-						<hbox options="1,0" id="r_used_time">
-							<image label="Times" src="timesheet"/>
-							<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
-							<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/>
-						</hbox>
-						<hbox options="1,0" id="planified">
-							<image label="planned time" src="k_alarm.png" readonly="true"/>
-							<date-duration id="${row}[info_planned_time]" span="all" class="infolog_planned" readonly="true" options="@duration_format"/>
-						</hbox>
-						<hbox options="1,0" id="replanified">
-							<image label="Re-planned time" src="agt_reload.png"/>
-							<date-duration id="${row}[info_replanned_time]" span="all" class="replanned" readonly="true" options="@duration_format"/>
-						</hbox>
-					</vbox>
-					<vbox options="0,0">
-						<menulist>
-							<menupopup type="select-account" id="${row}[info_owner]" readonly="true"/>
-						</menulist>
-						<listbox type="select-account" id="${row}[info_responsible]" readonly="true" rows="5"/>
-					</vbox>
-					<vbox options="0" orient="0">
-						<date-time id="${row}[info_datemodified]" readonly="true"/>
-						<menulist>
-							<menupopup type="select-account" id="${row}[info_modifier]" readonly="true"/>
-						</menulist>
-					</vbox>
-					<vbox options="0" align="center" class="noPrint" orient="0">
-						<button image="new" label="Add sub" align="center" id="sp[$row_cont[info_id]]" statustext="Add a new sub-task, -note, -call to this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;action=sp&amp;action_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
-						<button image="view.gif" label="View subs" align="center" id="view[$row_cont[info_id]]" statustext="View all subs of this entry"/>
-						<button image="parent.gif" label="View parent" align="center" id="view[$row_cont[info_id_parent]]" statustext="View the parent of this entry and all his subs"/>
-						<button image="timesheet" label="Add timesheet entry" id="timesheet[$row_cont[info_id]]" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit&amp;link_app[]=infolog&amp;cat_id=$row_cont[info_cat]&amp;link_id[]=$row_cont[info_id]$row_cont[extra_links]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;" align="center"/>
-					</vbox>
-					<hbox class="noPrint">
-						<button image="edit" label="Edit" id="edit[$row_cont[info_id]]" statustext="Edit this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
-						<button image="delete" label="Delete" id="delete[$row_cont[info_id]]" statustext="Delete this entry" onclick="return $row_cont[info_anz_subs] || confirm('Delete this entry');"/>
-						<button image="done" label="Close" id="close[$row_cont[info_id]]" statustext="Sets the status of this entry and its subs to done"/>
-					</hbox>
+					<et2-select-cat  id="${row}[info_cat]" readonly="true"></et2-select-cat>
+					<et2-vbox  cellpadding="0" cellspacing="0" keep="1" rows="3" cols="1">
+						<et2-date-time  id="${row}[info_startdate]" readonly="true" class="infolog_fixedHeight"></et2-date-time>
+						<et2-date  class="$row_cont[end_class] infolog_fixedHeight" id="${row}[info_enddate]" readonly="true"></et2-date>
+						<et2-date-time  id="${row}[info_datecompleted]" readonly="true" class="infolog_fixedHeight"></et2-date-time>
+					</et2-vbox>
+					<et2-vbox  rows="3" cols="1">
+						<et2-hbox  cellpadding="1" cellspacing="0" id="r_used_time">
+							<et2-image  label="Times" src="timesheet"></et2-image>
+							<et2-date-duration  id="${row}[info_used_time]" readonly="true" dataFormat="@duration_format" ></et2-date-duration>
+							<et2-date-duration  id="${row}[info_sum_timesheets]" readonly="true" class="timesheet" dataFormat="@duration_format"></et2-date-duration>
+						</et2-hbox>
+						<et2-hbox  cellpadding="1" cellspacing="0" id="planified">
+							<et2-image  label="planned time" src="k_alarm.png" readonly="true"></et2-image>
+							<et2-date-duration  id="${row}[info_planned_time]" span="all" class="infolog_planned" readonly="true" dataFormat="@duration_format" ></et2-date-duration>
+						</et2-hbox>
+						<et2-hbox  cellpadding="1" cellspacing="0" id="replanified">
+							<et2-image  label="Re-planned time" src="agt_reload.png"></et2-image>
+							<et2-date-duration  id="${row}[info_replanned_time]" span="all" class="replanned" readonly="true" dataFormat="@duration_format" ></et2-date-duration>
+						</et2-hbox>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-select-account  id="${row}[info_owner]" readonly="true"></et2-select-account>
+						<et2-select-account  id="${row}[info_responsible]" readonly="true" rows="5" multiple="1"></et2-select-account>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" orient="0">
+						<et2-date-time  id="${row}[info_datemodified]" readonly="true"></et2-date-time>
+						<et2-select-account  id="${row}[info_modifier]" readonly="true"></et2-select-account>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" align="center" class="noPrint" orient="0">
+						<et2-button  image="new" label="Add sub" align="center" id="sp[$row_cont[info_id]]" statustext="Add a new sub-task, -note, -call to this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;action=sp&amp;action_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"></et2-button>
+						<et2-button  image="view.gif" label="View subs" align="center" id="view[$row_cont[info_id]]" statustext="View all subs of this entry"></et2-button>
+						<et2-button  image="parent.gif" label="View parent" align="center" id="view[$row_cont[info_id_parent]]" statustext="View the parent of this entry and all his subs"></et2-button>
+						<et2-button  image="timesheet" label="Add timesheet entry" id="timesheet[$row_cont[info_id]]" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit&amp;link_app[]=infolog&amp;cat_id=$row_cont[info_cat]&amp;link_id[]=$row_cont[info_id]$row_cont[extra_links]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;" align="center"></et2-button>
+					</et2-vbox>
+					<et2-hbox  class="noPrint">
+						<et2-button  image="edit" label="Edit" id="edit[$row_cont[info_id]]" statustext="Edit this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"></et2-button>
+						<et2-button  image="delete" label="Delete" id="delete[$row_cont[info_id]]" statustext="Delete this entry" onclick="return $row_cont[info_anz_subs] || confirm('Delete this entry');"></et2-button>
+						<et2-button  image="done" label="Close" id="close[$row_cont[info_id]]" statustext="Sets the status of this entry and its subs to done"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -256,20 +245,20 @@
 			</columns>
 			<rows>
 				<row>
-					<description/>
+					<et2-description></et2-description>
 				</row>
 				<row>
 					<template content="main" align="center" id="infolog.index.rows-noheader"/>
 				</row>
 				<row valign="bottom" height="30">
-					<description class="infolog_headertext" value="Are you shure you want to delete this entry ?" align="center"/>
+					<et2-description  class="infolog_headertext" value="Are you shure you want to delete this entry ?" align="center"></et2-description>
 				</row>
 				<row height="50">
-					<hbox align="center">
-						<button label="Yes - Delete" id="delete" statustext="Sub-entries become subs of the parent or main entries, if there's no parent"/>
-						<button label="Yes - Delete including sub-entries" id="delete_subs" statustext="Delete this entry and all listed sub-entries"/>
-						<button label="No - Cancel" id="cancel" statustext="Abort without deleting"/>
-					</hbox>
+					<et2-hbox  align="center">
+						<et2-button  label="Yes - Delete" id="delete" statustext="Sub-entries become subs of the parent or main entries, if there's no parent"></et2-button>
+						<et2-button  label="Yes - Delete including sub-entries" id="delete_subs" statustext="Delete this entry and all listed sub-entries"></et2-button>
+						<et2-button  label="No - Cancel" id="cancel" statustext="Abort without deleting"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
 					<nextmatch options="infolog.index.rows" span="all" id="nm"/>
@@ -277,4 +266,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/infolog/templates/default/edit.print.xet b/infolog/templates/default/edit.print.xet
index f2b58754c8..45004eae31 100644
--- a/infolog/templates/default/edit.print.xet
+++ b/infolog/templates/default/edit.print.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="infolog.edit.print.project" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%" height="245">
@@ -10,30 +9,30 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description span="all" value="Projectmanager"/>
+					<et2-description  span="all" value="Projectmanager"></et2-description>
 				</row>
 				<row class="row">
-					<description value="Project"/>
-					<description id="pm_id" onchange="1" options="None" readonly="true"/>
+					<et2-description  value="Project"></et2-description>
+					<et2-description  id="pm_id" onchange="1" readonly="true" boldItalic="None"></et2-description>
 				</row>
 				<row class="row">
-					<description value="Price"/>
-					<hbox span="all">
-						<description id="pl_id" options="None" onchange="this.form['exec[info_price]'].value=this.options[this.selectedIndex].text.lastIndexOf('(') &lt; 0 ? '' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf('(')+1,-1);" readonly="true"/>
-						<textbox type="float" id="info_price" span="all" readonly="true"/>
-					</hbox>
+					<et2-description  value="Price"></et2-description>
+					<et2-hbox  span="all">
+						<et2-description  id="pl_id" onchange="this.form['exec[info_price]'].value=this.options[this.selectedIndex].text.lastIndexOf('(') &lt; 0 ? '' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf('(')+1,-1);" readonly="true" boldItalic="None"></et2-description>
+						<et2-number  id="info_price" span="all" readonly="true"></et2-number>
+					</et2-hbox>
 				</row>
 				<row class="row">
-					<description options=",,,info_planned_time" value="planned time"/>
-					<date-duration id="info_planned_time" options=",$cont[duration_format]" readonly="true"/>
+					<et2-description  value="planned time" labelFor="info_planned_time"></et2-description>
+					<et2-date-duration  id="info_planned_time" readonly="true"></et2-date-duration>
 				</row>
 				<row class="row">
-					<description options=",,,info_replanned_time" value="Re-planned time"/>
-					<date-duration id="info_replanned_time" options=",$cont[duration_format]" readonly="true"/>
+					<et2-description  value="Re-planned time" labelFor="info_replanned_time"></et2-description>
+					<et2-date-duration  id="info_replanned_time" readonly="true"></et2-date-duration>
 				</row>
 				<row class="row" valign="top" height="60%">
-					<description options=",,,info_used_time" value="used time" statustext="Leave blank to get the used time calculated by timesheet entries"/>
-					<date-duration id="info_used_time" readonly="true"/>
+					<et2-description  value="used time" statustext="Leave blank to get the used time calculated by timesheet entries" labelFor="info_used_time"></et2-description>
+					<et2-date-duration  id="info_used_time" readonly="true"></et2-date-duration>
 				</row>
 			</rows>
 		</grid>
@@ -46,10 +45,10 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description span="all" value="Existing links"/>
+					<et2-description  span="all" value="Existing links"></et2-description>
 				</row>
 				<row class="row_off" valign="top">
-					<link-list span="all" id="link_to" readonly="true"/>
+					<et2-link-list  span="all" id="link_to" readonly="true"></et2-link-list>
 				</row>
 			</rows>
 		</grid>
@@ -62,30 +61,26 @@
 			</columns>
 			<rows>
 				<row class="th" height="10">
-					<description span="all" value="General"/>
+					<et2-description  span="all" value="General"></et2-description>
 				</row>
 				<row class="row">
-					<description options=",,,info_priority" value="Priority"/>
-					<menulist>
-						<menupopup id="info_priority" statustext="select a priority for this task" readonly="true"/>
-					</menulist>
+					<et2-description  value="Priority" labelFor="info_priority"></et2-description>
+					<et2-select  id="info_priority" statustext="select a priority for this task" readonly="true"></et2-select>
 				</row>
 				<row class="row">
-					<description options=",,,info_location" value="Location" readonly="true"/>
-					<textbox size="80" maxlength="255" id="info_location" readonly="true"/>
+					<et2-description  value="Location" readonly="true" labelFor="info_location"></et2-description>
+					<et2-textbox  maxlength="255" id="info_location" readonly="true"></et2-textbox>
 				</row>
 				<row class="th" height="10">
-					<description span="all" value="Delegation"/>
+					<et2-description  span="all" value="Delegation"></et2-description>
 				</row>
 				<row class="row" valign="top">
-					<description options=",,,info_responsible" value="Responsible" readonly="true"/>
-					<listbox type="select-account" id="info_responsible" rows="10" options="both" statustext="select a responsible user: a person you want to delegate this task" readonly="true"/>
+					<et2-description  value="Responsible" readonly="true" labelFor="info_responsible"></et2-description>
+					<et2-select-account  id="info_responsible" rows="10" statustext="select a responsible user: a person you want to delegate this task" readonly="true" multiple="1" placeholder="both"></et2-select-account>
 				</row>
 				<row class="row" disabled="1">
-					<description options=",,,info_confirm" value="Confirm"/>
-					<menulist>
-						<menupopup id="info_confirm" statustext="do you want a confirmation of the responsible on: accepting, finishing the task or both" readonly="true"/>
-					</menulist>
+					<et2-description  value="Confirm" labelFor="info_confirm"></et2-description>
+					<et2-select  id="info_confirm" statustext="do you want a confirmation of the responsible on: accepting, finishing the task or both" readonly="true"></et2-select>
 				</row>
 			</rows>
 		</grid>
@@ -101,74 +96,70 @@
 			<rows>
 				<row disabled="!@msg">
 					<html span="all" class="message" align="center" id="msg" no_lang="1"/>
-					<description/>
-					<description/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row class="th" height="28">
-					<hbox>
-						<image src="print" onclick="window.print();"/>
-						<description value="Type" options=",,,info_type" readonly="true"/>
-					</hbox>
-					<hbox span="all" options="0,0">
-						<menulist>
-							<menupopup id="info_type" onchange="1" statustext="Type of the log-entry: Note, Phonecall or ToDo" no_lang="1" readonly="true"/>
-						</menulist>
-						<int id="info_number" class="infolog_infoId" readonly="true"/>
-					</hbox>
+					<et2-hbox>
+						<et2-image  src="print" onclick="window.print();"></et2-image>
+						<et2-description  value="Type" readonly="true" labelFor="info_type"></et2-description>
+					</et2-hbox>
+					<et2-hbox  span="all" cellpadding="0" cellspacing="0" >
+						<et2-select  id="info_type" onchange="1" statustext="Type of the log-entry: Note, Phonecall or ToDo" readonly="true" noLang="1"></et2-select>
+						<et2-number  id="info_number" class="infolog_infoId" readonly="true" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row class="row">
-					<description value="Category" options=",,,info_cat"/>
-					<menulist>
-						<menupopup type="select-cat" options="None" id="info_cat" statustext="select a category for this entry" readonly="true"/>
-					</menulist>
-					<hbox span="all">
-						<description value="Parent"/>
-						<link-entry options="infolog" id="info_id_parent" align="right" class="noWrap" readonly="true"/>
-					</hbox>
+					<et2-description  value="Category" labelFor="info_cat"></et2-description>
+					<et2-select-cat  id="info_cat" statustext="select a category for this entry" readonly="true" emptyLabel="None"></et2-select-cat>
+					<et2-hbox  span="all">
+						<et2-description  value="Parent"></et2-description>
+						<et2-link  id="info_id_parent" align="right" class="noWrap" app="infolog"></et2-link>
+					</et2-hbox>
 				</row>
 				<row class="row">
-					<description value="Contact" options=",,,info_from"/>
-					<vbox options="0,0">
-						<hbox options="0,0">
-							<link-entry id="info_contact" class="noWrap" readonly="true"/>
-							<checkbox id="info_custom_from" onchange="document.getElementById(form::name('info_from')).style.display=this.checked?'block':'none';" statustext="Check to specify custom contact" readonly="true"/>
-						</hbox>
-						<textbox size="36" maxlength="255" id="info_from" statustext="Custom contact-information, leave emtpy to use information from most recent link" blur="@blur_title" class="$cont[hide_from_css]" readonly="true"/>
-					</vbox>
+					<et2-description  value="Contact" labelFor="info_from"></et2-description>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-hbox  cellpadding="0" cellspacing="0" >
+							<et2-link  id="info_contact" class="noWrap" app=""></et2-link>
+							<et2-checkbox  id="info_custom_from" onchange="document.getElementById(form::name('info_from')).style.display=this.checked?'block':'none';" statustext="Check to specify custom contact" readonly="true"></et2-checkbox>
+						</et2-hbox>
+						<et2-textbox  maxlength="255" id="info_from" statustext="Custom contact-information, leave emtpy to use information from most recent link" class="$cont[hide_from_css]" readonly="true" placeholder="@blur_title"></et2-textbox>
+					</et2-vbox>
 				</row>
 				<row class="row">
-					<description value="Subject" options=",,,info_subject"/>
-					<textbox size="80" maxlength="255" span="all" class="b" id="info_subject" statustext="a short subject for the entry" readonly="true"/>
-					<description/>
-					<description/>
+					<et2-description  value="Subject" labelFor="info_subject"></et2-description>
+					<et2-textbox  maxlength="255" span="all" class="b" id="info_subject" statustext="a short subject for the entry" readonly="true"></et2-textbox>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row class="th" height="10">
-					<description span="all" value="Description"/>
+					<et2-description  span="all" value="Description"></et2-description>
 				</row>
 				<row>
-					<textbox multiline="true" no_lang="1" id="info_des" statustext="enter a textual description of the log-entry" span="all" class="description" readonly="true"/>
-					<description/>
-					<description/>
-					<description/>
+					<et2-textarea  id="info_des" statustext="enter a textual description of the log-entry" span="all" class="description" readonly="true" noLang="1"></et2-textarea>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row class="th">
-					<description span="all" value="customfields"/>
+					<et2-description  span="all" value="customfields"></et2-description>
 				</row>
 				<row>
-					<customfields span="all" options="@info_type" readonly="true"/>
+					<customfields span="all" sub-type="@info_type"  readonly="true"/>
 				</row>
 				<row>
 					<template span="all" id="infolog.edit.print.project"/>
@@ -177,57 +168,49 @@
 					<template id="infolog.edit.print.links" span="all"/>
 				</row>
 				<row>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
 					<template id="infolog.edit.print.delegation" span="all"/>
 				</row>
 				<row>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row class="th" height="10">
-					<description span="all" value="Dates, Status, Access"/>
+					<et2-description  span="all" value="Dates, Status, Access"></et2-description>
 				</row>
 				<row class="row_on">
-					<description value="Startdate" options=",,,info_startdate" readonly="true"/>
-					<date-time options=",2" id="info_startdate" statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)" readonly="true"/>
-					<description value="Enddate" options=",,,info_enddate"/>
-					<date id="info_enddate" statustext="til when should the ToDo or Phonecall be finished" readonly="true"/>
+					<et2-description  value="Startdate" readonly="true" labelFor="info_startdate"></et2-description>
+					<et2-date-time  id="info_startdate" statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)" readonly="true"></et2-date-time>
+					<et2-description  value="Enddate" labelFor="info_enddate"></et2-description>
+					<et2-date  id="info_enddate" statustext="til when should the ToDo or Phonecall be finished" readonly="true"></et2-date>
 				</row>
 				<row class="row">
-					<description value="Status" options=",,,info_status"/>
-					<menulist>
-						<menupopup id="info_status" statustext="@status_help" onchange="if (this.value=='done' || this.value=='billed') set_element(this.form,'exec[info_percent]','100'); else if (this.value=='not-started') set_element(this.form,'exec[info_percent]','0');" readonly="true"/>
-					</menulist>
-					<description value="Completed" options=",,,info_percent"/>
-					<menulist>
-						<menupopup type="select-percent" id="info_percent" statustext="Percent completed" onchange="if (this.value==100 &amp;&amp; this.form['exec[info_status]'].value != 'done' &amp;&amp; this.form['exec[info_status]'].value != 'billed' &amp;&amp; this.form['exec[info_status]'].value != 'cancelled') this.form['exec[info_status]'].value='done'; else if (this.value != 100 &amp;&amp; this.form['exec[info_status]'].value != 'cancelled') this.form['exec[info_status]'].value=this.value != 0 ? 'ongoing' : 'not-started'; else if (this.value==0 &amp;&amp; this.form['exec[info_status]'].value != 'cancelled' &amp;&amp; this.form['exec[info_status]'].value != 'offer') this.form['exec[info_status]'].value='not-started'; " readonly="true"/>
-					</menulist>
+					<et2-description  value="Status" labelFor="info_status"></et2-description>
+					<et2-select  id="info_status" statustext="@status_help" onchange="if (this.value=='done' || this.value=='billed') set_element(this.form,'exec[info_percent]','100'); else if (this.value=='not-started') set_element(this.form,'exec[info_percent]','0');" readonly="true"></et2-select>
+					<et2-description  value="Completed" labelFor="info_percent"></et2-description>
+					<et2-select-percent  id="info_percent" statustext="Percent completed" onchange="if (this.value==100 &amp;&amp; this.form['exec[info_status]'].value != 'done' &amp;&amp; this.form['exec[info_status]'].value != 'billed' &amp;&amp; this.form['exec[info_status]'].value != 'cancelled') this.form['exec[info_status]'].value='done'; else if (this.value != 100 &amp;&amp; this.form['exec[info_status]'].value != 'cancelled') this.form['exec[info_status]'].value=this.value != 0 ? 'ongoing' : 'not-started'; else if (this.value==0 &amp;&amp; this.form['exec[info_status]'].value != 'cancelled' &amp;&amp; this.form['exec[info_status]'].value != 'offer') this.form['exec[info_status]'].value='not-started'; " readonly="true"></et2-select-percent>
 				</row>
 				<row class="row">
-					<description options=",,,info_datecompleted" value="Date completed" readonly="true"/>
-					<date-time id="info_datecompleted" statustext="Date completed (leave it empty to have it automatic set if status is done or billed)" readonly="true"/>
-					<description value="Private" options=",,,info_access"/>
-					<checkbox options="private,public" id="info_access" statustext="should this entry only be visible to you and people you grant privat access via the ACL" readonly="true"/>
+					<et2-description  value="Date completed" readonly="true" labelFor="info_datecompleted"></et2-description>
+					<et2-date-time  id="info_datecompleted" statustext="Date completed (leave it empty to have it automatic set if status is done or billed)" readonly="true"></et2-date-time>
+					<et2-description  value="Private" labelFor="info_access"></et2-description>
+					<et2-checkbox  id="info_access" statustext="should this entry only be visible to you and people you grant privat access via the ACL" readonly="true" selectedValue="private" unselectedValue="public"></et2-checkbox>
 				</row>
 				<row class="row" disabled="!@info_owner">
-					<description value="Owner"/>
-					<menulist>
-						<menupopup type="select-account" id="info_owner" readonly="true"/>
-					</menulist>
-					<description value="Last modified"/>
-					<hbox options="0" orient="0">
-						<menulist>
-							<menupopup type="select-account" id="info_modifier" readonly="true"/>
-						</menulist>
-						<date-time class="infolog_lpadding5" id="info_datemodified" readonly="true"/>
-					</hbox>
+					<et2-description  value="Owner"></et2-description>
+					<et2-select-account  id="info_owner" readonly="true"></et2-select-account>
+					<et2-description  value="Last modified"></et2-description>
+					<et2-hbox  cellpadding="0" orient="0">
+						<et2-select-account  id="info_modifier" readonly="true"></et2-select-account>
+						<et2-date-time  class="infolog_lpadding5" id="info_datemodified" readonly="true"></et2-date-time>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -237,4 +220,4 @@
 .description textarea { width: 98%; }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/infolog/templates/default/export_csv_selectors.xet b/infolog/templates/default/export_csv_selectors.xet
index 8583a7dbff..7ddd9fc6cb 100644
--- a/infolog/templates/default/export_csv_selectors.xet
+++ b/infolog/templates/default/export_csv_selectors.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="infolog.export_csv_selectors" template="" lang="" group="0" version="1.9.002">
 		<grid>
@@ -9,15 +8,15 @@
 			</columns>
 			<rows>
 				<row>
-					<radio label="Use all" id="selection" options="all"/>
+					<radio label="Use all" id="selection" set_value="all" />
 				</row>
 				<row>
-					<radio label="Use search results" id="selection" options="search"/>
+					<radio label="Use search results" id="selection" set_value="search" />
 				</row>
 				<row>
-					<radio label="Use definition filter" id="selection" onclick="jQuery('div.filters').show();" options="filter"/>
+					<radio label="Use definition filter" id="selection" onclick="jQuery('div.filters').show();" set_value="filter" />
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/infolog/templates/default/home.link.xet b/infolog/templates/default/home.link.xet
index bcd63bb021..e5c2e9d550 100644
--- a/infolog/templates/default/home.link.xet
+++ b/infolog/templates/default/home.link.xet
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- $Id:$ -->
 <overlay>
 	<template id="infolog.home.link" template="" lang="" group="0" version="1.9.001">
-		<hbox class="infolog_CompletedClmn" height="45px">
-			<image label="$cont[info_status]" id="edit_status[$cont[info_id]]" href="javascript:egw.open($cont[info_id],'infolog');" src="image" default_src="status"/>
-			<vbox>
-				<link id="entry"/>
-				<image label="$cont[info_percent]" id="edit_percent[$cont[info_id]]" href="javascript:egw.open($cont[info_id],'infolog');" src="info_percent"/>
+		<et2-hbox  class="infolog_CompletedClmn" height="45px">
+			<et2-image  label="$cont[info_status]" id="edit_status[$cont[info_id]]" href="javascript:egw.open($cont[info_id],'infolog');" src="image" defaultSrc="status"></et2-image>
+			<et2-vbox>
+				<et2-link  id="entry" app=""></et2-link>
+				<et2-image  label="$cont[info_percent]" id="edit_percent[$cont[info_id]]" href="javascript:egw.open($cont[info_id],'infolog');" src="info_percent"></et2-image>
 				<progress label="$cont[info_percent]" id="info_percent2" href="javascript:egw.open($cont[info_id],'infolog');"/>
-			</vbox>
-		</hbox>
+			</et2-vbox>
+		</et2-hbox>
 		<grid class="tooltip" readonly="true" width="100%">
 			<columns>
 				<column width="70"/>
@@ -18,10 +18,10 @@
 			</columns>
 			<rows>
 				<row>
-					<link label="%s $cont[info_from]" id="info_link" options="b" span="all"/>
+					<et2-link  label="%s $cont[info_from]" id="info_link" app="" span="all"></et2-link>
 				</row>
 				<row>
-					<description id="info_des" no_lang="1" span="all"/>
+					<et2-description  id="info_des" span="all" noLang="1"></et2-description>
 				</row>
 			</rows>
 		</grid>
diff --git a/infolog/templates/default/home.xet b/infolog/templates/default/home.xet
index f6a74d3e35..c970b228d0 100644
--- a/infolog/templates/default/home.xet
+++ b/infolog/templates/default/home.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="infolog.home" template="" lang="" group="0" version="1.9.005">
 		<grid width="100%">
@@ -17,11 +16,11 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<vbox>
-						<nextmatch-filterheader id="info_type" no_lang="1" options="Type"/>
-						<nextmatch-filterheader align="center" id="info_status" options="Status" class="selectboxFullWidth"/>
+					<et2-vbox>
+						<et2-nextmatch-header-filter  id="info_type" noLang="1" emptyLabel="Type"/>
+						<et2-nextmatch-header-filter  align="center" id="info_status" class="selectboxFullWidth" emptyLabel="Status"/>
 						<nextmatch-sortheader align="right" label="Completed" id="info_percent"/>
-					</vbox>
+					</et2-vbox>
 					<grid width="100%" spacing="0" padding="0">
 						<columns>
 							<column/>
@@ -44,91 +43,85 @@
 					</grid>
 					<nextmatch-customfields id="customfields"/>
 					<nextmatch-header label="Category" id="cat_id"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Startdate" id="info_startdate" sortmode="DESC"/>
 						<nextmatch-sortheader label="Enddate" id="info_enddate" sortmode="DESC"/>
 						<nextmatch-sortheader label="Date completed" id="info_datecompleted" sortmode="DESC"/>
-					</vbox>
-					<vbox>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Times" id="info_used_time"/>
 						<nextmatch-sortheader label="planned" id="info_planned_time" class="infolog_planned"/>
-					</vbox>
-					<vbox>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Times" id="info_used_time"/>
 						<nextmatch-sortheader label="planned" id="info_planned_time" class="infolog_planned"/>
 						<nextmatch-sortheader label="Re-planned" id="info_replanned_time" class="replanned"/>
-					</vbox>
-					<vbox>
-						<nextmatch-accountfilter statustext="Select to filter by owner" id="info_owner" options="Owner,both" class="infolog_user_filter"/>
-						<nextmatch-accountfilter statustext="Select to filter by responsible" id="info_responsible" options="Responsible,both" class="infolog_user_filter"/>
-					</vbox>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-nextmatch-header-account  statustext="Select to filter by owner" id="info_owner" class="infolog_user_filter" emptyLabel="Owner" accountType="both"/>
+						<et2-nextmatch-header-account  statustext="Select to filter by responsible" id="info_responsible" class="infolog_user_filter" emptyLabel="Responsible" accountType="both"/>
+					</et2-vbox>
 					<nextmatch-sortheader label="last changed" id="info_datemodified" options="DESC"/>
 				</row>
 				<row class="$row_cont[info_cat] $row_cont[class]" valign="top">
-					<hbox align="center">
-						<image label="$row_cont[info_type]" src="${row}[info_type]" default_src="infolog/navbar"/>
-						<image label="$row_cont[info_status_label]" id="edit_status[$row_cont[info_id]]" href="javascript:egw.open($row_cont[info_id],'infolog');" src="$row_cont[info_status_label]" default_src="status"/>
-						<image label="$row_cont[info_percent]" id="edit_percent[$row_cont[info_id]]" href="javascript:egw.open($row_cont[info_id],'infolog');" src="$row_cont[info_percent]"/>
+					<et2-hbox  align="center">
+						<et2-image  label="$row_cont[info_type]" src="${row}[info_type]" defaultSrc="infolog/navbar"></et2-image>
+						<et2-image  label="$row_cont[info_status_label]" id="edit_status[$row_cont[info_id]]" href="javascript:egw.open($row_cont[info_id],'infolog');" src="$row_cont[info_status_label]" defaultSrc="status"></et2-image>
+						<et2-image  label="$row_cont[info_percent]" id="edit_percent[$row_cont[info_id]]" href="javascript:egw.open($row_cont[info_id],'infolog');" src="$row_cont[info_percent]"></et2-image>
 						<progress label="$row_cont[info_percent]" id="{$row}[info_percent2]" href="javascript:egw.open($row_cont[info_id],'infolog');"/>
-					</hbox>
-					<vbox class="infolog_fullWidth">
-						<hbox>
-							<description id="${row}[info_subject]" no_lang="1" class="$row_cont[sub_class]"/>
-							<description align="right" id="{$row}[info_number]" no_lang="1" class="infolog_infoId"/>
-						</hbox>
-						<box class="infoDes">
-							<description id="${row}[info_des]" no_lang="1" activate_links="1"/>
-						</box>
-						<link-string id="${row}[filelinks]"/>
-					</vbox>
+					</et2-hbox>
+					<et2-vbox  class="infolog_fullWidth">
+						<et2-hbox>
+							<et2-description  id="${row}[info_subject]" class="$row_cont[sub_class]" noLang="1"></et2-description>
+							<et2-description  align="right" id="{$row}[info_number]" class="infolog_infoId" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-box  class="infoDes">
+							<et2-description  id="${row}[info_des]" noLang="1" activateLinks="1"></et2-description>
+						</et2-box>
+						<et2-link-string  id="${row}[filelinks]"></et2-link-string>
+					</et2-vbox>
 					<customfields-list id="$row" class="customfields"/>
-					<menulist>
-						<menupopup type="select-cat" id="${row}[info_cat]" readonly="true"/>
-					</menulist>
-					<vbox>
-						<date-time id="${row}[info_startdate]" readonly="true" options=",8" class="infolog_fixedHeight"/>
-						<date-time id="${row}[info_enddate]" readonly="true" options=",8" class="$row_cont[end_class] infolog_fixedHeight"/>
-						<date-time id="${row}[info_datecompleted]" readonly="true" class="infolog_fixedHeight"/>
-					</vbox>
-					<vbox>
-						<hbox readonly="true">
-							<hbox readonly="true">
-								<date-duration id="${row}[info_used_time]" readonly="true" options="@@duration_format"/>
-								<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@@duration_format" class="timesheet"/>
-							</hbox>
-							<description/>
-						</hbox>
-						<date-duration id="${row}[info_planned_time]" readonly="true" options="@@duration_format" span="all" class="infolog_planned"/>
-					</vbox>
-					<vbox>
-						<hbox id="r_used_time">
-							<image label="Times" src="timesheet"/>
-							<date-duration id="${row}[info_used_time]" readonly="true" options="@@duration_format"/>
-							<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@@duration_format" class="timesheet"/>
-						</hbox>
-						<hbox id="planified">
-							<image label="planned time" src="k_alarm.png"/>
-							<date-duration id="${row}[info_planned_time]" readonly="true" options="@@duration_format" span="all" class="infolog_planned"/>
-						</hbox>
-						<hbox id="replanified">
-							<image label="Re-planned time" src="agt_reload.png"/>
-							<date-duration id="${row}[info_replanned_time]" readonly="true" options="@@duration_format" span="all" class="replanned"/>
-						</hbox>
-					</vbox>
-					<vbox>
-						<menulist>
-							<menupopup type="select-account" id="${row}[info_owner]" readonly="true"/>
-						</menulist>
-						<listbox type="select-account" id="${row}[info_responsible]" readonly="true" rows="5"/>
-					</vbox>
-					<vbox>
-						<date-time id="${row}[info_datemodified]" readonly="true"/>
-						<menulist>
-							<menupopup type="select-account" id="${row}[info_modifier]" readonly="true"/>
-						</menulist>
-					</vbox>
+					<et2-select-cat  id="${row}[info_cat]" readonly="true"></et2-select-cat>
+					<et2-vbox>
+						<et2-date-time  id="${row}[info_startdate]" readonly="true" class="infolog_fixedHeight"></et2-date-time>
+						<et2-date-time  id="${row}[info_enddate]" readonly="true" class="$row_cont[end_class] infolog_fixedHeight"></et2-date-time>
+						<et2-date-time  id="${row}[info_datecompleted]" readonly="true" class="infolog_fixedHeight"></et2-date-time>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-hbox  readonly="true">
+							<et2-hbox  readonly="true">
+								<et2-date-duration  id="${row}[info_used_time]" readonly="true" dataFormat="@@duration_format" ></et2-date-duration>
+								<et2-date-duration  id="${row}[info_sum_timesheets]" readonly="true" class="timesheet" dataFormat="@@duration_format"></et2-date-duration>
+							</et2-hbox>
+							<et2-description></et2-description>
+						</et2-hbox>
+						<et2-date-duration  id="${row}[info_planned_time]" readonly="true" span="all" class="infolog_planned" dataFormat="@@duration_format"></et2-date-duration>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-hbox  id="r_used_time">
+							<et2-image  label="Times" src="timesheet"></et2-image>
+							<et2-date-duration  id="${row}[info_used_time]" readonly="true" dataFormat="@@duration_format" ></et2-date-duration>
+							<et2-date-duration  id="${row}[info_sum_timesheets]" readonly="true" class="timesheet" dataFormat="@@duration_format"></et2-date-duration>
+						</et2-hbox>
+						<et2-hbox  id="planified">
+							<et2-image  label="planned time" src="k_alarm.png"></et2-image>
+							<et2-date-duration  id="${row}[info_planned_time]" readonly="true" span="all" class="infolog_planned" dataFormat="@@duration_format"></et2-date-duration>
+						</et2-hbox>
+						<et2-hbox  id="replanified">
+							<et2-image  label="Re-planned time" src="agt_reload.png"></et2-image>
+							<et2-date-duration  id="${row}[info_replanned_time]" readonly="true" span="all" class="replanned" dataFormat="@@duration_format"></et2-date-duration>
+						</et2-hbox>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-select-account  id="${row}[info_owner]" readonly="true"></et2-select-account>
+						<et2-select-account  id="${row}[info_responsible]" readonly="true" rows="5" multiple="1"></et2-select-account>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-date-time  id="${row}[info_datemodified]" readonly="true"></et2-date-time>
+						<et2-select-account  id="${row}[info_modifier]" readonly="true"></et2-select-account>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/infolog/templates/default/import.ical_conditions.xet b/infolog/templates/default/import.ical_conditions.xet
index 22b2dd19f0..1b7acdebe9 100644
--- a/infolog/templates/default/import.ical_conditions.xet
+++ b/infolog/templates/default/import.ical_conditions.xet
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="infolog.import.ical_conditions" template="" lang="" group="0" version="16.1">
-		<vbox>
+		<et2-vbox>
 			<template id="importexport.wizard_basic_import_csv.conditions" disabled="@no_conditions"/>
 
-			<select-cat id="override_values[info_cat][value]" label="Category" empty_label="From file" options=",,,@application"/>
-		</vbox>
+			<et2-select-cat  id="override_values[info_cat][value]" label="Category" application="@application" emptyLabel="From file"></et2-select-cat>
+		</et2-vbox>
 		<styles>
 			#importexport-wizardbox_delete_title {
 				margin-top: 1em;
 			}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/infolog/templates/default/index.rows.xet b/infolog/templates/default/index.rows.xet
deleted file mode 100644
index 41b423d4c2..0000000000
--- a/infolog/templates/default/index.rows.xet
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
-<overlay>
-	<template id="infolog.index.rows" template="" lang="" group="0" version="1.9.005">
-		<grid width="100%">
-			<columns>
-				<column width="120"/>
-				<column width="45%"/>
-				<column width="15%" disabled="@no_customfields"/>
-				<column/>
-				<column width="120"/>
-				<column/>
-				<column/>
-				<column width="120" disabled="@no_info_owner_info_responsible"/>
-				<column width="120"/>
-			</columns>
-			<rows>
-				<row class="th">
-					<vbox>
-						<nextmatch-filterheader id="info_type" no_lang="1" options="Type"/>
-						<nextmatch-filterheader align="center" id="info_status" options="Status" class="selectboxFullWidth"/>
-						<nextmatch-sortheader align="right" label="Completed" id="info_percent"/>
-					</vbox>
-					<grid width="100%" spacing="0" padding="0">
-						<columns>
-							<column/>
-							<column/>
-						</columns>
-						<rows>
-							<row>
-								<nextmatch-customfilter id="linked" options="link-entry"/>
-								<nextmatch-sortheader align="right" label="Priority" id="info_priority" options="DESC" class="noPrint"/>
-							</row>
-							<row>
-								<nextmatch-sortheader label="Subject" id="info_subject"/>
-								<nextmatch-sortheader align="right" label="Creation" id="info_id" options="DESC" class="noPrint"/>
-							</row>
-							<row>
-								<nextmatch-sortheader label="Description" id="info_des"/>
-								<nextmatch-sortheader align="right" label="last changed" id="info_datemodified" options="DESC" class="noPrint"/>
-							</row>
-						</rows>
-					</grid>
-					<nextmatch-customfields id="customfields" app="infolog"/>
-					<nextmatch-header label="Category" id="cat_id"/>
-					<vbox>
-						<nextmatch-sortheader label="Startdate" id="info_startdate" sortmode="DESC"/>
-						<nextmatch-sortheader label="Enddate" id="info_enddate" sortmode="DESC"/>
-						<nextmatch-sortheader label="Date completed" id="info_datecompleted" sortmode="DESC"/>
-					</vbox>
-					<vbox>
-						<nextmatch-sortheader label="Times" id="info_used_time"/>
-						<nextmatch-sortheader label="planned" id="info_planned_time" class="infolog_planned"/>
-					</vbox>
-					<vbox>
-						<nextmatch-sortheader label="Times" id="info_used_time"/>
-						<nextmatch-sortheader label="planned" id="info_planned_time" class="infolog_planned"/>
-						<nextmatch-sortheader label="Re-planned" id="info_replanned_time" class="replanned"/>
-					</vbox>
-					<vbox>
-						<nextmatch-accountfilter statustext="Select to filter by owner" id="info_owner" options="Owner,both" class="infolog_user_filter"/>
-						<nextmatch-accountfilter statustext="Select to filter by responsible" id="info_responsible" options="Responsible,both" class="infolog_user_filter"/>
-					</vbox>
-					<nextmatch-sortheader label="last changed" id="info_datemodified" options="DESC"/>
-				</row>
-				<row class="$row_cont[info_cat] $row_cont[class]" valign="top">
-					<hbox align="center">
-						<image label="$row_cont[info_type]" src="${row}[info_type]" default_src="infolog/navbar"/>
-						<image label="$row_cont[info_status_label]" id="edit_status[$row_cont[info_id]]" href="javascript:egw.open($row_cont[info_id],'infolog');" src="$row_cont[info_status_label]" default_src="status"/>
-						<image label="$row_cont[info_percent]" id="edit_percent[$row_cont[info_id]]" href="javascript:egw.open($row_cont[info_id],'infolog');" src="$row_cont[info_percent]"/>
-						<progress label="$row_cont[info_percent]" id="{$row}[info_percent2]" href="javascript:egw.open($row_cont[info_id],'infolog');"/>
-					</hbox>
-					<vbox class="infolog_fullWidth">
-						<hbox>
-							<description id="${row}[info_subject]" no_lang="1" class="$row_cont[sub_class]"/>
-							<description align="right" id="{$row}[info_number]" no_lang="1" class="infolog_infoId"/>
-						</hbox>
-						<box class="infoDes">
-							<description id="${row}[info_des]" no_lang="1" activate_links="1"/>
-						</box>
-						<link-string id="${row}[filelinks]"/>
-					</vbox>
-					<customfields-list id="$row" class="customfields" app="infolog"/>
-					<menulist>
-						<menupopup type="select-cat" id="${row}[info_cat]" readonly="true"/>
-					</menulist>
-					<vbox>
-						<date-time id="${row}[info_startdate]" readonly="true" options=",8" class="infolog_fixedHeight"/>
-						<date-time id="${row}[info_enddate]" readonly="true" options=",8" class="$row_cont[end_class] infolog_fixedHeight"/>
-						<date-time id="${row}[info_datecompleted]" readonly="true" class="infolog_fixedHeight"/>
-					</vbox>
-					<vbox>
-						<hbox readonly="true">
-							<hbox readonly="true">
-								<date-duration id="${row}[info_used_time]" readonly="true" options="@@duration_format"/>
-								<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@@duration_format" class="timesheet"/>
-							</hbox>
-							<description/>
-						</hbox>
-						<date-duration id="${row}[info_planned_time]" readonly="true" options="@@duration_format" span="all" class="infolog_planned"/>
-					</vbox>
-					<vbox>
-						<hbox id="r_used_time">
-							<image label="Times" src="timesheet"/>
-							<date-duration id="${row}[info_used_time]" readonly="true" options="@@duration_format"/>
-							<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@@duration_format" class="timesheet"/>
-						</hbox>
-						<hbox id="planified">
-							<image label="planned time" src="k_alarm.png"/>
-							<date-duration id="${row}[info_planned_time]" readonly="true" options="@@duration_format" span="all" class="infolog_planned"/>
-						</hbox>
-						<hbox id="replanified">
-							<image label="Re-planned time" src="agt_reload.png"/>
-							<date-duration id="${row}[info_replanned_time]" readonly="true" options="@@duration_format" span="all" class="replanned"/>
-						</hbox>
-					</vbox>
-					<vbox>
-						<menulist>
-							<menupopup type="select-account" id="${row}[info_owner]" readonly="true"/>
-						</menulist>
-						<listbox type="select-account" id="${row}[info_responsible]" readonly="true" rows="5"/>
-					</vbox>
-					<vbox>
-						<date-time id="${row}[info_datemodified]" readonly="true"/>
-						<menulist>
-							<menupopup type="select-account" id="${row}[info_modifier]" readonly="true"/>
-						</menulist>
-					</vbox>
-				</row>
-			</rows>
-		</grid>
-	</template>
-	<template id="infolog.index" template="" lang="" group="0" version="1.9.005">
-		<grid width="100%" border="0" spacing="0" padding="0">
-			<columns>
-				<column width="70%"/>
-				<column/>
-			</columns>
-			<rows>
-				<row disabled="!@css">
-					<html id="css" span="all"/>
-				</row>
-				<row>
-					<description align="center" id="msg" no_lang="1" span="all" class="message"/>
-				</row>
-				<row disabled="1">
-					<template id="dates"/>
-					<template id="header_right"/>
-				</row>
-				<row>
-					<nextmatch id="nm" template="infolog.index.rows"  header_left="infolog.index.dates" span="all"/>
-				</row>
-				<row>
-					<hbox class=" ">
-						<box id="responsible_popup" class="action_popup prompt">
-							<vbox>
-								<description value="Change responsible" class="promptheader"/>
-								<description value="Select users or groups"/>
-								<listbox type="select-account" id="responsible" rows="5" account_type="both" class="action_popup-content"/>
-								<hbox>
-									<button label="Add" id="responsible_action[add]" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Delete" id="responsible_action[delete]" onclick="nm_submit_popup(this); return false;"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'responsible_popup');"/>
-								</hbox>
-							</vbox>
-						</box>
-						<box id="delete_popup" class="action_popup prompt">
-							<vbox>
-								<description value="Delete" class="promptheader"/>
-								<description value="Delete selected entries?" id="delete_prompt"/>
-								<hbox>
-									<button label="Yes - Delete" id="delete" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Yes - Delete including sub-entries" id="delete_sub" onclick="nm_popup_action.id = 'delete_sub'; nm_submit_popup(this); return false;"/>
-									<buttononly label="No - Cancel" onclick="nm_hide_popup(this,'delete_popup');"/>
-								</hbox>
-							</vbox>
-						</box>
-						<box id="link_popup" class="action_popup prompt">
-							<vbox>
-								<description value="Add / Remove link" class="promptheader"/>
-								<link-entry id="link" class="action_popup-content"/>
-								<hbox>
-									<button label="Add" id="link_action[add]" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Delete" id="link_action[delete]" onclick="nm_submit_popup(this); return false;"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'link_popup');"/>
-								</hbox>
-							</vbox>
-						</box>
-					</hbox>
-					<description/>
-				</row>
-			</rows>
-		</grid>
-		<styles>
-			/**
- * Add / remove link or category popup used for actions on multiple entries
- */
-
-.action_popup[id] {
-	position: fixed;
-	top: 200px;
-	left: 450px;
-	width: 76ex;
-	z-index: 20000;
-	display: none;
-	border-collapse:collapse;
-	border-spacing:0px
-}
-.action_popup-content {
-	display:block;
-	padding:2ex;
-	color:#666666;
-	margin: -2px -1px 0px -2px;
-}
-.action_popup &gt; table {
-	width: 100%
-}
-.action_popup .promptheader {
-	padding: 1ex;
-	width: 100%
-}
-
-.action_select {
-	width: 100%
-}
-		</styles>
-	</template>
-</overlay>
diff --git a/infolog/templates/default/index.xet b/infolog/templates/default/index.xet
index 3146f9b816..565cf836e9 100644
--- a/infolog/templates/default/index.xet
+++ b/infolog/templates/default/index.xet
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="infolog.index.add" template="" lang="" group="0" version="1.9.001">
-		<button statustext="Add" id="add" image="add" background_image="true" onclick="app.infolog.add_with_extras(widget,'','$cont[action]','$cont[action_id]');"/>
+		<et2-button  statustext="Add" id="add" image="add" onclick="app.infolog.add_with_extras(widget,'','$cont[action]','$cont[action_id]');"></et2-button>
 	</template>
 	<template id="infolog.index.dates" template="" lang="" group="0" version="1.9.001">
-		<hbox>
-			<date id="startdate" label="Start" onchange="widget.getParent().getWidgetById('enddate').set_min(widget.getValue());return true;"/>
-			<date id="enddate" label="End" onchange="widget.getParent().getWidgetById('startdate').set_max(widget.getValue());return true;"/>
-		</hbox>
+		<et2-hbox>
+			<et2-date  id="startdate" label="Start" onchange="widget.getParent().getWidgetById('enddate').set_min(widget.getValue());return true;"></et2-date>
+			<et2-date  id="enddate" label="End" onchange="widget.getParent().getWidgetById('startdate').set_max(widget.getValue());return true;"></et2-date>
+		</et2-hbox>
 	</template>
 	<template id="infolog.index.rows" template="" lang="" group="0" version="1.9.005">
 		<grid width="100%">
@@ -26,11 +25,11 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<vbox>
-						<nextmatch-filterheader id="info_type" no_lang="1" options="Type"/>
-						<nextmatch-filterheader align="center" id="info_status" options="Status" class="selectboxFullWidth"/>
+					<et2-vbox>
+						<et2-nextmatch-header-filter  id="info_type" noLang="1" emptyLabel="Type"/>
+						<et2-nextmatch-header-filter  align="center" id="info_status" class="selectboxFullWidth" emptyLabel="Status"/>
 						<nextmatch-sortheader align="right" label="Completed" id="info_percent"/>
-					</vbox>
+					</et2-vbox>
 					<grid width="100%" spacing="0" padding="0">
 						<columns>
 							<column/>
@@ -53,82 +52,81 @@
 					</grid>
 					<nextmatch-customfields id="customfields" app="infolog"/>
 					<nextmatch-header label="Category" id="cat_id"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Startdate" id="info_startdate" sortmode="DESC"/>
 						<nextmatch-sortheader label="Enddate" id="info_enddate" sortmode="DESC"/>
 						<nextmatch-sortheader label="Date completed" id="info_datecompleted" sortmode="DESC"/>
-					</vbox>
-					<vbox>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Times" id="info_used_time"/>
 						<nextmatch-sortheader label="planned" id="info_planned_time" class="infolog_planned"/>
-					</vbox>
-					<vbox>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Times" id="info_used_time"/>
 						<nextmatch-sortheader label="planned" id="info_planned_time" class="infolog_planned"/>
 						<nextmatch-sortheader label="Re-planned" id="info_replanned_time" class="replanned"/>
-					</vbox>
-					<vbox>
-						<nextmatch-accountfilter statustext="Select to filter by owner" id="info_owner" options="Owner,both" class="infolog_user_filter"/>
-						<nextmatch-accountfilter statustext="Select to filter by responsible" id="info_responsible" options="Responsible,both" class="infolog_user_filter"/>
-					</vbox>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-nextmatch-header-account  statustext="Select to filter by owner" id="info_owner" class="infolog_user_filter" emptyLabel="Owner" accountType="both"/>
+						<et2-nextmatch-header-account  statustext="Select to filter by responsible" id="info_responsible" class="infolog_user_filter" emptyLabel="Responsible" accountType="both"/>
+					</et2-vbox>
 					<nextmatch-sortheader label="last changed" id="info_datemodified" options="DESC"/>
 				</row>
 				<row class="$row_cont[info_cat] $row_cont[class]" valign="top">
-					<hbox align="center"  class="infolog_CompletedClmn">
-						<image label="$row_cont[info_type]" src="infolog/$row_cont[info_type]" default_src="infolog/navbar"/>
-						<image label="$row_cont[info_status_label]" id="edit_status[$row_cont[info_id]]" href="javascript:egw.open($row_cont[info_id],'infolog');" src="infolog/$row_cont[info_status_label]" default_src="status"/>
-						<image label="$row_cont[info_percent]" id="edit_percent[$row_cont[info_id]]" href="javascript:egw.open($row_cont[info_id],'infolog');" src="$row_cont[info_percent]"/>
+					<et2-hbox  align="center" class="infolog_CompletedClmn">
+						<et2-image  label="$row_cont[info_type]" src="infolog/$row_cont[info_type]" defaultSrc="infolog/navbar"></et2-image>
+						<et2-image  label="$row_cont[info_status_label]" id="edit_status[$row_cont[info_id]]" href="javascript:egw.open($row_cont[info_id],'infolog');" src="infolog/$row_cont[info_status_label]" defaultSrc="status"></et2-image>
+						<et2-image  label="$row_cont[info_percent]" id="edit_percent[$row_cont[info_id]]" href="javascript:egw.open($row_cont[info_id],'infolog');" src="$row_cont[info_percent]"></et2-image>
 						<progress label="$row_cont[info_percent]" id="{$row}[info_percent2]" href="javascript:egw.open($row_cont[info_id],'infolog');"/>
-					</hbox>
-					<vbox class="infolog_fullWidth">
-						<link label="%s $row_cont[info_addr]" id="${row}[info_link]" options="b"/>
-						<hbox>
-							<description id="${row}[info_subject]" no_lang="1" class="$row_cont[sub_class] et2_ellipsis" overflow="hidden" width="85%"/>
-							<description align="right" id="{$row}[info_number]" no_lang="1" class="infolog_infoId"/>
-						</hbox>
-						<box class="infoDes">
-							<description id="${row}[info_des]" no_lang="1" activate_links="1"/>
-						</box>
-						<link-string id="${row}[filelinks]"/>
-					</vbox>
+					</et2-hbox>
+					<et2-vbox  class="infolog_fullWidth">
+						<et2-link  label="%s $row_cont[info_addr]" id="${row}[info_link]" app=""></et2-link>
+						<et2-hbox>
+							<et2-description  id="${row}[info_subject]" class="$row_cont[sub_class] et2_ellipsis" overflow="hidden" width="85%" noLang="1"></et2-description>
+							<et2-description  align="right" id="{$row}[info_number]" class="infolog_infoId" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-box  class="infoDes">
+							<et2-description  id="${row}[info_des]" noLang="1" activateLinks="1"></et2-description>
+						</et2-box>
+						<et2-link-string  id="${row}[filelinks]"></et2-link-string>
+					</et2-vbox>
 					<customfields-list id="$row" class="customfields" app="infolog"/>
-					<select-cat id="${row}[info_cat]" readonly="true"/>
-					<vbox>
-						<date-time id="${row}[info_startdate]" readonly="true" options=",8" class="infolog_fixedHeight"/>
-						<date-time id="${row}[info_enddate]" readonly="true" options=",8" class="$row_cont[end_class] infolog_fixedHeight"/>
-						<date-time id="${row}[info_datecompleted]" readonly="true" class="infolog_fixedHeight"/>
-					</vbox>
-					<vbox>
-						<hbox>
-							<date-duration id="${row}[info_used_time]" readonly="true" select_unit="true" display_format="@@duration_format" disabled="!$row_cont[info_used_time]"/>
-                            <date-duration id="${row}[info_sum_timesheets]" readonly="true" select_unit="true" display_format="@@duration_format" class="timesheet"/>
- 						</hbox>
-                        <date-duration id="${row}[info_planned_time]" readonly="true" display_format="@@duration_format" select_unit="true" span="all" class="infolog_planned"/>
-					</vbox>
-					<vbox>
-                        <hbox id="r_used_time">
-                            <image label="Times" src="timesheet"/>
-                            <date-duration id="${row}[info_used_time]" readonly="true" select_unit="true" display_format="@@duration_format" disabled="!$row_cont[info_used_time]"/>
-                            <date-duration id="${row}[info_sum_timesheets]" readonly="true" select_unit="true" display_format="@@duration_format" class="timesheet"/>
-                        </hbox>
-						<hbox id="planified">
-							<image label="planned time" src="k_alarm.png"/>
-                            <date-duration id="${row}[info_planned_time]" readonly="true"
-                                           display_format="@@duration_format" span="all" class="infolog_planned"/>
-						</hbox>
-						<hbox id="replanified">
-							<image label="Re-planned time" src="agt_reload.png"/>
-                            <date-duration id="${row}[info_replanned_time]" readonly="true" select_unit="true" display_format="@@duration_format" span="all" class="replanned"/>
-						</hbox>
-					</vbox>
-					<vbox>
-                        <select-account id="${row}[info_owner]" readonly="true"/>
-                        <select-account id="${row}[info_responsible]" readonly="true" rows="5"/>
-                    </vbox>
-					<vbox>
-						<date-time id="${row}[info_datemodified]" readonly="true"/>
-						<select-account id="${row}[info_modifier]" readonly="true"/>
-					</vbox>
+					<et2-select-cat  id="${row}[info_cat]" readonly="true"></et2-select-cat>
+					<et2-vbox>
+						<et2-date-time  id="${row}[info_startdate]" readonly="true" class="infolog_fixedHeight"></et2-date-time>
+						<et2-date-time  id="${row}[info_enddate]" readonly="true" class="$row_cont[end_class] infolog_fixedHeight"></et2-date-time>
+						<et2-date-time  id="${row}[info_datecompleted]" readonly="true" class="infolog_fixedHeight"></et2-date-time>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-hbox>
+							<et2-date-duration  id="${row}[info_used_time]" readonly="true" disabled="!$row_cont[info_used_time]" selectUnit="true" displayFormat="@@duration_format"></et2-date-duration>
+                            <et2-date-duration  id="${row}[info_sum_timesheets]" readonly="true" class="timesheet" selectUnit="true" displayFormat="@@duration_format"></et2-date-duration>
+ 						</et2-hbox>
+                        <et2-date-duration  id="${row}[info_planned_time]" readonly="true" span="all" class="infolog_planned" displayFormat="@@duration_format" selectUnit="true"></et2-date-duration>
+					</et2-vbox>
+					<et2-vbox>
+                        <et2-hbox  id="r_used_time">
+                            <et2-image  label="Times" src="timesheet"></et2-image>
+                            <et2-date-duration  id="${row}[info_used_time]" readonly="true" disabled="!$row_cont[info_used_time]" selectUnit="true" displayFormat="@@duration_format"></et2-date-duration>
+                            <et2-date-duration  id="${row}[info_sum_timesheets]" readonly="true" class="timesheet" selectUnit="true" displayFormat="@@duration_format"></et2-date-duration>
+                        </et2-hbox>
+						<et2-hbox  id="planified">
+							<et2-image  label="planned time" src="k_alarm.png"></et2-image>
+                            <et2-date-duration  id="${row}[info_planned_time]" readonly="true" span="all" class="infolog_planned" displayFormat="@@duration_format"></et2-date-duration>
+						</et2-hbox>
+						<et2-hbox  id="replanified">
+							<et2-image  label="Re-planned time" src="agt_reload.png"></et2-image>
+                            <et2-date-duration  id="${row}[info_replanned_time]" readonly="true" span="all" class="replanned" selectUnit="true" displayFormat="@@duration_format"></et2-date-duration>
+						</et2-hbox>
+					</et2-vbox>
+					<et2-vbox>
+                        <et2-select-account  id="${row}[info_owner]" readonly="true"></et2-select-account>
+                        <et2-select-account  id="${row}[info_responsible]" readonly="true" rows="5" multiple="1"></et2-select-account>
+                    </et2-vbox>
+					<et2-vbox>
+						<et2-date-time  id="${row}[info_datemodified]" readonly="true"></et2-date-time>
+						<et2-select-account  id="${row}[info_modifier]" readonly="true"></et2-select-account>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
@@ -147,68 +145,68 @@
 					<nextmatch id="nm" template="infolog.index.rows"  header_left="infolog.index.add" header_right="infolog.index.dates" span="all"/>
 				</row>
 				<row>
-					<hbox class=" ">
-						<box id="responsible_popup" class="action_popup prompt">
-							<vbox>
-								<description value="Change responsible" class="promptheader"/>
-								<vbox class="action_popup-content">
-									<description id="responsible_action[title]"/>
-									<description value="Select users or groups"/>
-									<taglist-account id="responsible" rows="5" account_type="both" class=" et2_fullWidth" empty_label="Delegation"/>
-								</vbox>
-								<hbox>
-									<button label="Ok" id="responsible_action[ok]" onclick="nm_submit_popup(this); return false;" image="check" background_image="true"/>
-									<button label="Add" id="responsible_action[add]" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Delete" id="responsible_action[delete]" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Cancel" id="responsible_cancel" onclick="nm_hide_popup(this,'responsible_popup');" image="cancelled" background_image="true"/>
-								</hbox>
-							</vbox>
-						</box>
-						<box id="delete_popup" class="action_popup prompt">
-							<vbox>
-								<description value="Delete" class="promptheader"/>
-								<description value="Delete selected entries?" id="delete_prompt"/>
-								<hbox>
-									<button label="Yes - Delete" id="delete" onclick="app.infolog.actionCallback('delete'); return false;" image="check" background_image="true"/>
-									<button label="Yes - Delete including sub-entries" id="delete_sub" onclick="app.infolog.actionCallback('delete_sub'); return false;" image="check" background_image="true"/>
-									<button label="No - Cancel" id="delete_cancel" onclick="nm_hide_popup(this,'delete_popup');" image="cancelled" background_image="true"/>
-								</hbox>
-							</vbox>
-						</box>
-						<box id="link_popup" class="action_popup prompt">
-							<vbox>
-								<description value="Add / Remove link" class="promptheader"/>
-								<link-entry id="link" class="action_popup-content"/>
-								<hbox>
-									<button label="Add" id="link_action[add]" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Delete" id="link_action[delete]" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Cancel" id="link_cancel" onclick="nm_hide_popup(this,'link_popup');" image="cancelled" background_image="true"/>
-								</hbox>
-							</vbox>
-						</box>
-						<box id="startdate_popup" class="action_popup prompt">
-							<vbox>
-								<description value="Start date" class="promptheader"/>
-								<description id="startdate_action[title]"/>
-								<date-time id="startdate" class="action_popup-content"/>
-								<hbox>
-									<button label="Ok" id="startdate_action[ok]" onclick="nm_submit_popup(this); return false;" image="check" background_image="true"/>
-									<button label="Cancel" id="startdate_cancel" onclick="nm_hide_popup(this,'link_popup');" image="cancelled" background_image="true"/>
-								</hbox>
-							</vbox>
-						</box>
-						<box id="enddate_popup" class="action_popup prompt">
-							<vbox>
-								<description value="Due date" class="promptheader"/>
-								<description id="enddate_action[title]"/>
-								<date-time id="enddate" class="action_popup-content"/>
-								<hbox>
-									<button label="Ok" id="enddate_action[ok]" onclick="nm_submit_popup(this); return false;" image="check" background_image="true"/>
-									<button label="Cancel" id="enddate_cancel" onclick="nm_hide_popup(this,'link_popup');" image="cancelled" background_image="true"/>
-								</hbox>
-							</vbox>
-						</box>
-					</hbox>
+					<et2-hbox>
+						<et2-box id="responsible_popup" class="action_popup prompt">
+							<et2-vbox>
+								<et2-description  value="Change responsible" class="promptheader"></et2-description>
+								<et2-vbox  class="action_popup-content">
+									<et2-description  id="responsible_action[title]"></et2-description>
+									<et2-description  value="Select users or groups"></et2-description>
+									<et2-select-account  id="responsible" rows="5" multiple="1" placeholder="Delegation" accountType="both"></et2-select-account>
+								</et2-vbox>
+								<et2-hbox>
+									<et2-button  label="Ok" id="responsible_action[ok]" onclick="nm_submit_popup(this); return false;" image="check"></et2-button>
+									<et2-button  label="Add" id="responsible_action[add]" onclick="nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Delete" id="responsible_action[delete]" onclick="nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Cancel" id="responsible_cancel" onclick="nm_hide_popup(this,'responsible_popup');" image="cancelled"></et2-button>
+								</et2-hbox>
+							</et2-vbox>
+						</et2-box>
+						<et2-box  id="delete_popup" class="action_popup prompt">
+							<et2-vbox>
+								<et2-description  value="Delete" class="promptheader"></et2-description>
+								<et2-description  value="Delete selected entries?" id="delete_prompt"></et2-description>
+								<et2-hbox>
+									<et2-button  label="Yes - Delete" id="delete" onclick="app.infolog.actionCallback('delete'); return false;" image="check"></et2-button>
+									<et2-button  label="Yes - Delete including sub-entries" id="delete_sub" onclick="app.infolog.actionCallback('delete_sub'); return false;" image="check"></et2-button>
+									<et2-button  label="No - Cancel" id="delete_cancel" onclick="nm_hide_popup(this,'delete_popup');" image="cancelled"></et2-button>
+								</et2-hbox>
+							</et2-vbox>
+						</et2-box>
+						<et2-box  id="link_popup" class="action_popup prompt">
+							<et2-vbox>
+								<et2-description  value="Add / Remove link" class="promptheader"></et2-description>
+								<et2-link-entry  id="link" class="action_popup-content"></et2-link-entry>
+								<et2-hbox>
+									<et2-button  label="Add" id="link_action[add]" onclick="nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Delete" id="link_action[delete]" onclick="nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Cancel" id="link_cancel" onclick="nm_hide_popup(this,'link_popup');" image="cancelled"></et2-button>
+								</et2-hbox>
+							</et2-vbox>
+						</et2-box>
+						<et2-box  id="startdate_popup" class="action_popup prompt">
+							<et2-vbox>
+								<et2-description  value="Start date" class="promptheader"></et2-description>
+								<et2-description  id="startdate_action[title]"></et2-description>
+								<et2-date-time  id="startdate" class="action_popup-content"></et2-date-time>
+								<et2-hbox>
+									<et2-button  label="Ok" id="startdate_action[ok]" onclick="nm_submit_popup(this); return false;" image="check"></et2-button>
+									<et2-button  label="Cancel" id="startdate_cancel" onclick="nm_hide_popup(this,'link_popup');" image="cancelled"></et2-button>
+								</et2-hbox>
+							</et2-vbox>
+						</et2-box>
+						<et2-box  id="enddate_popup" class="action_popup prompt">
+							<et2-vbox>
+								<et2-description  value="Due date" class="promptheader"></et2-description>
+								<et2-description  id="enddate_action[title]"></et2-description>
+								<et2-date-time  id="enddate" class="action_popup-content"></et2-date-time>
+								<et2-hbox>
+									<et2-button  label="Ok" id="enddate_action[ok]" onclick="nm_submit_popup(this); return false;" image="check"></et2-button>
+									<et2-button  label="Cancel" id="enddate_cancel" onclick="nm_hide_popup(this,'link_popup');" image="cancelled"></et2-button>
+								</et2-hbox>
+							</et2-vbox>
+						</et2-box>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
diff --git a/infolog/templates/default/widget.infolog-value.xet b/infolog/templates/default/widget.infolog-value.xet
index f3dcd69ccd..dec2d5e80f 100644
--- a/infolog/templates/default/widget.infolog-value.xet
+++ b/infolog/templates/default/widget.infolog-value.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="infolog.widget.infolog-value" template="" lang="" group="0" version="1.7.001">
 		<grid>
@@ -14,47 +13,41 @@
 			</columns>
 			<rows>
 				<row class="row">
-					<description options=",,,type" value="Type"/>
-					<menulist>
-						<menupopup id="type" onchange="1" statustext="type of the field (select Label if field should be empty)"/>
-					</menulist>
+					<et2-description  value="Type" labelFor="type"></et2-description>
+					<et2-select  id="type" onchange="1" statustext="type of the field (select Label if field should be empty)"></et2-select>
 					<infolog-fields id="options[0]" statustext="Contact field to show" span="all" label="Field"/>
 				</row>
 				<row class="row">
-					<description value="Compare"/>
-					<textbox id="options[1]" statustext="show a X if content equals this compare value, otherwise show nothing"/>
-					<textbox size="40" span="all" label="Alternatives" id="options[2]" statustext="colon (:) separated list of field names to use if value is empty or to sum up"/>
+					<et2-description  value="Compare"></et2-description>
+					<et2-textbox  id="options[1]" statustext="show a X if content equals this compare value, otherwise show nothing"></et2-textbox>
+					<et2-textbox  span="all" label="Alternatives" id="options[2]" statustext="colon (:) separated list of field names to use if value is empty or to sum up"></et2-textbox>
 				</row>
 				<row class="row">
-					<description value="Contactfield"/>
+					<et2-description  value="Contactfield"></et2-description>
 					<contact-fields id="options[3]"/>
-					<textbox span="2" label="Regular expression " id="options[4]" statustext="first argument for preg_replace"/>
-					<textbox span="2" label="Replacement" id="options[5]" statustext="second parameter for preg_replace"/>
+					<et2-textbox  span="2" label="Regular expression " id="options[4]" statustext="first argument for preg_replace"></et2-textbox>
+					<et2-textbox  span="2" label="Replacement" id="options[5]" statustext="second parameter for preg_replace"></et2-textbox>
 				</row>
 				<row class="row">
-					<description options=",,,label" value="Label"/>
-					<textbox id="label" statustext="displayed in front of input or input is inserted for a '%s' in the label (label of the Submitbutton or Image-filename)"/>
-					<textbox size="10" id="span" statustext="number of colums the field/cell should span or 'all' for the remaining columns, CSS-class name (for the TD tag)" label="Span, Class" span="2"/>
-					<description value="Align" align="center"/>
-					<menulist>
-						<menupopup id="align" statustext="alignment of label and input-field in table-cell"/>
-					</menulist>
+					<et2-description  value="Label" labelFor="label"></et2-description>
+					<et2-textbox  id="label" statustext="displayed in front of input or input is inserted for a '%s' in the label (label of the Submitbutton or Image-filename)"></et2-textbox>
+					<et2-textbox  id="span" statustext="number of colums the field/cell should span or 'all' for the remaining columns, CSS-class name (for the TD tag)" label="Span, Class" span="2"></et2-textbox>
+					<et2-description  value="Align" align="center"></et2-description>
+					<et2-select  id="align" statustext="alignment of label and input-field in table-cell"></et2-select>
 				</row>
 				<row class="row">
-					<description options=",,,name" value="Name"/>
-					<textbox id="name" statustext="index/name of returned content (name of the Template, Link / Method for Image)"/>
-					<checkbox label="%s disabled" id="disabled" statustext="if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell" span="all"/>
+					<et2-description  value="Name" labelFor="name"></et2-description>
+					<et2-textbox  id="name" statustext="index/name of returned content (name of the Template, Link / Method for Image)"></et2-textbox>
+					<et2-checkbox  label="%s disabled" id="disabled" statustext="if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell" span="all"></et2-checkbox>
 				</row>
 				<row class="row" disabled="!@type=button">
-					<description options="onclick" value="onClick"/>
-					<hbox options="0,0" span="all">
-						<menulist>
-							<menupopup id="onclick_type" statustext="confirmation necesary or custom java-script"/>
-						</menulist>
-						<textbox size="53" span="all" class="leftPad5 inputFullWidth" id="onclick" statustext="confirmation message or custom javascript (returning true or false)" align="right"/>
-					</hbox>
+					<et2-description  value="onClick" boldItalic="onclick"></et2-description>
+					<et2-hbox  cellpadding="0" cellspacing="0" span="all">
+						<et2-select  id="onclick_type" statustext="confirmation necesary or custom java-script"></et2-select>
+						<et2-textbox  span="all" class="leftPad5 inputFullWidth" id="onclick" statustext="confirmation message or custom javascript (returning true or false)" align="right"></et2-textbox>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/infolog/templates/mobile/edit.xet b/infolog/templates/mobile/edit.xet
index 2bf2120e3b..348d12bf0e 100644
--- a/infolog/templates/mobile/edit.xet
+++ b/infolog/templates/mobile/edit.xet
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- $Id: edit.xet 54611 2015-12-22 17:01:32Z nathangray $ -->
 <overlay>
 	<template id="infolog.edit.description" template="" lang="" group="0" version="1.6.001">
-		<textbox multiline="true"  id="info_des" no_lang="1" width="99.7%" height="250" resize_ratio="0"/>
+		<et2-textarea  id="info_des" width="99.7%" height="250" noLang="1" resizeRatio="0"></et2-textarea>
 	</template>
 	<template id="infolog.edit.links" template="" lang="" group="0" version="1.3.001">
 		<grid width="100%">
@@ -12,13 +12,13 @@
 			</columns>
 			<rows>
 				<row disabled="@view">
-					<link-to id="link_to"/>
+					<et2-link-to  id="link_to"></et2-link-to>
 				</row>
 				<row class="th">
-					<description value="Existing links"/>
+					<et2-description  value="Existing links"></et2-description>
 				</row>
 				<row>
-					<link-list id="link_to"/>
+					<et2-link-list  id="link_to"></et2-link-list>
 				</row>
 			</rows>
 		</grid>
@@ -31,27 +31,27 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Project"/>
-					<link-entry id="pm_id" only_app='projectmanager' onchange="app.infolog.submit_if_not_empty" blur="None" class="infolog_projectName" width="99%"/>
+					<et2-description  value="Project"></et2-description>
+					<et2-link-entry  id="pm_id" onchange="app.infolog.submit_if_not_empty" class="infolog_projectName" width="99%" onlyApp="projectmanager" placeholder="None"></et2-link-entry>
 				</row>
 				<row>
-					<description value="Price"/>
-					<hbox>
-						<textbox type="float" id="info_price" size="10"/>
+					<et2-description  value="Price"></et2-description>
+					<et2-hbox>
+						<et2-number  id="info_price"></et2-number>
 						<projectmanager-pricelist id="pl_id" onchange="window.app.infolog.et2.getWidgetById('info_price').set_value(this.options[this.selectedIndex].text.lastIndexOf('(') &lt; 0 ? '' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf('(')+1,-1));" options="None" />
-					</hbox>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="planned time" for="info_planned_time"/>
-					<date-duration id="info_planned_time" display_format="$cont[duration_format]"  class="infolog_date_duration" hours_per_day="$cont[hours_per_workday]"/>
+					<et2-description  value="planned time" for="info_planned_time"></et2-description>
+					<et2-date-duration  id="info_planned_time" class="infolog_date_duration" displayFormat="$cont[duration_format]" hoursPerDay="$cont[hours_per_workday]"></et2-date-duration>
 				</row>
 				<row>
-					<description value="Re-planned time" for="info_replanned_time"/>
-					<date-duration id="info_replanned_time" display_format="$cont[duration_format]"  class="infolog_date_duration" hours_per_day="$cont[hours_per_workday]"/>
+					<et2-description  value="Re-planned time" for="info_replanned_time"></et2-description>
+					<et2-date-duration  id="info_replanned_time" class="infolog_date_duration" displayFormat="$cont[duration_format]" hoursPerDay="$cont[hours_per_workday]"></et2-date-duration>
 				</row>
 				<row>
-					<description statustext="Leave blank to get the used time calculated by timesheet entries" value="used time" for="info_used_time"/>
-					<date-duration id="info_used_time" span="2" display_format="$cont[duration_format]" class="infolog_date_duration" hours_per_day="$cont[hours_per_workday]"/>
+					<et2-description  statustext="Leave blank to get the used time calculated by timesheet entries" value="used time" for="info_used_time"></et2-description>
+					<et2-date-duration  id="info_used_time" span="2" class="infolog_date_duration" displayFormat="$cont[duration_format]" hoursPerDay="$cont[hours_per_workday]"></et2-date-duration>
 				</row>
 			</rows>
 		</grid>
@@ -67,40 +67,36 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="CC"/>
-					<taglist-email id="info_cc"  width="100%" empty_label="email"/>
+					<et2-description  value="CC"></et2-description>
+					<et2-select-email  id="info_cc" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="email"></et2-select-email>
 				</row>
 				<row>
-					<description value="Responsible" for="info_responsible"/>
-					<menulist width="100%">
-						<menupopup type="select-account" statustext="select a responsible user: a person you want to delegate this task" id="info_responsible" multiple="true" no_lang="1" tags="true" class="et2_fullWidth" account_type="both" empty_label="User or group" onchange="app.infolog.onchangeResponsible"/>
-					</menulist>
+					<et2-description  value="Responsible" for="info_responsible"></et2-description>
+					<et2-select-account  width="100%" statustext="select a responsible user: a person you want to delegate this task" id="info_responsible" multiple="true" onchange="app.infolog.onchangeResponsible" placeholder="User or group" noLang="1" accountType="both"></et2-select-account>
 				</row>
 				<row>
-					<description value="Category" for="info_cat"/>
-					<menulist class="et2_fullWidth">
-							<menupopup type="select-cat" statustext="select a category for this entry" id="info_cat" options="None"/>
-					</menulist>
+					<et2-description  value="Category" for="info_cat"></et2-description>
+					<et2-select-cat  statustext="select a category for this entry" id="info_cat" emptyLabel="None"></et2-select-cat>
 				</row>
 				<row >
-					<description value="Parent" font_style="1"/>
-					<link-entry id="info_id_parent" onchange="if(egw &amp;&amp; widget) { if(widget._oldValue) window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget._oldValue,false);window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget.getValue(),false);}" options="infolog" class="et2_fullWidth"/>
+					<et2-description  value="Parent" fontStyle="1"></et2-description>
+					<et2-link-entry  id="info_id_parent" onchange="if(egw &amp;&amp; widget) { if(widget._oldValue) window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget._oldValue,false);window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget.getValue(),false);}" onlyApp="infolog"></et2-link-entry>
 				</row>
 				<row>
-					<description value="Location" for="info_location"/>
-					<textbox id="info_location" size="60" maxlength="255" class="et2_fullWidth"/>
+					<et2-description  value="Location" for="info_location"></et2-description>
+					<et2-textbox  id="info_location" maxlength="255"></et2-textbox>
 				</row>
 				<row>
-					<description value="Priority" for="info_priority"/>
-					<select class="et2_fullWidth" statustext="select a priority for this task" id="info_priority"/>
+					<et2-description  value="Priority" for="info_priority"></et2-description>
+					<et2-select  statustext="select a priority for this task" id="info_priority"></et2-select>
 				</row>
 				<row>
-					<description value="Date completed" for="info_datecompleted"/>
-					<date-time statustext="Date completed (leave it empty to have it automatic set if status is done or billed)" id="info_datecompleted" onchange="app.infolog.statusChanged" class="et2_fullWidth"/>
+					<et2-description  value="Date completed" for="info_datecompleted"></et2-description>
+					<et2-date-time  statustext="Date completed (leave it empty to have it automatic set if status is done or billed)" id="info_datecompleted" onchange="app.infolog.statusChanged"></et2-date-time>
 				</row>
 				<row>
-					<description value="Contact" for="info_from"/>
-					<textbox blur="@blur_title" class="et2_fullWidth" statustext="Custom contact-information, leave emtpy to use information from most recent link" id="info_from" size="60" maxlength="255"/>
+					<et2-description  value="Contact" for="info_from"></et2-description>
+					<et2-textbox  statustext="Custom contact-information, leave emtpy to use information from most recent link" id="info_from" maxlength="255" placeholder="@blur_title"></et2-textbox>
 				</row>
 			</rows>
 		</grid>
@@ -113,29 +109,25 @@
 			</columns>
 			<rows>
 				<row disabled="!@info_owner">
-					<description value="Owner"/>
-					<menulist>
-							<menupopup type="select-account" id="info_owner" readonly="true"/>
-					</menulist>
+					<et2-description  value="Owner"></et2-description>
+					<et2-select-account  id="info_owner" readonly="true"></et2-select-account>
 				</row>
 				<row>
-					<description value="Created"/>
-					<date-time id="info_created" readonly="true"/>
+					<et2-description  value="Created"></et2-description>
+					<et2-date-time  id="info_created" readonly="true"></et2-date-time>
 				</row>
 				<row>
-					<description value="Private" for="info_access"/>
-					<checkbox statustext="should this entry only be visible to you and people you grant privat access via the ACL" id="info_access" options="private,public"/>
+					<et2-description  value="Private" for="info_access"></et2-description>
+					<et2-checkbox  statustext="should this entry only be visible to you and people you grant privat access via the ACL" id="info_access" selectedValue="private" unselectedValue="public" ></et2-checkbox>
 				</row>
 
 				<row>
-					<description value="Last modified"/>
-					<menulist>
-							<menupopup type="select-account" id="info_modifier" readonly="true"/>
-					</menulist>
+					<et2-description  value="Last modified"></et2-description>
+					<et2-select-account  id="info_modifier" readonly="true"></et2-select-account>
 				</row>
 				<row>
-					<description/>
-					<date-time id="info_datemodified" readonly="true"/>
+					<et2-description></et2-description>
+					<et2-date-time  id="info_datemodified" readonly="true"></et2-date-time>
 				</row>
 			</rows>
 		</grid>
@@ -148,71 +140,71 @@
 			</columns>
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
-					<hbox  span="all" width="100%">
-						<button statustext="Apply the changes" id="button[apply]" image="apply"/>
-						<button statustext="delete this entry" id="button[delete]" onclick="if($cont[info_anz_subs]) return $cont[info_anz_subs]; et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" span="all"/>
-						<timestamper statustext="Insert timestamp into description field" id="timestamp" class="infologExtraButton infologTimestamp" image="timesheet" target="info_des"/>
-						<et2-switch toggle_on=" " toggle_off=" " label="notifications" id="no_notifications" class="notification_check"/>
-						<textbox type="integer" id="info_number" readonly="true" class="entry_id"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button-icon  statustext="Apply the changes" id="button[apply]" image="apply"></et2-button-icon>
+						<et2-button-icon  statustext="delete this entry" id="button[delete]" onclick="if($cont[info_anz_subs]) return $cont[info_anz_subs]; et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" span="all"></et2-button-icon>
+						<et2-button-timestamp  statustext="Insert timestamp into description field" id="timestamp" class="infologExtraButton infologTimestamp" image="timesheet" target="info_des"></et2-button-timestamp>
+						<et2-switch  label="notifications" id="no_notifications" class="notification_check" toggleOn=" " toggleOff=" "/>
+						<et2-number  id="info_number" readonly="true" class="entry_id" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
-					<hbox span="all" width="100%">
-						<button label="Search" id="button[search]" image="search" background_image="1"/>
-						<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  label="Search" id="button[search]" image="search"></et2-button>
+						<et2-button  label="Cancel" id="button[cancelsearch]" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Title" for="info_subject"/>
-					<textbox statustext="a short subject for the entry" id="info_subject" class="et2_fullWidth et2_required" maxlength="255" span="5" tabindex="1"/>
+					<et2-description  value="Title" for="info_subject"></et2-description>
+					<et2-textbox  statustext="a short subject for the entry" id="info_subject" class="et2_required" maxlength="255" span="5" tabindex="1"></et2-textbox>
 				</row>
 				<row>
-					<description value="Type" for="info_type"/>
-					<hbox>
-						<menulist class="et2_fullWidth">
-							<menupopup statustext="Type of the log-entry: Note, Phonecall or ToDo" id="info_type" no_lang="1" onchange="widget.getInstanceManager().submit(null,false,true); return false;" />
-						</menulist>
-					</hbox>
+					<et2-description  value="Type" for="info_type"></et2-description>
+					<et2-hbox>
+						<et2-select  statustext="Type of the log-entry: Note, Phonecall or ToDo" id="info_type" onchange="widget.getInstanceManager().submit(null,false,true); return false;" noLang="1"></et2-select>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Contact"/>
-					<link-entry id="info_contact" span="4"/>
+					<et2-description  value="Contact"></et2-description>
+					<et2-link-entry  id="info_contact" span="4"></et2-link-entry>
 				</row>
 				<row>
-					<description value="Startdate" for="info_startdate"/>
-					<date-time statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)" id="info_startdate" class="et2_fullWidth"/>
+					<et2-description  value="Startdate" for="info_startdate"></et2-description>
+					<et2-date-time  statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)" id="info_startdate"></et2-date-time>
 				</row>
 				<row>
-					<description value="Enddate" for="info_enddate"/>
-					<date-time statustext="til when should the ToDo or Phonecall be finished" id="info_enddate" class="et2_fullWidth"/>
+					<et2-description  value="Enddate" for="info_enddate"></et2-description>
+					<et2-date-time  statustext="til when should the ToDo or Phonecall be finished" id="info_enddate"></et2-date-time>
 				</row>
 				<row>
-					<description value="Status" for="info_status"/>
-					<select class="et2_fullWidth" statustext="@status_help" id="info_status" onchange="app.infolog.statusChanged"/>
+					<et2-description  value="Status" for="info_status"></et2-description>
+					<et2-select  statustext="@status_help" id="info_status" onchange="app.infolog.statusChanged"></et2-select>
 				</row>
 				<row>
-					<description value="Completed" for="info_percent"/>
-					<select-percent class="et2_fullWidth" span="4" statustext="Percent completed" id="info_percent" onchange="app.infolog.statusChanged"/>
+					<et2-description  value="Completed" for="info_percent"></et2-description>
+					<et2-select-percent  span="4" statustext="Percent completed" id="info_percent" onchange="app.infolog.statusChanged"></et2-select-percent>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" width="100%" align_tabs="v">
-						<tabs>
-							<tab id="description" label="Description" statustext="longer textual description"/>
-							<tab id="details" label="Details" statustext="Location, priority , ..."/>
-							<tab id="links" label="Links" statustext="Links of this entry"/>
-							<tab id="project" label="Projectmanager" statustext="Project settings: price, times"/>
-							<tab id="customfields" label="Customfields" statustext="Custom fields"/>
-							<tab id="ownership" label="Ownership" statustext="Ownership"/>
-						</tabs>
-						<tabpanels>
+					<et2-vbox  id="tabs" span="all" width="100%">
+						<et2-details  id="description" summary="Description" title="longer textual description">
 							<template id="infolog.edit.description"/>
+						</et2-details>
+						<et2-details  id="details" summary="Details" title="Location, priority , ...">
 							<template id="infolog.edit.details"/>
+						</et2-details>
+						<et2-details  id="links" summary="Links" title="Links of this entry">
 							<template id="infolog.edit.links"/>
+						</et2-details>
+						<et2-details  id="project" summary="Projectmanager" title="Project settings: price, times">
 							<template id="infolog.edit.project"/>
+						</et2-details>
+						<et2-details  id="customfields" summary="Customfields" title="Custom fields">
 							<template id="infolog.edit.customfields"/>
+						</et2-details>
+						<et2-details  id="ownership" summary="Ownership" title="Ownership">
 							<template id="infolog.edit.ownership"/>
-						</tabpanels>
-					</tabbox>
+						</et2-details>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
diff --git a/infolog/templates/mobile/index.xet b/infolog/templates/mobile/index.xet
index 521d04ffc0..99c3c2a892 100644
--- a/infolog/templates/mobile/index.xet
+++ b/infolog/templates/mobile/index.xet
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="infolog.index.dates" template="" lang="" group="0" version="1.9.001">
-		<hbox>
-			<date id="startdate" label="Start"/>
-			<date statustext="Leave it empty for a full week" id="enddate" label="End"/>
-		</hbox>
+		<et2-hbox>
+			<et2-date  id="startdate" label="Start"></et2-date>
+			<et2-date  statustext="Leave it empty for a full week" id="enddate" label="End"></et2-date>
+		</et2-hbox>
 	</template>
 	<template id="infolog.index.rows" template="" lang="" group="0" version="1.9.005">
 		<grid width="100%" >
@@ -20,36 +19,36 @@
 
 				</row>
 				<row class="$row_cont[class]" valign="top">
-					<description class=" cat_$row_cont[info_cat] mobile_cat_col"/>
-					<vbox class="infolog_fullWidth">
+					<et2-description  class="cat_$row_cont[info_cat] mobile_cat_col"></et2-description>
+					<et2-vbox  class="infolog_fullWidth">
 						<customfields-list id="$row" class="customfields" app="infolog" disabled="true"/>
-						<hbox class="infoSubRow">
-							<description id="${row}[info_subject]" no_lang="1" class="$row_cont[sub_class] et2_ellipsis" overflow="hidden" width="100%" />
-						</hbox>
-						<box class="infoDescRow">
-							<description id="${row}[info_des]" no_lang="1" activate_links="1"/>
+						<et2-hbox  class="infoSubRow">
+							<et2-description  id="${row}[info_subject]" class="$row_cont[sub_class] et2_ellipsis" overflow="hidden" width="100%" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-box  class="infoDescRow">
+							<et2-description  id="${row}[info_des]" noLang="1" activateLinks="1"></et2-description>
 
-						</box>
-					</vbox>
-					<vbox class="infolog_CompletedClmn">
-						<time_or_date id="${row}[info_startdate]" readonly="true" options=",8"/>
-						<vbox>
-							<hbox class="infoType">
-								<image label="$row_cont[info_type]" src="${row}[info_type]" default_src="infolog/navbar"/>
-							</hbox>
+						</et2-box>
+					</et2-vbox>
+					<et2-vbox  class="infolog_CompletedClmn">
+						<et2-date-time-today  id="${row}[info_startdate]" readonly="true" options=",8"></et2-date-time-today>
+						<et2-vbox>
+							<et2-hbox  class="infoType">
+								<et2-image  label="$row_cont[info_type]" src="${row}[info_type]" defaultSrc="infolog/navbar"></et2-image>
+							</et2-hbox>
 
-							<hbox class="infoPercent">
+							<et2-hbox  class="infoPercent">
 								<progress label="$row_cont[info_percent]" id="{$row}[info_percent2]" href="javascript:egw.open($row_cont[info_id],'infolog');"/>
-							</hbox>
-						</vbox>
-						<time_or_date id="${row}[info_enddate]" readonly="true" options=",8" class="$row_cont[end_class]" width="64"/>
-					</vbox>
+							</et2-hbox>
+						</et2-vbox>
+						<et2-date-time-today  id="${row}[info_enddate]" readonly="true" options=",8" class="$row_cont[end_class]" width="64"></et2-date-time-today>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="infolog.index" template="" lang="" group="0" version="1.9.005">
-		<button class="plus_button" statustext="Add a new ToDo" id="add[task]" onclick="app.infolog.add_with_extras(widget,'task','$cont[action]','$cont[action_id]');"/>
+		<et2-button  class="plus_button" statustext="Add a new ToDo" id="add[task]" onclick="app.infolog.add_with_extras(widget,'task','$cont[action]','$cont[action_id]');"></et2-button>
 		<grid width="100%" border="0" spacing="0" padding="0">
 			<columns>
 				<column width="70%"/>
@@ -60,7 +59,7 @@
 					<html id="css" span="all"/>
 				</row>
 				<row>
-					<description align="center" id="msg" no_lang="1" span="all" class="message"/>
+					<et2-description  align="center" id="msg" span="all" class="message" noLang="1"></et2-description>
 				</row>
 				<row disabled="1">
 					<template id="dates"/>
@@ -70,43 +69,43 @@
 					<nextmatch id="nm" template="infolog.index.rows" header_left="infolog.index.dates" span="all"/>
 				</row>
 				<row>
-					<hbox class=" ">
-						<box id="responsible_popup" class="action_popup prompt">
-							<vbox>
-								<description value="Change responsible" class="promptheader"/>
-								<description value="Select users or groups"/>
-								<listbox type="select-account" id="responsible" rows="5" account_type="both" class="action_popup-content"/>
-								<hbox>
-									<button label="Add" id="responsible_action[add]" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Delete" id="responsible_action[delete]" onclick="nm_submit_popup(this); return false;"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'responsible_popup');"/>
-								</hbox>
-							</vbox>
-						</box>
-						<box id="delete_popup" class="action_popup prompt">
-							<vbox>
-								<description value="Delete" class="promptheader"/>
-								<description value="Delete selected entries?" id="delete_prompt"/>
-								<hbox>
-									<button label="Yes - Delete" id="delete" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Yes - Delete including sub-entries" id="delete_sub" onclick="nm_popup_action.id = 'delete_sub'; nm_submit_popup(this); return false;"/>
-									<buttononly label="No - Cancel" onclick="nm_hide_popup(this,'delete_popup');"/>
-								</hbox>
-							</vbox>
-						</box>
-						<box id="link_popup" class="action_popup prompt">
-							<vbox>
-								<description value="Add / Remove link" class="promptheader"/>
-								<link-entry id="link" class="action_popup-content"/>
-								<hbox>
-									<button label="Add" id="link_action[add]" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Delete" id="link_action[delete]" onclick="nm_submit_popup(this); return false;"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'link_popup');"/>
-								</hbox>
-							</vbox>
-						</box>
-					</hbox>
-					<description/>
+					<et2-hbox >
+						<et2-box  id="responsible_popup" class="action_popup prompt">
+							<et2-vbox>
+								<et2-description  value="Change responsible" class="promptheader"></et2-description>
+								<et2-description  value="Select users or groups"></et2-description>
+								<et2-select-account  id="responsible" rows="5" class="action_popup-content" multiple="1" accountType="both"></et2-select-account>
+								<et2-hbox>
+									<et2-button  label="Add" id="responsible_action[add]" onclick="nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Delete" id="responsible_action[delete]" onclick="nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Cancel" onclick="nm_hide_popup(this,'responsible_popup');" noSubmit="true"></et2-button>
+								</et2-hbox>
+							</et2-vbox>
+						</et2-box>
+						<et2-box  id="delete_popup" class="action_popup prompt">
+							<et2-vbox>
+								<et2-description  value="Delete" class="promptheader"></et2-description>
+								<et2-description  value="Delete selected entries?" id="delete_prompt"></et2-description>
+								<et2-hbox>
+									<et2-button  label="Yes - Delete" id="delete" onclick="nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Yes - Delete including sub-entries" id="delete_sub" onclick="nm_popup_action.id = 'delete_sub'; nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="No - Cancel" onclick="nm_hide_popup(this,'delete_popup');" noSubmit="true"></et2-button>
+								</et2-hbox>
+							</et2-vbox>
+						</et2-box>
+						<et2-box  id="link_popup" class="action_popup prompt">
+							<et2-vbox>
+								<et2-description  value="Add / Remove link" class="promptheader"></et2-description>
+								<et2-link-entry  id="link" class="action_popup-content"></et2-link-entry>
+								<et2-hbox>
+									<et2-button  label="Add" id="link_action[add]" onclick="nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Delete" id="link_action[delete]" onclick="nm_submit_popup(this); return false;"></et2-button>
+									<et2-button  label="Cancel" onclick="nm_hide_popup(this,'link_popup');" noSubmit="true"></et2-button>
+								</et2-hbox>
+							</et2-vbox>
+						</et2-box>
+					</et2-hbox>
+					<et2-description></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -144,4 +143,4 @@
 }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/infolog/templates/mobile/view.xet b/infolog/templates/mobile/view.xet
index 7c5eb46ec1..7abcd8870b 100644
--- a/infolog/templates/mobile/view.xet
+++ b/infolog/templates/mobile/view.xet
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- $Id: edit.xet 54611 2015-12-22 17:01:32Z nathangray $ -->
 <overlay>
 	<template id="infolog.view.description" template="" lang="" group="0" version="1.6.001">
-		<textbox multiline="true"  id="info_des" no_lang="1" width="99.7%" height="250" resize_ratio="0"/>
+		<et2-textarea  id="info_des" width="99.7%" height="250" noLang="1" resizeRatio="0"></et2-textarea>
 	</template>
 	<template id="infolog.view.links" template="" lang="" group="0" version="1.3.001">
 		<grid width="100%">
@@ -12,10 +12,10 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description value="Existing links"/>
+					<et2-description  value="Existing links"></et2-description>
 				</row>
 				<row>
-					<link-string id="filelinks"/>
+					<et2-link-string  id="filelinks"></et2-link-string>
 				</row>
 			</rows>
 		</grid>
@@ -28,27 +28,27 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Project"/>
-					<link-entry id="pm_id" only_app='projectmanager' blur="None" class="infolog_projectName"/>
+					<et2-description  value="Project"></et2-description>
+					<et2-link-entry  id="pm_id" class="infolog_projectName" onlyApp="projectmanager" placeholder="None"></et2-link-entry>
 				</row>
 				<row>
-					<description value="Price"/>
-					<hbox>
-						<textbox type="float" id="info_price" size="10"/>
-						<listbox id="pl_id"  options="None" />
-					</hbox>
+					<et2-description  value="Price"></et2-description>
+					<et2-hbox>
+						<et2-number  id="info_price"></et2-number>
+						<et2-select  id="pl_id" options="None"></et2-select>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="planned time" for="info_planned_time"/>
-					<date-duration id="info_planned_time" display_format="$cont[duration_format]"  class="infolog_date_duration" hours_per_day="$cont[hours_per_workday]"/>
+					<et2-description  value="planned time" for="info_planned_time"></et2-description>
+					<et2-date-duration  id="info_planned_time" class="infolog_date_duration" displayFormat="$cont[duration_format]" hoursPerDay="$cont[hours_per_workday]"></et2-date-duration>
 				</row>
 				<row>
-					<description value="Re-planned time" for="info_replanned_time"/>
-					<date-duration id="info_replanned_time" display_format="$cont[duration_format]"  class="infolog_date_duration" hours_per_day="$cont[hours_per_workday]"/>
+					<et2-description  value="Re-planned time" for="info_replanned_time"></et2-description>
+					<et2-date-duration  id="info_replanned_time" class="infolog_date_duration" displayFormat="$cont[duration_format]" hoursPerDay="$cont[hours_per_workday]"></et2-date-duration>
 				</row>
 				<row>
-					<description statustext="Leave blank to get the used time calculated by timesheet entries" value="used time" for="info_used_time"/>
-					<date-duration id="info_used_time" span="2" display_format="$cont[duration_format]" class="infolog_date_duration" hours_per_day="$cont[hours_per_workday]"/>
+					<et2-description  statustext="Leave blank to get the used time calculated by timesheet entries" value="used time" for="info_used_time"></et2-description>
+					<et2-date-duration  id="info_used_time" span="2" class="infolog_date_duration" displayFormat="$cont[duration_format]" hoursPerDay="$cont[hours_per_workday]"></et2-date-duration>
 				</row>
 			</rows>
 		</grid>
@@ -64,42 +64,36 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="CC"/>
-					<taglist-email id="info_cc"  width="100%" empty_label="email"/>
+					<et2-description  value="CC"></et2-description>
+					<et2-select-email  id="info_cc" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="email"></et2-select-email>
 				</row>
 				<row>
-					<description value="Responsible" for="info_responsible"/>
-					<menulist width="100%">
-						<menupopup type="select-account" statustext="select a responsible user: a person you want to delegate this task" id="info_responsible" multiple="true" no_lang="1" tags="true" class="et2_fullWidth" account_type="both" empty_label="User or group"/>
-					</menulist>
+					<et2-description  value="Responsible" for="info_responsible"></et2-description>
+					<et2-select-account  width="100%" statustext="select a responsible user: a person you want to delegate this task" id="info_responsible" multiple="true" placeholder="User or group" noLang="1" accountType="both"></et2-select-account>
 				</row>
 				<row>
-					<description value="Category" for="info_cat"/>
-					<menulist class="et2_fullWidth">
-							<menupopup type="select-cat" statustext="select a category for this entry" id="info_cat" options="None"/>
-					</menulist>
+					<et2-description  value="Category" for="info_cat"></et2-description>
+					<et2-select-cat  statustext="select a category for this entry" id="info_cat" emptyLabel="None"></et2-select-cat>
 				</row>
 				<row >
-					<description value="Parent" font_style="1"/>
-					<link-entry id="info_id_parent" options="infolog" class="et2_fullWidth"/>
+					<et2-description  value="Parent" fontStyle="1"></et2-description>
+					<et2-link-entry  id="info_id_parent" onlyApp="infolog"></et2-link-entry>
 				</row>
 				<row>
-					<description value="Location" for="info_location"/>
-					<textbox id="info_location" size="60" maxlength="255" class="et2_fullWidth"/>
+					<et2-description  value="Location" for="info_location"></et2-description>
+					<et2-textbox  id="info_location" maxlength="255"></et2-textbox>
 				</row>
 				<row>
-					<description value="Priority" for="info_priority"/>
-					<menulist class="et2_fullWidth">
-							<menupopup statustext="select a priority for this task" id="info_priority"/>
-					</menulist>
+					<et2-description  value="Priority" for="info_priority"></et2-description>
+					<et2-select  statustext="select a priority for this task" id="info_priority"></et2-select>
 				</row>
 				<row>
-					<description value="Date completed" for="info_datecompleted"/>
-					<date-time statustext="Date completed (leave it empty to have it automatic set if status is done or billed)" id="info_datecompleted" class="et2_fullWidth"/>
+					<et2-description  value="Date completed" for="info_datecompleted"></et2-description>
+					<et2-date-time  statustext="Date completed (leave it empty to have it automatic set if status is done or billed)" id="info_datecompleted"></et2-date-time>
 				</row>
 				<row>
-					<description value="Contact" for="info_from"/>
-					<textbox blur="@blur_title" class="et2_fullWidth" statustext="Custom contact-information, leave emtpy to use information from most recent link" id="info_from" size="60" maxlength="255"/>
+					<et2-description  value="Contact" for="info_from"></et2-description>
+					<et2-textbox  statustext="Custom contact-information, leave emtpy to use information from most recent link" id="info_from" maxlength="255" placeholder="@blur_title"></et2-textbox>
 				</row>
 			</rows>
 		</grid>
@@ -112,29 +106,25 @@
 			</columns>
 			<rows>
 				<row disabled="!@info_owner">
-					<description value="Owner"/>
-					<menulist>
-							<menupopup type="select-account" id="info_owner" readonly="true"/>
-					</menulist>
+					<et2-description  value="Owner"></et2-description>
+					<et2-select-account  id="info_owner" readonly="true"></et2-select-account>
 				</row>
 				<row>
-					<description value="Created"/>
-					<date-time id="info_created" readonly="true"/>
+					<et2-description  value="Created"></et2-description>
+					<et2-date-time  id="info_created" readonly="true"></et2-date-time>
 				</row>
 				<row>
-					<description value="Private" for="info_access"/>
-					<checkbox statustext="should this entry only be visible to you and people you grant privat access via the ACL" id="info_access" options="private,public"/>
+					<et2-description  value="Private" for="info_access"></et2-description>
+					<et2-checkbox  statustext="should this entry only be visible to you and people you grant privat access via the ACL" id="info_access" selectedValue="private" unselectedValue="public" ></et2-checkbox>
 				</row>
 
 				<row>
-					<description value="Last modified"/>
-					<menulist>
-							<menupopup type="select-account" id="info_modifier" readonly="true"/>
-					</menulist>
+					<et2-description  value="Last modified"></et2-description>
+					<et2-select-account  id="info_modifier" readonly="true"></et2-select-account>
 				</row>
 				<row>
-					<description/>
-					<date-time id="info_datemodified" readonly="true"/>
+					<et2-description></et2-description>
+					<et2-date-time  id="info_datemodified" readonly="true"></et2-date-time>
 				</row>
 			</rows>
 		</grid>
@@ -147,65 +137,61 @@
 			</columns>
 			<rows>
 				<row class="dialogHeadbar" >
-					<box>
-						<textbox type="integer" id="info_number" readonly="true" class="entry_id"/>
-					</box>
+					<et2-box>
+						<et2-number  id="info_number" readonly="true" class="entry_id" precision="0"></et2-number>
+					</et2-box>
 				</row>
 				<row>
-					<description value="Title" for="info_subject"/>
-					<textbox statustext="a short subject for the entry" id="info_subject" class="et2_fullWidth et2_required" maxlength="255" span="5" tabindex="1"/>
+					<et2-description  value="Title" for="info_subject"></et2-description>
+					<et2-textbox  statustext="a short subject for the entry" id="info_subject" class="et2_required" maxlength="255" span="5" tabindex="1"></et2-textbox>
 				</row>
 				<row>
-					<description value="Type" for="info_type"/>
-					<menulist class="et2_fullWidth">
-						<menupopup statustext="Type of the log-entry: Note, Phonecall or ToDo" id="info_type" no_lang="1"/>
-					</menulist>
+					<et2-description  value="Type" for="info_type"></et2-description>
+					<et2-select  statustext="Type of the log-entry: Note, Phonecall or ToDo" id="info_type" noLang="1"></et2-select>
 				</row>
 				<row>
-					<description value="Contact"/>
-					<link-entry id="info_contact" span="4"/>
+					<et2-description  value="Contact"></et2-description>
+					<et2-link-entry  id="info_contact" span="4"></et2-link-entry>
 				</row>
 				<row>
-					<description value="Startdate" for="info_startdate"/>
-					<date-time statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)" id="info_startdate" class="et2_fullWidth"/>
+					<et2-description  value="Startdate" for="info_startdate"></et2-description>
+					<et2-date-time  statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)" id="info_startdate"></et2-date-time>
 				</row>
 				<row>
-					<description value="Enddate" for="info_enddate"/>
-					<date-time statustext="til when should the ToDo or Phonecall be finished" id="info_enddate" class="et2_fullWidth"/>
+					<et2-description  value="Enddate" for="info_enddate"></et2-description>
+					<et2-date-time  statustext="til when should the ToDo or Phonecall be finished" id="info_enddate"></et2-date-time>
 				</row>
 				<row>
-					<description value="Status" for="info_status"/>
-					<menulist class="et2_fullWidth">
-						<menupopup statustext="@status_help" id="info_status"/>
-					</menulist>
+					<et2-description  value="Status" for="info_status"></et2-description>
+					<et2-select  statustext="@status_help" id="info_status"></et2-select>
 				</row>
 				<row>
-					<description value="Completed" for="info_percent"/>
-					<menulist class="et2_fullWidth" span="4">
-						<menupopup type="select-percent" statustext="Percent completed" id="info_percent"/>
-					</menulist>
+					<et2-description  value="Completed" for="info_percent"></et2-description>
+					<et2-select-percent  span="4" statustext="Percent completed" id="info_percent"></et2-select-percent>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" width="100%" align_tabs="v">
-						<tabs>
-							<tab id="description" label="Description" statustext="longer textual description"/>
-							<tab id="details" label="Details" statustext="Location, priority , ..."/>
-							<tab id="links" label="Links" statustext="Links of this entry"/>
-							<tab id="project" label="Projectmanager" statustext="Project settings: price, times"/>
-							<tab id="customfields" label="Customfields" statustext="Custom fields"/>
-							<tab id="ownership" label="Ownership" statustext="Ownership"/>
-						</tabs>
-						<tabpanels>
+					<et2-vbox  id="tabs" span="all" width="100%">
+						<et2-details  id="description" summary="Description" title="longer textual description">
 							<template id="infolog.view.description"/>
+						</et2-details>
+						<et2-details  id="details" summary="Details" title="Location, priority , ...">
 							<template id="infolog.view.details"/>
+						</et2-details>
+						<et2-details  id="links" summary="Links" title="Links of this entry">
 							<template id="infolog.view.links"/>
+						</et2-details>
+						<et2-details  id="project" summary="Projectmanager" title="Project settings: price, times">
 							<template id="infolog.view.project"/>
+						</et2-details>
+						<et2-details  id="customfields" summary="Customfields" title="Custom fields">
 							<template id="infolog.view.customfields"/>
+						</et2-details>
+						<et2-details  id="ownership" summary="Ownership" title="Ownership">
 							<template id="infolog.view.ownership"/>
-						</tabpanels>
-					</tabbox>
+						</et2-details>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/infolog/templates/test/entry_test.xet b/infolog/templates/test/entry_test.xet
index ac6452ac0d..2ae489e2e0 100644
--- a/infolog/templates/test/entry_test.xet
+++ b/infolog/templates/test/entry_test.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!--
 This template is used for client-side testing, and needs these custom fields to work properly:
 Infolog:
@@ -13,28 +13,28 @@ Include it into the normal edit template with:
 -->
 <overlay>
 	<template id="infolog.entry_test.Thorsby.locality">
-		<vbox>
-			<description value="THORSBY"/>
+		<et2-vbox>
+			<et2-description  value="THORSBY"></et2-description>
 			<contact-account value="info_modifier" id="info_modifier_fn" options="n_fn" label="Modifier full name:"/>
-		</vbox>
+		</et2-vbox>
 	</template>
 	<template id="infolog.entry_test.Kaiserslautern.locality">
-		<vbox>
-			<description value="KAISERSLAUTERN"/>
+		<et2-vbox>
+			<et2-description  value="KAISERSLAUTERN"></et2-description>
 			<contact-account value="info_modifier" id="info_modifier_fn" options="n_fn" label="Modifier full name:"/>
-		</vbox>
+		</et2-vbox>
 	</template>
 	<template id="infolog.entry_test" lang="" group="0" version="1.9">
-		<vbox>
+		<et2-vbox>
 		<!-- These are all the same -->
-		<description value="Contact's Email:"/>
+		<et2-description  value="Contact's Email:"></et2-description>
 		<contact-value id="info_contact_email" value="info_contact" options="email"/>
 		<contact-value id="info_contact_email" value="info_contact" field="email"/>
 		<contact-value id="info_contact" options="email"/>
 		<hrule/>
 
 		<!-- These use some of the other attributes -->
-		<description value="Entry alternate field attribute using numeric custom fields #chrgs1 &amp; #chrgs2 and #date:"/>
+		<et2-description  value="Entry alternate field attribute using numeric custom fields #chrgs1 &amp; #chrgs2 and #date:"></et2-description>
 		<infolog-value id="info_id"  options=",,#chrgs1:#chrgs2" label="First non-empty:"/>
 		<infolog-value id="info_id" field="sum" alternate_fields="#chrgs1:#chrgs2" label="Sum:"/>
 		<infolog-value id="info_id" field="sum" options=",,#chrgs1:#chrgs2" label="Sum:"/>
@@ -43,15 +43,15 @@ Include it into the normal edit template with:
 		<hrule/>
 
 		<!-- Accessing other application info -->
-		<description value="Values from other applications using Infolog cf #tracker and Tracker cf #gender"/>
+		<et2-description  value="Values from other applications using Infolog cf #tracker and Tracker cf #gender"></et2-description>
 		<infolog-value id="is_tracker_male" value="info_id" field="#tracker/#gender" label="Tracker gender cf:"/>
 		<tracker-value id="#tracker" field="#gender" compare="Male" class="bill_11m" label="Tracker gender is Male:"/>
 		<tracker-value id="#tracker" field="#gender" compare="Female" class="bill_11f" label="Tracker gender is Female:"/>
 		<hrule/>
 
-		<description value="A whole template based on modifier's town (Thorsby or Kaiserslautern)"/>
+		<et2-description  value="A whole template based on modifier's town (Thorsby or Kaiserslautern)"></et2-description>
 		<contact-template label="infolog.entry_test.%s.locality" id="info_modifier_versicherung" field="adr_one_locality" value="info_modifier" span="all"/>
 
-		</vbox>
+		</et2-vbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/acl.xet b/mail/templates/default/acl.xet
index 0208c4b933..2002f6df14 100755
--- a/mail/templates/default/acl.xet
+++ b/mail/templates/default/acl.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.acl" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%" height="100%">
@@ -10,16 +9,14 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader">
-					<description value="Mail ACL"  />
+					<et2-description  value="Mail ACL"></et2-description>
 				</row>
 				<row>
-					<description value="Folder"/>
-					<taglist id="mailbox" width="100%" maxSelection="1" height="150" multiple="false"
-                             allowFreeEntries="false" searchUrl="mail.mail_compose.ajax_searchFolder"
-                             onchange='app.mail.acl_folderChange'/>
+					<et2-description  value="Folder"></et2-description>
+					<et2-select  id="mailbox" width="100%" height="150" allowFreeEntries="false" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_search" onchange="app.mail.acl_folderChange"></et2-select>
 				</row>
 				<row>
-					<description value="Rights"/>
+					<et2-description  value="Rights"></et2-description>
 					<grid id="grid" width="100%">
 						<columns>
 							<column/>
@@ -42,46 +39,44 @@
 						</columns>
 						<rows>
 							<row class="th">
-								<description value="Name"/>
-								<description value="Common ACL"/>
-								<description align="center" statustext="Lookup (mailbox is visible to LIST/LSUB commands, SUBSCRIBE mailbox)" value="L"/>
-								<description align="center" statustext="Read (SELECT the mailbox, perform STATUS)" value="R"/>
-								<description align="center" statustext="Keep seen/unseen information across sessions (set or clear \SEEN flag via STORE, also set \SEEN during APPEND/COPY/ FETCH BODY[...])" value="S"/>
-								<description align="center" statustext="Write (set or clear flags other than \SEEN and \DELETED via STORE, also set them during APPEND/COPY)" value="W"/>
-								<description align="center" statustext="Insert (perform APPEND, COPY into mailbox)" value="I"/>
-								<description align="center" statustext="Post (send mail to submission address for mailbox, not enforced by IMAP4 itself)" value="P"/>
-								<description align="center" statustext="Obsolet create right, combination rights of K and X" value="C"/>
-								<description align="center" statustext="Obsolete delete right, combination rights of E, T and X" value="D"/>
-								<description align="center" statustext="Create mailboxes (CREATE new sub-mailboxes in any implementation-defined hierarchy, parent mailbox for the new mailb" value="K"/>
-								<description align="center" statustext="Delete mailbox (DELETE mailbox, old mailbox name in RENAME)" value="X"/>
-								<description align="center" statustext="Delete messages (set or clear \DELETED flag via STORE, set \DELETED flag during APPEND/COPY)" value="T"/>
-								<description align="center" statustext="Perform EXPUNGE and expunge as a part of CLOSE" value="E"/>
-								<description align="center" statustext="Administer (perform SETACL/DELETEACL/GETACL/LISTRIGHTS)" value="A"/>
-								<description align="center" statustext="Apply rights recursively to sub-folders" value="Recursively"/>
-								<description value="Action"/>
+								<et2-description  value="Name"></et2-description>
+								<et2-description  value="Common ACL"></et2-description>
+								<et2-description  align="center" statustext="Lookup (mailbox is visible to LIST/LSUB commands, SUBSCRIBE mailbox)" value="L"></et2-description>
+								<et2-description  align="center" statustext="Read (SELECT the mailbox, perform STATUS)" value="R"></et2-description>
+								<et2-description  align="center" statustext="Keep seen/unseen information across sessions (set or clear \SEEN flag via STORE, also set \SEEN during APPEND/COPY/ FETCH BODY[...])" value="S"></et2-description>
+								<et2-description  align="center" statustext="Write (set or clear flags other than \SEEN and \DELETED via STORE, also set them during APPEND/COPY)" value="W"></et2-description>
+								<et2-description  align="center" statustext="Insert (perform APPEND, COPY into mailbox)" value="I"></et2-description>
+								<et2-description  align="center" statustext="Post (send mail to submission address for mailbox, not enforced by IMAP4 itself)" value="P"></et2-description>
+								<et2-description  align="center" statustext="Obsolet create right, combination rights of K and X" value="C"></et2-description>
+								<et2-description  align="center" statustext="Obsolete delete right, combination rights of E, T and X" value="D"></et2-description>
+								<et2-description  align="center" statustext="Create mailboxes (CREATE new sub-mailboxes in any implementation-defined hierarchy, parent mailbox for the new mailb" value="K"></et2-description>
+								<et2-description  align="center" statustext="Delete mailbox (DELETE mailbox, old mailbox name in RENAME)" value="X"></et2-description>
+								<et2-description  align="center" statustext="Delete messages (set or clear \DELETED flag via STORE, set \DELETED flag during APPEND/COPY)" value="T"></et2-description>
+								<et2-description  align="center" statustext="Perform EXPUNGE and expunge as a part of CLOSE" value="E"></et2-description>
+								<et2-description  align="center" statustext="Administer (perform SETACL/DELETEACL/GETACL/LISTRIGHTS)" value="A"></et2-description>
+								<et2-description  align="center" statustext="Apply rights recursively to sub-folders" value="Recursively"></et2-description>
+								<et2-description  value="Action"></et2-description>
 							</row>
 							<row class="row">
-								<taglist-account id="${row}[acc_id]" allowFreeEntries="true" maxSelection="1" height="70" account_type="@account_type" />
-								<menulist>
-									<menupopup id="${row}[acl]"  onchange="app.mail.acl_common_rights_selector"/>
-								</menulist>
-								<checkbox align="center" id="${row}[acl_l]" onchange="app.mail.acl_common_rights"/>
-								<checkbox align="center" id="${row}[acl_r]" onchange="app.mail.acl_common_rights"/>
-								<checkbox align="center" id="${row}[acl_s]" onchange="app.mail.acl_common_rights"/>
-								<checkbox align="center" id="${row}[acl_w]" onchange="app.mail.acl_common_rights"/>
-								<checkbox align="center" id="${row}[acl_i]" onchange="app.mail.acl_common_rights"/>
-								<checkbox align="center" id="${row}[acl_p]" onchange="app.mail.acl_common_rights"/>
-								<checkbox align="center" id="${row}[acl_c]" onchange="app.mail.acl_common_rights"/>
-								<checkbox align="center" id="${row}[acl_d]" onchange="app.mail.acl_common_rights"/>
-								<checkbox align="center" id="${row}[acl_k]" onchange="app.mail.acl_common_rights"/>
-								<checkbox align="center" id="${row}[acl_x]" onchange="app.mail.acl_common_rights"/>
-								<checkbox align="center" id="${row}[acl_t]" onchange="app.mail.acl_common_rights"/>
-								<checkbox align="center" id="${row}[acl_e]" onchange="app.mail.acl_common_rights"/>
-								<checkbox align="center" id="${row}[acl_a]" onchange="app.mail.acl_common_rights"/>
-								<checkbox align="center" id="${row}[acl_recursive]"/>
-								<hbox orient=",0,0">
-									<button align="right" statustext="Delete this ACL" label="Delete" id="delete[${row}]" value="${row}" image="delete" onclick="et2_dialog.confirm(widget,'Do you really want to remove all rights from this account?','Remove')"/>
-								</hbox>
+								<et2-select-account  id="${row}[acc_id]" allowFreeEntries="true" height="70" accountType="@account_type"></et2-select-account>
+								<et2-select  id="${row}[acl]" onchange="app.mail.acl_common_rights_selector"></et2-select>
+								<et2-checkbox  align="center" id="${row}[acl_l]" onchange="app.mail.acl_common_rights"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[acl_r]" onchange="app.mail.acl_common_rights"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[acl_s]" onchange="app.mail.acl_common_rights"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[acl_w]" onchange="app.mail.acl_common_rights"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[acl_i]" onchange="app.mail.acl_common_rights"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[acl_p]" onchange="app.mail.acl_common_rights"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[acl_c]" onchange="app.mail.acl_common_rights"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[acl_d]" onchange="app.mail.acl_common_rights"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[acl_k]" onchange="app.mail.acl_common_rights"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[acl_x]" onchange="app.mail.acl_common_rights"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[acl_t]" onchange="app.mail.acl_common_rights"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[acl_e]" onchange="app.mail.acl_common_rights"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[acl_a]" onchange="app.mail.acl_common_rights"></et2-checkbox>
+								<et2-checkbox  align="center" id="${row}[acl_recursive]"></et2-checkbox>
+								<et2-hbox  orient=",0,0">
+									<et2-button  align="right" statustext="Delete this ACL" label="Delete" id="delete[${row}]" value="${row}" image="delete" onclick="et2_dialog.confirm(widget,'Do you really want to remove all rights from this account?','Remove')"></et2-button>
+								</et2-hbox>
 							</row>
 						</rows>
 					</grid>
@@ -95,13 +90,13 @@
 					</grid>
 				</row>
 				<row class="dialogFooterToolbar">
-					<hbox>
-						<button label="Save" id="button[save]"/>
-						<button label="Apply" id="button[apply]"/>
-						<buttononly label="Cancel" id="button[cancel]" onclick="window.close()"/>
-					</hbox>
+					<et2-hbox>
+						<et2-button  label="Save" id="button[save]"></et2-button>
+						<et2-button  label="Apply" id="button[apply]"></et2-button>
+						<et2-button  label="Cancel" id="button[cancel]" onclick="window.close()" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/checkmailbox.xet b/mail/templates/default/checkmailbox.xet
index d3e0b69a59..f653249225 100644
--- a/mail/templates/default/checkmailbox.xet
+++ b/mail/templates/default/checkmailbox.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.checkmailbox" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -12,35 +11,35 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<vbox options="0,0">
-						<description value="Folder" readonly="true"/>
-					</vbox>
-					<vbox options="0,0">
-						<description value="Subject" readonly="true"/>
-					</vbox>
-					<vbox options="0,0">
-						<description value="From" readonly="true"/>
-					</vbox>
-					<vbox options="0,0">
-						<description value="Received" readonly="true"/>
-					</vbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-description  value="Folder" readonly="true"></et2-description>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-description  value="Subject" readonly="true"></et2-description>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-description  value="From" readonly="true"></et2-description>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-description  value="Received" readonly="true"></et2-description>
+					</et2-vbox>
 				</row>
 				<row class="row" valign="top">
-					<vbox options="0,0">
-						<description id="${row}[mail_folder]"/>
-					</vbox>
-					<vbox options="0,0">
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-description  id="${row}[mail_folder]"></et2-description>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
 						<!-- description id="${row}[mail_subject]" no_lang="1" font_style="b" href="mail.mail_ui.displayMessage&amp;uid=$row_cont[mail_uid]&amp;mailbox=$row_cont[mail_folder_base64]" extra_link_popup="750x500"/ -->
-						<description id="${row}[mail_subject]" no_lang="1" font_style="b"/>
-					</vbox>
-					<vbox options="0,0">
-						<url-email id="${row}[mail_from]" no_lang="1" readonly="true"/>
-					</vbox>
-					<vbox options="0,0">
-						<date-time id="${row}[mail_received]" readonly="true" options=",8"/>
-					</vbox>
+						<et2-description  id="${row}[mail_subject]" noLang="1" fontStyle="b"></et2-description>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-url-email  id="${row}[mail_from]" readonly="true" noLang="1"></et2-url-email>
+					</et2-vbox>
+					<et2-vbox  cellpadding="0" cellspacing="0" >
+						<et2-date-time  id="${row}[mail_received]" readonly="true" ></et2-date-time>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index 58fe9865eb..46fc3a97b5 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.compose" template="" lang="" group="0" version="1.9.001">
-		<vbox class="mailCompose mailComposeHeaderSection" width="100%">
+		<et2-vbox  class="mailCompose mailComposeHeaderSection" width="100%">
 			<toolbar id="composeToolbar" width="et2_fullWidth" view_range="7" flat_list="false" list_header="short"/>
-			<hbox class="mail-compose_toolbar_assist" width="100%">
+			<et2-hbox  class="mail-compose_toolbar_assist" width="100%">
 				<vfs-select class="$cont[vfsNotAvailable] compose_egw_icons" dialog_title="Attach files" button_label="attach" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose" button_caption=""/>
-				<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='attachments' onFinish="app.mail.uploadForCompose" onStart="app.mail.composeUploadStart" id="uploadForCompose" drop_target ="mail-compose"/>
-				<checkbox statustext="check to save as infolog on send" id="to_infolog" options="on,off"/>
-				<checkbox statustext="check to save as tracker entry on send" id="to_tracker" options="on,off"/>
-				<checkbox statustext="check to save as calendar event on send" id="to_calendar" options="on,off"/>
-				<checkbox statustext="check to receive a notification when the message is read (note: not all clients support this and/or the receiver may not authorize the notification)" id="disposition" options="on,off"/>
-				<checkbox statustext="check to sign the message on send" id="smime_sign" options="on,off"/>
-				<checkbox statustext="check to encrypt the message on send" id="smime_encrypt" options="on,off"/>
-				<textbox id="appendix_data"/>
-				<passwd id="smime_passphrase"/>
-				<taglist id="to_integrate_ids"/>
-				<menulist>
-					<menupopup id="priority"/>
-				</menulist>
-			</hbox>
+				<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple="true" progress="attachments" onFinish="app.mail.uploadForCompose" onStart="app.mail.composeUploadStart" id="uploadForCompose" drop_target ="mail-compose"/>
+				<et2-checkbox  statustext="check to save as infolog on send" id="to_infolog" selectedValue="on" unselectedValue="off" ></et2-checkbox>
+				<et2-checkbox  statustext="check to save as tracker entry on send" id="to_tracker" selectedValue="on" unselectedValue="off" ></et2-checkbox>
+				<et2-checkbox  statustext="check to save as calendar event on send" id="to_calendar" selectedValue="on" unselectedValue="off" ></et2-checkbox>
+				<et2-checkbox  statustext="check to receive a notification when the message is read (note: not all clients support this and/or the receiver may not authorize the notification)" id="disposition" selectedValue="on" unselectedValue="off" ></et2-checkbox>
+				<et2-checkbox  statustext="check to sign the message on send" id="smime_sign" selectedValue="on" unselectedValue="off" ></et2-checkbox>
+				<et2-checkbox  statustext="check to encrypt the message on send" id="smime_encrypt" selectedValue="on" unselectedValue="off" ></et2-checkbox>
+				<et2-textbox  id="appendix_data"></et2-textbox>
+				<et2-password  id="smime_passphrase"></et2-password>
+				<et2-select  id="to_integrate_ids" multiple="true" allowFreeEntries="true" editModeEnabled="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_search"></et2-select>
+				<et2-select  id="priority"></et2-select>
+			</et2-hbox>
 
 			<grid  width="100%" resize_ratio="0">
 				<columns>
@@ -30,67 +27,65 @@
 				</columns>
 				<rows>
 					<row class="mailComposeHeaders" >
-						<description value="From"/>
-						<select id="mailaccount" onchange="app.mail.submitOnChange" class="et2_fullWidth"/>
-						<vbox>
-							<description id="replyto_expander" value="Reply to" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
-							<description id="folder_expander" value="Folder" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="composeID"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="serverID"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="processedmail_id"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="mode"/>
-							<textbox class="mail-index_quotaDisplayNone" id="lastDrafted"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="references"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="in-reply-to"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="thread-topic"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="thread-index"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="list-id"/>
-						</vbox>
+						<et2-description  value="From"></et2-description>
+						<et2-select  id="mailaccount" onchange="app.mail.submitOnChange"></et2-select>
+						<et2-vbox>
+							<et2-description  id="replyto_expander" value="Reply to" class="et2_button_text" onclick="app.mail.compose_fieldExpander"></et2-description>
+							<et2-description  id="folder_expander" value="Folder" class="et2_button_text" onclick="app.mail.compose_fieldExpander"></et2-description>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="composeID"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="serverID"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="processedmail_id"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="mode"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" id="lastDrafted"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="references"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="in-reply-to"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="thread-topic"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="thread-index"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="list-id"></et2-textbox>
+						</et2-vbox>
 					</row>
 					<row class="mailComposeHeaders mailComposeJQueryReplyto">
-						<description value="Reply to"/>
-						<taglist-email id="replyto" width="100%" onclick="app.mail.address_click"/>
-						<description/>
+						<et2-description  value="Reply to"></et2-description>
+						<et2-select-email  id="replyto" width="100%" onclick="app.mail.address_click" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-select-email>
+						<et2-description></et2-description>
 					</row>
 					<row class="mailComposeHeaders mailComposeJQueryFolder">
-						<description value="Folder"/>
-						<taglist id="folder" autocomplete_url="mail.mail_compose.ajax_searchFolder" autocomplete_params="" allowFreeEntries="false" onclick="app.mail.address_click"/>
-						<description/>
+						<et2-description  value="Folder"></et2-description>
+						<et2-select  id="folder" allowFreeEntries="false" onclick="app.mail.address_click" multiple="true" searchUrl="mail.mail_compose.ajax_searchFolder" searchOptions=""></et2-select>
+						<et2-description></et2-description>
 					</row>
 					<row class="mailComposeHeaders" >
-						<description value="To"/>
-						<taglist-email id="to" allowDragAndDrop="true" width="100%" onclick="app.mail.address_click"
-                                       multiple="true" include_lists="true" onchange="app.mail.recipients_onchange"
-                                       empty_label="select or insert email address" autofocus="true"/>
-						<hbox>
-							<description id="cc_expander" value="Cc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
-							<description id="bcc_expander" value="Bcc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
-						</hbox>
+						<et2-description  value="To"></et2-description>
+						<et2-select-email  id="to" allowDragAndDrop="true" width="100%" onclick="app.mail.address_click" multiple="true" onchange="app.mail.recipients_onchange" autofocus="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="select or insert email address" includeLists="true"></et2-select-email>
+						<et2-hbox>
+							<et2-description  id="cc_expander" value="Cc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"></et2-description>
+							<et2-description  id="bcc_expander" value="Bcc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"></et2-description>
+						</et2-hbox>
 					</row>
 					<row class="mailComposeHeaders mailComposeJQueryCc">
-						<description value="Cc"/>
-						<taglist-email id="cc" width="100%" allowDragAndDrop="true" onclick="app.mail.address_click" multiple="true" include_lists="true" onchange="app.mail.recipients_onchange" empty_label="select or insert email address"/>
-						<description/>
+						<et2-description  value="Cc"></et2-description>
+						<et2-select-email  id="cc" width="100%" allowDragAndDrop="true" onclick="app.mail.address_click" multiple="true" onchange="app.mail.recipients_onchange" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="select or insert email address" includeLists="true"></et2-select-email>
+						<et2-description></et2-description>
 					</row>
 					<row  class="mailComposeHeaders mailComposeJQueryBcc">
-						<description value="Bcc"/>
-						<taglist-email id="bcc" width="100%" allowDragAndDrop="true" onclick="app.mail.address_click" multiple="true" include_lists="true" onchange="app.mail.recipients_onchange" empty_label="select or insert email address"/>
-						<description/>
+						<et2-description  value="Bcc"></et2-description>
+						<et2-select-email  id="bcc" width="100%" allowDragAndDrop="true" onclick="app.mail.address_click" multiple="true" onchange="app.mail.recipients_onchange" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="select or insert email address" includeLists="true"></et2-select-email>
+						<et2-description></et2-description>
 					</row>
 					<row class="mailComposeHeaders">
-						<description value="Subject"/>
-						<textbox align="left" width="100%" id="subject" height="25" onchange="app.mail.subject2title"/>
-						<hbox align="left">
-							<checkbox statustext="Change editor type" label="HTML" id="mimeType" onchange="app.mail.submitOnChange" options=",, ,disable" tabindex="7"/>
-						</hbox>
+						<et2-description  value="Subject"></et2-description>
+						<et2-textbox  align="left" width="100%" id="subject" height="25" onchange="app.mail.subject2title"></et2-textbox>
+						<et2-hbox  align="left">
+							<et2-checkbox  statustext="Change editor type" label="HTML" id="mimeType" onchange="app.mail.submitOnChange" tabindex="7" roTrue=" " roFalse="disable"></et2-checkbox>
+						</et2-hbox>
 					</row>
 				</rows>
 			</grid>
-		</vbox>
-		<vbox class="mailComposeBodySection" width="100%">
-			<vbox class="et2_file mailUploadSection" disabled="@no_griddata">
+		</et2-vbox>
+		<et2-vbox  class="mailComposeBodySection" width="100%">
+			<et2-vbox  class="et2_file mailUploadSection" disabled="@no_griddata">
 				<et2-details  toggleAlign="left" title="@attachmentsBlockTitle" toggleOnHover="true" class="attachments" hoist="true" disabled="!@attachments">
-					<hbox slot="summary">
+					<et2-hbox  slot="summary">
 						<grid class="previewAttachmentArea egwGridView_grid" >
 							<columns>
 								<column width= "3%"/>
@@ -100,14 +95,14 @@
 							</columns>
 							<rows>
 								<row class="row attachmentRow">
-									<image src="@attachments[0][filemode_icon]" statustext="@attachments[0][filemode_title]"/>
-									<description id="attachments[0][tmp_name]"/>
-									<description class="useEllipsis et2_link" value="@attachments[0][name]" id="0[name]" no_lang="1" onclick="app.mail.displayUploadedFile"/>
+									<et2-image  src="@attachments[0][filemode_icon]" statustext="@attachments[0][filemode_title]"></et2-image>
+									<et2-description  id="attachments[0][tmp_name]"></et2-description>
+									<et2-description  class="useEllipsis et2_link" value="@attachments[0][name]" id="0[name]" onclick="app.mail.displayUploadedFile" noLang="1"></et2-description>
 									<vfs-size align="right" id="attachments[0][size]" />
 								</row>
 							</rows>
 						</grid>
-					</hbox>
+					</et2-hbox>
 					<grid id="attachments" class="previewAttachmentArea egwGridView_grid">
 						<columns>
 							<column width= "3%"/>
@@ -118,31 +113,31 @@
 						</columns>
 						<rows>
 							<row class="row attachmentRow">
-								<image src="$row_cont[filemode_icon]" statustext="$row_cont[filemode_title]"/>
-								<description id="${row}[tmp_name]"/>
-								<description class="useEllipsis et2_link" id="${row}[name]" no_lang="1" onclick="app.mail.displayUploadedFile"/>
+								<et2-image  src="$row_cont[filemode_icon]" statustext="$row_cont[filemode_title]"></et2-image>
+								<et2-description  id="${row}[tmp_name]"></et2-description>
+								<et2-description  class="useEllipsis et2_link" id="${row}[name]" onclick="app.mail.displayUploadedFile" noLang="1"></et2-description>
 								<vfs-size align="right" id="${row}[size]" />
-								<button id="delete[$row_cont[tmp_name]]" value="Delete" image="delete"/>
+								<et2-button-icon  id="delete[$row_cont[tmp_name]]" value="Delete" image="delete"></et2-button-icon>
 							</row>
 						</rows>
 					</grid>
 				</et2-details>
-				<hbox>
-					<select id="filemode" label="Send files as" onchange="app.mail.check_sharing_filemode"/>
-					<hbox>
-						<description value="Expiration"/>
-						<date id="expiration" blur="@expiration_blur" data_format="Y-m-d"/>
-					</hbox>
-					<passwd id="password" blur="password protect" statustext="Only makes sense, if you transport password through a different channel / outside of this mail to recipients!"/>
-				</hbox>
-			</vbox>
-			<hbox disabled="@is_plain" class="mailComposeBody mailComposeHtmlContainer">
+				<et2-hbox>
+					<et2-select  id="filemode" label="Send files as" onchange="app.mail.check_sharing_filemode"></et2-select>
+					<et2-hbox>
+						<et2-description  value="Expiration"></et2-description>
+						<et2-date  id="expiration" placeholder="@expiration_blur" dataFormat="Y-m-d"></et2-date>
+					</et2-hbox>
+					<et2-password  id="password" statustext="Only makes sense, if you transport password through a different channel / outside of this mail to recipients!" placeholder="password protect"></et2-password>
+				</et2-hbox>
+			</et2-vbox>
+			<et2-hbox  disabled="@is_plain" class="mailComposeBody mailComposeHtmlContainer">
 				<htmlarea name="mail_htmltext" id="mail_htmltext" statusbar="false" menubar="false" toolbar="@html_toolbar" imageUpload="link_to" expand_toolbar="true" height="478px" width="100%" resize_ratio="0"/>
-			</hbox>
-			<hbox disabled="@is_html" class="mailComposeBody mailComposeTextContainer">
-				<textbox multiline="true" rows="40" cols="120" width="100%" span="all" no_lang="1" name="mail_plaintext" id="mail_plaintext" resize_ratio="0"/>
-			</hbox>
+			</et2-hbox>
+			<et2-hbox  disabled="@is_html" class="mailComposeBody mailComposeTextContainer">
+				<et2-textarea  rows="40" cols="120" width="100%" span="all" name="mail_plaintext" id="mail_plaintext" noLang="1" resizeRatio="0"></et2-textarea>
+			</et2-hbox>
 
-		</vbox>
+		</et2-vbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/config.xet b/mail/templates/default/config.xet
index 4f11237442..ebac1ba737 100644
--- a/mail/templates/default/config.xet
+++ b/mail/templates/default/config.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.config" template="" lang="" group="0" version="16.1">
 		<grid width="100%" class="admin-config egwGridView_grid">
@@ -10,125 +9,124 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Deny certain groups access to following features" span="all" class="subHeader"/>
+					<et2-description  value="Deny certain groups access to following features" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Create new account"/>
-					<select-account id="newsettings[deny_createaccount]" account_type="groups" multiple="true" tags="true" width="100%"/>
+					<et2-description  value="Create new account"></et2-description>
+					<et2-select-account  id="newsettings[deny_createaccount]" multiple="true" width="100%" accountType="groups"></et2-select-account>
 				</row>
 				<row>
-					<vbox>
-						<description value="Prevent managing folders"/>
-						<description value="Do you want to prevent the managing of folders (creation, accessrights AND subscribtion)?"/>
-					</vbox>
-					<select-account id="newsettings[deny_managefolders]" account_type="groups" multiple="true" tags="true" width="100%"/>
+					<et2-vbox>
+						<et2-description  value="Prevent managing folders"></et2-description>
+						<et2-description  value="Do you want to prevent the managing of folders (creation, accessrights AND subscribtion)?"></et2-description>
+					</et2-vbox>
+					<et2-select-account  id="newsettings[deny_managefolders]" multiple="true" width="100%" accountType="groups"></et2-select-account>
 				</row>
 				<row>
-					<vbox>
-						<description value="Prevent managing notifications"/>
-						<description value="Do you want to prevent the editing/setup of notification by mail to other emailadresses if emails arrive (, even if SIEVE is enabled)?"/>
-					</vbox>
-					<select-account id="newsettings[deny_notificationformailviaemail]" account_type="groups" multiple="true" tags="true" width="100%"/>
+					<et2-vbox>
+						<et2-description  value="Prevent managing notifications"></et2-description>
+						<et2-description  value="Do you want to prevent the editing/setup of notification by mail to other emailadresses if emails arrive (, even if SIEVE is enabled)?"></et2-description>
+					</et2-vbox>
+					<et2-select-account  id="newsettings[deny_notificationformailviaemail]" multiple="true" width="100%" accountType="groups"></et2-select-account>
 				</row>
 				<row>
-					<vbox>
-						<description value="Prevent managing filters"/>
-						<description value="Do you want to prevent the editing/setup of filter rules (, even if SIEVE is enabled)?"/>
-					</vbox>
-					<select-account id="newsettings[deny_editfilterrules]" account_type="groups" multiple="true" tags="true" width="100%"/>
+					<et2-vbox>
+						<et2-description  value="Prevent managing filters"></et2-description>
+						<et2-description  value="Do you want to prevent the editing/setup of filter rules (, even if SIEVE is enabled)?"></et2-description>
+					</et2-vbox>
+					<et2-select-account  id="newsettings[deny_editfilterrules]" multiple="true" width="100%" accountType="groups"></et2-select-account>
 				</row>
 				<row>
-					<vbox>
-						<description value="Prevent managing vacation notice"/>
-						<description value="Do you want to prevent the editing/setup of the absent/vacation notice (, even if SIEVE is enabled)?"/>
-					</vbox>
-					<select-account id="newsettings[deny_absentnotice]" account_type="groups" multiple="true" tags="true" width="100%"/>
+					<et2-vbox>
+						<et2-description  value="Prevent managing vacation notice"></et2-description>
+						<et2-description  value="Do you want to prevent the editing/setup of the absent/vacation notice (, even if SIEVE is enabled)?"></et2-description>
+					</et2-vbox>
+					<et2-select-account  id="newsettings[deny_absentnotice]" multiple="true" width="100%" accountType="groups"></et2-select-account>
 				</row>
 				<row>
-					<vbox>
-						<description value="restrict acl management"/>
-						<description value="effective only if server supports ACL at all"/>
-					</vbox>
-					<select-account id="newsettings[deny_aclmanagement]" account_type="groups" multiple="true" tags="true" width="100%"/>
+					<et2-vbox>
+						<et2-description  value="restrict acl management"></et2-description>
+						<et2-description  value="effective only if server supports ACL at all"></et2-description>
+					</et2-vbox>
+					<et2-select-account  id="newsettings[deny_aclmanagement]" multiple="true" width="100%" accountType="groups"></et2-select-account>
 				</row>
 				<row height="25px" valign="bottom">
-					<description value="Push notifications" span="all" class="subHeader"/>
+					<et2-description  value="Push notifications" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<url label="The IMAP server need to meet certain requirements AND be configured for it:" span="all"
-						 value="https://github.com/EGroupware/egroupware/wiki/IMAP-Push-Notifications" readonly="true"/>
+					<et2-url  label="The IMAP server need to meet certain requirements AND be configured for it:" span="all" value="https://github.com/EGroupware/egroupware/wiki/IMAP-Push-Notifications" readonly="true"></et2-url>
 				</row>
 				<row>
-					<description value="Name of IMAP servers (space separated host or host:port)" for="newsettings[imap_hosts_with_push]"/>
-					<textbox id="newsettings[imap_hosts_with_push]" class="et2_fullWidth"/>
+					<et2-description  value="Name of IMAP servers (space separated host or host:port)" for="newsettings[imap_hosts_with_push]"></et2-description>
+					<et2-textbox  id="newsettings[imap_hosts_with_push]"></et2-textbox>
 				</row>
 				<row>
-					<description value="Sieve" span="all" class="subHeader"/>
+					<et2-description  value="Sieve" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="provide a default vacation text, (used on new vacation messages when there was no message set up previously)"/>
-					<textbox id="newsettings[default_vacation_text]" cols="50" rows="8"/>
+					<et2-description  value="provide a default vacation text, (used on new vacation messages when there was no message set up previously)"></et2-description>
+					<et2-textarea  id="newsettings[default_vacation_text]" cols="50" rows="8"></et2-textarea>
 				</row>
 				<row>
-					<description value="Handling of external http images / mixed content in mails" span="all" class="subHeader"/>
+					<et2-description  value="Handling of external http images / mixed content in mails" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="By default 'http://' is just replaced with 'https://'. Feel free to configure 'https://proxy.egroupware.org/' to also load images only available via http." span="all"/>
+					<et2-description  value="By default 'http://' is just replaced with 'https://'. Feel free to configure 'https://proxy.egroupware.org/' to also load images only available via http." span="all"></et2-description>
 				</row>
 				<row>
-					<description value="Replace 'http://' in image urls with (trailing / required!)"/>
-					<textbox id="newsettings[http_image_proxy]" blur="https://" class="et2_fullWidth" validator="/^(https:[\/]{2}(.+\/)?)?$/"/>
+					<et2-description  value="Replace 'http://' in image urls with (trailing / required!)"></et2-description>
+					<et2-textbox  id="newsettings[http_image_proxy]" validator="/^(https:[\/]{2}(.+\/)?)?$/" placeholder="https://"></et2-textbox>
 				</row>
 				<row>
-					<description value="Miscellaneous" span="all" class="subHeader"/>
+					<et2-description  value="Miscellaneous" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Limit mailing list results when searching for addresses"/>
-					<integer max="100" min="5" id="newsettings[address_list_limit]"/>
+					<et2-description  value="Limit mailing list results when searching for addresses"></et2-description>
+					<et2-number  max="100" min="5" id="newsettings[address_list_limit]" precision="0"></et2-number>
 				</row>
 				<row>
-                    <description value="Default toolbar actions shown in mail's HTML editor"/>
-                    <taglist id="newsettings[html_toolbar]" allowFreeEntries="false"  autocomplete_url=''  editModeEnabled="false"/>
+                    <et2-description  value="Default toolbar actions shown in mail's HTML editor"></et2-description>
+                    <et2-select  id="newsettings[html_toolbar]" allowFreeEntries="false" editModeEnabled="false" multiple="true" searchUrl=""></et2-select>
                 </row>
 				<row>
-					<vbox>
-						<description value="examine namespace to retrieve folders in others and shared"/>
-						<description value="only needed for some servers, that do not return all folders on root level queries to retrieve all folders for that level"/>
-					</vbox>
-					<select id="newsettings[examineNamespace]">
+					<et2-vbox>
+						<et2-description  value="examine namespace to retrieve folders in others and shared"></et2-description>
+						<et2-description  value="only needed for some servers, that do not return all folders on root level queries to retrieve all folders for that level"></et2-description>
+					</et2-vbox>
+					<et2-select  id="newsettings[examineNamespace]">
 						<option value="">No</option>
 						<option value="True">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<vbox>
-						<description value="Caching of flags"/>
-						<description value="Required to disable if you use Dovecot with private seen flags on shared or user folder!"/>
-					</vbox>
-					<select id="newsettings[disble_caching]">
+					<et2-vbox>
+						<et2-description  value="Caching of flags"></et2-description>
+						<et2-description  value="Required to disable if you use Dovecot with private seen flags on shared or user folder!"></et2-description>
+					</et2-vbox>
+					<et2-select  id="newsettings[disble_caching]">
 						<option value="">{Enabled} ({default})</option>
 						<option value="flags">Disable caching of flags</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<vbox>
-						<description value="Disable use of flowed lines in plain text mails (RFC3676)"/>
-						<description value="Some clients fail to detect correct charset, if flowed lines are enabled."/>
-					</vbox>
-					<select id="newsettings[disable_rfc3676_flowed]">
+					<et2-vbox>
+						<et2-description  value="Disable use of flowed lines in plain text mails (RFC3676)"></et2-description>
+						<et2-description  value="Some clients fail to detect correct charset, if flowed lines are enabled."></et2-description>
+					</et2-vbox>
+					<et2-select  id="newsettings[disable_rfc3676_flowed]">
 						<option value="">No</option>
 						<option value="True">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Quota limit warning in MegaByte (recommended value is 30 MB)."/>
-					<textbox id="newsettings[quota_limit_warning]"/>
+					<et2-description  value="Quota limit warning in MegaByte (recommended value is 30 MB)."></et2-description>
+					<et2-textbox  id="newsettings[quota_limit_warning]"></et2-textbox>
 				</row>
 				<row>
-					<description value="Default value for remembering S/MIME passphrase in minutes"/>
-					<textbox id="newsettings[smime_pass_exp]"/>
+					<et2-description  value="Default value for remembering S/MIME passphrase in minutes"></et2-description>
+					<et2-textbox  id="newsettings[smime_pass_exp]"></et2-textbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 61ae9f776f..4f19c3345c 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -1,68 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.display" template="" lang="" group="0" version="1.9.001">
         <html id="msg"/>
-        <vbox class="mailDisplay">
+        <et2-vbox  class="mailDisplay">
             <toolbar id="displayToolbar" width="100%" view_range="6" flat_list="true" list_header="short"
                      class="noPrint"/>
-            <hbox class="mailPreviewHeaders">
-                <description id="mail_displaysubject" readonly="true"
-                             hover_action="app.mail.modifyMessageSubjectDialog"
-                             hover_action_title="Modify subject of this message"/>
-                <hbox class="mailPreviewHeaders smimeIcons">
-                    <image id="smime_signature" src="smime_sign" statustext="Smime signed message"
-                           disabled="!@smime=smime_sign"
-                           align="right" width="24"/>
-                    <image id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message"
-                           disabled="!@smime=smime_encrypt" align="right" width="24"/>
-                </hbox>
-            </hbox>
-            <vbox width="100%" class="mailPreviewHeaders onlyPrint">
+            <et2-hbox  class="mailPreviewHeaders">
+                <et2-description  id="mail_displaysubject" readonly="true" hoverAction="app.mail.modifyMessageSubjectDialog" hoverActionTitle="Modify subject of this message"></et2-description>
+                <et2-hbox  class="mailPreviewHeaders smimeIcons">
+                    <et2-image  id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="!@smime=smime_sign" align="right" width="24"></et2-image>
+                    <et2-image  id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" disabled="!@smime=smime_encrypt" align="right" width="24"></et2-image>
+                </et2-hbox>
+            </et2-hbox>
+            <et2-vbox  width="100%" class="mailPreviewHeaders onlyPrint">
 
-                <date-time align="right" id="mail_displaydate" readonly="true"
-                           style="max-width: fit-content;"/>
-                <vbox>
-                    <hbox>
-                        <lavatar src="@avatar" lname="@from[0]" shape="rounded"/>
+                <et2-date-time  align="right" id="mail_displaydate" readonly="true" style="max-width: fit-content;"></et2-date-time>
+                <et2-vbox>
+                    <et2-hbox>
+                        <et2-lavatar  src="@avatar" lname="@from[0]" shape="rounded"></et2-lavatar>
                         <grid id="from">
                             <columns>
                                 <column/>
                             </columns>
                             <rows>
                                 <row>
-                                    <et2-select-email id="${row}" readonly="true"></et2-select-email>
+                                    <et2-select-email  id="${row}" readonly="true"></et2-select-email>
                                 </row>
                             </rows>
                         </grid>
-                    </hbox>
-                    <hbox disabled="!@sender">
-                        <description value="Sender" class="firstColumnTitle"/>
+                    </et2-hbox>
+                    <et2-hbox  disabled="!@sender">
+                        <et2-description  value="Sender" class="firstColumnTitle"></et2-description>
                         <grid id="sender">
                             <columns>
                                 <column/>
                             </columns>
                             <rows>
                                 <row>
-                                    <et2-select-email id="${row}" readonly="true"></et2-select-email>
+                                    <et2-select-email  id="${row}" readonly="true"></et2-select-email>
                                 </row>
                             </rows>
                         </grid>
-                    </hbox>
-                    <hbox disabled="!@to">
-                        <description value="To" class="firstColumnTitle"/>
-                        <et2-select-email id="to" readonly="true" multiple="true" fullEmail="true"/>
-                    </hbox>
-                    <hbox disabled="!@cc">
-                        <description value="Cc" class="firstColumnTitle"/>
-                        <et2-select-email id="cc" readonly="true" multiple="true" fullEmail="true"/>
-                    </hbox>
-                    <hbox disabled="!@bcc">
-                        <description value="Bcc" class="firstColumnTitle"/>
-                        <et2-select-email id="bcc" readonly="true" multiple="true" fullEmail="true"/>
-                    </hbox>
-                </vbox>
+                    </et2-hbox>
+                    <et2-hbox  disabled="!@to">
+                        <et2-description  value="To" class="firstColumnTitle"></et2-description>
+                        <et2-select-email  id="to" readonly="true" multiple="true" fullEmail="true"/>
+                    </et2-hbox>
+                    <et2-hbox  disabled="!@cc">
+                        <et2-description  value="Cc" class="firstColumnTitle"></et2-description>
+                        <et2-select-email  id="cc" readonly="true" multiple="true" fullEmail="true"/>
+                    </et2-hbox>
+                    <et2-hbox  disabled="!@bcc">
+                        <et2-description  value="Bcc" class="firstColumnTitle"></et2-description>
+                        <et2-select-email  id="bcc" readonly="true" multiple="true" fullEmail="true"/>
+                    </et2-hbox>
+                </et2-vbox>
                 <grid id="mail_displayattachments" class="attachments ">
                     <columns>
                         <column/>
@@ -71,48 +64,44 @@
                     </columns>
                     <rows>
                         <row class="row attachmentRow">
-                            <description id="${row}[type]"/>
-                            <description class="et2_link useEllipsis" id="${row}[filename]" no_lang="1"
-                                         expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]"
-                                         href="$row_cont[mime_url]"/>
-                            <description align="right" id="${row}[size]"/>
+                            <et2-description  id="${row}[type]"></et2-description>
+                            <et2-description-expose  class="et2_link useEllipsis" id="${row}[filename]" mime="$row_cont[type]" href="$row_cont[mime_url]" noLang="1" mimeData="$row_cont[mime_data]"></et2-description-expose>
+                            <et2-description  align="right" id="${row}[size]"></et2-description>
                         </row>
                     </rows>
                 </grid>
-            </vbox>
-            <hbox width="100%" class="mailPreviewHeaders noPrint">
-                <lavatar src="@avatar" lname="@from[0]" shape="rounded"/>
-                <vbox class="previewWrapper">
-                    <hbox>
-                        <et2-details class="details" title="details" toggleOnHover="true" hoist="true"
-                                     toggleAlign="left">
-                            <et2-select-email slot="summary" value="@from" readonly="true" multiple="true"/>
-                            <hbox disabled="!@from">
-                                <description value="From" class="firstColumnTitle"/>
-                                <et2-select-email id="from" readonly="true" multiple="true"></et2-select-email>
-                            </hbox>
-                            <hbox disabled="!@sender">
-                                <description value="Sender" class="firstColumnTitle"/>
-                                <et2-select-email id="sender" readonly="true" multiple="true"></et2-select-email>
-                            </hbox>
-                            <hbox disabled="!@to">
-                                <description value="To" class="firstColumnTitle"/>
-                                <et2-select-email id="to" readonly="true" multiple="true"></et2-select-email>
-                            </hbox>
-                            <hbox disabled="!@cc">
-                                <description value="Cc" class="firstColumnTitle"/>
-                                <et2-select-email id="cc" readonly="true" multiple="true"></et2-select-email>
-                            </hbox>
-                            <hbox disabled="!@bcc">
-                                <description value="Bcc" class="firstColumnTitle"/>
-                                <et2-select-email id="bcc" readonly="true" multiple="true"></et2-select-email>
-                            </hbox>
+            </et2-vbox>
+            <et2-hbox  width="100%" class="mailPreviewHeaders noPrint">
+                <et2-lavatar  src="@avatar" lname="@from[0]" shape="rounded"></et2-lavatar>
+                <et2-vbox  class="previewWrapper">
+                    <et2-hbox>
+                        <et2-details  class="details" title="details" toggleOnHover="true" hoist="true" toggleAlign="left">
+                            <et2-select-email  slot="summary" value="@from" readonly="true" multiple="true"/>
+                            <et2-hbox  disabled="!@from">
+                                <et2-description  value="From" class="firstColumnTitle"></et2-description>
+                                <et2-select-email  id="from" readonly="true" multiple="true"></et2-select-email>
+                            </et2-hbox>
+                            <et2-hbox  disabled="!@sender">
+                                <et2-description  value="Sender" class="firstColumnTitle"></et2-description>
+                                <et2-select-email  id="sender" readonly="true" multiple="true"></et2-select-email>
+                            </et2-hbox>
+                            <et2-hbox  disabled="!@to">
+                                <et2-description  value="To" class="firstColumnTitle"></et2-description>
+                                <et2-select-email  id="to" readonly="true" multiple="true"></et2-select-email>
+                            </et2-hbox>
+                            <et2-hbox  disabled="!@cc">
+                                <et2-description  value="Cc" class="firstColumnTitle"></et2-description>
+                                <et2-select-email  id="cc" readonly="true" multiple="true"></et2-select-email>
+                            </et2-hbox>
+                            <et2-hbox  disabled="!@bcc">
+                                <et2-description  value="Bcc" class="firstColumnTitle"></et2-description>
+                                <et2-select-email  id="bcc" readonly="true" multiple="true"></et2-select-email>
+                            </et2-hbox>
                         </et2-details>
-                        <date-time-today align="right" id="mail_displaydate" readonly="true"/>
-                    </hbox>
-                    <et2-details toggleAlign="left" title="@attachmentsBlockTitle" toggleOnHover="true"
-                                 class="attachments" hoist="true" disabled="!@mail_displayattachments">
-                        <hbox slot="summary">
+                        <et2-date-time-today  align="right" id="mail_displaydate" readonly="true"></et2-date-time-today>
+                    </et2-hbox>
+                    <et2-details  toggleAlign="left" title="@attachmentsBlockTitle" toggleOnHover="true" class="attachments" hoist="true" disabled="!@mail_displayattachments">
+                        <et2-hbox  slot="summary">
                             <grid class="previewAttachmentArea egwGridView_grid">
                                 <columns>
                                     <column disabled="!@showtempname"/>
@@ -125,16 +114,16 @@
                                 </columns>
                                 <rows>
                                     <row class="row attachmentRow">
-                                        <description id="mail_displayattachments[0][attachment_number]" />
-                                        <description id="mail_displayattachments[0][partID]" />
-                                        <description id="mail_displayattachments[0][type]" />
-                                        <description id="mail_displayattachments[0][winmailFlag]" />
-                                        <description class="et2_link useEllipsis" id="mail_displayattachments[0][filename]" no_lang="1" expose_view="true" mime="@mail_displayattachments[0][type]" mime_data="@mail_displayattachments[0][mime_data]" href="@mail_displayattachments[0][mime_url]"/>
-                                        <description align="right" id="mail_displayattachments[0][size]"/>
+                                        <et2-description  id="mail_displayattachments[0][attachment_number]"></et2-description>
+                                        <et2-description  id="mail_displayattachments[0][partID]"></et2-description>
+                                        <et2-description  id="mail_displayattachments[0][type]"></et2-description>
+                                        <et2-description  id="mail_displayattachments[0][winmailFlag]"></et2-description>
+                                        <et2-description-expose  class="et2_link useEllipsis" id="mail_displayattachments[0][filename]" mime="@mail_displayattachments[0][type]" href="@mail_displayattachments[0][mime_url]" noLang="1" mimeData="@mail_displayattachments[0][mime_data]"></et2-description-expose>
+                                        <et2-description  align="right" id="mail_displayattachments[0][size]"></et2-description>
                                     </row>
                                 </rows>
                             </grid>
-                        </hbox>
+                        </et2-hbox>
                         <grid id="mail_displayattachments" class="previewAttachmentArea egwGridView_grid">
                             <columns>
                                 <column disabled="!@showtempname"/>
@@ -148,23 +137,23 @@
                             </columns>
                             <rows>
                                 <row class="row attachmentRow">
-                                    <description id="${row}[attachment_number]" />
-                                    <description id="${row}[partID]" />
-                                    <description id="${row}[type]" />
-                                    <description id="${row}[winmailFlag]" />
-                                    <description class="et2_link useEllipsis" id="${row}[filename]" no_lang="1" expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
-                                    <description align="right" id="${row}[size]"/>
-                                    <et2-dropdown-button id="${row}[actions]" label="$row_cont[actionsDefaultLabel]" readonly="false" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
+                                    <et2-description  id="${row}[attachment_number]"></et2-description>
+                                    <et2-description  id="${row}[partID]"></et2-description>
+                                    <et2-description  id="${row}[type]"></et2-description>
+                                    <et2-description  id="${row}[winmailFlag]"></et2-description>
+                                    <et2-description-expose  class="et2_link useEllipsis" id="${row}[filename]" mime="$row_cont[type]" href="$row_cont[mime_url]" noLang="1" mimeData="$row_cont[mime_data]"></et2-description-expose>
+                                    <et2-description  align="right" id="${row}[size]"></et2-description>
+                                    <et2-dropdown-button  id="${row}[actions]" label="$row_cont[actionsDefaultLabel]" readonly="false" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
                                 </row>
                             </rows>
                         </grid>
                     </et2-details>
-				</vbox>
-			</hbox>
+				</et2-vbox>
+			</et2-hbox>
 
-			<box class="mailDisplayContainer">
+			<et2-box  class="mailDisplayContainer">
 				<iframe frameborder="1" class="mail_displaybody" id="mailDisplayBodySrc" name="mailDisplayBodySrc" scrolling="auto" width="100%"/>
-			</box>
-        </vbox>
+			</et2-box>
+        </et2-vbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/displayAllAdresses.xet b/mail/templates/default/displayAllAdresses.xet
index e1f3181fdc..92050385c4 100644
--- a/mail/templates/default/displayAllAdresses.xet
+++ b/mail/templates/default/displayAllAdresses.xet
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.displayAllAdresses" template="" lang="" group="0" version="1.9.001">
-		<description value="All Adresses:" />
-		<vbox class="maildisplayAllAdresses">
+		<et2-description  value="All Adresses:"></et2-description>
+		<et2-vbox  class="maildisplayAllAdresses">
 			<grid disabled="@no_griddata" id="displayallAdresses">
 			  <columns>
 			   <column width="10%" />
@@ -12,11 +11,11 @@
 			  </columns>
 			  <rows>
 			   <row >
-				<description id="${row}[type]" />
-				<url-email align="left" id="${row}[address]" readonly='true'/>
+				<et2-description  id="${row}[type]"></et2-description>
+				<et2-url-email  align="left" id="${row}[address]" readonly="true"></et2-url-email>
 			   </row>
 			  </rows>
 			</grid>
-		</vbox>
+		</et2-vbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/folder_management.xet b/mail/templates/default/folder_management.xet
index 0c4e5c2dd8..8e90351100 100644
--- a/mail/templates/default/folder_management.xet
+++ b/mail/templates/default/folder_management.xet
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.folder_management" template="" lang="" group="0" version="1.9.001">
-		<hbox class="dialogHeader" >
-			<description value="Folder Management" class="mail_folder_management_header"/>
-		</hbox>
-		<hbox class="treeContainer">
+		<et2-hbox  class="dialogHeader" >
+			<et2-description  value="Folder Management" class="mail_folder_management_header"></et2-description>
+		</et2-hbox>
+		<et2-hbox  class="treeContainer">
 			<tree id="tree" multiple="true" autoloading="mail_ui::ajax_folderMgmtTree_autoloading" multimarking="strict" oncheck="app.mail.folderMgmt_onCheck" onselect="app.mail.folderMgmt_onSelect" onopenstart="app.mail.folderMgmt_autoloadingStart" onopenend="app.mail.folderMgmt_autoloadingEnd" highlighting="true"/>
-		</hbox>
-		<hbox  class="dialogFooterToolbar">
-			<button statustext="Delete" label="Delete" id="button[delete]" onclick="app.mail.folderMgmt_deleteBtn"/>
-			<button label="Cancel" id="button[cancel]" onclick="window.close()"/>
-		</hbox>
+		</et2-hbox>
+		<et2-hbox  class="dialogFooterToolbar">
+			<et2-button  statustext="Delete" label="Delete" id="button[delete]" onclick="app.mail.folderMgmt_deleteBtn"></et2-button>
+			<et2-button  label="Cancel" id="button[cancel]" onclick="window.close()"></et2-button>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/importMessage.xet b/mail/templates/default/importMessage.xet
index 4361771360..239430f245 100644
--- a/mail/templates/default/importMessage.xet
+++ b/mail/templates/default/importMessage.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.importMessage" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -10,23 +9,23 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader">
-					<description value="Import message" align="center" span="all" class="et2_fullWidth"/>
+					<et2-description  value="Import message" align="center" span="all"></et2-description>
 				</row>
 				<row>
-					<description value="Store to Folder"/>
-					<taglist id="FOLDER" autocomplete_url='mail.mail_compose.ajax_searchFolder' autocomplete_params='' maxSelection="1" allowFreeEntries="false" onclick="app.mail.address_click"/>
+					<et2-description  value="Store to Folder"></et2-description>
+					<et2-select  id="FOLDER" allowFreeEntries="false" onclick="app.mail.address_click" searchUrl="mail.mail_compose.ajax_searchFolder" searchOptions=""></et2-select>
 				</row>
 				<row>
-					<description value="Choose file"/>
-					<hbox>
+					<et2-description  value="Choose file"></et2-description>
+					<et2-hbox>
 						<vfs-select id="vfsfile" button_caption = "" mode="open" mime="message/rfc822" onchange="app.mail.vfsUploadForImport"/>
 						<file statustext="Select file to import into Folder" onFinish="app.mail.uploadForImport" mime="/^message\//i" id="uploadForImport" drop_target ="mail-importMessage" class="mail_importMessageFile"/>
-					</hbox>
+					</et2-hbox>
 				</row>
 				<row class="dialogFooterToolbar">
-					<buttononly statustext="Closes this window" label="Close" onclick="window.close();" image="close" background_image="1"/>
+					<et2-button  statustext="Closes this window" label="Close" onclick="window.close();" image="close" noSubmit="true"></et2-button>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/index.rows.horizental.xet b/mail/templates/default/index.rows.horizental.xet
index b89e025408..e60d1d5130 100644
--- a/mail/templates/default/index.rows.horizental.xet
+++ b/mail/templates/default/index.rows.horizental.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
     <template id="mail.index.rows.horizental" template="" lang="" group="0" version="1.9.001">
         <grid width="100%">
@@ -32,24 +31,24 @@
                     <nextmatch-header statustext="security" label="Security" id="security"/>
                 </row>
                 <row class="$row_cont[class]">
-                    <lavatar image="$row_cont[avatar]" fname="$row_cont[address]" size="2.75em" shape="rounded"/>
-                    <description span="1" class="status_img"/>
+                    <et2-lavatar  image="$row_cont[avatar]" fname="$row_cont[address]" size="2.75em" shape="rounded"></et2-lavatar>
+                    <et2-description  span="1" class="status_img"></et2-description>
                     <html id="${row}[attachments]"/>
-                    <vbox>
-                        <description id="${row}[subject]" no_lang="1"/>
-                        <description id="${row}[bodypreview]" no_lang="1" class='et2_label bodypreview'/>
-                    </vbox>
-                    <hbox>
-                        <date-time_today align="center" id="${row}[date]" readonly="true"/>
-                    </hbox>
-                    <date-time_today align="center" id="${row}[modified]" readonly="true"/>
-                    <url-email id="${row}[address]" contact_plus = "true" readonly="true"/>
-                    <url-email id="${row}[toaddress]" contact_plus = "true" readonly="true"/>
-                    <url-email id="${row}[fromaddress]" contact_plus = "true" readonly="true"/>
+                    <et2-vbox>
+                        <et2-description  id="${row}[subject]" noLang="1"></et2-description>
+                        <et2-description  id="${row}[bodypreview]" class="et2_label bodypreview" noLang="1"></et2-description>
+                    </et2-vbox>
+                    <et2-hbox>
+                        <et2-date-time-today  align="center" id="${row}[date]" readonly="true"></et2-date-time-today>
+                    </et2-hbox>
+                    <et2-date-time-today  align="center" id="${row}[modified]" readonly="true"></et2-date-time-today>
+                    <et2-url-email  id="${row}[address]" readonly="true"></et2-url-email>
+                    <et2-url-email  id="${row}[toaddress]" readonly="true"></et2-url-email>
+                    <et2-url-email  id="${row}[fromaddress]" readonly="true"></et2-url-email>
                     <vfs-size align="right" id="${row}[size]" no_lang="1" readonly="true"/>
-                    <image src="$row_cont[smime]" />
+                    <et2-image  src="$row_cont[smime]" ></et2-image>
                 </row>
             </rows>
         </grid>
     </template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/index.rows.vertical.xet b/mail/templates/default/index.rows.vertical.xet
index 442baaef69..4b6667ea84 100644
--- a/mail/templates/default/index.rows.vertical.xet
+++ b/mail/templates/default/index.rows.vertical.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
     <template id="mail.index.rows.vertical" template="" lang="" group="0" version="1.9.001">
         <grid width="100%">
@@ -20,29 +19,29 @@
                     <nextmatch-header statustext="security" label="Security" id="security"/>
                 </row>
                 <row class="$row_cont[class]">
-                    <hbox class="$row_cont[class] mobile_cat_col">
-                        <lavatar image="$row_cont[avatar]" fname="$row_cont[address]" size="2.75em" shape="rounded"/>
-                        <vbox>
-                            <url-email id="${row}[address]" class="$row_cont[class]" readonly="true"/>
-                            <hbox>
+                    <et2-hbox  class="$row_cont[class] mobile_cat_col">
+                        <et2-lavatar  image="$row_cont[avatar]" fname="$row_cont[address]" size="2.75em" shape="rounded"></et2-lavatar>
+                        <et2-vbox>
+                            <et2-url-email  id="${row}[address]" class="$row_cont[class]" readonly="true"></et2-url-email>
+                            <et2-hbox>
 
-                                <description id="${row}[subject]" no_lang="1" class="$row_cont[class]" />
-                            </hbox>
-                            <description id="${row}[bodypreview]" no_lang="1" class='et2_label bodypreview'/>
-                        </vbox>
-                    </hbox>
-                    <vbox>
-                        <hbox>
-                            <date-time_today align="center"  class="$row_cont[class]" id="${row}[date]" readonly="true"/>
-                        </hbox>
-                        <hbox>
-                            <image src="$row_cont[smime]" height="16px"/>
+                                <et2-description  id="${row}[subject]" class="$row_cont[class]" noLang="1"></et2-description>
+                            </et2-hbox>
+                            <et2-description  id="${row}[bodypreview]" class="et2_label bodypreview" noLang="1"></et2-description>
+                        </et2-vbox>
+                    </et2-hbox>
+                    <et2-vbox>
+                        <et2-hbox>
+                            <et2-date-time-today  align="center" class="$row_cont[class]" id="${row}[date]" readonly="true"></et2-date-time-today>
+                        </et2-hbox>
+                        <et2-hbox>
+                            <et2-image  src="$row_cont[smime]" height="16px"></et2-image>
                             <html id="${row}[attachments]"/>
-                            <description  class="status_img $row_cont[class]"/>
-                        </hbox>
-                    </vbox>
+                            <et2-description  class="status_img $row_cont[class]"></et2-description>
+                        </et2-hbox>
+                    </et2-vbox>
                 </row>
             </rows>
         </grid>
     </template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index ce15232f2f..3b9e9dc1e7 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.index.splitter" height="100%" template="" lang="" group="0" version="1.9.001">
-		<split dock_side="bottomDock" id="mailSplitter" style="--min: 30%;--max:70%;">
+		<et2-split  id="mailSplitter" style="--min: 30%;--max:70%;" vertical="false" primary="start">
 			<nextmatch id="nm" onselect="app.mail.mail_preview" class="" template="mail.index.rows.vertical" header_left="mail.index.add" header_right="mail.index.header_right" disable_selection_advance="true"/>
             <template id="mail.index.preview"/>
-        </split>
+        </et2-split>
     </template>
     <template id="mail.index.preview">
         <toolbar id="toolbar" list_header="short"/>
@@ -19,45 +18,41 @@
 
                 </row>
                 <row>
-                    <vbox class="previewWrapper">
-                        <box id="blank" disabled="@fromaddress">
-                            <image src="email"/>
-                            <description value="Select an item to read"/>
-                        </box>
-                        <hbox class="mailPreviewHeaders">
-                            <description id="subject" readonly="true"
-                                         hover_action="app.mail.modifyMessageSubjectDialog"
-                                         hover_action_title="Modify subject of this message"/>
-                            <hbox class="mailPreviewHeaders smimeIcons">
-                                <image id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="!@smime=smime_sign"
-                                       align="right" width="24"/>
-                                <image id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message"
-                                       disabled="!@smime=smime_encrypt" align="right" width="24"/>
-                            </hbox>
-                        </hbox>
-                        <hbox width="100%" class="mailPreviewHeaders">
-                            <lavatar src="@fromavatar" lname="@fromaddress" shape="rounded" size="2.75em"/>
-                            <vbox>
-                                <hbox>
-                                    <et2-details class="details" toggleOnHover="true" hoist="true" toggleAlign="left">
-                                        <et2-select-email slot="summary" id="fromaddress" readonly="true" multiple="true"/>
-                                        <hbox>
-                                            <description value="From" class="firstColumnTitle"/>
-                                            <et2-select-email id="additionalfromaddress" readonly="true" multiple="true"></et2-select-email>
-                                        </hbox>
-                                        <hbox disabled="!@toaddress" width="100%">
-                                            <description value="To" class="firstColumnTitle"/>
-                                            <et2-select-email id="additionaltoaddress" readonly="true" multiple="true"></et2-select-email>
-                                        </hbox>
-                                        <hbox disabled="!@ccaddress"  width="100%">
-                                            <description value="Cc" class="firstColumnTitle"/>
-                                            <et2-select-email id="ccaddress" readonly="true" multiple="true"></et2-select-email>
-                                        </hbox>
+                    <et2-vbox  class="previewWrapper">
+                        <et2-box  id="blank" disabled="@fromaddress">
+                            <et2-image  src="email"></et2-image>
+                            <et2-description  value="Select an item to read"></et2-description>
+                        </et2-box>
+                        <et2-hbox  class="mailPreviewHeaders">
+                            <et2-description  id="subject" readonly="true" hoverAction="app.mail.modifyMessageSubjectDialog" hoverActionTitle="Modify subject of this message"></et2-description>
+                            <et2-hbox  class="mailPreviewHeaders smimeIcons">
+                                <et2-image  id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="!@smime=smime_sign" align="right" width="24"></et2-image>
+                                <et2-image  id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" disabled="!@smime=smime_encrypt" align="right" width="24"></et2-image>
+                            </et2-hbox>
+                        </et2-hbox>
+                        <et2-hbox  width="100%" class="mailPreviewHeaders">
+                            <et2-lavatar  src="@fromavatar" lname="@fromaddress" shape="rounded" size="2.75em"></et2-lavatar>
+                            <et2-vbox>
+                                <et2-hbox>
+                                    <et2-details  class="details" toggleOnHover="true" hoist="true" toggleAlign="left">
+                                        <et2-select-email  slot="summary" id="fromaddress" readonly="true" multiple="true"/>
+                                        <et2-hbox>
+                                            <et2-description  value="From" class="firstColumnTitle"></et2-description>
+                                            <et2-select-email  id="additionalfromaddress" readonly="true" multiple="true"></et2-select-email>
+                                        </et2-hbox>
+                                        <et2-hbox  disabled="!@toaddress" width="100%">
+                                            <et2-description  value="To" class="firstColumnTitle"></et2-description>
+                                            <et2-select-email  id="additionaltoaddress" readonly="true" multiple="true"></et2-select-email>
+                                        </et2-hbox>
+                                        <et2-hbox  disabled="!@ccaddress" width="100%">
+                                            <et2-description  value="Cc" class="firstColumnTitle"></et2-description>
+                                            <et2-select-email  id="ccaddress" readonly="true" multiple="true"></et2-select-email>
+                                        </et2-hbox>
                                     </et2-details>
-                                    <date-time-today align="right" id="date" readonly="true"/>
-                                </hbox>
+                                    <et2-date-time-today  align="right" id="date" readonly="true"></et2-date-time-today>
+                                </et2-hbox>
                                 <et2-details  toggleAlign="left" title="@attachmentsBlockTitle" toggleOnHover="true" hoist="true" class="attachments" disabled="!@attachmentsBlock">
-                                    <hbox slot="summary">
+                                    <et2-hbox  slot="summary">
                                         <grid class="previewAttachmentArea egwGridView_grid" >
                                             <columns>
                                                 <column disabled="!@showtempname"/>
@@ -70,16 +65,16 @@
                                             </columns>
                                             <rows>
                                                 <row class="row attachmentRow">
-                                                    <description id="attachmentsBlock[0][attachment_number]" />
-                                                    <description id="attachmentsBlock[0][partID]" />
-                                                    <description id="attachmentsBlock[0][type]" />
-                                                    <description id="attachmentsBlock[0][winmailFlag]" />
-                                                    <description class="et2_link useEllipsis" id="attachmentsBlock[0][filename]" no_lang="1" expose_view="true" mime="@attachmentsBlock[0][type]" mime_data="@attachmentsBlock[0][mime_data]" href="@attachmentsBlock[0][mime_url]"/>
-                                                    <description align="right" id="attachmentsBlock[0][size]"/>
+                                                    <et2-description  id="attachmentsBlock[0][attachment_number]"></et2-description>
+                                                    <et2-description  id="attachmentsBlock[0][partID]"></et2-description>
+                                                    <et2-description  id="attachmentsBlock[0][type]"></et2-description>
+                                                    <et2-description  id="attachmentsBlock[0][winmailFlag]"></et2-description>
+                                                    <et2-description-expose  class="et2_link useEllipsis" id="attachmentsBlock[0][filename]" mime="@attachmentsBlock[0][type]" href="@attachmentsBlock[0][mime_url]" noLang="1" mimeData="@attachmentsBlock[0][mime_data]"></et2-description-expose>
+                                                    <et2-description  align="right" id="attachmentsBlock[0][size]"></et2-description>
                                                 </row>
                                             </rows>
                                         </grid>
-                                    </hbox>
+                                    </et2-hbox>
 
                                     <grid id="attachmentsBlock" class="previewAttachmentArea egwGridView_grid">
                                         <columns>
@@ -93,51 +88,50 @@
                                         </columns>
                                         <rows>
                                             <row class="row attachmentRow" id="${row}">
-                                                <description id="${row}[attachment_number]" />
-                                                <description id="${row}[partID]" />
-                                                <description id="${row}[type]" />
-                                                <description id="${row}[winmailFlag]" />
-                                                <description class="et2_link useEllipsis" id="${row}[filename]" no_lang="1" expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
-                                                <description align="right" id="${row}[size]"/>
-                                                <et2-dropdown-button id="${row}[actions]" label="$row_cont[actionsDefaultLabel]" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
+                                                <et2-description  id="${row}[attachment_number]"></et2-description>
+                                                <et2-description  id="${row}[partID]"></et2-description>
+                                                <et2-description  id="${row}[type]"></et2-description>
+                                                <et2-description  id="${row}[winmailFlag]"></et2-description>
+                                                <et2-description-expose  class="et2_link useEllipsis" id="${row}[filename]" mime="$row_cont[type]" href="$row_cont[mime_url]" noLang="1" mimeData="$row_cont[mime_data]"></et2-description-expose>
+                                                <et2-description  align="right" id="${row}[size]"></et2-description>
+                                                <et2-dropdown-button  id="${row}[actions]" label="$row_cont[actionsDefaultLabel]" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
                                             </row>
                                         </rows>
                                     </grid>
                                 </et2-details>
-                            </vbox>
+                            </et2-vbox>
 
-                        </hbox>
+                        </et2-hbox>
 
 
-                    </vbox>
+                    </et2-vbox>
                 </row>
             </rows>
         </grid>
-        <box id="mailPreviewContainer">
+        <et2-box  id="mailPreviewContainer">
             <iframe frameborder="1" id="messageIFRAME" scrolling="auto"/>
-        </box>
+        </et2-box>
     </template>
     <template id="mail.index.nosplitter" template="" lang="" group="0" version="1.9.001">
         <nextmatch id="nm" onselect="app.mail.mail_preview" template="mail.index.rows.horizental" header_left="mail.index.add"
                    header_right="mail.index.header_right"/>
     </template>
     <template id="mail.index.add" template="" lang="" group="0" version="1.9.001">
-        <buttononly id="button[mailcreate]" onclick="app.mail.mail_compose(false);" label="Compose" image="add"/>
+        <et2-button  id="button[mailcreate]" onclick="app.mail.mail_compose(false);" label="Compose" image="add" noSubmit="true"></et2-button>
     </template>
     <template id="mail.index.header_right" template="" lang="" group="0" version="1.9.001">
-        <et2-details id="mail.index.vacationnotice" disabled="true" summary="on vacation" toggleOnHover="true"
-                     hoist="true" class="vacationnotice" onclick="app.mail.edit_vacation">
-            <description id="nm[vacationnotice]" class="@nm[vacationclass]"/>
-            <description id="nm[vacationrange]" class="@nm[vacationrangeclass]"/>
+        <et2-details  id="mail.index.vacationnotice" disabled="true" summary="on vacation" toggleOnHover="true" hoist="true" class="vacationnotice" onclick="app.mail.edit_vacation">
+            <et2-description  id="nm[vacationnotice]" class="@nm[vacationclass]"></et2-description>
+            <et2-description  id="nm[vacationrange]" class="@nm[vacationrangeclass]"></et2-description>
         </et2-details>
 
-        <hbox id="mail.index.datefilter" class="mail-index_datefilter">
-            <date id="startdate" label="Start" onchange="app.mail.mail_refreshMessageGrid(false,true);"/>
-            <date id="enddate" label="End" onchange="app.mail.mail_refreshMessageGrid(false,true);"/>
-        </hbox>
-        <hbox id="mail.index.quotabox" class="mail-index_quotabox">
+        <et2-hbox  id="mail.index.datefilter" class="mail-index_datefilter">
+            <et2-date  id="startdate" label="Start" onchange="app.mail.mail_refreshMessageGrid(false,true);"></et2-date>
+            <et2-date  id="enddate" label="End" onchange="app.mail.mail_refreshMessageGrid(false,true);"></et2-date>
+        </et2-hbox>
+        <et2-hbox  id="mail.index.quotabox" class="mail-index_quotabox">
             <progress id="nm[quotainpercent]" label="@nm[quota]" class="@nm[quotaclass]"/>
-        </hbox>
+        </et2-hbox>
     </template>
     <template id="mail.index" template="" lang="" group="0" version="1.9.001">
         <tree autoloading="mail.mail_ui.ajax_foldertree" id="nm[foldertree]" onclick="app.mail.mail_changeFolder"
@@ -146,4 +140,4 @@
         <template id="splitter" height="100%" template="mail.index.splitter"/>
         <iframe frameborder="1" id="extra_iframe" scrolling="auto" disabled="true"/>
     </template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/integration_to_entry_dialog.xet b/mail/templates/default/integration_to_entry_dialog.xet
index 5edcef997d..08df059f04 100644
--- a/mail/templates/default/integration_to_entry_dialog.xet
+++ b/mail/templates/default/integration_to_entry_dialog.xet
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.integration_to_entry_dialog" template="" lang="" group="0" version="1.9.001">
-		<vbox width="100%">
-			<description value="Select an existing entry in order to append mail content to it"/>
-			<description/>
-			<link-entry id="id" only_app="@appName" class="et2_fullWidth"/>
-		</vbox>
+		<et2-vbox  width="100%">
+			<et2-description  value="Select an existing entry in order to append mail content to it"></et2-description>
+			<et2-description></et2-description>
+			<et2-link-entry  id="id" onlyApp="@appName"></et2-link-entry>
+		</et2-vbox>
 		<styles>
 			#_id {width: 100%;}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/modifyMessageSubjectDialog.xet b/mail/templates/default/modifyMessageSubjectDialog.xet
index 69f2d420dc..57c0a73fbb 100644
--- a/mail/templates/default/modifyMessageSubjectDialog.xet
+++ b/mail/templates/default/modifyMessageSubjectDialog.xet
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.modifyMessageSubjectDialog" template="" lang="" group="0" version="17.1">
-		<hbox class="et2_prompt">
+		<et2-hbox  class="et2_prompt">
 			<grid width="100%">
 				<columns>
 					<column width="120"/>
@@ -11,15 +10,15 @@
 				</columns>
 				<rows>
 					<row>
-						<description label= "%s:" value="Current subject"/>
-						<description value="@value"/>
+						<et2-description  value="Current subject"></et2-description>
+						<et2-description  value="@value"></et2-description>
 					</row>
 					<row>
-						<description label= "%s:" value="New subject"/>
-						<textbox multiline="true" id="value" width="400"/>
+						<et2-description  value="New subject"></et2-description>
+						<et2-textarea  id="value" width="400"></et2-textarea>
 					</row>
 				</rows>
 			</grid>
-		</hbox>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/moveFolder.xet b/mail/templates/default/moveFolder.xet
index f226c99690..9f193b1d00 100644
--- a/mail/templates/default/moveFolder.xet
+++ b/mail/templates/default/moveFolder.xet
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.moveFolder" template="" lang="" group="0" version="1.9.001">
-		<hbox><description value="Move Folder:" /><textbox readonly="true" id="selectedLeaf"/></hbox>
-		<textbox class="mail-index_quotaDisplayNone" readonly="true" id="selectedNode"/>
-		<vbox class="mailChooseFolder">
-			<taglist id="folder" width="88%" maxSelection="1" autocomplete_url='mail.mail_compose.ajax_searchFolder' autocomplete_params='' allowFreeEntries="false" onclick="app.mail.address_click"/>
-			<description value="The folder will be copied as a new child to the node selected above, and on sucess deleted." />
-		</vbox>
+		<et2-hbox><et2-description  value="Move Folder:"></et2-description><et2-textbox  readonly="true" id="selectedLeaf"></et2-textbox></et2-hbox>
+		<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="selectedNode"></et2-textbox>
+		<et2-vbox  class="mailChooseFolder">
+			<et2-select  id="folder" width="88%" allowFreeEntries="false" onclick="app.mail.address_click" searchUrl="mail.mail_compose.ajax_searchFolder" searchOptions=""></et2-select>
+			<et2-description  value="The folder will be copied as a new child to the node selected above, and on sucess deleted."></et2-description>
+		</et2-vbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/predefinedAddressesDialog.xet b/mail/templates/default/predefinedAddressesDialog.xet
index 78c223d89b..8130346770 100644
--- a/mail/templates/default/predefinedAddressesDialog.xet
+++ b/mail/templates/default/predefinedAddressesDialog.xet
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.predefinedAddressesDialog" template="" lang="" group="0" version="17.1">
-		<hbox class="et2_prompt">
+		<et2-hbox  class="et2_prompt">
 			<grid width="390">
 				<columns>
 					<column width="60"/>
@@ -11,26 +10,26 @@
 				</columns>
 				<rows>
 					<row>
-						<description value="Configured values will be set automatically on compose dialog for respected field when composing a new email."/>
+						<et2-description  value="Configured values will be set automatically on compose dialog for respected field when composing a new email."></et2-description>
 					</row>
 					<row>
-						<description value="Reply to"/>
-						<taglist-email id="replyto" width="100%"/>
+						<et2-description  value="Reply to"></et2-description>
+						<et2-select-email  id="replyto" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-select-email>
 					</row>
 					<row>
-						<description value="Folder"/>
-						<taglist id="folder" autocomplete_url="mail.mail_compose.ajax_searchFolder" autocomplete_params="" allowFreeEntries="false"/>
+						<et2-description  value="Folder"></et2-description>
+						<et2-select  id="folder" allowFreeEntries="false" multiple="true" searchUrl="mail.mail_compose.ajax_searchFolder" searchOptions=""></et2-select>
 					</row>
 					<row>
-						<description label= "%s:" value="Cc"/>
-						<taglist-email id="cc" allowFreeEntries="true" include_lists="true"/>
+						<et2-description  value="Cc"></et2-description>
+						<et2-select-email  id="cc" allowFreeEntries="true" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" includeLists="true"></et2-select-email>
 					</row>
 					<row>
-						<description label= "%s:" value="Bcc"/>
-						<taglist-email id="bcc" allowFreeEntries="true" include_lists="true"/>
+						<et2-description  value="Bcc"></et2-description>
+						<et2-select-email  id="bcc" allowFreeEntries="true" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" includeLists="true"></et2-select-email>
 					</row>
 				</rows>
 			</grid>
-		</hbox>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/profiles.index.xet b/mail/templates/default/profiles.index.xet
index ec6312fa4d..069898f2ce 100644
--- a/mail/templates/default/profiles.index.xet
+++ b/mail/templates/default/profiles.index.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.profiles.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%" id="acc" class="egwGridView_grid">
@@ -11,27 +10,27 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description value="ID"/>
-					<description value="Description"/>
-					<description align="center" value="Default"/>
+					<et2-description  value="ID"></et2-description>
+					<et2-description  value="Description"></et2-description>
+					<et2-description  align="center" value="Default"></et2-description>
 				</row>
 				<row class="row"  >
-					<description id="${row}[id]" readonly="true"/>
-					<description id="${row}[description]" no_lang="1"/>
-					<description align="center" id="${row}[default]" no_lang="1" readonly="true"/>
+					<et2-description  id="${row}[id]" readonly="true"></et2-description>
+					<et2-description  id="${row}[description]" noLang="1"></et2-description>
+					<et2-description  align="center" id="${row}[default]" readonly="true" noLang="1"></et2-description>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="mail.profiles.index" template="" lang="" group="0" version="1.9.001">
-		<description id="msg" no_lang="1" class="message" span="all"/>
+		<et2-description  id="msg" class="message" span="all" noLang="1"></et2-description>
 		<grid width="100%">
 			<columns>
 				<column width="100%"/>
 			</columns>
 			<rows>
 				<row>
-					<buttononly class="$cont[hideIfSigDisabled]" align="right" label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=mail.mail_uipreferences.edit'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;"/>
+					<et2-button  class="$cont[hideIfSigDisabled]" align="right" label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=mail.mail_uipreferences.edit'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;" noSubmit="true"></et2-button>
 				</row>
 				<row>
 					<template id="rows"/>
@@ -39,4 +38,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/sieve.edit.xet b/mail/templates/default/sieve.edit.xet
index aa9a2e74b8..5f10536c1b 100644
--- a/mail/templates/default/sieve.edit.xet
+++ b/mail/templates/default/sieve.edit.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.sieve.condition" template="" lang="" group="0" version="16.1">
 		<grid width="99%">
@@ -10,63 +9,55 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Match:"/>
-					<menulist>
-						<menupopup id="anyof"/>
-					</menulist>
+					<et2-description  value="Match:"></et2-description>
+					<et2-select  id="anyof"></et2-select>
 				</row>
 				<row class="sieveRowActive">
-					<description value="If from contains:(*)"/>
-					<textbox id="from" class="et2_fullWidth"/>
+					<et2-description  value="If from contains:(*)"></et2-description>
+					<et2-textbox  id="from"></et2-textbox>
 				</row>
 				<row>
-					<description value="If to contains:(*)"/>
-					<textbox id="to" class="et2_fullWidth"/>
+					<et2-description  value="If to contains:(*)"></et2-description>
+					<et2-textbox  id="to"></et2-textbox>
 				</row>
 				<row>
-					<description value="If subject contains:(*)"/>
-					<textbox id="subject" class="et2_fullWidth"/>
+					<et2-description  value="If subject contains:(*)"></et2-description>
+					<et2-textbox  id="subject"></et2-textbox>
 				</row>
 				<row>
-					<description value="If message size"/>
-					<hbox>
-						<menulist>
-							<menupopup id="gthan"/>
-						</menulist>
-						<textbox id="size"/>
-						<description value="kilobytes"/>
-					</hbox>
+					<et2-description  value="If message size"></et2-description>
+					<et2-hbox>
+						<et2-select  id="gthan"></et2-select>
+						<et2-textbox  id="size"></et2-textbox>
+						<et2-description  value="kilobytes"></et2-description>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="If mail header"/>
-					<hbox>
-						<textbox id="field"/>
-						<description value="Contains(*)"/>
-						<textbox id="field_val"/>
-					</hbox>
+					<et2-description  value="If mail header"></et2-description>
+					<et2-hbox>
+						<et2-textbox  id="field"></et2-textbox>
+						<et2-description  value="Contains(*)"></et2-description>
+						<et2-textbox  id="field_val"></et2-textbox>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="If mail body message type"/>
-					<hbox>
-						<menulist>
-							<menupopup id="bodytransform"/>
-						</menulist>
-						<description value="Contains(*)"/>
-						<textbox id="field_bodytransform"/>
-					</hbox>
+					<et2-description  value="If mail body message type"></et2-description>
+					<et2-hbox>
+						<et2-select  id="bodytransform"></et2-select>
+						<et2-description  value="Contains(*)"></et2-description>
+						<et2-textbox  id="field_bodytransform"></et2-textbox>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="If mail body content / attachment type"/>
-					<hbox>
-						<menulist>
-							<menupopup id="ctype"/>
-						</menulist>
-						<description value="/"/>
-						<textbox blur="for eg.: mpeg" id="field_ctype_val"/>
-					</hbox>
+					<et2-description  value="If mail body content / attachment type"></et2-description>
+					<et2-hbox>
+						<et2-select  id="ctype"></et2-select>
+						<et2-description  value="/"></et2-description>
+						<et2-textbox  id="field_ctype_val" placeholder="for eg.: mpeg"></et2-textbox>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value='sieve_edit_instructions'/>
+					<et2-description  value="sieve_edit_instructions"></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -79,37 +70,37 @@
 			</columns>
 			<rows>
 				<row>
-					<radio label="File into:" id="action" options="folder"/>
-					<hbox>
-						<taglist id="action_folder_text"  class="et2_fullWidth" autocomplete_url="mail.mail_sieve.ajax_getFolders" autocomplete_params="" allowFreeEntries="false" maxSelection="1" onfocus="app.mail.sieve_focus_radioBtn" />
-					</hbox>
+					<radio label="File into:" id="action" set_value="folder" />
+					<et2-hbox>
+						<et2-select  id="action_folder_text" allowFreeEntries="false" onfocus="app.mail.sieve_focus_radioBtn" searchUrl="mail.mail_sieve.ajax_getFolders" searchOptions=""></et2-select>
+					</et2-hbox>
 				</row>
 				<row disabled="@no_forward">
-					<radio label="Forward to address (*):" id="action" options="address"/>
-					<hbox>
-						<taglist-email allowFreeEntries="true" id="action_address_text" class="et2_fullWidth" onfocus="app.mail.sieve_focus_radioBtn" />
-					</hbox>
+					<radio label="Forward to address (*):" id="action" set_value="address" />
+					<et2-hbox>
+						<et2-select-email  allowFreeEntries="true" id="action_address_text" onfocus="app.mail.sieve_focus_radioBtn" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-select-email>
+					</et2-hbox>
 				</row>
 				<row>
-					<radio label="Send a reject message:" id="action" options="reject"/>
-					<textbox multiline="true" id="action_reject_text" onfocus="app.mail.sieve_focus_radioBtn" height="100" class="et2_fullWidth" />
+					<radio label="Send a reject message:" id="action" set_value="reject" />
+					<et2-textarea  id="action_reject_text" onfocus="app.mail.sieve_focus_radioBtn" height="100" ></et2-textarea>
 				</row>
 				<row>
-					<radio label="Discard message" id="action" options="discard"/>
-					<description/>
+					<radio label="Discard message" id="action" set_value="discard" />
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<radio label="set flags" id="action" options="flags"/>
-					<taglist id="action_flags_list">
+					<radio label="set flags" id="action" set_value="flags" />
+					<et2-select  id="action_flags_list" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_search">
 						<option value="\\Flagged">Flagged</option>
 						<option value="\\Deleted">Deleted</option>
 						<option value="\\Seen">Read</option>
 						<option value="\\Answered">Answered</option>
 						<option value="\\Draft">Draft</option>
-					</taglist>
+					</et2-select>
 				</row>
 				<row>
-					<description value="(*) Please consider, forward to multiple addresses will not work if number of addresses exceeds the Limit. For most mail Servers the limit is 4 by default, please contact your mail server administrator for further info."/>
+					<et2-description  value="(*) Please consider, forward to multiple addresses will not work if number of addresses exceeds the Limit. For most mail Servers the limit is 4 by default, please contact your mail server administrator for further info."></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -121,14 +112,14 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader sieve-title">
-					<hbox>
-						<label value="Mail filter rule" />
-						<description id="ruleID" class="ruleID"/>
-						<image src="filter.png" align="right"/>
-					</hbox>
+					<et2-hbox>
+						<et2-label  value="Mail filter rule" ></et2-label>
+						<et2-description  id="ruleID" class="ruleID"></et2-description>
+						<et2-image  src="filter.png" align="right"></et2-image>
+					</et2-hbox>
 				</row>
 				<row>
-					<tabbox id="tabs" class="et2_nowrap" width="100%" span="all" tab_height="440">
+					<et2-tabbox  id="tabs" class="et2_nowrap" width="100%" span="all" tabHeight="440">
 						<tabs>
 							<tab id="condition" label="Condition"/>
 							<tab id="action" label="Action"/>
@@ -137,24 +128,24 @@
 							<template id="mail.sieve.condition"/>
 							<template id="mail.sieve.action"/>
 						</tabpanels>
-					</tabbox>
+					</et2-tabbox>
 				</row>
 				<row class="dialogFooterToolbar">
-					<checkbox label="Check message against next rule also" id="continue"/>
+					<et2-checkbox  label="Check message against next rule also" id="continue"></et2-checkbox>
 				</row>
 				<row>
-					<checkbox label="Keep a copy of the message in your inbox" id="keep"/>
+					<et2-checkbox  label="Keep a copy of the message in your inbox" id="keep"></et2-checkbox>
 				</row>
 				<row>
-					<checkbox label="Use regular expressions (see wikipedia for information on POSIX regular expressions)" id="regexp"/>
+					<et2-checkbox  label="Use regular expressions (see wikipedia for information on POSIX regular expressions)" id="regexp"></et2-checkbox>
 				</row>
 				<row class="dialogFooterToolbar">
-					<hbox width="100%">
-						<button statustext="Saves this rule" label="Save" id="button[save]"/>
-						<button statustext="Applies the changes made" label="Apply" id="button[apply]"/>
-                        <button label="Cancel" id="button[cancel]" onclick="window.close()"/>
-						<button label="Delete" id="button[delete]" align="right"/>
-					</hbox>
+					<et2-hbox  width="100%">
+						<et2-button  statustext="Saves this rule" label="Save" id="button[save]"></et2-button>
+						<et2-button  statustext="Applies the changes made" label="Apply" id="button[apply]"></et2-button>
+                        <et2-button  label="Cancel" id="button[cancel]" onclick="window.close()"></et2-button>
+						<et2-button  label="Delete" id="button[delete]" align="right"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
diff --git a/mail/templates/default/sieve.emailNotification.xet b/mail/templates/default/sieve.emailNotification.xet
index 945888804a..0678b88209 100644
--- a/mail/templates/default/sieve.emailNotification.xet
+++ b/mail/templates/default/sieve.emailNotification.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.sieve.emailNotification" template="" lang="" group="0" version="1.9.002">
 		<grid>
@@ -10,38 +9,34 @@
 			</columns>
 			<rows>
 				<row disabled="!@msg" part="header">
-					<description align="center" id="msg" span="all" class="message"/>
-					<description/>
+					<et2-description  align="center" id="msg" span="all" class="message"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row class="th" valign="top" part="header">
-					<description value="email notification settings"/>
-					<description/>
+					<et2-description  value="email notification settings"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description value="Status:"/>
-					<menulist>
-						<menupopup id="status"/>
-					</menulist>
+					<et2-description  value="Status:"></et2-description>
+					<et2-select  id="status"></et2-select>
 				</row>
 				<row>
-					<description value="External email address:"/>
-					<taglist-email id="externalEmail" required="true" width="40%" allowFreeEntries="true" maxSelection="1" />
+					<et2-description  value="External email address:"></et2-description>
+					<et2-select-email  id="externalEmail" required="true" width="40%" allowFreeEntries="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-select-email>
 				</row>
 				<row>
-					<description value="Display mail subject in notification:	"/>
-					<menulist>
-						<menupopup id="displaySubject"/>
-					</menulist>
+					<et2-description  value="Display mail subject in notification:	"></et2-description>
+					<et2-select  id="displaySubject"></et2-select>
 				</row>
 				<row>
-					<hbox>
-						<button class="$cont[hideIfSieveDisabled]" label="Save" id="button[save]"/>
-						<button class="$cont[hideIfSieveDisabled]" label="Apply" id="button[apply]"/>
-						<button class="$cont[hideIfSieveDisabled]" label="Cancel" id="button[cancel]"/>
-					</hbox>
-					<description/>
+					<et2-hbox>
+						<et2-button  class="$cont[hideIfSieveDisabled]" label="Save" id="button[save]"></et2-button>
+						<et2-button  class="$cont[hideIfSieveDisabled]" label="Apply" id="button[apply]"></et2-button>
+						<et2-button  class="$cont[hideIfSieveDisabled]" label="Cancel" id="button[cancel]"></et2-button>
+					</et2-hbox>
+					<et2-description></et2-description>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/sieve.index.xet b/mail/templates/default/sieve.index.xet
index c601f45e04..7caedcaa7f 100644
--- a/mail/templates/default/sieve.index.xet
+++ b/mail/templates/default/sieve.index.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.sieve.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%" id="rg" sortable="mail.mail_sieve.ajax_moveRule" class="egwGridView_grid">
@@ -11,27 +10,27 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description value="Rule priority position"/>
-					<description value="Status"/>
-					<description value="rules"/>
+					<et2-description  value="Rule priority position"></et2-description>
+					<et2-description  value="Status"></et2-description>
+					<et2-description  value="rules"></et2-description>
 				</row>
 				<row class="row $row_cont[class]">
-					<description id="${row}[ruleID]" />
-					<select id="${row}[status]" readonly="true"/>
-					<description id="${row}[rules]" />
+					<et2-description  id="${row}[ruleID]"></et2-description>
+					<et2-select  id="${row}[status]" readonly="true"></et2-select>
+					<et2-description  id="${row}[rules]"></et2-description>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="mail.sieve.index" template="" lang="" group="0" version="1.9.001">
-		<description id="msg" no_lang="1" class="message" span="all"/>
+		<et2-description  id="msg" class="message" span="all" noLang="1"></et2-description>
 		<grid width="100%">
 			<columns>
 				<column width="100%"/>
 			</columns>
 			<rows>
 				<row class="nextmatch_header_row">
-					<buttononly class="$cont[hideIfSieveDisabled] et2_toolbar" align="left" id="add" onclick="window.open(egw::link('/index.php','menuaction=mail.mail_sieve.edit'),'_blank','dependent=yes,width=600,height=680,scrollbars=yes,status=yes'); return false;"/>
+					<et2-button  class="$cont[hideIfSieveDisabled] et2_toolbar" align="left" id="add" onclick="window.open(egw::link('/index.php','menuaction=mail.mail_sieve.edit'),'_blank','dependent=yes,width=600,height=680,scrollbars=yes,status=yes'); return false;" noSubmit="true"></et2-button>
 				</row>
 				<row>
 					<template id="rows"/>
diff --git a/mail/templates/default/sieve.vacation.xet b/mail/templates/default/sieve.vacation.xet
index 49c3cf206d..28829836da 100644
--- a/mail/templates/default/sieve.vacation.xet
+++ b/mail/templates/default/sieve.vacation.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.sieve.vacation" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%" height="100%">
@@ -12,57 +11,53 @@
 			</columns>
 			<rows>
 				<row valign="top" class="dialogHeader">
-					<description value="Edit vacation settings" class="et2_fullWidth"/>
-					<description align="right" disabled="!@is_admin_vac" for="acc_id" value="Mail account"/>
-					<menulist>
-						<menupopup id="acc_id" disabled="!@is_admin_vac" onchange="app.mail.vacation_change_account" class="et2_fullWidth"/>
-					</menulist>
-					<description/>
+					<et2-description  value="Edit vacation settings"></et2-description>
+					<et2-description  align="right" disabled="!@is_admin_vac" for="acc_id" value="Mail account"></et2-description>
+					<et2-select  id="acc_id" disabled="!@is_admin_vac" onchange="app.mail.vacation_change_account"></et2-select>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description value="Status:"/>
-					<hbox span="all">
-						<menulist>
-							<menupopup id="status" onchange='app.mail.vacationFilterStatusChange'/>
-						</menulist>
-						<date id="start_date"/>
-						<date id="end_date" />
-					</hbox>
+					<et2-description  value="Status:"></et2-description>
+					<et2-hbox  span="all">
+						<et2-select  id="status" onchange="app.mail.vacationFilterStatusChange"></et2-select>
+						<et2-date  id="start_date"></et2-date>
+						<et2-date  id="end_date" ></et2-date>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Respond to mail sent to:"/>
-					<taglist-email rows="3" id="addresses" needed="true" class="et2_required" allowFreeEntries="true" empty_label="all my email addresses" span="2"/>
-					<button class="$cont[hideIfSieveDisabled] et2_fullWidth"  label="Add all my aliases" id="AllAddresses" onclick='app.mail.sieve_vac_all_aliases()'/>
+					<et2-description  value="Respond to mail sent to:"></et2-description>
+					<et2-select-email  rows="3" id="addresses" class="et2_required" allowFreeEntries="true" span="2" multiple="1" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="all my email addresses" required="true"></et2-select-email>
+					<et2-button  class="$cont[hideIfSieveDisabled]" label="Add all my aliases" id="AllAddresses" onclick="app.mail.sieve_vac_all_aliases()"></et2-button>
 				</row>
 				<row>
-					<description value="Forward messages to:"/>
-					<taglist-email id="forwards" allowFreeEntries="true" width="100%" empty_label="do not forward"/>
+					<et2-description  value="Forward messages to:"></et2-description>
+					<et2-select-email  id="forwards" allowFreeEntries="true" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="do not forward"></et2-select-email>
 				</row>
 				<row>
-					<description value="Resend after how many days?"/>
-					<textbox type="integer" id="days" min="1" max="31"/>
+					<et2-description  value="Resend after how many days?"></et2-description>
+					<et2-number  id="days" min="1" max="31" precision="0"></et2-number>
 				</row>
 				<row>
-					<description value="With message:"/>
-					<vbox span="all">
-						<textbox multiline="true" id="text" rows="10" needed="1" class="et2_required"/>
-						<description id="by_date_label" value="You can use $$start$$ for the above start date and $$end$$ for the end date."/>
-					</vbox>
+					<et2-description  value="With message:"></et2-description>
+					<et2-vbox  span="all">
+						<et2-textarea  id="text" rows="10" class="et2_required" required="1"></et2-textarea>
+						<et2-description  id="by_date_label" value="You can use $$start$$ for the above start date and $$end$$ for the end date."></et2-description>
+					</et2-vbox>
 				</row>
 				<row>
-					<description value="Set it as default:" disabled="@is_not_admin_user"/>
-					<checkbox id="set_as_default"/>
-					<description value="Validate addresses on submit:"/>
-					<checkbox id="check_mail_sent_to"/>
+					<et2-description  value="Set it as default:" disabled="@is_not_admin_user"></et2-description>
+					<et2-checkbox  id="set_as_default"></et2-checkbox>
+					<et2-description  value="Validate addresses on submit:"></et2-description>
+					<et2-checkbox  id="check_mail_sent_to"></et2-checkbox>
 				</row>
 				<row class="dialogFooterToolbar">
-					<hbox span="all">
-						<button label="Save" id="button[save]" class="$cont[hideIfSieveDisabled]"/>
-						<button label="Apply" id="button[apply]" class="$cont[hideIfSieveDisabled]"/>
-						<button label="Cancel" id="button[cancel]" onclick="window.close();" class="$cont[hideIfSieveDisabled]"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Save" id="button[save]" class="$cont[hideIfSieveDisabled]"></et2-button>
+						<et2-button  label="Apply" id="button[apply]" class="$cont[hideIfSieveDisabled]"></et2-button>
+						<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();" class="$cont[hideIfSieveDisabled]"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/signatures.index.xet b/mail/templates/default/signatures.index.xet
index 8ee1734ada..e51b27e859 100644
--- a/mail/templates/default/signatures.index.xet
+++ b/mail/templates/default/signatures.index.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.signatures.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%" id="sig" class="egwGridView_grid">
@@ -11,27 +10,27 @@
 			</columns>
 			<rows>
 				<row class="th">
-					<description value="ID"/>
-					<description value="Description"/>
-					<description align="center" value="Default"/>
+					<et2-description  value="ID"></et2-description>
+					<et2-description  value="Description"></et2-description>
+					<et2-description  align="center" value="Default"></et2-description>
 				</row>
 				<row class="row"  >
-					<description id="${row}[fm_signatureid]" readonly="true"/>
-					<description id="${row}[fm_description]" no_lang="1"/>
-					<description align="center" id="${row}[fm_defaultsignature]" no_lang="1" readonly="true"/>
+					<et2-description  id="${row}[fm_signatureid]" readonly="true"></et2-description>
+					<et2-description  id="${row}[fm_description]" noLang="1"></et2-description>
+					<et2-description  align="center" id="${row}[fm_defaultsignature]" readonly="true" noLang="1"></et2-description>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="mail.signatures.index" template="" lang="" group="0" version="1.9.001">
-		<description id="msg" no_lang="1" class="message" span="all"/>
+		<et2-description  id="msg" class="message" span="all" noLang="1"></et2-description>
 		<grid width="100%">
 			<columns>
 				<column width="100%"/>
 			</columns>
 			<rows>
 				<row>
-					<buttononly class="$cont[hideIfSigDisabled]" align="right" label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=mail.mail_signatures.edit'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;"/>
+					<et2-button  class="$cont[hideIfSigDisabled]" align="right" label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=mail.mail_signatures.edit'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;" noSubmit="true"></et2-button>
 				</row>
 				<row>
 					<template id="rows"/>
@@ -39,4 +38,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/smimeCertAddToContact.xet b/mail/templates/default/smimeCertAddToContact.xet
index 6c5db4e700..32df762ed8 100644
--- a/mail/templates/default/smimeCertAddToContact.xet
+++ b/mail/templates/default/smimeCertAddToContact.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.smimeCertAddToContact" template="" lang="" group="0" version="17.1">
 		<grid width="100%">
@@ -11,41 +10,41 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader">
-					<description span="2" id="message"/>
-					<image src="smime_sign" class="@class"/>
+					<et2-description  span="2" id="message"></et2-description>
+					<et2-image  src="smime_sign" class="@class"></et2-image>
 				</row>
 				<row>
-					<description id="message2"/>
+					<et2-description  id="message2"></et2-description>
 				</row>
 				<row>
-					<description value="Signed by" label="%s:"/>
-					<description id="certDetails[subject][commonName]"/>
+					<et2-description  value="Signed by" label="%s:"></et2-description>
+					<et2-description  id="certDetails[subject][commonName]"></et2-description>
 				</row>
 				<row>
-					<description value="Email address" label="%s:"/>
-					<description id="certDetails[subject][emailAddress]"/>
+					<et2-description  value="Email address" label="%s:"></et2-description>
+					<et2-description  id="certDetails[subject][emailAddress]"></et2-description>
 				</row>
 				<row>
-					<description value="Country" label="%s:"/>
-					<description id="certDetails[subject][countryName]"/>
+					<et2-description  value="Country" label="%s:"></et2-description>
+					<et2-description  id="certDetails[subject][countryName]"></et2-description>
 				</row>
 				<row>
-					<description value="Certificate issued by" label="%s:"/>
-					<description id="certDetails[issuer][commonName]"/>
+					<et2-description  value="Certificate issued by" label="%s:"></et2-description>
+					<et2-description  id="certDetails[issuer][commonName]"></et2-description>
 				</row>
 				<row>
-					<tabbox id="tabs" class="et2_nowrap" tab_height="250" width="100%" align_tabs="h">
+					<et2-tabbox  id="tabs" class="et2_nowrap" width="100%" tabHeight="250" alignTabs="h">
 						<tabs>
 							<tab id="details" label="Certificate Details"/>
 							<tab id="certificate" label="Certificate in text"/>
 						</tabs>
 						<tabpanels>
 							<html multiline="true" id="certHtml" readonly="true"/>
-							<textbox id="cert" readonly="true" multiline="true" class="et2_fullWidth" />
+							<et2-textarea  id="cert" readonly="true" ></et2-textarea>
 						</tabpanels>
-					</tabbox>
+					</et2-tabbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/smimeCertGen.xet b/mail/templates/default/smimeCertGen.xet
index 53c90566d0..84262d451c 100644
--- a/mail/templates/default/smimeCertGen.xet
+++ b/mail/templates/default/smimeCertGen.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.smimeCertGen" template="" lang="" group="0" version="17.1">
 		<grid width="100%">
@@ -10,29 +10,29 @@
 				<row>
 					<groupbox>
 						<caption label="Certificate details"/>
-						<vbox>
-							<textbox id="countryName" class="et2_fullWidth" blur="Country name (2 letter code, eg. DE)" maxlength="2"/>
-							<textbox id="stateOrProvinceName" class="et2_fullWidth" blur="State or province name"/>
-							<textbox id="localityName" class="et2_fullWidth" blur="Locality name"/>
-							<textbox id="organizationName" class="et2_fullWidth" blur="Organization name"/>
-							<textbox id="organizationalUnitName" class="et2_fullWidth" blur="Organizational unit name"/>
-							<textbox id="commonName" class="et2_fullWidth" blur="Common name"/>
-							<textbox id="emailAddress" class="et2_fullWidth" blur="Email address"/>
-							<textbox id="validity" type="integer" label="Certificate validity in days" blur="3650"/>
-						</vbox>
+						<et2-vbox>
+							<et2-textbox  id="countryName" maxlength="2" placeholder="Country name (2 letter code, eg. DE)"></et2-textbox>
+							<et2-textbox  id="stateOrProvinceName" placeholder="State or province name"></et2-textbox>
+							<et2-textbox  id="localityName" placeholder="Locality name"></et2-textbox>
+							<et2-textbox  id="organizationName" placeholder="Organization name"></et2-textbox>
+							<et2-textbox  id="organizationalUnitName" placeholder="Organizational unit name"></et2-textbox>
+							<et2-textbox  id="commonName" placeholder="Common name"></et2-textbox>
+							<et2-textbox  id="emailAddress" placeholder="Email address"></et2-textbox>
+							<et2-textbox  id="validity" type="integer" label="Certificate validity in days" placeholder="3650"></et2-textbox>
+						</et2-vbox>
 					</groupbox>
 				</row>
 				<row>
 					<groupbox>
 						<caption label="passphrase"/>
-						<description value="Enter a passphrase if you would like to protect your private key by password."/>
-						<vbox>
-							<passwd id="passphrase" blur="Enter a passphrase" class="et2_fullWidth"/>
-							<passwd id="passphraseConf" blur="Repeat the passphrase" class="et2_fullWidth"/>
-						</vbox>
+						<et2-description  value="Enter a passphrase if you would like to protect your private key by password."></et2-description>
+						<et2-vbox>
+							<et2-password  id="passphrase" placeholder="Enter a passphrase"></et2-password>
+							<et2-password  id="passphraseConf" placeholder="Repeat the passphrase"></et2-password>
+						</et2-vbox>
 					</groupbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/subscribe.xet b/mail/templates/default/subscribe.xet
index e174811f83..31ed85a594 100755
--- a/mail/templates/default/subscribe.xet
+++ b/mail/templates/default/subscribe.xet
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.subscribe" template="" lang="" group="0" version="1.9.001">
-		<hbox class="dialogHeader" >
-			<description value="Subscription folders" class="mail_subscription_header"/>
-		</hbox>
-		<hbox class="treeContainer">
+		<et2-hbox  class="dialogHeader" >
+			<et2-description  value="Subscription folders" class="mail_subscription_header"></et2-description>
+		</et2-hbox>
+		<et2-hbox  class="treeContainer">
 			<tree id="foldertree" multiple="true" autoloading="mail_ui::ajax_tree_autoloading" onopenstart="app.mail.subscription_autoloadingStart" onopenend="app.mail.subscription_autoloadingEnd" multimarking="strict" highlighting="true" oncheck="app.mail.folderMgmt_onCheck" onselect="app.mail.folderMgmt_onSelect"/>
-		</hbox>
-		<hbox  class="dialogFooterToolbar">
-			<button statustext="Saves subscription changes" label="Save" id="button[save]"/>
-			<button statustext="Applies the changes made" label="Apply" id="button[apply]" onclick="app.mail.subscription_apply"/>
-			<button label="Cancel" id="button[cancel]" onclick="window.close()"/>
-		</hbox>
+		</et2-hbox>
+		<et2-hbox  class="dialogFooterToolbar">
+			<et2-button  statustext="Saves subscription changes" label="Save" id="button[save]"></et2-button>
+			<et2-button  statustext="Applies the changes made" label="Apply" id="button[apply]" onclick="app.mail.subscription_apply"></et2-button>
+			<et2-button  label="Cancel" id="button[cancel]" onclick="window.close()"></et2-button>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/mobile/acl.xet b/mail/templates/mobile/acl.xet
index f0f30b1afe..ad1ec3540d 100644
--- a/mail/templates/mobile/acl.xet
+++ b/mail/templates/mobile/acl.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.acl" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%" height="100%">
@@ -9,14 +8,14 @@
 			</columns>
 			<rows>
 				<row class="dialogHeadbar">
-					<hbox span="all">
-						<button id="button[save]" class="$cont[hideIfSieveDisabled]"/>
-						<button id="button[apply]" class="$cont[hideIfSieveDisabled]"/>
-						<button id="button[cancel]" onclick="window.close();" class="$cont[hideIfSieveDisabled]"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  id="button[save]" class="$cont[hideIfSieveDisabled]"></et2-button>
+						<et2-button  id="button[apply]" class="$cont[hideIfSieveDisabled]"></et2-button>
+						<et2-button  id="button[cancel]" onclick="window.close();" class="$cont[hideIfSieveDisabled]"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<taglist id="mailbox" width="100%" maxSelection="1" empty_label="Folder" autocomplete_params='' allowFreeEntries="false" onchange='app.mail.acl_folderChange'/>
+					<et2-select  id="mailbox" width="100%" allowFreeEntries="false" onchange="app.mail.acl_folderChange" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_search" searchOptions="" emptyLabel="Folder"></et2-select>
 				</row>
 				<row>
 					<grid id="grid" width="100%">
@@ -25,31 +24,29 @@
 						</columns>
 						<rows>
 							<row class="th">
-								<description value="Rights"/>
+								<et2-description  value="Rights"></et2-description>
 							</row>
 							<row class="row"  valign="top">
-								<vbox>
-									<taglist-account id="${row}[acc_id]" allowFreeEntries="true" maxSelection="1" account_type="@account_type" empty_label="Add user or email" />
-									<hbox>
-										<menulist>
-											<menupopup id="${row}[acl]" label="Rights" onchange="app.mail.acl_common_rights_selector"/>
-										</menulist>
-										<checkbox align="center" label="Recursively" id="${row}[acl_recursive]"/>
-										<button align="right" statustext="Delete this ACL" id="delete[${row}]" value="${row}" image="delete" onclick="et2_dialog.confirm(widget,'Do you really want to remove all rights from this account?','Remove')"/>
-									</hbox>
+								<et2-vbox>
+									<et2-select-account  id="${row}[acc_id]" allowFreeEntries="true" accountType="@account_type" emptyLabel="Add user or email"></et2-select-account>
+									<et2-hbox>
+										<et2-select  id="${row}[acl]" label="Rights" onchange="app.mail.acl_common_rights_selector"></et2-select>
+										<et2-checkbox  align="center" label="Recursively" id="${row}[acl_recursive]"></et2-checkbox>
+										<et2-button-icon  align="right" statustext="Delete this ACL" id="delete[${row}]" value="${row}" image="delete" onclick="et2_dialog.confirm(widget,'Do you really want to remove all rights from this account?','Remove')"></et2-button-icon>
+									</et2-hbox>
 
-									<hbox class="aclDetails">
-										<checkbox align="center" id="${row}[acl_l]" onchange="app.mail.acl_common_rights" label="L"/>
-										<checkbox align="center" id="${row}[acl_r]" onchange="app.mail.acl_common_rights" label="R"/>
-										<checkbox align="center" id="${row}[acl_s]" onchange="app.mail.acl_common_rights" label="S"/>
-										<checkbox align="center" id="${row}[acl_w]" onchange="app.mail.acl_common_rights" label="W"/>
-										<checkbox align="center" id="${row}[acl_i]" onchange="app.mail.acl_common_rights" label="I"/>
-										<checkbox align="center" id="${row}[acl_p]" onchange="app.mail.acl_common_rights" label="P"/>
-										<checkbox align="center" id="${row}[acl_c]" onchange="app.mail.acl_common_rights" label="C"/>
-										<checkbox align="center" id="${row}[acl_d]" onchange="app.mail.acl_common_rights" label="D"/>
-										<checkbox align="center" id="${row}[acl_a]" onchange="app.mail.acl_common_rights" label="A"/>
-									</hbox>
-								</vbox>
+									<et2-hbox  class="aclDetails">
+										<et2-checkbox  align="center" id="${row}[acl_l]" onchange="app.mail.acl_common_rights" label="L"></et2-checkbox>
+										<et2-checkbox  align="center" id="${row}[acl_r]" onchange="app.mail.acl_common_rights" label="R"></et2-checkbox>
+										<et2-checkbox  align="center" id="${row}[acl_s]" onchange="app.mail.acl_common_rights" label="S"></et2-checkbox>
+										<et2-checkbox  align="center" id="${row}[acl_w]" onchange="app.mail.acl_common_rights" label="W"></et2-checkbox>
+										<et2-checkbox  align="center" id="${row}[acl_i]" onchange="app.mail.acl_common_rights" label="I"></et2-checkbox>
+										<et2-checkbox  align="center" id="${row}[acl_p]" onchange="app.mail.acl_common_rights" label="P"></et2-checkbox>
+										<et2-checkbox  align="center" id="${row}[acl_c]" onchange="app.mail.acl_common_rights" label="C"></et2-checkbox>
+										<et2-checkbox  align="center" id="${row}[acl_d]" onchange="app.mail.acl_common_rights" label="D"></et2-checkbox>
+										<et2-checkbox  align="center" id="${row}[acl_a]" onchange="app.mail.acl_common_rights" label="A"></et2-checkbox>
+									</et2-hbox>
+								</et2-vbox>
 							</row>
 						</rows>
 					</grid>
@@ -57,4 +54,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/mobile/compose.xet b/mail/templates/mobile/compose.xet
index a9b136a46c..b4bce4177c 100644
--- a/mail/templates/mobile/compose.xet
+++ b/mail/templates/mobile/compose.xet
@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.compose" template="" lang="" group="0" version="1.9.001">
-		<vbox class="mailCompose mailComposeHeaderSection" width="100%">
-			<hbox class="dialogHeadbar">
-				<hbox>
+		<et2-vbox  class="mailCompose mailComposeHeaderSection" width="100%">
+			<et2-hbox  class="dialogHeadbar">
+				<et2-hbox>
 					<toolbar class="et2_head_toolbar" id="composeToolbar" width="100%" view_range="2" flat_list="false"/>
-					<description/>
-				</hbox>
-			</hbox>
-			<hbox class="mail-compose_toolbar_assist" width="100%">
+					<et2-description></et2-description>
+				</et2-hbox>
+			</et2-hbox>
+			<et2-hbox  class="mail-compose_toolbar_assist" width="100%">
 				<vfs-select class="$cont[vfsNotAvailable] compose_egw_icons" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose" button_caption=""/>
-				<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='attachments' onFinish="app.mail.uploadForCompose" onStart="app.mail.composeUploadStart" id="uploadForCompose" drop_target ="mail-compose"/>
-				<checkbox statustext="check to save as infolog on send" id="to_infolog" options="on,off"/>
-				<checkbox statustext="check to save as tracker entry on send" id="to_tracker" options="on,off"/>
-				<checkbox statustext="check to save as calendar event on send" id="to_calendar" options="on,off"/>
-				<checkbox statustext="check to receive a notification when the message is read (note: not all clients support this and/or the receiver may not authorize the notification)" id="disposition" options="on,off"/>
-				<checkbox statustext="check to sign the message on send" id="smime_sign" options="on,off"/>
-				<checkbox statustext="check to encrypt the message on send" id="smime_encrypt" options="on,off"/>
-				<passwd id="smime_passphrase"/>
-				<menulist>
-					<menupopup id="priority"/>
-				</menulist>
-			</hbox>
+				<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple="true" progress="attachments" onFinish="app.mail.uploadForCompose" onStart="app.mail.composeUploadStart" id="uploadForCompose" drop_target ="mail-compose"/>
+				<et2-checkbox  statustext="check to save as infolog on send" id="to_infolog" selectedValue="on" unselectedValue="off" ></et2-checkbox>
+				<et2-checkbox  statustext="check to save as tracker entry on send" id="to_tracker" selectedValue="on" unselectedValue="off" ></et2-checkbox>
+				<et2-checkbox  statustext="check to save as calendar event on send" id="to_calendar" selectedValue="on" unselectedValue="off" ></et2-checkbox>
+				<et2-checkbox  statustext="check to receive a notification when the message is read (note: not all clients support this and/or the receiver may not authorize the notification)" id="disposition" selectedValue="on" unselectedValue="off" ></et2-checkbox>
+				<et2-checkbox  statustext="check to sign the message on send" id="smime_sign" selectedValue="on" unselectedValue="off" ></et2-checkbox>
+				<et2-checkbox  statustext="check to encrypt the message on send" id="smime_encrypt" selectedValue="on" unselectedValue="off" ></et2-checkbox>
+				<et2-password  id="smime_passphrase"></et2-password>
+				<et2-select  id="priority"></et2-select>
+			</et2-hbox>
 
 			<grid  width="100%" resize_ratio="0">
 				<columns>
@@ -33,71 +30,71 @@
 				</columns>
 				<rows>
 					<row class="mailComposeHeaders" >
-						<description value="From"/>
-						<menupopup id="mailaccount" onchange="app.mail.submitOnChange" class="et2_fullWidth"/>
-						<vbox>
-							<description id="replyto_expander" value="Reply to" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
-							<description id="folder_expander" value="Folder" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="composeID"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="serverID"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="processedmail_id"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="mode"/>
-							<textbox class="mail-index_quotaDisplayNone" id="lastDrafted"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="references"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="in-reply-to"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="thread-topic"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="thread-index"/>
-							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="list-id"/>
-						</vbox>
+						<et2-description  value="From"></et2-description>
+						<et2-select  id="mailaccount" onchange="app.mail.submitOnChange"></et2-select>
+						<et2-vbox>
+							<et2-description  id="replyto_expander" value="Reply to" class="et2_button_text" onclick="app.mail.compose_fieldExpander"></et2-description>
+							<et2-description  id="folder_expander" value="Folder" class="et2_button_text" onclick="app.mail.compose_fieldExpander"></et2-description>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="composeID"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="serverID"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="processedmail_id"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="mode"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" id="lastDrafted"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="references"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="in-reply-to"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="thread-topic"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="thread-index"></et2-textbox>
+							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="list-id"></et2-textbox>
+						</et2-vbox>
 					</row>
 					<row class="mailComposeHeaders mailComposeJQueryReplyto">
-						<description value="Reply to"/>
-						<taglist-email id="replyto" width="100%" maxSelection="1" onclick="app.mail.address_click"/>
-						<description/>
+						<et2-description  value="Reply to"></et2-description>
+						<et2-select-email  id="replyto" width="100%" onclick="app.mail.address_click" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-select-email>
+						<et2-description></et2-description>
 					</row>
 					<row class="mailComposeHeaders mailComposeJQueryFolder">
-						<description value="Folder"/>
-						<taglist id="folder" autocomplete_url="mail.mail_compose.ajax_searchFolder" autocomplete_params="" allowFreeEntries="false" onclick="app.mail.address_click"/>
-						<description/>
+						<et2-description  value="Folder"></et2-description>
+						<et2-select  id="folder" allowFreeEntries="false" onclick="app.mail.address_click" multiple="true" searchUrl="mail.mail_compose.ajax_searchFolder" searchOptions=""></et2-select>
+						<et2-description></et2-description>
 					</row>
 					<row class="mailComposeHeaders" >
-						<description value="To"/>
-						<taglist-email id="to" width="100%" onclick="app.mail.address_click" include_lists="true" onchange="app.mail.recipients_onchange"/>
-						<vbox>
-							<description id="cc_expander" value="Cc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
-							<description id="bcc_expander" value="Bcc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
-						</vbox>
+						<et2-description  value="To"></et2-description>
+						<et2-select-email  id="to" width="100%" onclick="app.mail.address_click" onchange="app.mail.recipients_onchange" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" includeLists="true"></et2-select-email>
+						<et2-vbox>
+							<et2-description  id="cc_expander" value="Cc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"></et2-description>
+							<et2-description  id="bcc_expander" value="Bcc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"></et2-description>
+						</et2-vbox>
 					</row>
 					<row class="mailComposeHeaders mailComposeJQueryCc">
-						<description value="Cc"/>
-						<taglist-email id="cc" width="100%" onclick="app.mail.address_click" include_lists="true" onchange="app.mail.recipients_onchange"/>
-						<description/>
+						<et2-description  value="Cc"></et2-description>
+						<et2-select-email  id="cc" width="100%" onclick="app.mail.address_click" onchange="app.mail.recipients_onchange" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" includeLists="true"></et2-select-email>
+						<et2-description></et2-description>
 					</row>
 					<row  class="mailComposeHeaders mailComposeJQueryBcc">
-						<description value="Bcc"/>
-						<taglist-email id="bcc" width="100%" onclick="app.mail.address_click" include_lists="true" onchange="app.mail.recipients_onchange"/>
-						<description/>
+						<et2-description  value="Bcc"></et2-description>
+						<et2-select-email  id="bcc" width="100%" onclick="app.mail.address_click" onchange="app.mail.recipients_onchange" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" includeLists="true"></et2-select-email>
+						<et2-description></et2-description>
 					</row>
 					<row class="mailComposeHeaders subjectContainer">
-						<textbox span="2" align="left" width="100%" id="subject" blur="Subject" height="25" onchange="app.mail.subject2title"/>
-						<checkbox statustext="Change editor type" label="HTML" id="mimeType" onchange="app.mail.submitOnChange" options=",, ,disable" tabindex="7"/>
+						<et2-textbox  span="2" align="left" width="100%" id="subject" height="25" onchange="app.mail.subject2title" placeholder="Subject"></et2-textbox>
+						<et2-checkbox  statustext="Change editor type" label="HTML" id="mimeType" onchange="app.mail.submitOnChange" tabindex="7" roTrue=" " roFalse="disable"></et2-checkbox>
 					</row>
 				</rows>
 			</grid>
-		</vbox>
-		<vbox class="mailComposeBodySection" width="99%">
-			<hbox disabled="@is_plain" class="mailComposeBody mailComposeHtmlContainer">
+		</et2-vbox>
+		<et2-vbox  class="mailComposeBodySection" width="99%">
+			<et2-hbox  disabled="@is_plain" class="mailComposeBody mailComposeHtmlContainer">
 				<htmlarea span="all" name="mail_htmltext" id="mail_htmltext" statusbar="false" menubar="false" mode="simple" imageUpload="link_to"  height="478px" width="100%" resize_ratio="0"/>
-			</hbox>
-			<hbox disabled="@is_html" class="mailComposeBody mailComposeTextContainer">
-				<textbox multiline="true" rows="40" cols="120" width="100%" span="all" height="100%" no_lang="1" name="mail_plaintext" id="mail_plaintext" resize_ratio="0"/>
-			</hbox>
-			<vbox class="et2_file mailUploadSection" disabled="@no_griddata">
-				<vbox>
-					<select id="filemode" label="Send files as" onchange="app.mail.check_sharing_filemode"/>
-					<date id="expiration" label="Expiration" blur="EPL only" data_format="Y-m-d"/>
-					<passwd id="password" blur="password protect" statustext="Only makes sense, if you transport password through a different channel / outside of this mail to recipients!"/>
-				</vbox>
+			</et2-hbox>
+			<et2-hbox  disabled="@is_html" class="mailComposeBody mailComposeTextContainer">
+				<et2-textarea  rows="40" cols="120" width="100%" span="all" height="100%" name="mail_plaintext" id="mail_plaintext" noLang="1" resizeRatio="0"></et2-textarea>
+			</et2-hbox>
+			<et2-vbox  class="et2_file mailUploadSection" disabled="@no_griddata">
+				<et2-vbox>
+					<et2-select  id="filemode" label="Send files as" onchange="app.mail.check_sharing_filemode"></et2-select>
+					<et2-date  id="expiration" label="Expiration" placeholder="EPL only" dataFormat="Y-m-d"></et2-date>
+					<et2-password  id="password" statustext="Only makes sense, if you transport password through a different channel / outside of this mail to recipients!" placeholder="password protect"></et2-password>
+				</et2-vbox>
 				<grid id="attachments" width="100%" maxheight="165" class="egwGridView_grid" resize_ratio="0">
 					<columns>
 						<column disabled="!@showtempname" width="10%"/>
@@ -107,14 +104,14 @@
 					</columns>
 					<rows>
 						<row class="row attachmentRow">
-							<description id="${row}[tmp_name]"/>
-							<description class="useEllipsis et2_link" id="${row}[name]" no_lang="1" onclick="app.mail.displayUploadedFile"/>
+							<et2-description  id="${row}[tmp_name]"></et2-description>
+							<et2-description  class="useEllipsis et2_link" id="${row}[name]" onclick="app.mail.displayUploadedFile" noLang="1"></et2-description>
 							<vfs-size align="right" id="${row}[size]" />
-							<button id="delete[$row_cont[tmp_name]]" value="Delete" image="delete"/>
+							<et2-button-icon  id="delete[$row_cont[tmp_name]]" value="Delete" image="delete"></et2-button-icon>
 						</row>
 					</rows>
 				</grid>
-			</vbox>
-		</vbox>
+			</et2-vbox>
+		</et2-vbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/mobile/display.xet b/mail/templates/mobile/display.xet
index adfe49583d..331a00b64b 100644
--- a/mail/templates/mobile/display.xet
+++ b/mail/templates/mobile/display.xet
@@ -1,54 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.display" template="" lang="" group="0" version="1.9.001">
-		<appicon class="onlyPrint"/>
+		<et2-appicon  class="onlyPrint"></et2-appicon>
 		<html id="msg"/>
-		<vbox class="mailDisplay">
-			<hbox class="dialogHeadbar">
-				<hbox>
+		<et2-vbox  class="mailDisplay">
+			<et2-hbox  class="dialogHeadbar">
+				<et2-hbox>
 					<toolbar class="et2_head_toolbar" id="displayToolbar" width="100%" view_range="6" flat_list="true"/>
-					<description/>
-				</hbox>
-			</hbox>
-			<hbox  class="mail-d-h1" width="100%">
-				<description align="left" id="mail_displaysubject" no_lang="1" readonly="true"/>
-			</hbox>
+					<et2-description></et2-description>
+				</et2-hbox>
+			</et2-hbox>
+			<et2-hbox  class="mail-d-h1" width="100%">
+				<et2-description  align="left" id="mail_displaysubject" readonly="true" noLang="1"></et2-description>
+			</et2-hbox>
 
-			<hbox class="mail-d-h2" id="mailDisplayHeadersFrom" disabled="!@FROM" width="100%">
-				<url-email id="FROM" readonly="true"/>
-			</hbox>
-			<hbox class="mail-d-h2" align="right" width="100%">
-				<date-time id="mail_displaydate" readonly="true"/>
-			</hbox>
-			<hbox class="mail-d-h2" id="mailDisplayHeadersTo" disabled="!@TO" width="100%">
-				<description value="To"/>
-				<hbox id="TO" class="mail_extraEmails">
-				</hbox>
-				<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
-			</hbox>
-			<hbox>
-				<details title="show details" toggle_align="left">
-					<hbox class="mail-d-h2" id="mailDisplayHeadersSender" disabled="!@SENDER" width="100%">
-						<description value="on behalf of"/>
-						<url-email id="SENDER" readonly="true"/>
-					</hbox>
-					<hbox class="mail-d-h2" id="mailDisplayHeadersCc" disabled="!@CC"  width="100%">
-						<description value="Cc"/>
-						<hbox id="CC" class="mail_extraEmails">
-						</hbox>
-						<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
-					</hbox>
-					<hbox class="mail-d-h2" id="mailDisplayHeadersBcc" disabled="!@BCC" width="100%">
-						<description value="Bcc"/>
-						<hbox id="BCC" class="mail_extraEmails">
-						</hbox>
-						<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
-					</hbox>
-				</details>
-				<details title="show attachments" toggle_align="left" class="attachments">
-					<box class="$cont[mailDisplayAttachmentsClass]">
+			<et2-hbox  class="mail-d-h2" id="mailDisplayHeadersFrom" disabled="!@FROM" width="100%">
+				<et2-url-email  id="FROM" readonly="true"></et2-url-email>
+			</et2-hbox>
+			<et2-hbox  class="mail-d-h2" align="right" width="100%">
+				<et2-date-time  id="mail_displaydate" readonly="true"></et2-date-time>
+			</et2-hbox>
+			<et2-hbox  class="mail-d-h2" id="mailDisplayHeadersTo" disabled="!@TO" width="100%">
+				<et2-description  value="To"></et2-description>
+				<et2-hbox  id="TO" class="mail_extraEmails">
+				</et2-hbox>
+				<et2-button  class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader" noSubmit="true"></et2-button>
+			</et2-hbox>
+			<et2-hbox>
+				<et2-details  summary="show details" toggleAlign="left">
+					<et2-hbox  class="mail-d-h2" id="mailDisplayHeadersSender" disabled="!@SENDER" width="100%">
+						<et2-description  value="on behalf of"></et2-description>
+						<et2-url-email  id="SENDER" readonly="true"></et2-url-email>
+					</et2-hbox>
+					<et2-hbox  class="mail-d-h2" id="mailDisplayHeadersCc" disabled="!@CC" width="100%">
+						<et2-description  value="Cc"></et2-description>
+						<et2-hbox  id="CC" class="mail_extraEmails">
+						</et2-hbox>
+						<et2-button  class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader" noSubmit="true"></et2-button>
+					</et2-hbox>
+					<et2-hbox  class="mail-d-h2" id="mailDisplayHeadersBcc" disabled="!@BCC" width="100%">
+						<et2-description  value="Bcc"></et2-description>
+						<et2-hbox  id="BCC" class="mail_extraEmails">
+						</et2-hbox>
+						<et2-button  class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader" noSubmit="true"></et2-button>
+					</et2-hbox>
+				</et2-details>
+				<et2-details  class="attachments" summary="show attachments" toggleAlign="left">
+					<et2-box  class="$cont[mailDisplayAttachmentsClass]">
 						<grid disabled="@no_griddata" id="mail_displayattachments" class="egwGridView_grid" width="100%">
 							<columns>
 								<column disabled="!@showtempname"/>
@@ -64,28 +63,28 @@
 							</columns>
 							<rows>
 								<row class="row attachmentRow" >
-									<description id="${row}[attachment_number]" />
-									<description id="${row}[partID]" />
-									<description id="${row}[type]" />
-									<description id="${row}[winmailFlag]" />
-									<description class="useEllipsis et2_link" id="${row}[filename]" expose_view="true" mime="$row_cont[type]" no_lang="1" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
-									<description align="right" id="${row}[size]" />
-									<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachmentHandler(widget,'downloadOneAsFile', ${row})"/>
-									<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})"/>
-									<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAttachmentHandler(widget,'saveAllToVfs', ${row})"/>
-									<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_zip" onclick="app.mail.saveAttachmentHandler(widget,'downloadAllToZip', ${row})" label="Save as Zip"/>
+									<et2-description  id="${row}[attachment_number]"></et2-description>
+									<et2-description  id="${row}[partID]"></et2-description>
+									<et2-description  id="${row}[type]"></et2-description>
+									<et2-description  id="${row}[winmailFlag]"></et2-description>
+									<et2-description-expose  class="useEllipsis et2_link" id="${row}[filename]" mime="$row_cont[type]" href="$row_cont[mime_url]" noLang="1" mimeData="$row_cont[mime_data]"></et2-description-expose>
+									<et2-description  align="right" id="${row}[size]"></et2-description>
+									<et2-button-icon  id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachmentHandler(widget,'downloadOneAsFile', ${row})" noSubmit="true"></et2-button-icon>
+									<et2-button-icon  id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})" noSubmit="true"></et2-button-icon>
+									<et2-button-icon  class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAttachmentHandler(widget,'saveAllToVfs', ${row})" noSubmit="true"></et2-button-icon>
+									<et2-button  class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_zip" onclick="app.mail.saveAttachmentHandler(widget,'downloadAllToZip', ${row})" label="Save as Zip" noSubmit="true"></et2-button>
 								</row>
 							</rows>
 						</grid>
-					</box>
-				</details>
-			</hbox>
+					</et2-box>
+				</et2-details>
+			</et2-hbox>
 
 
-		</vbox>
-		<vbox class="mailDisplay">
+		</et2-vbox>
+		<et2-vbox  class="mailDisplay">
 			<iframe frameborder="1" class="mail_displaybody" id="mailDisplayBodySrc" name="mailDisplayBodySrc" scrolling="auto" width="100%"/>
 
-		</vbox>
+		</et2-vbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/mobile/index.xet b/mail/templates/mobile/index.xet
index f11efa7b42..d9a8ceee50 100644
--- a/mail/templates/mobile/index.xet
+++ b/mail/templates/mobile/index.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -14,42 +13,42 @@
 
 				</row>
 				<row>
-					<hbox>
-						<description class="$row_cont[class] mobile_cat_col"/>
-						<lavatar src="$row_cont[avatar]" lname="$row_cont[address]" shape="rounded" size="2.75em"/>
-					</hbox>
-					<vbox>
-						<url-email id="${row}[address]" class="$row_cont[class]" readonly="true"/>
-						<hbox>
-							<description  class="status_img $row_cont[class]"/>
-							<description id="${row}[subject]" no_lang="1" class="$row_cont[class]" />
-						</hbox>
-						<description id="${row}[bodypreview]" no_lang="1" class='et2_label bodypreview'/>
-					</vbox>
-					<vbox>
-						<hbox>
-							<date-time-today align="center"  class="$row_cont[class]" id="${row}[date]" readonly="true"/>
-						</hbox>
-						<hbox>
-							<image src="$row_cont[smime]" height="16px"/>
+					<et2-hbox>
+						<et2-description  class="$row_cont[class] mobile_cat_col"></et2-description>
+						<et2-lavatar  src="$row_cont[avatar]" lname="$row_cont[address]" shape="rounded" size="2.75em"></et2-lavatar>
+					</et2-hbox>
+					<et2-vbox>
+						<et2-url-email  id="${row}[address]" class="$row_cont[class]" readonly="true"></et2-url-email>
+						<et2-hbox>
+							<et2-description  class="status_img $row_cont[class]"></et2-description>
+							<et2-description  id="${row}[subject]" class="$row_cont[class]" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-description  id="${row}[bodypreview]" class="et2_label bodypreview" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-hbox>
+							<et2-date-time-today  align="center" class="$row_cont[class]" id="${row}[date]" readonly="true"></et2-date-time-today>
+						</et2-hbox>
+						<et2-hbox>
+							<et2-image  src="$row_cont[smime]" height="16px"></et2-image>
 							<html id="${row}[attachments]"/>
-						</hbox>
-					</vbox>
+						</et2-hbox>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="mail.index.header_right">
-		<hbox class="mail-index_quotabox"><progress id="nm[quotainpercent]" label="@nm[quota]" class="@nm[quotaclass]"/></hbox>
+		<et2-hbox  class="mail-index_quotabox"><progress id="nm[quotainpercent]" label="@nm[quota]" class="@nm[quotaclass]"/></et2-hbox>
 	</template>
 	<template id="mail.index" template="" lang="" group="0" version="1.9.001">
 		<tree autoloading="mail.mail_ui.ajax_foldertree" id="nm[foldertree]" onclick="app.mail.mail_changeFolder" parent_node="mail-tree_target"/>
 		<html id="msg"/>
-		<hbox class="mail-index_vacation"><vbox>
-			<description id="nm[vacationnotice]" class="@nm[vacationclass]"/>
-			<description id="nm[vacationrange]" class="@nm[vacationrangeclass]"/></vbox>
-		</hbox>
+		<et2-hbox  class="mail-index_vacation"><et2-vbox>
+			<et2-description  id="nm[vacationnotice]" class="@nm[vacationclass]"></et2-description>
+			<et2-description  id="nm[vacationrange]" class="@nm[vacationrangeclass]"></et2-description></et2-vbox>
+		</et2-hbox>
 		<nextmatch id="nm" onselect="app.mail.mail_preview" template="mail.index.rows" right_header="mail.index.header_right"/>
-		<buttononly id="composeMail" class="plus_button" onclick="app.mail.mail_compose(false);" size="large" image="plus" circle="true" background_image="true"/>
+		<et2-button  id="composeMail" class="plus_button" onclick="app.mail.mail_compose(false);" size="large" image="plus" circle="true" noSubmit="true"></et2-button>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/mobile/sieve.vacation.xet b/mail/templates/mobile/sieve.vacation.xet
index efa78d4857..4e2a127136 100644
--- a/mail/templates/mobile/sieve.vacation.xet
+++ b/mail/templates/mobile/sieve.vacation.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.sieve.vacation" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%" height="100%">
@@ -9,70 +8,66 @@
 			</columns>
 			<rows>
 				<row class="dialogHeadbar">
-					<hbox span="all">
-						<button id="button[save]" class="$cont[hideIfSieveDisabled]"/>
-						<button id="button[apply]" class="$cont[hideIfSieveDisabled]"/>
-						<button id="button[cancel]" onclick="window.close();" class="$cont[hideIfSieveDisabled]"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  id="button[save]" class="$cont[hideIfSieveDisabled]"></et2-button>
+						<et2-button  id="button[apply]" class="$cont[hideIfSieveDisabled]"></et2-button>
+						<et2-button  id="button[cancel]" onclick="window.close();" class="$cont[hideIfSieveDisabled]"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<hbox>
-						<description align="right" disabled="!@is_admin_vac" for="acc_id" value="Mail account"/>
-						<menulist>
-							<menupopup id="acc_id" disabled="!@is_admin_vac" onchange="app.mail.vacation_change_account" class="et2_fullWidth"/>
-						</menulist>
-					</hbox>
+					<et2-hbox>
+						<et2-description  align="right" disabled="!@is_admin_vac" for="acc_id" value="Mail account"></et2-description>
+						<et2-select  id="acc_id" disabled="!@is_admin_vac" onchange="app.mail.vacation_change_account"></et2-select>
+					</et2-hbox>
 				</row>
 				<row>
-					<hbox>
-						<description value="Status:"/>
-						<vbox span="all">
-							<menulist>
-								<menupopup id="status" onchange='app.mail.vacationFilterStatusChange'/>
-							</menulist>
-							<date id="start_date"/>
-							<date id="end_date" />
-						</vbox>
-					</hbox>
+					<et2-hbox>
+						<et2-description  value="Status:"></et2-description>
+						<et2-vbox  span="all">
+							<et2-select  id="status" onchange="app.mail.vacationFilterStatusChange"></et2-select>
+							<et2-date  id="start_date"></et2-date>
+							<et2-date  id="end_date" ></et2-date>
+						</et2-vbox>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="Respond to mail sent to:"/>
+					<et2-description  value="Respond to mail sent to:"></et2-description>
 				</row>
 				<row>
-					<vbox>
-						<taglist-email id="addresses" needed="true" class="et2_required" allowFreeEntries="true" empty_label="all my email addresses" span="2"/>
-						<button class="$cont[hideIfSieveDisabled] et2_fullWidth"  label="Add all my aliases" id="AllAddresses" onclick='app.mail.sieve_vac_all_aliases()'/>
-					</vbox>
+					<et2-vbox>
+						<et2-select-email  id="addresses" class="et2_required" allowFreeEntries="true" span="2" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="all my email addresses" required="true"></et2-select-email>
+						<et2-button  class="$cont[hideIfSieveDisabled]" label="Add all my aliases" id="AllAddresses" onclick="app.mail.sieve_vac_all_aliases()"></et2-button>
+					</et2-vbox>
 				</row>
 				<row>
-					<description value="Forward messages to:"/>
+					<et2-description  value="Forward messages to:"></et2-description>
 				</row>
 				<row>
-					<taglist-email id="forwards" allowFreeEntries="true" width="100%" empty_label="do not forward"/>
+					<et2-select-email  id="forwards" allowFreeEntries="true" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="do not forward"></et2-select-email>
 				</row>
 				<row>
-					<hbox>
-						<description value="Resend after how many days?"/>
-						<textbox type="integer" id="days" min="1" max="31"/>
-					</hbox>
+					<et2-hbox>
+						<et2-description  value="Resend after how many days?"></et2-description>
+						<et2-number  id="days" min="1" max="31" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row>
-					<description value="With message:"/>
+					<et2-description  value="With message:"></et2-description>
 				</row>
 				<row>
-					<textbox multiline="true" id="text" width="99%" height="150px" needed="1" class="et2_required" resize_ratio="0"/>
+					<et2-textarea  id="text" width="99%" height="150px" class="et2_required" required="1" resizeRatio="0"></et2-textarea>
 				</row>
 				<row>
-					<description id="by_date_label" value="You can use $$start$$ for the above start date and $$end$$ for the end date."/>
+					<et2-description  id="by_date_label" value="You can use $$start$$ for the above start date and $$end$$ for the end date."></et2-description>
 				</row>
 
 				<row>
-					<checkbox id="set_as_default" label="Set it as default:"/>
+					<et2-checkbox  id="set_as_default" label="Set it as default:"></et2-checkbox>
 				</row>
 				<row>
-					<checkbox id="check_mail_sent_to" label="Validate addresses on submit:"/>
+					<et2-checkbox  id="check_mail_sent_to" label="Validate addresses on submit:"></et2-checkbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/mobile/subscribe.xet b/mail/templates/mobile/subscribe.xet
index 8c6a3931dc..300106f480 100644
--- a/mail/templates/mobile/subscribe.xet
+++ b/mail/templates/mobile/subscribe.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.subscribe" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -9,26 +8,26 @@
 			</columns>
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
-					<hbox  span="all" width="100%">
-						<button statustext="Saves this entry" id="button[save]" image="save"/>
-						<button statustext="Apply the changes" id="button[apply]" image="apply"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button-icon  statustext="Saves this entry" id="button[save]" image="save"></et2-button-icon>
+						<et2-button-icon  statustext="Apply the changes" id="button[apply]" image="apply"></et2-button-icon>
+					</et2-hbox>
 				</row>
 				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
-					<hbox span="all" width="100%">
-						<button label="Search" id="button[search]" image="search"/>
-						<button label="Cancel" id="button[cancelsearch]" image="cancel"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  label="Search" id="button[search]" image="search"></et2-button>
+						<et2-button  label="Cancel" id="button[cancelsearch]" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>	
 				<row>
-					<description value="Subscription folders" class="mail_subscription_header"/>
+					<et2-description  value="Subscription folders" class="mail_subscription_header"></et2-description>
 				</row>
 				<row>
-					<box scrolling="auto">
+					<et2-box  scrolling="auto">
 						<tree id="foldertree" multiple="true" autoloading="mail_ui::ajax_tree_autoloading" onopenstart="app.mail.subscription_autoloadingStart" onopenend="app.mail.subscription_autoloadingEnd"/>
-					</box>
+					</et2-box>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/mobile/view.xet b/mail/templates/mobile/view.xet
index abe9427401..b477d3a52f 100644
--- a/mail/templates/mobile/view.xet
+++ b/mail/templates/mobile/view.xet
@@ -1,49 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="mail.view" template="" lang="" group="0" version="1.9.001" height="100%">
-		<vbox width="100%" height="100%">
-			<hbox class="dialogHeadbar">
-				<hbox>
+		<et2-vbox  width="100%" height="100%">
+			<et2-hbox  class="dialogHeadbar">
+				<et2-hbox>
 					<toolbar id="toolbar"  class="et2_head_toolbar" width="100%" view_range="1" flat_list="true"/>
-					<description/>
-				</hbox>
-			</hbox>
-			<hbox class="mailPreviewHeaders">
-				<description id="subject" readonly="true"
-							 hover_action="app.mail.modifyMessageSubjectDialog"
-							 hover_action_title="Modify subject of this message"/>
-				<hbox class="mailPreviewHeaders smimeIcons">
-					<image id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="!@smime=smime_sign"
-						   align="right" width="24"/>
-					<image id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message"
-						   disabled="!@smime=smime_encrypt" align="right" width="24"/>
-				</hbox>
-			</hbox>
-			<hbox width="100%" class="mailPreviewHeaders">
-				<lavatar src="@avatar" lname="@address" shape="rounded" size="2.75em"/>
-				<vbox>
-					<hbox>
-						<et2-details class="details" toggleOnHover="true" hoist="true" toggleAlign="left">
-							<et2-select-email slot="summary" id="fromaddress" readonly="true"/>
-							<hbox>
-								<description value="From" class="firstColumnTitle"/>
-								<et2-select-email id="additionalfromaddress" readonly="true"></et2-select-email>
-							</hbox>
-							<hbox disabled="!@toaddress" width="100%">
-								<description value="To" class="firstColumnTitle"/>
-								<et2-select-email id="additionaltoaddress" readonly="true"></et2-select-email>
-							</hbox>
-							<hbox disabled="!@ccaddress"  width="100%">
-								<description value="Cc" class="firstColumnTitle"/>
-								<et2-select-email id="ccaddress" readonly="true"></et2-select-email>
-							</hbox>
+					<et2-description></et2-description>
+				</et2-hbox>
+			</et2-hbox>
+			<et2-hbox  class="mailPreviewHeaders">
+				<et2-description  id="subject" readonly="true" hoverAction="app.mail.modifyMessageSubjectDialog" hoverActionTitle="Modify subject of this message"></et2-description>
+				<et2-hbox  class="mailPreviewHeaders smimeIcons">
+					<et2-image  id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="!@smime=smime_sign" align="right" width="24"></et2-image>
+					<et2-image  id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" disabled="!@smime=smime_encrypt" align="right" width="24"></et2-image>
+				</et2-hbox>
+			</et2-hbox>
+			<et2-hbox  width="100%" class="mailPreviewHeaders">
+				<et2-lavatar  src="@avatar" lname="@address" shape="rounded" size="2.75em"></et2-lavatar>
+				<et2-vbox>
+					<et2-hbox>
+						<et2-details  class="details" toggleOnHover="true" hoist="true" toggleAlign="left">
+							<et2-select-email  slot="summary" id="fromaddress" readonly="true"/>
+							<et2-hbox>
+								<et2-description  value="From" class="firstColumnTitle"></et2-description>
+								<et2-select-email  id="additionalfromaddress" readonly="true"></et2-select-email>
+							</et2-hbox>
+							<et2-hbox  disabled="!@toaddress" width="100%">
+								<et2-description  value="To" class="firstColumnTitle"></et2-description>
+								<et2-select-email  id="additionaltoaddress" readonly="true"></et2-select-email>
+							</et2-hbox>
+							<et2-hbox  disabled="!@ccaddress" width="100%">
+								<et2-description  value="Cc" class="firstColumnTitle"></et2-description>
+								<et2-select-email  id="ccaddress" readonly="true"></et2-select-email>
+							</et2-hbox>
 						</et2-details>
-						<date-time-today align="right" id="date" readonly="true"/>
-					</hbox>
+						<et2-date-time-today  align="right" id="date" readonly="true"></et2-date-time-today>
+					</et2-hbox>
 					<et2-details  toggleAlign="left" title="@attachmentsBlockTitle" toggleOnHover="true" hoist="true" class="attachments" disabled="!@attachmentsBlock">
-						<hbox slot="summary">
+						<et2-hbox  slot="summary">
 							<grid class="previewAttachmentArea egwGridView_grid" >
 								<columns>
 									<column disabled="!@showtempname"/>
@@ -56,16 +51,16 @@
 								</columns>
 								<rows>
 									<row class="row attachmentRow">
-										<description id="attachmentsBlock[0][attachment_number]" />
-										<description id="attachmentsBlock[0][partID]" />
-										<description id="attachmentsBlock[0][type]" />
-										<description id="attachmentsBlock[0][winmailFlag]" />
-										<description class="et2_link useEllipsis" id="attachmentsBlock[0][filename]" no_lang="1" expose_view="true" mime="@attachmentsBlock[0][type]" mime_data="@attachmentsBlock[0][mime_data]" href="@attachmentsBlock[0][mime_url]"/>
-										<description align="right" id="attachmentsBlock[0][size]"/>
+										<et2-description  id="attachmentsBlock[0][attachment_number]"></et2-description>
+										<et2-description  id="attachmentsBlock[0][partID]"></et2-description>
+										<et2-description  id="attachmentsBlock[0][type]"></et2-description>
+										<et2-description  id="attachmentsBlock[0][winmailFlag]"></et2-description>
+										<et2-description-expose  class="et2_link useEllipsis" id="attachmentsBlock[0][filename]" mime="@attachmentsBlock[0][type]" href="@attachmentsBlock[0][mime_url]" noLang="1" mimeData="@attachmentsBlock[0][mime_data]"></et2-description-expose>
+										<et2-description  align="right" id="attachmentsBlock[0][size]"></et2-description>
 									</row>
 								</rows>
 							</grid>
-						</hbox>
+						</et2-hbox>
 
 						<grid id="attachmentsBlock" class="previewAttachmentArea egwGridView_grid">
 							<columns>
@@ -79,22 +74,22 @@
 							</columns>
 							<rows>
 								<row class="row attachmentRow" id="${row}">
-									<description id="${row}[attachment_number]" />
-									<description id="${row}[partID]" />
-									<description id="${row}[type]" />
-									<description id="${row}[winmailFlag]" />
-									<description class="et2_link useEllipsis" id="${row}[filename]" no_lang="1" expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
-									<description align="right" id="${row}[size]"/>
-									<et2-dropdown-button id="${row}[actions]" label="$row_cont[actionsDefaultLabel]" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
+									<et2-description  id="${row}[attachment_number]"></et2-description>
+									<et2-description  id="${row}[partID]"></et2-description>
+									<et2-description  id="${row}[type]"></et2-description>
+									<et2-description  id="${row}[winmailFlag]"></et2-description>
+									<et2-description-expose  class="et2_link useEllipsis" id="${row}[filename]" mime="$row_cont[type]" href="$row_cont[mime_url]" noLang="1" mimeData="$row_cont[mime_data]"></et2-description-expose>
+									<et2-description  align="right" id="${row}[size]"></et2-description>
+									<et2-dropdown-button  id="${row}[actions]" label="$row_cont[actionsDefaultLabel]" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
 								</row>
 							</rows>
 						</grid>
 					</et2-details>
-				</vbox>
-			</hbox>
-			<box height="100%">
+				</et2-vbox>
+			</et2-hbox>
+			<et2-box  height="100%">
 				<iframe id="iframe" width="100%" height="100%" scrolling="auto"/>
-			</box>
-		</vbox>
+			</et2-box>
+		</et2-vbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/notifications/templates/default/config.xet b/notifications/templates/default/config.xet
index 19d4642b71..444c73dfdf 100644
--- a/notifications/templates/default/config.xet
+++ b/notifications/templates/default/config.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="notifications.config" template="" lang="" group="0" version="16.1">
 		<grid width="100%" class="admin-config egwGridView_grid">
@@ -10,35 +9,35 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="EGroupware-Popup backend" span="all" class="subHeader"/>
+					<et2-description  value="EGroupware-Popup backend" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Poll interval"/>
-					<select id="newsettings[popup_poll_interval]">
+					<et2-description  value="Poll interval"></et2-description>
+					<et2-select  id="newsettings[popup_poll_interval]">
 						<option value="5">5 seconds</option>
 						<option value="60">1 {minute}</option>
 						<option value="120">2 {minutes}</option>
 						<option value="300">5 {minutes}</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Windows-Popup backend" span="all" class="subHeader"/>
+					<et2-description  value="Windows-Popup backend" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Enable Windows-Popup backend"/>
-					<select id="newsettings[winpopup_enable]">
+					<et2-description  value="Enable Windows-Popup backend"></et2-description>
+					<et2-select  id="newsettings[winpopup_enable]">
 						<option value="">No</option>
 						<option value="True">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Account" span="all" class="subHeader"/>
+					<et2-description  value="Account" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-                    <description value="Mail account to use for notifications"/>
-                    <select id="newsettings[async_identity]"/>
+                    <et2-description  value="Mail account to use for notifications"></et2-description>
+                    <et2-select  id="newsettings[async_identity]"></et2-select>
                 </row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/preferences/templates/default/config.xet b/preferences/templates/default/config.xet
index c8e739f053..f823bfc77c 100644
--- a/preferences/templates/default/config.xet
+++ b/preferences/templates/default/config.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="preferences.config" template="" lang="" group="0" version="16.1">
 		<grid width="100%" class="admin-config egwGridView_grid">
@@ -10,22 +9,22 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Deny following groups access to preferences" label="%s:"/>
-					<select-account id="newsettings[deny_prefs]" account_type="groups" multiple="true" tags="true" width="100%"/>
+					<et2-description  value="Deny following groups access to preferences" label="%s:"></et2-description>
+					<et2-select-account  id="newsettings[deny_prefs]" multiple="true" width="100%" accountType="groups"></et2-select-account>
 				</row>
 				<row>
-					<description value="Deny following groups access to ACL (grant access)" label="%s:"/>
-					<select-account id="newsettings[deny_acl]" account_type="groups" multiple="true" tags="true" width="100%"/>
+					<et2-description  value="Deny following groups access to ACL (grant access)" label="%s:"></et2-description>
+					<et2-select-account  id="newsettings[deny_acl]" multiple="true" width="100%" accountType="groups"></et2-select-account>
 				</row>
 				<row>
-					<description value="Deny following groups access to edit categories" label="%s:"/>
-					<select-account id="newsettings[deny_cats]" account_type="groups" multiple="true" tags="true" width="100%"/>
+					<et2-description  value="Deny following groups access to edit categories" label="%s:"></et2-description>
+					<et2-select-account  id="newsettings[deny_cats]" multiple="true" width="100%" accountType="groups"></et2-select-account>
 				</row>
 				<row>
-					<description value="Deny following groups access to security popup" label="%s:"/>
-					<select-account id="newsettings[deny_security]" account_type="groups" multiple="true" tags="true" width="100%"/>
+					<et2-description  value="Deny following groups access to security popup" label="%s:"></et2-description>
+					<et2-select-account  id="newsettings[deny_security]" multiple="true" width="100%" accountType="groups"></et2-select-account>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/preferences/templates/default/password.xet b/preferences/templates/default/password.xet
index ff4ca23cb8..6d75257b3b 100644
--- a/preferences/templates/default/password.xet
+++ b/preferences/templates/default/password.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="preferences.password.change" template="" lang="" group="0" version="14.2">
 		<grid width="100%">
@@ -10,12 +9,12 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Enter your new password"/>
-					<passwd id="n_passwd" class="et2_required" suggest="16" autocomplete="new-password"/>
+					<et2-description  value="Enter your new password"></et2-description>
+					<et2-password  id="n_passwd" class="et2_required" suggest="16" autocomplete="new-password"></et2-password>
 				</row>
 				<row>
-					<description value="Re-enter your password"/>
-					<passwd id="n_passwd_2" class="et2_required"/>
+					<et2-description  value="Re-enter your password"></et2-description>
+					<et2-password  id="n_passwd_2" class="et2_required"></et2-password>
 				</row>
 			</rows>
 		</grid>
@@ -28,32 +27,27 @@
 			</columns>
 			<rows>
 				<row disabled="!@hide_qrc" valign="top">
-					<vbox>
-						<button id="action[show]" label="Show QRCode" statustext="Show QRCode to enable on an additional device."/>
-						<button id="action[reset]" label="Reset QRCode"
-							statustext="Generate new QRCode to disable existing one, after enabling the new one!"/>
-						<button id="action[disable]" label="Disable Two Factor Auth"
-							onclick="et2_dialog.confirm(widget,'Are you sure?','Disable Two Factor Auth')"
-							statustext="Disabling allows to again log in without a second factor."/>
-					</vbox>
-					<description id="status" class="toptStatus"/>
+					<et2-vbox>
+						<et2-button  id="action[show]" label="Show QRCode" statustext="Show QRCode to enable on an additional device."></et2-button>
+						<et2-button  id="action[reset]" label="Reset QRCode" statustext="Generate new QRCode to disable existing one, after enabling the new one!"></et2-button>
+						<et2-button  id="action[disable]" label="Disable Two Factor Auth" onclick="et2_dialog.confirm(widget,'Are you sure?','Disable Two Factor Auth')" statustext="Disabling allows to again log in without a second factor."></et2-button>
+					</et2-vbox>
+					<et2-description  id="status" class="toptStatus"></et2-description>
 				</row>
 				<row disabled="@hide_qrc" valign="top">
-					<image src="qrc" class="qrCode"/>
-					<vbox>
-						<description value="Setup Two Factor Authentication" class="toptStatus" height="50px"/>
-						<description/>
-						<description value="Scan QRCode with a Time-based One-time Password (TOTP) App:"/>
-						<description value="Google Authenticator for Android" statustext="click to install"
-							extra_link_target="_blank" class="toptApp" href="$cont[gauth_android]"/>
-						<description value="Google Authenticator for iOS" statustext="click to install"
-							extra_link_target="_blank" class="toptApp" href="$cont[gauth_ios]"/>
-						<description value="Or other compatible apps" class="toptApp"/>
-					</vbox>
+					<et2-image  src="qrc" class="qrCode"></et2-image>
+					<et2-vbox>
+						<et2-description  value="Setup Two Factor Authentication" class="toptStatus" height="50px"></et2-description>
+						<et2-description></et2-description>
+						<et2-description  value="Scan QRCode with a Time-based One-time Password (TOTP) App:"></et2-description>
+						<et2-description  value="Google Authenticator for Android" statustext="click to install" class="toptApp" href="$cont[gauth_android]" extraLinkTarget="_blank"></et2-description>
+						<et2-description  value="Google Authenticator for iOS" statustext="click to install" class="toptApp" href="$cont[gauth_ios]" extraLinkTarget="_blank"></et2-description>
+						<et2-description  value="Or other compatible apps" class="toptApp"></et2-description>
+					</et2-vbox>
 				</row>
 				<row disabled="@hide_qrc">
-					<textbox id="code" blur="XXX XXX" class="et2_required"/>
-					<description value="Enter code to verify correct setup"/>
+					<et2-textbox  id="code" class="et2_required" placeholder="XXX XXX"></et2-textbox>
+					<et2-description  value="Enter code to verify correct setup"></et2-description>
 				</row>
 			</rows>
 		</grid>
@@ -66,19 +60,19 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Security &amp; Password" class="securityHeader"/>
+					<et2-description  value="Security &amp; Password" class="securityHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Current password" for="password"/>
-					<hbox>
-						<passwd id="password" needed="true" autocomplete="current-password"/>
-						<description value=" "/>
-						<description value="You need to enter your password to make any security changes!"/>
-					</hbox>
+					<et2-description  value="Current password" for="password"></et2-description>
+					<et2-hbox>
+						<et2-password  id="password" autocomplete="current-password" required="true"></et2-password>
+						<et2-description  value=" "></et2-description>
+						<et2-description  value="You need to enter your password to make any security changes!"></et2-description>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
-		<tabbox id="tabs" tab_height="400" width="100%">
+		<et2-tabbox  id="tabs" width="100%" tabHeight="400">
 			<tabs>
 				<tab id="change_password" label="Change password"/>
 				<tab id="two_factor_auth" label="Two factor auth"/>
@@ -87,10 +81,10 @@
 				<template id="preferences.password.change"/>
 				<template id="preferences.password.2fa"/>
 			</tabpanels>
-		</tabbox>
-		<hbox class="dialogFooterToolbar">
-			<button label="Save" id="button[save]"/>
-			<button label="Cancel" id="button[cancel]" onclick="window.close();"/>
-		</hbox>
+		</et2-tabbox>
+		<et2-hbox  class="dialogFooterToolbar">
+			<et2-button  label="Save" id="button[save]"></et2-button>
+			<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();"></et2-button>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/preferences/templates/default/settings.xet b/preferences/templates/default/settings.xet
index 6eb85a7bfc..ab2e0744fe 100644
--- a/preferences/templates/default/settings.xet
+++ b/preferences/templates/default/settings.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="preferences.settings.tab1" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%" class="prefTable egwGridView_grid">
@@ -11,42 +10,38 @@
 			</columns>
 			<rows>
 				<row class="prefRow">
-					<vbox class="prefName">
-						<description for="@${row}[name]" id="${row}[label]"/>
-						<description id="${row}[default]" no_lang="1" class="prefDefault"/>
-					</vbox>
-					<box class="prefValueColumn">
+					<et2-vbox  class="prefName">
+						<et2-description  for="@${row}[name]" id="${row}[label]"></et2-description>
+						<et2-description  id="${row}[default]" class="prefDefault" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-box  class="prefValueColumn">
 						<widget type="@${row}[type]" id="@${row}[name]" onchange="@${row}[onchange]" no_lang="1"
                                 class="prefValue"/>
-					</box>
-					<box class="prefHelpColumn">
+					</et2-box>
+					<et2-box  class="prefHelpColumn">
 						<html id="${row}[help]" class="prefHelp"/>
-					</box>
+					</et2-box>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="preferences.settings" template="" lang="" group="0" version="1.9.002">
-		<hbox class="dialogHeader">
-			<menulist>
-				<menupopup id="appname" onchange="1" options="Common preferences" class="prefApp"/>
-			</menulist>
-			<menulist>
-				<menupopup id="type" onchange="1" class="prefType"/>
-			</menulist>
-		</hbox>
-		<tabbox id="tabs" tab_height="450">
+		<et2-hbox  class="dialogHeader">
+			<et2-select  id="appname" onchange="1" class="prefApp" emptyLabel="Common preferences"></et2-select>
+			<et2-select  id="type" onchange="1" class="prefType"></et2-select>
+		</et2-hbox>
+		<et2-tabbox  id="tabs" tabHeight="450">
 			<tabs>
 				<tab id="tab1" label="Settings"/>
 			</tabs>
 			<tabpanels>
 				<template id="preferences.settings.tab1" content="tab1"/>
 			</tabpanels>
-		</tabbox>
-		<hbox class="dialogFooterToolbar">
-			<button label="Save" id="button[save]"/>
-			<button label="Apply" id="button[apply]"/>
-			<button label="Cancel" id="button[cancel]" onclick="window.close();"/>
-		</hbox>
+		</et2-tabbox>
+		<et2-hbox  class="dialogFooterToolbar">
+			<et2-button  label="Save" id="button[save]"></et2-button>
+			<et2-button  label="Apply" id="button[apply]"></et2-button>
+			<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();"></et2-button>
+		</et2-hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/preferences/templates/mobile/password.xet b/preferences/templates/mobile/password.xet
index 1b82592906..d017ee480f 100644
--- a/preferences/templates/mobile/password.xet
+++ b/preferences/templates/mobile/password.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="preferences.password.change" template="" lang="" group="0" version="14.2">
 		<grid width="100%">
@@ -10,12 +9,12 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Enter your new password"/>
-					<passwd id="n_passwd" class="et2_required"/>
+					<et2-description  value="Enter your new password"></et2-description>
+					<et2-password  id="n_passwd" class="et2_required"></et2-password>
 				</row>
 				<row>
-					<description value="Re-enter your password"/>
-					<passwd id="n_passwd_2" class="et2_required"/>
+					<et2-description  value="Re-enter your password"></et2-description>
+					<et2-password  id="n_passwd_2" class="et2_required"></et2-password>
 				</row>
 			</rows>
 		</grid>
@@ -28,32 +27,27 @@
 			</columns>
 			<rows>
 				<row disabled="!@hide_qrc" valign="top">
-					<vbox>
-						<button id="action[show]" label="Show QRCode" statustext="Show QRCode to enable on an additional device."/>
-						<button id="action[reset]" label="Reset QRCode"
-							statustext="Generate new QRCode to disable existing one, after enabling the new one!"/>
-						<button id="action[disable]" label="Disable Two Factor Auth"
-							onclick="et2_dialog.confirm(widget,'Are you sure?','Disable Two Factor Auth')"
-							statustext="Disabling allows to again log in without a second factor."/>
-					</vbox>
-					<description id="status" class="toptStatus"/>
+					<et2-vbox>
+						<et2-button  id="action[show]" label="Show QRCode" statustext="Show QRCode to enable on an additional device."></et2-button>
+						<et2-button  id="action[reset]" label="Reset QRCode" statustext="Generate new QRCode to disable existing one, after enabling the new one!"></et2-button>
+						<et2-button  id="action[disable]" label="Disable Two Factor Auth" onclick="et2_dialog.confirm(widget,'Are you sure?','Disable Two Factor Auth')" statustext="Disabling allows to again log in without a second factor."></et2-button>
+					</et2-vbox>
+					<et2-description  id="status" class="toptStatus"></et2-description>
 				</row>
 				<row disabled="@hide_qrc" valign="top">
-					<vbox>
-						<image src="qrc" class="qrCode" width="200"/>
-						<description value="Scan QRCode with a Time-based One-time Password (TOTP) App:"/>
-						<description value="Google Authenticator for Android" statustext="click to install"
-							extra_link_target="_blank" class="toptApp" href="$cont[gauth_android]"/>
-						<description value="Google Authenticator for iOS" statustext="click to install"
-							extra_link_target="_blank" class="toptApp" href="$cont[gauth_ios]"/>
-						<description value="Or other compatible apps" class="toptApp"/>
-					</vbox>
+					<et2-vbox>
+						<et2-image  src="qrc" class="qrCode" width="200"></et2-image>
+						<et2-description  value="Scan QRCode with a Time-based One-time Password (TOTP) App:"></et2-description>
+						<et2-description  value="Google Authenticator for Android" statustext="click to install" class="toptApp" href="$cont[gauth_android]" extraLinkTarget="_blank"></et2-description>
+						<et2-description  value="Google Authenticator for iOS" statustext="click to install" class="toptApp" href="$cont[gauth_ios]" extraLinkTarget="_blank"></et2-description>
+						<et2-description  value="Or other compatible apps" class="toptApp"></et2-description>
+					</et2-vbox>
 				</row>
 				<row disabled="@hide_qrc">
-					<vbox>
-						<description value="Enter code to verify correct setup"/>
-						<textbox id="code" blur="XXX XXX" class="et2_required" width="100%"/>
-					</vbox>
+					<et2-vbox>
+						<et2-description  value="Enter code to verify correct setup"></et2-description>
+						<et2-textbox  id="code" class="et2_required" width="100%" placeholder="XXX XXX"></et2-textbox>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
@@ -66,30 +60,28 @@
 			</columns>
 			<rows>
 				<row class="dialogHeadbar">
-					<hbox>
-						<button id="button[save]"/>
-						<button id="button[cancel]" onclick="window.close();"/>
-					</hbox>
+					<et2-hbox>
+						<et2-button  id="button[save]"></et2-button>
+						<et2-button  id="button[cancel]" onclick="window.close();"></et2-button>
+					</et2-hbox>
 				</row>
 				<row>
-					<passwd span="all" id="password" needed="true" autocomplete="off" blur="Current password" width="100%"/>
+					<et2-password  span="all" id="password" autocomplete="off" width="100%" required="true" placeholder="Current password"></et2-password>
 				</row>
 				<row>
-					<description span="all" value="You need to enter your password to make any security changes!"/>
+					<et2-description  span="all" value="You need to enter your password to make any security changes!"></et2-description>
 				</row>
 				<row>
-					<tabbox id="tabs" tab_height="400" width="100%" align_tabs="v">
-						<tabs>
-							<tab id="change_password" label="Change password"/>
-							<tab id="two_factor_auth" label="Two factor auth"/>
-						</tabs>
-						<tabpanels>
+					<et2-vbox  id="tabs" width="100%" tabHeight="400">
+						<et2-details  id="change_password" summary="Change password" title="">
 							<template id="preferences.password.change"/>
+						</et2-details>
+						<et2-details  id="two_factor_auth" summary="Two factor auth" title="">
 							<template id="preferences.password.2fa"/>
-						</tabpanels>
-					</tabbox>
+						</et2-details>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/preferences/templates/mobile/settings.xet b/preferences/templates/mobile/settings.xet
index b043348cca..fa2d3ff085 100644
--- a/preferences/templates/mobile/settings.xet
+++ b/preferences/templates/mobile/settings.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="preferences.settings.tab1" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%" class="prefTable egwGridView_grid">
@@ -10,14 +9,14 @@
 			</columns>
 			<rows>
 				<row class="prefRow">
-					<box class="prefName">
-						<description for="@${row}[name]" id="${row}[label]"/>
+					<et2-box  class="prefName">
+						<et2-description  for="@${row}[name]" id="${row}[label]"></et2-description>
 						<html id="${row}[help]" class="prefHelp"/>
-					</box>
-					<box>
+					</et2-box>
+					<et2-box>
 						<widget type="@${row}[type]" id="@${row}[name]" onchange="@${row}[onchange]" size="@${row}[size]"  no_lang="1" class="prefValue"/>
-						<description id="${row}[default]" no_lang="1" class="prefDefault"/>
-					</box>
+						<et2-description  id="${row}[default]" class="prefDefault" noLang="1"></et2-description>
+					</et2-box>
 				</row>
 			</rows>
 		</grid>
@@ -30,32 +29,25 @@
 			</columns>
 			<rows>
 				<row class="dialogHeadbar" >
-					<hbox width="100%">
-						<button  id="button[save]"/>
-						<button  id="button[apply]"/>
-						<button  id="button[cancel]" onclick="window.close();"/>
-					</hbox>
+					<et2-hbox  width="100%">
+						<et2-button  id="button[save]"></et2-button>
+						<et2-button  id="button[apply]"></et2-button>
+						<et2-button  id="button[cancel]" onclick="window.close();"></et2-button>
+					</et2-hbox>
 
 				</row>
 				<row>
-					<hbox width="100%">
-						<menulist>
-							<menupopup id="appname" onchange="1" options="Common preferences" class="prefApp"/>
-						</menulist>
-						<menulist>
-							<menupopup id="type" onchange="1" class="prefType"/>
-						</menulist>
-					</hbox>
+					<et2-hbox  width="100%">
+						<et2-select  id="appname" onchange="1" class="prefApp" emptyLabel="Common preferences"></et2-select>
+						<et2-select  id="type" onchange="1" class="prefType"></et2-select>
+					</et2-hbox>
 				</row>
 				<row>
-					<tabbox id="tabs" align_tabs="v">
-						<tabs>
-							<tab id="tab1" label="Settings"/>
-						</tabs>
-						<tabpanels>
+					<et2-vbox  id="tabs">
+						<et2-details  id="tab1" summary="Settings" title="">
 							<template id="preferences.settings.tab1" content="tab1"/>
-						</tabpanels>
-					</tabbox>
+						</et2-details>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
@@ -63,4 +55,4 @@
 
 
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/resources/templates/default/acl.xet b/resources/templates/default/acl.xet
index ebe03402fc..59da886317 100644
--- a/resources/templates/default/acl.xet
+++ b/resources/templates/default/acl.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="resources.acl.rows">
 		<grid width="100%">
@@ -22,33 +22,29 @@
 					<nextmatch-header statustext="Category admin" id="owner" label="Category owner"/>
 					<nextmatch-header id="location" label="Locations / rooms"/>
 					<nextmatch-header label="Read permissions" id="read"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-header label="Write permissions" id="write" />
-						<description label="implies read permission"/>
-					</vbox>
+						<et2-description  label="implies read permission"></et2-description>
+					</et2-vbox>
 					<nextmatch-header label="Read Calendar permissions" id="calread"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-header label="Direct booking permissions" id="calwrite"/>
-						<description label="implies booking permission"/>
-					</vbox>
+						<et2-description  label="implies booking permission"></et2-description>
+					</et2-vbox>
 				</row>
 				<row class="$row_cont[id] $row_cont[class]">
-					<hbox>
+					<et2-hbox>
 						<html id="${row}[level_spacer]"/>
-						<description id="${row}[name]" class="$row_cont[class]"/>
-					</hbox>
-					<image align="center" src="${row}[icon_url]"/>
-					<menulist>
-						<menupopup type="select-account" id="${row}[admin]" readonly="true" options="All users,groups"/>
-					</menulist>
-					<menulist>
-						<menupopup type="select-account" id="${row}[owner]" readonly="true" options="All users,groups"/>
-					</menulist>
-					<checkbox align="center" id="${row}[location]" readonly="true"/>
-					<listbox type="select-account" id="${row}[read]" readonly="true" rows="5"/>
-					<listbox type="select-account" id="${row}[write]" readonly="true" rows="5"/>
-					<listbox type="select-account" id="${row}[calread]" readonly="true" rows="5"/>
-					<listbox type="select-account" id="${row}[calwrite]" readonly="true" rows="5"/>
+						<et2-description  id="${row}[name]" class="$row_cont[class]"></et2-description>
+					</et2-hbox>
+					<et2-image  align="center" src="${row}[icon_url]"></et2-image>
+					<et2-select-account  id="${row}[admin]" readonly="true" emptyLabel="All users" accountType="groups"></et2-select-account>
+					<et2-select-account  id="${row}[owner]" readonly="true" emptyLabel="All users" accountType="groups"></et2-select-account>
+					<et2-checkbox  align="center" id="${row}[location]" readonly="true"></et2-checkbox>
+					<et2-select-account  id="${row}[read]" readonly="true" rows="5" multiple="1"></et2-select-account>
+					<et2-select-account  id="${row}[write]" readonly="true" rows="5" multiple="1"></et2-select-account>
+					<et2-select-account  id="${row}[calread]" readonly="true" rows="5" multiple="1"></et2-select-account>
+					<et2-select-account  id="${row}[calwrite]" readonly="true" rows="5" multiple="1"></et2-select-account>
 				</row>
 			</rows>
 		</grid>
@@ -56,4 +52,4 @@
 	<template id="resources.acl" template="" lang="" group="0" version="">
 		<nextmatch id="nm" template="resources.acl.rows" />		
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/resources/templates/default/acl_edit.xet b/resources/templates/default/acl_edit.xet
index 64cdaac5ca..ebf6a247df 100644
--- a/resources/templates/default/acl_edit.xet
+++ b/resources/templates/default/acl_edit.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="resources.acl_edit" template="" lang="" group="0" version="16.1">
 		<grid width="100%">
@@ -10,20 +9,20 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader">
-					<description value="Category" for="name"/>
-					<description id="name" class="et2_fullWidth"/>
+					<et2-description  value="Category" for="name"></et2-description>
+					<et2-description  id="name"></et2-description>
 				</row>
 				<row valign="top">
-					<description value="Description" for="description"/>
-					<textbox multiline="true" id="description" rows="5" cols="50" readonly="true"/>
+					<et2-description  value="Description" for="description"></et2-description>
+					<et2-textarea  id="description" rows="5" cols="50" readonly="true"></et2-textarea>
 				</row>
 				<row>
-					<description value="Category admin" for="admin"/>
-					<select-account id="admin" account_type="accounts" tags="true" empty_label="Choose category admin"/>
+					<et2-description  value="Category admin" for="admin"></et2-description>
+					<et2-select-account  id="admin" multiple="true" placeholder="Choose category admin" accountType="accounts"></et2-select-account>
 				</row>
 				<row class="nmr" disabled="@no_private">
-					<description value="Locations / rooms"/>
-					<checkbox id="location"/>
+					<et2-description  value="Locations / rooms"></et2-description>
+					<et2-checkbox  id="location"></et2-checkbox>
 				</row>
 				<row>
 					<grid span="all" class="permissions">
@@ -35,34 +34,34 @@
 						</columns>
 						<rows>
 							<row class="th">
-								<description label="Read permissions" />
-								<vbox>
-									<description label="Write permissions" />
-									<description label="implies read permission"/>
-								</vbox>
-								<description label="Read Calendar permissions" />
-								<vbox>
-									<description label="Direct booking permissions" />
-									<description label="implies booking permission"/>
-								</vbox>
+								<et2-description  label="Read permissions"></et2-description>
+								<et2-vbox>
+									<et2-description  label="Write permissions"></et2-description>
+									<et2-description  label="implies read permission"></et2-description>
+								</et2-vbox>
+								<et2-description  label="Read Calendar permissions"></et2-description>
+								<et2-vbox>
+									<et2-description  label="Direct booking permissions"></et2-description>
+									<et2-description  label="implies booking permission"></et2-description>
+								</et2-vbox>
 							</row>
 							<row valign="top">
-								<select-account account_type="both" id="read" multiple="true" tags="true"/>
-								<select-account account_type="both" id="write" multiple="true" tags="true"/>
-								<select-account account_type="both" id="calread" multiple="true" tags="true"/>
-								<select-account account_type="both" id="calwrite" multiple="true" tags="true"/>
+								<et2-select-account  id="read" multiple="true" accountType="both"></et2-select-account>
+								<et2-select-account  id="write" multiple="true" accountType="both"></et2-select-account>
+								<et2-select-account  id="calread" multiple="true" accountType="both"></et2-select-account>
+								<et2-select-account  id="calwrite" multiple="true" accountType="both"></et2-select-account>
 							</row>
 						</rows>
 					</grid>
 				</row>
 				<row  class="dialogFooterToolbar">
-					<hbox span="all">
-						<button label="Save" id="button[save]" image="save" background_image="1"/>
-						<button label="Apply" id="button[apply]" image="apply" background_image="1"/>
-						<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all">
+						<et2-button  label="Save" id="button[save]" image="save"></et2-button>
+						<et2-button  label="Apply" id="button[apply]" image="apply"></et2-button>
+						<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" noSubmit="true"></et2-button>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/resources/templates/default/admin.types.xet b/resources/templates/default/admin.types.xet
index c0309cfa75..c0f4735c25 100644
--- a/resources/templates/default/admin.types.xet
+++ b/resources/templates/default/admin.types.xet
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
     <template id="resources.customfields.types">
     </template>
     <template id="resources.customfields.add" template="" lang="" group="0" version="1.9.001">
-        <buttononly label="Add" id="add"
-                    onclick="egw.open_link('resources.resources_customfields.edit&amp;appname='+widget.getArrayMgr('content').getRoot().getEntry('nm[appname]'),false,'450x380');"/>
+        <et2-button  label="Add" id="add" onclick="egw.open_link('resources.resources_customfields.edit&amp;appname='+widget.getArrayMgr('content').getRoot().getEntry('nm[appname]'),false,'450x380');" noSubmit="true"></et2-button>
     </template>
     <template id="resources.admin.types" template="" lang="" group="0" version="">
         <template id="resources.customfields.types" content="content_types"/>
@@ -15,4 +13,4 @@
             }
         </styles>
     </template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/resources/templates/default/calendar_sidebox.xet b/resources/templates/default/calendar_sidebox.xet
index 96ed2e5777..39089c1430 100644
--- a/resources/templates/default/calendar_sidebox.xet
+++ b/resources/templates/default/calendar_sidebox.xet
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="resources.calendar_sidebox" template="" lang="" group="0" version="16.1">
-		<vbox parent_node="calendar-resources-et2_target">
+		<et2-vbox  parentId="calendar-resources-et2_target">
 			<tree id="owner" autoloading="resources_ui::ajax_tree" multiple="true" onchange="app.resources.sidebox_change"/>
-		</vbox>
+		</et2-vbox>
 		<styles>
 			#resources-calendar_sidebox {
 				display: none;
 			}
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/resources/templates/default/config.xet b/resources/templates/default/config.xet
index 857720fb97..4d651c459f 100644
--- a/resources/templates/default/config.xet
+++ b/resources/templates/default/config.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="resources.config" template="" lang="" group="0" version="16.1">
 		<grid width="100%" class="admin-config egwGridView_grid">
@@ -10,35 +9,35 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Allow ignore conflicts"/>
-					<select id="newsettings[ignoreconflicts]">
+					<et2-description  value="Allow ignore conflicts"></et2-description>
+					<et2-select  id="newsettings[ignoreconflicts]">
 						<option value="">Yes, only users with direct booking permission</option>
 						<option value="allusers">Yes, all users can ignore conflicts</option>
 						<option value="no">No</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Booking requests" span="all" class="subHeader"/>
+					<et2-description  value="Booking requests" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Allow booking requests from any user when creating events?"/>
-					<select id="newsettings[bookingrequests]">
+					<et2-description  value="Allow booking requests from any user when creating events?"></et2-description>
+					<et2-select  id="newsettings[bookingrequests]">
 						<option value="disabled">No, users will need to contact users with direct booking permission</option>
 						<option value="">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="History logging" span="all" class="subHeader"/>
+					<et2-description  value="History logging" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Prevent deleting"/>
-					<select id="newsettings[history]">
+					<et2-description  value="Prevent deleting"></et2-description>
+					<et2-select  id="newsettings[history]">
 						<option value="">No</option>
 						<option value="history">Yes, only admins can purge deleted items</option>
 						<option value="userpurge">Yes, users can purge their deleted items</option>
-					</select>
+					</et2-select>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/resources/templates/default/edit.xet b/resources/templates/default/edit.xet
index c9322c0ba5..c98577008a 100644
--- a/resources/templates/default/edit.xet
+++ b/resources/templates/default/edit.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="resources.edit_tabs.general" template="" lang="" group="0" version="">
 		<grid width="100%" height="245">
@@ -15,33 +14,31 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Inventory number"/>
-					<textbox  id="inventory_number" class="et2_fullWidth"/>
-					<description/>
-					<description value="Accessory of"/>
-					<vbox span="all" class="et2_fullWidth">
-						<menulist class="et2_fullWidth">
-							<menupopup id="accessory_of" no_lang="1" />
-						</menulist>
-						<description id="accessory_label"/>
-					</vbox>
+					<et2-description  value="Inventory number"></et2-description>
+					<et2-textbox  id="inventory_number"></et2-textbox>
+					<et2-description></et2-description>
+					<et2-description  value="Accessory of"></et2-description>
+					<et2-vbox  span="all">
+						<et2-select  id="accessory_of" noLang="1"></et2-select>
+						<et2-description  id="accessory_label"></et2-description>
+					</et2-vbox>
 				</row>
 				<row>
-					<description value="Description (short)"/>
-					<textbox statustext="Short description of resource" id="short_description" size="50" maxlength="100" class="et2_fullWidth"/>
-					<description/>
-					<description value="Storage information"/>
-					<textbox statustext="Information about storage" id="storage_info" size="50" maxlength="100" class="et2_fullWidth" span="all"/>
+					<et2-description  value="Description (short)"></et2-description>
+					<et2-textbox  statustext="Short description of resource" id="short_description" maxlength="100"></et2-textbox>
+					<et2-description></et2-description>
+					<et2-description  value="Storage information"></et2-description>
+					<et2-textbox  statustext="Information about storage" id="storage_info" maxlength="100" span="all"></et2-textbox>
 				</row>
 				<row>
-					<description value="Location"/>
-					<textbox statustext="Where to find this resource?" id="location" size="50" maxlength="100" class="et2_fullWidth" />
-					<description/>
-					<description disabled="true" value="Buyable"/>
-					<checkbox disabled="true" statustext="Is resource buyable?" id="buyable" span="all" class="et2_fullWidth" />
+					<et2-description  value="Location"></et2-description>
+					<et2-textbox  statustext="Where to find this resource?" id="location" maxlength="100" ></et2-textbox>
+					<et2-description></et2-description>
+					<et2-description  disabled="true" value="Buyable"></et2-description>
+					<et2-checkbox  disabled="true" statustext="Is resource buyable?" id="buyable" span="all" ></et2-checkbox>
 				</row>
 				<row>
-					<description value="Picture"/>
+					<et2-description  value="Picture"></et2-description>
 					<grid width="100%">
 						<columns>
 							<column width="10%"/>
@@ -49,25 +46,25 @@
 						</columns>
 						<rows>
 							<row>
-								<radio id="picture_src" options="gen_src"/>
-								<description value="Use general resources icon"/>
+								<radio id="picture_src" set_value="gen_src" />
+								<et2-description  value="Use general resources icon"></et2-description>
 							</row>
 							<row>
-								<radio id="picture_src" options="cat_src"/>
-								<description value="Use the category's icon"/>
+								<radio id="picture_src" set_value="cat_src" />
+								<et2-description  value="Use the category's icon"></et2-description>
 							</row>
 							<row>
-								<radio id="picture_src" options="own_src"/>
-								<description value="Use own picture"/>
+								<radio id="picture_src" set_value="own_src" />
+								<et2-description  value="Use own picture"></et2-description>
 							</row>
 							<row>
-								<description/>
+								<et2-description></et2-description>
 								<file id="own_file" class="resources_pictureFile et2_fullWidth" onchange="app.resources.select_picture_src"/>
 							</row>
 						</rows>
 					</grid>
-					<description/>
-					<image src="resource_picture" href="$cont[picture_original]" expose_view="true" align="center"/>
+					<et2-description></et2-description>
+					<et2-image-expose  src="resource_picture" href="$cont[picture_original]" align="center"></et2-image-expose>
 				</row>
 			</rows>
 		</grid>
@@ -93,13 +90,13 @@
 			</columns>
 			<rows>
 				<row class="row">
-					<link-to id="link_to" span="all"/>
+					<et2-link-to  id="link_to" span="all"></et2-link-to>
 				</row>
 				<row class="th">
-					<description value="Existing links" span="all"/>
+					<et2-description  value="Existing links" span="all"></et2-description>
 				</row>
 				<row class="row_off" valign="top">
-					<link-list id="link_to" span="all"/>
+					<et2-link-list  id="link_to" span="all"></et2-link-list>
 				</row>
 			</rows>
 		</grid>
@@ -111,7 +108,7 @@
 			</columns>
 			<rows>
 				<row class="th" height="20">
-					<description value="Custom fields"/>
+					<et2-description  value="Custom fields"></et2-description>
 				</row>
 				<row valign="top">
 					<customfields type_filter="@cat_id"/>
@@ -136,32 +133,30 @@
 			</columns>
 			<rows>
 				<row class="dialogHeader">
-					<description value="Name"/>
-					<textbox statustext="Name of resource" id="name" needed="1" class="et2_fullWidth et2_required" span="4"/>
-					<textbox type="integer" id="res_id" readonly="true"/>
-					<appicon/>
-					<description/>
+					<et2-description  value="Name"></et2-description>
+					<et2-textbox  statustext="Name of resource" id="name" class="et2_required" span="4" required="1"></et2-textbox>
+					<et2-number  id="res_id" readonly="true" precision="0"></et2-number>
+					<et2-appicon></et2-appicon>
+					<et2-description></et2-description>
 				</row>
                 <row class="dialogHeader2">
-                    <description value="Quantity"/>
-                    <textbox statustext="Quantity of resource" id="quantity" size="5" maxlength="10"
-                             class="et2_fullWidth"/>
-                    <description/>
-                    <description value="Category"/>
-                    <select span="3" tatustext="Which category does this resource belong to?" id="cat_id"
-                            needed="1" no_lang="1" onchange="1" class="et2_fullWidth"/>
-                    <description/>
+                    <et2-description  value="Quantity"></et2-description>
+                    <et2-textbox  statustext="Quantity of resource" id="quantity" maxlength="10"></et2-textbox>
+                    <et2-description></et2-description>
+                    <et2-description  value="Category"></et2-description>
+                    <et2-select  span="3" tatustext="Which category does this resource belong to?" id="cat_id" onchange="1" required="1" noLang="1"></et2-select>
+                    <et2-description></et2-description>
                 </row>
 				<row class="dialogHeader3">
-					<description value="Useable"/>
-					<textbox statustext="How many of them are useable?" id="useable" size="5" maxlength="10" class="et2_fullWidth"/>
-					<description/>
-					<description value="Bookable"/>
-					<checkbox statustext="Is resource bookable?" id="bookable" span="3"/>
-					<description/>
+					<et2-description  value="Useable"></et2-description>
+					<et2-textbox  statustext="How many of them are useable?" id="useable" maxlength="10"></et2-textbox>
+					<et2-description></et2-description>
+					<et2-description  value="Bookable"></et2-description>
+					<et2-checkbox  statustext="Is resource bookable?" id="bookable" span="3"></et2-checkbox>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" width="100%" tab_height="250">
+					<et2-tabbox  id="tabs" span="all" width="100%" tabHeight="250">
 						<tabs>
 							<tab id="page" label="Description" statustext="Informations about the location of resource"/>
 							<tab id="general" label="Details" statustext="General informations about resource"/>
@@ -176,34 +171,30 @@
 							<template id="resources.edit_tabs.custom"/>
 							<template id="resources.edit_tabs.history"/>
 						</tabpanels>
-					</tabbox>
+					</et2-tabbox>
 				</row>
 				<row class="dialogOperators">
-					<description value="Created by"/>
-					<hbox>
-						<menulist>
-							<menupopup type="select-account" id="res_creator" readonly="true"/>
-						</menulist>
-						<date-time id="res_created" readonly="true" align="right"/>
-					</hbox>
-					<description/>
-					<description value="Last modified"/>
-					<hbox>
-						<menulist>
-							<menupopup type="select-account" id="res_modifier" readonly="true"/>
-						</menulist>
-							<date-time  id="res_modified" readonly="true" align="right"/>
-					</hbox>
+					<et2-description  value="Created by"></et2-description>
+					<et2-hbox>
+						<et2-select-account  id="res_creator" readonly="true"></et2-select-account>
+						<et2-date-time  id="res_created" readonly="true" align="right"></et2-date-time>
+					</et2-hbox>
+					<et2-description></et2-description>
+					<et2-description  value="Last modified"></et2-description>
+					<et2-hbox>
+						<et2-select-account  id="res_modifier" readonly="true"></et2-select-account>
+							<et2-date-time  id="res_modified" readonly="true" align="right"></et2-date-time>
+					</et2-hbox>
 				</row>
 				<row class="dialogFooterToolbar">
-					<hbox span="3">
-						<button statustext="Saves entry and exits" label="Save" id="button[save]" image="save" background_image="1"/>
-						<button label="Apply" id="button[apply]" image="apply" background_image="1"/>
-						<button label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-					</hbox>
-					<button align="right" label="Delete" id="button[delete]" onclick="et2_dialog.confirm(widget,'Do you really want to delete this resource?','Delete')" image="delete" background_image="1"/>
+					<et2-hbox  span="3">
+						<et2-button  statustext="Saves entry and exits" label="Save" id="button[save]" image="save"></et2-button>
+						<et2-button  label="Apply" id="button[apply]" image="apply"></et2-button>
+						<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel"></et2-button>
+					</et2-hbox>
+					<et2-button  align="right" label="Delete" id="button[delete]" onclick="et2_dialog.confirm(widget,'Do you really want to delete this resource?','Delete')" image="delete"></et2-button>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/resources/templates/default/show.rows.xet b/resources/templates/default/show.rows.xet
index a34ce92eba..19e94eebee 100644
--- a/resources/templates/default/show.rows.xet
+++ b/resources/templates/default/show.rows.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="resources.show.rows" template="" lang="" group="0" version="1.9.003">
 		<grid width="100%">
@@ -16,63 +15,59 @@
 			<rows>
 				<row class="th">
 					<nextmatch-sortheader label="Image" id="image"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Name" id="name"/>
 						<nextmatch-sortheader label="Short description" id="short_description"/>
-					</vbox>
-					<vbox>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader statustext="How many of this resource are usable" label="Useable" id="useable"/>
 						<nextmatch-sortheader statustext="How many of this resource exists" label="Quantity" id="quantity"/>
-					</vbox>
-					<vbox>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Category" id="cat_id"/>
-						<description value="Administrator"/>
-					</vbox>
-					<vbox>
+						<et2-description  value="Administrator"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Location" id="location"/>
-						<description value="Storage information"/>
-					</vbox>
+						<et2-description  value="Storage information"></et2-description>
+					</et2-vbox>
 					<nextmatch-header label="Resource / Accessories"/>
 					<nextmatch-customfields id="customfields"/>
 				</row>
 				<row class="$row_cont[class]">
-					<image id="${row}[picture_thumb]" width="100%" image_tooltip="true" height="auto" extra_link_target="_blank" href="webdav.php/apps/resources/${row_cont[res_id]}/.picture.jpg" src="${row}[picture_thumb]" />
-					<vbox>
-						<description id="${row}[name]" no_lang="1"/>
-						<description id="${row}[short_description]" no_lang="1"/>
-					</vbox>
-					<vbox align="left">
-						<description align="left" id="${row}[useable]" no_lang="1"/>
-						<description align="left" id="${row}[quantity]" no_lang="1"/>
-					</vbox>
-					<vbox>
-						<menulist>
-							<menupopup type="select-cat" id="{$row}[cat_id]" no_lang="1" readonly="true"/>
-						</menulist>
-						<menulist>
-							<menupopup type="select-account" id="{$row}[admin]" no_lang="1" readonly="true"/>
-						</menulist>
-					</vbox>
-					<vbox>
-						<description id="${row}[location]" no_lang="1"/>
-						<description id="${row}[storage_info]" no_lang="1"/>
-					</vbox>
-					<vbox no_lang="1">
-						<description extra_link_popup="850x600" href="resources.resources_ui.edit&amp;res_id=$row_cont[accessory_of]" id="${row}[accessory_of_label]" no_lang="1"/>
+					<et2-image  id="${row}[picture_thumb]" width="100%" height="auto" href="webdav.php/apps/resources/${row_cont[res_id]}/.picture.jpg" src="${row}[picture_thumb]" imageTooltip="true" extraLinkTarget="_blank" ></et2-image>
+					<et2-vbox>
+						<et2-description  id="${row}[name]" noLang="1"></et2-description>
+						<et2-description  id="${row}[short_description]" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-vbox  align="left">
+						<et2-description  align="left" id="${row}[useable]" noLang="1"></et2-description>
+						<et2-description  align="left" id="${row}[quantity]" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-select-cat  id="{$row}[cat_id]" readonly="true" noLang="1"></et2-select-cat>
+						<et2-select-account  id="{$row}[admin]" readonly="true" noLang="1"></et2-select-account>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-description  id="${row}[location]" noLang="1"></et2-description>
+						<et2-description  id="${row}[storage_info]" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-vbox  noLang="1">
+						<et2-description  href="resources.resources_ui.edit&amp;res_id=$row_cont[accessory_of]" id="${row}[accessory_of_label]" extraLinkPopup="850x600" noLang="1"></et2-description>
 						<grid width="100%" id="${row}[accessories]">
 							<columns>
 								<column/>
 							</columns>
 							<rows>
 								<row>
-									<description extra_link_popup="850x600" href="resources.resources_ui.edit&amp;res_id=$row_cont[acc_id]" id="${row}[name]" no_lang="1"/>
+									<et2-description  href="resources.resources_ui.edit&amp;res_id=$row_cont[acc_id]" id="${row}[name]" extraLinkPopup="850x600" noLang="1"></et2-description>
 								</row>
 							</rows>
 						</grid>
-					</vbox>
+					</et2-vbox>
 					<customfields-list id="$row"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/resources/templates/default/show.xet b/resources/templates/default/show.xet
index 253c3c8346..a310dbadbb 100644
--- a/resources/templates/default/show.xet
+++ b/resources/templates/default/show.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="resources.show.rows" template="" lang="" group="0" version="1.9.003">
 		<grid width="100%">
@@ -16,96 +16,92 @@
 			<rows>
 				<row class="th">
 					<nextmatch-header label="Image" id="image"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Name" id="name"/>
 						<nextmatch-sortheader label="Short description" id="short_description"/>
-					</vbox>
-					<vbox>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader statustext="How many of this resource are usable" label="Useable" id="useable"/>
 						<nextmatch-sortheader statustext="How many of this resource exists" label="Quantity" id="quantity"/>
 						<nextmatch-sortheader statustext="Is the ressource bookable?" label="Bookable" id="bookable"/>
-					</vbox>
-					<vbox>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Category" id="cat_id"/>
-						<description value="Administrator"/>
-					</vbox>
-					<vbox>
+						<et2-description  value="Administrator"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Location" id="location"/>
-						<description value="Storage information"/>
-					</vbox>
+						<et2-description  value="Storage information"></et2-description>
+					</et2-vbox>
                     <nextmatch-sortheader label="Inventory Number" id="inventory_number"/>
 					<nextmatch-header label="Resource / Accessories"/>
 					<nextmatch-customfields id="customfields"/>
 				</row>
 				<row class="$row_cont[class]">
-					<image id="${row}[picture_thumb]" expose_view="true" href="$row_cont[picture_original]" src="$row_cont[picture_thumb]" class="thumbnailImage"/>
-					<vbox>
-						<description id="${row}[name]" no_lang="1"/>
-						<description id="${row}[short_description]" no_lang="1"/>
-					</vbox>
-					<vbox align="left">
-						<description align="left" id="${row}[useable]" no_lang="1"/>
-						<description align="left" id="${row}[quantity]" no_lang="1"/>
-						<description align="left" id="${row}[bookable]" no_lang="1"/>
-					</vbox>
-					<vbox>
-						<menulist>
-							<menupopup type="select-cat" id="{$row}[cat_id]" no_lang="1" readonly="true"/>
-						</menulist>
-						<menulist>
-							<menupopup type="select-account" id="{$row}[admin]" no_lang="1" readonly="true"/>
-						</menulist>
-					</vbox>
-					<vbox>
-						<description id="${row}[location]" no_lang="1"/>
-						<description id="${row}[storage_info]" no_lang="1"/>
-					</vbox>
-                    <description id="${row}[inventory_number]" no_lang="1"/>
-					<vbox no_lang="1">
-						<description extra_link_popup="850x600" href="resources.resources_ui.edit&amp;res_id=$row_cont[accessory_of]" id="${row}[accessory_of_label]" no_lang="1"/>
+					<et2-image-expose  id="${row}[picture_thumb]" href="$row_cont[picture_original]" src="$row_cont[picture_thumb]" class="thumbnailImage"></et2-image-expose>
+					<et2-vbox>
+						<et2-description  id="${row}[name]" noLang="1"></et2-description>
+						<et2-description  id="${row}[short_description]" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-vbox  align="left">
+						<et2-description  align="left" id="${row}[useable]" noLang="1"></et2-description>
+						<et2-description  align="left" id="${row}[quantity]" noLang="1"></et2-description>
+						<et2-description  align="left" id="${row}[bookable]" noLang="1"></et2-description>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-select-cat  id="{$row}[cat_id]" readonly="true" noLang="1"></et2-select-cat>
+						<et2-select-account  id="{$row}[admin]" readonly="true" noLang="1"></et2-select-account>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-description  id="${row}[location]" noLang="1"></et2-description>
+						<et2-description  id="${row}[storage_info]" noLang="1"></et2-description>
+					</et2-vbox>
+                    <et2-description  id="${row}[inventory_number]" noLang="1"></et2-description>
+					<et2-vbox  noLang="1">
+						<et2-description  href="resources.resources_ui.edit&amp;res_id=$row_cont[accessory_of]" id="${row}[accessory_of_label]" extraLinkPopup="850x600" noLang="1"></et2-description>
 						<grid width="100%" id="${row}[accessories]">
 							<columns>
 								<column/>
 							</columns>
 							<rows>
 								<row>
-									<description extra_link_popup="850x600" href="resources.resources_ui.edit&amp;res_id=$row_cont[acc_id]" id="${row}[name]" no_lang="1"/>
+									<et2-description  href="resources.resources_ui.edit&amp;res_id=$row_cont[acc_id]" id="${row}[name]" extraLinkPopup="850x600" noLang="1"></et2-description>
 								</row>
 							</rows>
 						</grid>
-					</vbox>
+					</et2-vbox>
 					<customfields-list id="$row"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="resources.show.add" template="" lang="" group="0" version="1.9.002">
-		<buttononly statustext="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=resources.resources_ui.edit'),'','dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes'); return false; return false;"/>
+		<et2-button  statustext="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=resources.resources_ui.edit'),'','dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes'); return false; return false;" noSubmit="true"></et2-button>
 	</template>
 	<template id="resources.show" template="" lang="" group="0" version="1.9.003">
 		<nextmatch id="nm" no_lang="1" template="resources.show.rows" header_left="resources.show.add"/>
-		<box id="delete_popup" class="action_popup prompt">
-			<vbox class="prompt">
-				<description value="Delete" class="promptheader"/>
-				<description value="Delete accessories of selected resources too?"/>
-				<hbox>
-					<button label="Yes - Delete accessories too" id="delete" onclick="nm_submit_popup(this); return false;"/>
-					<button label="No - Make them resources" id="delete_promote" onclick="nm_popup_action.id = 'delete_promote'; nm_submit_popup(this); return false;"/>
-					<buttononly label="Cancel" onclick="nm_hide_popup(this,'delete_popup');"/>
-				</hbox>
-			</vbox>
-		</box>
-		<box id="restore_popup" class="action_popup prompt">
-			<vbox class="prompt">
-				<description value="Un-delete" class="promptheader"/>
-				<description value="Un-delete accessories of selected resources too?"/>
-				<hbox>
-					<button label="Yes - Un-delete accessories too" id="restore_accessories" onclick="nm_popup_action.id = 'restore_accessories';nm_submit_popup(this); return false;"/>
-					<button label="No - Leave them" id="restore" onclick="nm_popup_action.id = 'restore'; nm_submit_popup(this); return false;"/>
-					<buttononly label="Cancel" onclick="nm_hide_popup(this,'restore_popup');"/>
-				</hbox>
-			</vbox>
-		</box>
+		<et2-box  id="delete_popup" class="action_popup prompt">
+			<et2-vbox  class="prompt">
+				<et2-description  value="Delete" class="promptheader"></et2-description>
+				<et2-description  value="Delete accessories of selected resources too?"></et2-description>
+				<et2-hbox>
+					<et2-button  label="Yes - Delete accessories too" id="delete" onclick="nm_submit_popup(this); return false;"></et2-button>
+					<et2-button  label="No - Make them resources" id="delete_promote" onclick="nm_popup_action.id = 'delete_promote'; nm_submit_popup(this); return false;"></et2-button>
+					<et2-button  label="Cancel" onclick="nm_hide_popup(this,'delete_popup');" noSubmit="true"></et2-button>
+				</et2-hbox>
+			</et2-vbox>
+		</et2-box>
+		<et2-box  id="restore_popup" class="action_popup prompt">
+			<et2-vbox  class="prompt">
+				<et2-description  value="Un-delete" class="promptheader"></et2-description>
+				<et2-description  value="Un-delete accessories of selected resources too?"></et2-description>
+				<et2-hbox>
+					<et2-button  label="Yes - Un-delete accessories too" id="restore_accessories" onclick="nm_popup_action.id = 'restore_accessories';nm_submit_popup(this); return false;"></et2-button>
+					<et2-button  label="No - Leave them" id="restore" onclick="nm_popup_action.id = 'restore'; nm_submit_popup(this); return false;"></et2-button>
+					<et2-button  label="Cancel" onclick="nm_hide_popup(this,'restore_popup');" noSubmit="true"></et2-button>
+				</et2-hbox>
+			</et2-vbox>
+		</et2-box>
 		<styles>
 			.thumbnailImage img {
 				width: 100%;
diff --git a/resources/templates/default/showdetails.xet b/resources/templates/default/showdetails.xet
index eb0abf51cd..2201c3e675 100644
--- a/resources/templates/default/showdetails.xet
+++ b/resources/templates/default/showdetails.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="resources.showdetails" template="" lang="" group="0" version="1.5.001">
 		<grid width="750" height="480">
@@ -10,7 +9,7 @@
 			</columns>
 			<rows>
 				<row class="nmh" height="240px">
-					<image src="resource_picture" align="center"/>
+					<et2-image  src="resource_picture" align="center"></et2-image>
 					<grid>
 						<columns>
 							<column/>
@@ -18,75 +17,71 @@
 						</columns>
 						<rows>
 							<row>
-								<description options="b" value="Name:"/>
-								<description options="b" no_lang="1" id="name"/>
+								<et2-description  value="Name:" boldItalic="b"></et2-description>
+								<et2-description  id="name" boldItalic="b" noLang="1"></et2-description>
 							</row>
 							<row>
-								<description value="Inventory number:"/>
-								<description no_lang="1" id="inventory_number"/>
+								<et2-description  value="Inventory number:"></et2-description>
+								<et2-description  id="inventory_number" noLang="1"></et2-description>
 							</row>
 							<row>
-								<description value="Category:"/>
-								<menulist>
-									<menupopup type="select-cat" id="cat_id" readonly="true"/>
-								</menulist>
+								<et2-description  value="Category:"></et2-description>
+								<et2-select-cat  id="cat_id" readonly="true"></et2-select-cat>
 							</row>
 							<row>
-								<description value="Responsible: "/>
-								<menulist>
-									<menupopup type="select-account" id="cat_admin" readonly="true"/>
-								</menulist>
+								<et2-description  value="Responsible: "></et2-description>
+								<et2-select-account  id="cat_admin" readonly="true"></et2-select-account>
 							</row>
 							<row valign="top">
-								<description value="Quantity: "/>
-								<description id="quantity"/>
+								<et2-description  value="Quantity: "></et2-description>
+								<et2-description  id="quantity"></et2-description>
 							</row>
 							<row>
-								<description value="Useable:"/>
-								<description id="useable"/>
+								<et2-description  value="Useable:"></et2-description>
+								<et2-description  id="useable"></et2-description>
 							</row>
 							<row>
-								<description value="Location:"/>
-								<description no_lang="1" id="location"/>
+								<et2-description  value="Location:"></et2-description>
+								<et2-description  id="location" noLang="1"></et2-description>
 							</row>
 							<row>
-								<description value="Storage information:"/>
-								<description id="storage_info"/>
+								<et2-description  value="Storage information:"></et2-description>
+								<et2-description  id="storage_info"></et2-description>
 							</row>
 						</rows>
 					</grid>
 				</row>
 				<row>
-					<description/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row height="1%">
 					<html span="2" id="description" readonly="true"/>
 				</row>
 				<row>
-					<description/>
-					<description/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row class="th" disabled="@!link_to">
-					<description span="2" rows="1" cols="4" value="Related links"/>
+					<et2-description  span="2" rows="1" cols="4" value="Related links"></et2-description>
 				</row>
 				<row class="row_off" valign="top">
-					<link-list span="all" id="link_to" readonly="true"/>
+					<et2-link-list  span="all" id="link_to" readonly="true"></et2-link-list>
 				</row>
 				<row>
-					<hbox label="Cancel" span="2">
-						<hbox label="Edit" span="2" id="btn_edit">
-							<button label="Edit" span="2" id="btn_edit" statustext="Buy this article"/>
-							<button label="Cancel" onclick="window.close()"/>
-							<button label="Calendar" span="2" id="btn_calendar" statustext="Show calendar of resource" onclick="opener.location=egw::link('/index.php','menuaction=calendar.calendar_uiviews.month&amp;owner=r$cont[res_id]'); return false;"/>
-							<button label="Book" onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.edit&amp;participants=r$cont[res_id]'),'','dependent=yes,width=750,height=400,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes');" id="btn_book" statustext="Book this resource"/>
-						</hbox>
-						<hbox align="right">
-							<button label="Delete" onclick="return confirm('Do you really want to delete this resource?');" id="btn_delete"/>
-						</hbox>
-					</hbox>
+					<et2-hbox  label="Cancel" span="2">
+						<et2-hbox  label="Edit" span="2" id="btn_edit">
+							<et2-button  label="Edit" span="2" id="btn_edit" statustext="Buy this article"></et2-button>
+							<et2-button  label="Cancel" onclick="window.close()"></et2-button>
+							<et2-button  label="Calendar" span="2" id="btn_calendar" statustext="Show calendar of resource" onclick="opener.location=egw::link('/index.php','menuaction=calendar.calendar_uiviews.month&amp;owner=r$cont[res_id]'); return false;"></et2-button>
+							<et2-button  label="Book" onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.edit&amp;participants=r$cont[res_id]'),'','dependent=yes,width=750,height=400,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes');" id="btn_book" statustext="Book this resource"></et2-button>
+						</et2-hbox>
+						<et2-hbox  align="right">
+							<et2-button  label="Delete" onclick="return confirm('Do you really want to delete this resource?');" id="btn_delete"></et2-button>
+						</et2-hbox>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/resources/templates/default/sitemgr_book.xet b/resources/templates/default/sitemgr_book.xet
index b66a3ba2f5..37bd4ed0df 100644
--- a/resources/templates/default/sitemgr_book.xet
+++ b/resources/templates/default/sitemgr_book.xet
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="resources.sitemgr_book" template="" lang="" group="0" version="1.9.001">
-		<box cols="1" rows="1">
+		<et2-box  cols="1" rows="1">
 			<grid width="100%">
 				<columns>
 					<column/>
@@ -12,66 +11,62 @@
 				<rows>
 					<row>
 						<hidden id="res_id"/>
-						<description/>
+						<et2-description></et2-description>
 					</row>
 					<row disabled="!@msg">
 						<html id="msg" span="all" class="message"/>
-						<description/>
+						<et2-description></et2-description>
 					</row>
 					<row>
-						<description id="name" class="name"/>
-						<image align="right" src="picture" class="resource_thumb"/>
+						<et2-description  id="name" class="name"></et2-description>
+						<et2-image  align="right" src="picture" class="resource_thumb"></et2-image>
 					</row>
 					<row disabled="!@short_description">
-						<description id="short_description" span="all" class="description"/>
-						<description/>
+						<et2-description  id="short_description" span="all" class="description"></et2-description>
+						<et2-description></et2-description>
 					</row>
 					<row disabled="!@long_description">
 						<html id="long_description" span="all" class="description"/>
-						<description/>
+						<et2-description></et2-description>
 					</row>
 					<row>
-						<description value="Date"/>
-						<hbox options="0,0">
-							<date id="date" onchange="var request = new egw_json_request('resources.resources_reserve.ajax_update_planner',[document.getElementById('exec[res_id]').value, Math.round(window.calendar.date.getTime()/1000)]);request.sendRequest(); return false;"/>
-							<menulist>
-								<menupopup id="time[hour]"/>
-							</menulist>
-							<description value=":"/>
-							<menulist>
-								<menupopup type="select-number" id="time[minute]" options=",0,59,$cont[duration]"/>
-							</menulist>
-						</hbox>
+						<et2-description  value="Date"></et2-description>
+						<et2-hbox  cellpadding="0" cellspacing="0" >
+							<et2-date  id="date" onchange="var request = new egw_json_request('resources.resources_reserve.ajax_update_planner',[document.getElementById('exec[res_id]').value, Math.round(window.calendar.date.getTime()/1000)]);request.sendRequest(); return false;"></et2-date>
+							<et2-select  id="time[hour]"></et2-select>
+							<et2-description  value=":"></et2-description>
+							<et2-select-number  id="time[minute]" min="0" max="59" interval="$cont[duration]"></et2-select-number>
+						</et2-hbox>
 					</row>
 					<row disabled="!@contact_form">
 						<template id="@contact_form" span="all"/>
 					</row>
 					<row disabled="!@show_contact">
-						<description value="Name"/>
-						<hbox options="0,0">
-							<textbox id="n_given"/>
-							<textbox id="n_family"/>
-						</hbox>
+						<et2-description  value="Name"></et2-description>
+						<et2-hbox  cellpadding="0" cellspacing="0" >
+							<et2-textbox  id="n_given"></et2-textbox>
+							<et2-textbox  id="n_family"></et2-textbox>
+						</et2-hbox>
 					</row>
 					<row disabled="!@show_contact">
-						<description value="Email"/>
-						<url-email id="email" needed="1" options="48"/>
+						<et2-description  value="Email"></et2-description>
+						<et2-url-email  id="email" options="48" required="1"></et2-url-email>
 					</row>
 					<row>
-						<description value="Party size"/>
-						<hbox>
-							<textbox type="integer" id="quantity"/>
-							<button align="right" label="Book" id="book"/>
-						</hbox>
+						<et2-description  value="Party size"></et2-description>
+						<et2-hbox>
+							<et2-number  id="quantity" precision="0"></et2-number>
+							<et2-button  align="right" label="Book" id="book"></et2-button>
+						</et2-hbox>
 					</row>
 					<row>
-						<box id="planner_div" span="all">
+						<et2-box  id="planner_div" span="all">
 							<html id="planner" span="all"/>
-						</box>
+						</et2-box>
 					</row>
 				</rows>
 			</grid>
-		</box>
+		</et2-box>
 		<styles>
 			.resource_thumb img  {
 float:right;
@@ -79,4 +74,4 @@ position:absolute;
 }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/resources/templates/mobile/edit.xet b/resources/templates/mobile/edit.xet
index dd51ad8b9c..5beb4f5985 100644
--- a/resources/templates/mobile/edit.xet
+++ b/resources/templates/mobile/edit.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="resources.edit_tabs.general" template="" lang="" group="0" version="">
 		<grid width="100%">
@@ -10,36 +9,34 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Inventory number"/>
-					<textbox  id="inventory_number" class="et2_fullWidth"/>
+					<et2-description  value="Inventory number"></et2-description>
+					<et2-textbox  id="inventory_number"></et2-textbox>
 				</row>
 				<row>
-					<description value="Accessory of"/>
-					<vbox class="et2_fullWidth">
-						<menulist class="et2_fullWidth">
-							<menupopup id="accessory_of" no_lang="1" />
-						</menulist>
-						<description id="accessory_label"/>
-					</vbox>
+					<et2-description  value="Accessory of"></et2-description>
+					<et2-vbox >
+						<et2-select  id="accessory_of" noLang="1"></et2-select>
+						<et2-description  id="accessory_label"></et2-description>
+					</et2-vbox>
 				</row>
 				<row>
-					<description value="Description (short)"/>
-					<textbox statustext="Short description of resource" id="short_description"  size="50" maxlength="100" class="et2_fullWidth"/>
+					<et2-description  value="Description (short)"></et2-description>
+					<et2-textbox  statustext="Short description of resource" id="short_description" maxlength="100"></et2-textbox>
 				</row>
 				<row>
-					<description value="Storage information"/>
-					<textbox statustext="Information about storage" id="storage_info"  maxlength="100" size="50" class="et2_fullWidth" span="all"/>
+					<et2-description  value="Storage information"></et2-description>
+					<et2-textbox  statustext="Information about storage" id="storage_info" maxlength="100" span="all"></et2-textbox>
 				</row>
 				<row>
-					<description value="Location"/>
-					<textbox statustext="Where to find this resource?" id="location"  maxlength="100" size="50" class="et2_fullWidth" />
+					<et2-description  value="Location"></et2-description>
+					<et2-textbox  statustext="Where to find this resource?" id="location" maxlength="100" ></et2-textbox>
 				</row>
 				<row>
-					<description disabled="true" value="Buyable"/>
-					<checkbox disabled="true" statustext="Is resource buyable?" id="buyable" span="all" class="et2_fullWidth" />
+					<et2-description  disabled="true" value="Buyable"></et2-description>
+					<et2-checkbox  disabled="true" statustext="Is resource buyable?" id="buyable" span="all" ></et2-checkbox>
 				</row>
 				<row>
-					<description value="Picture"/>
+					<et2-description  value="Picture"></et2-description>
 					<grid>
 						<columns>
 							<column width="10%"/>
@@ -48,16 +45,16 @@
 						<rows>
 
 							<row>
-								<radio id="picture_src" options="gen_src"/>
-								<description value="Use general resources icon"/>
+								<radio id="picture_src" set_value="gen_src" />
+								<et2-description  value="Use general resources icon"></et2-description>
 							</row>
 							<row>
-								<radio id="picture_src" options="cat_src"/>
-								<description value="Use the category's icon"/>
+								<radio id="picture_src" set_value="cat_src" />
+								<et2-description  value="Use the category's icon"></et2-description>
 							</row>
 							<row>
-								<radio id="picture_src" options="own_src"/>
-								<description value="Use own picture"/>
+								<radio id="picture_src" set_value="own_src" />
+								<et2-description  value="Use own picture"></et2-description>
 							</row>
 
 						</rows>
@@ -80,13 +77,13 @@
 			</columns>
 			<rows>
 				<row class="row">
-					<link-to id="link_to" span="all"/>
+					<et2-link-to  id="link_to" span="all"></et2-link-to>
 				</row>
 				<row class="th">
-					<description value="Existing links" span="all"/>
+					<et2-description  value="Existing links" span="all"></et2-description>
 				</row>
 				<row class="row_off" valign="top">
-					<link-list id="link_to" span="all"/>
+					<et2-link-list  id="link_to" span="all"></et2-link-list>
 				</row>
 			</rows>
 		</grid>
@@ -98,7 +95,7 @@
 			</columns>
 			<rows>
 				<row class="th" height="20">
-					<description value="Custom fields"/>
+					<et2-description  value="Custom fields"></et2-description>
 				</row>
 				<row valign="top">
 					<customfields/>
@@ -114,21 +111,17 @@
 			</columns>
 			<rows>
 				<row class="dialogOperators">
-					<description value="Created by"/>
-					<hbox>
-						<menulist>
-							<menupopup type="select-account" id="res_creator" readonly="true"/>
-						</menulist>
-						<date-time id="res_created" readonly="true" align="right"/>
-					</hbox>
-					<description/>
-					<description value="Last modified"/>
-					<hbox>
-						<menulist>
-							<menupopup type="select-account" id="res_modifier" readonly="true"/>
-						</menulist>
-							<date-time  id="res_modified" readonly="true" align="right"/>
-					</hbox>
+					<et2-description  value="Created by"></et2-description>
+					<et2-hbox>
+						<et2-select-account  id="res_creator" readonly="true"></et2-select-account>
+						<et2-date-time  id="res_created" readonly="true" align="right"></et2-date-time>
+					</et2-hbox>
+					<et2-description></et2-description>
+					<et2-description  value="Last modified"></et2-description>
+					<et2-hbox>
+						<et2-select-account  id="res_modifier" readonly="true"></et2-select-account>
+							<et2-date-time  id="res_modified" readonly="true" align="right"></et2-date-time>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -141,64 +134,63 @@
 			</columns>
 			<rows>
 				<row  class="dialogHeadbar" >
-					<hbox>
-						<button id="button[apply]" image="apply" background_image="1"/>
-						<button id="button[delete]" onclick="et2_dialog.confirm(widget,'Do you really want to delete this resource?','Delete')" image="delete" background_image="1"/>
-						<textbox type="integer" id="res_id" readonly="true" class="entry_id"/>
-					</hbox>
+					<et2-hbox>
+						<et2-button  id="button[apply]" image="apply"></et2-button>
+						<et2-button  id="button[delete]" onclick="et2_dialog.confirm(widget,'Do you really want to delete this resource?','Delete')" image="delete"></et2-button>
+						<et2-number  id="res_id" readonly="true" class="entry_id" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row>
-					<description/>
-					<box>
-						<hbox class="avatar">
-							<image src="resource_picture" href="$cont[picture_original]" expose_view="true" align="center"/>
-						</hbox>
+					<et2-description></et2-description>
+					<et2-box>
+						<et2-hbox  class="avatar">
+							<et2-image-expose  src="resource_picture" href="$cont[picture_original]" align="center"></et2-image-expose>
+						</et2-hbox>
 
-					</box>
+					</et2-box>
 				</row>
 				<row class="dialogHeader">
-					<description value="Name"/>
-					<textbox statustext="Name of resource" id="name" needed="1" class="et2_fullWidth et2_required" span="4"/>
+					<et2-description  value="Name"></et2-description>
+					<et2-textbox  statustext="Name of resource" id="name" class="et2_required" span="4" required="1"></et2-textbox>
 				</row>
 				<row>
-					<description value="Quantity"/>
-					<textbox statustext="Quantity of resource" id="quantity" size="5" maxlength="10" class="et2_fullWidth"/>
+					<et2-description  value="Quantity"></et2-description>
+					<et2-textbox  statustext="Quantity of resource" id="quantity" maxlength="10"></et2-textbox>
 				</row>
 				<row>
-					<description value="Category"/>
-					<menulist span="3">
-						<menupopup align="right" statustext="Which category does this resource belong to?" id="cat_id" needed="1" no_lang="1" class="et2_fullWidth" />
-					</menulist>
+					<et2-description  value="Category"></et2-description>
+					<et2-select  span="3" align="right" statustext="Which category does this resource belong to?" id="cat_id" required="1" noLang="1"></et2-select>
 				</row>
 				<row>
-					<description value="Usable"/>
-					<textbox statustext="How many of them are useable?" id="useable" size="5" maxlength="10" class="et2_fullWidth"/>
+					<et2-description  value="Usable"></et2-description>
+					<et2-textbox  statustext="How many of them are useable?" id="useable" maxlength="10"></et2-textbox>
 				</row>
 				<row>
-					<description value="Bookable"/>
-					<checkbox statustext="Is resource bookable?" id="bookable" span="3"/>
+					<et2-description  value="Bookable"></et2-description>
+					<et2-checkbox  statustext="Is resource bookable?" id="bookable" span="3"></et2-checkbox>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" width="100%" tab_height="250" align_tabs="v">
-						<tabs>
-							<tab id="page" label="Description" statustext="Informations about the location of resource"/>
-							<tab id="general" label="Details" statustext="General informations about resource"/>
-							<tab id="links" label="Links" statustext="Web-Page of resource"/>
-							<tab id="custom" label="Custom" statustext="Pictures or resource"/>
-							<tab id="ownership" label="Ownership"/>
-						</tabs>
-						<tabpanels>
+					<et2-vbox  id="tabs" span="all" width="100%" tabHeight="250">
+						<et2-details  id="page" summary="Description" title="Informations about the location of resource">
 							<template id="resources.edit_tabs.page"/>
+						</et2-details>
+						<et2-details  id="general" summary="Details" title="General informations about resource">
 							<template id="resources.edit_tabs.general"/>
+						</et2-details>
+						<et2-details  id="links" summary="Links" title="Web-Page of resource">
 							<template id="resources.edit_tabs.links"/>
+						</et2-details>
+						<et2-details  id="custom" summary="Custom" title="Pictures or resource">
 							<template id="resources.edit_tabs.custom"/>
+						</et2-details>
+						<et2-details  id="ownership" summary="Ownership" title="">
 							<template id="resources.edit_tabs.ownership"/>
-						</tabpanels>
-					</tabbox>
+						</et2-details>
+					</et2-vbox>
 				</row>
 
 
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/resources/templates/mobile/show.xet b/resources/templates/mobile/show.xet
index b5a07f9b7b..aaf7986359 100644
--- a/resources/templates/mobile/show.xet
+++ b/resources/templates/mobile/show.xet
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="resources.show.nm_right" template="" lang="" group="0" version="1.9.002">
-		<buttononly class="plus_button" parent_node="resources-show_plus_button_container" id="add_button" onclick="window.open(egw::link('/index.php','menuaction=resources.resources_ui.edit'),'','dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes'); return false; return false;"/>
+		<et2-button  class="plus_button" id="add_button" onclick="window.open(egw::link('/index.php','menuaction=resources.resources_ui.edit'),'','dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes'); return false; return false;" noSubmit="true" parentId="resources-show_plus_button_container"></et2-button>
 	</template>
 	<template id="resources.show.rows" template="" lang="" group="0" version="1.9.003">
 		<grid width="100%">
@@ -18,43 +17,41 @@
 
 				</row>
 				<row class="$row_cont[class]">
-					<description class="cat_$row_cont[cat_id] mobile_cat_col"/>
-					<vbox>
+					<et2-description  class="cat_$row_cont[cat_id] mobile_cat_col"></et2-description>
+					<et2-vbox>
 						<customfields-list id="$row" class="customfields" app="resources" disabled="true"/>
-						<description id="${row}[name]" no_lang="1"/>
-						<description id="${row}[short_description]" no_lang="1"/>
-						<hbox>
-							<description extra_link_popup="850x600" href="resources.resources_ui.edit&amp;res_id=$row_cont[accessory_of]" id="${row}[accessory_of_label]" no_lang="1"/>
+						<et2-description  id="${row}[name]" noLang="1"></et2-description>
+						<et2-description  id="${row}[short_description]" noLang="1"></et2-description>
+						<et2-hbox>
+							<et2-description  href="resources.resources_ui.edit&amp;res_id=$row_cont[accessory_of]" id="${row}[accessory_of_label]" extraLinkPopup="850x600" noLang="1"></et2-description>
 							<grid width="100%" id="${row}[accessories]">
 								<columns>
 									<column/>
 								</columns>
 								<rows>
 									<row>
-										<description extra_link_popup="850x600" href="resources.resources_ui.edit&amp;res_id=$row_cont[acc_id]" id="${row}[name]" no_lang="1"/>
+										<et2-description  href="resources.resources_ui.edit&amp;res_id=$row_cont[acc_id]" id="${row}[name]" extraLinkPopup="850x600" noLang="1"></et2-description>
 									</row>
 								</rows>
 							</grid>
-						</hbox>
-					</vbox>
-					<vbox class="resourcesCol2">
-						<hbox>
-							<label value="Useable"/>
-							<description align="left" id="${row}[useable]" no_lang="1"/>
-						</hbox>
-						<hbox>
-							<label value="Quantity"/>
-							<description align="left" id="${row}[quantity]" no_lang="1"/>
-						</hbox>
-						<menulist>
-							<menupopup type="select-cat" id="{$row}[cat_id]" no_lang="1" readonly="true"/>
-						</menulist>
-					</vbox>
-					<vbox>
-						<hbox class="avatar">
-							<image id="${row}[picture_thumb]" width="50px" height="50px" expose_view="true" href="$row_cont[picture_original]" src="${row}[picture_thumb]" />
-						</hbox>
-					</vbox>
+						</et2-hbox>
+					</et2-vbox>
+					<et2-vbox  class="resourcesCol2">
+						<et2-hbox>
+							<et2-label  value="Useable"></et2-label>
+							<et2-description  align="left" id="${row}[useable]" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-hbox>
+							<et2-label  value="Quantity"></et2-label>
+							<et2-description  align="left" id="${row}[quantity]" noLang="1"></et2-description>
+						</et2-hbox>
+						<et2-select-cat  id="{$row}[cat_id]" readonly="true" noLang="1"></et2-select-cat>
+					</et2-vbox>
+					<et2-vbox>
+						<et2-hbox  class="avatar">
+							<et2-image-expose  id="${row}[picture_thumb]" width="50px" height="50px" href="$row_cont[picture_original]" src="${row}[picture_thumb]" ></et2-image-expose>
+						</et2-hbox>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
@@ -66,39 +63,39 @@
 			</columns>
 			<rows>
 				<row disabled="!@msg">
-						<description align="center" id="msg" span="all" class="message"/>
+						<et2-description  align="center" id="msg" span="all" class="message"></et2-description>
 				</row>
 				<row>
-					<description id="plus_button_container"/>
+					<et2-description  id="plus_button_container"></et2-description>
 				</row>
 				<row>
 					<nextmatch id="nm" no_lang="1" template="resources.show.rows"/>
 				</row>
 				<row>
-					<box id="delete_popup" class="action_popup prompt">
-						<vbox class="prompt">
-							<description value="Delete" class="promptheader"/>
-							<description value="Delete accessories of selected resources too?"/>
-							<hbox>
-								<button label="Yes - Delete accessories too" id="delete" onclick="nm_submit_popup(this); return false;"/>
-								<button label="No - Make them resources" id="delete_promote" onclick="nm_popup_action.id = 'delete_promote'; nm_submit_popup(this); return false;"/>
-								<buttononly label="Cancel" onclick="nm_hide_popup(this,'delete_popup');"/>
-							</hbox>
-						</vbox>
-					</box>
+					<et2-box  id="delete_popup" class="action_popup prompt">
+						<et2-vbox  class="prompt">
+							<et2-description  value="Delete" class="promptheader"></et2-description>
+							<et2-description  value="Delete accessories of selected resources too?"></et2-description>
+							<et2-hbox>
+								<et2-button  label="Yes - Delete accessories too" id="delete" onclick="nm_submit_popup(this); return false;"></et2-button>
+								<et2-button  label="No - Make them resources" id="delete_promote" onclick="nm_popup_action.id = 'delete_promote'; nm_submit_popup(this); return false;"></et2-button>
+								<et2-button  label="Cancel" onclick="nm_hide_popup(this,'delete_popup');" noSubmit="true"></et2-button>
+							</et2-hbox>
+						</et2-vbox>
+					</et2-box>
 				</row>
 				<row>
-					<box id="restore_popup" class="action_popup prompt">
-						<vbox class="prompt">
-							<description value="Un-delete" class="promptheader"/>
-							<description value="Un-delete accessories of selected resources too?"/>
-							<hbox>
-								<button label="Yes - Un-delete accessories too" id="restore_accessories" onclick="nm_popup_action.id = 'restore_accessories';nm_submit_popup(this); return false;"/>
-								<button label="No - Leave them" id="restore" onclick="nm_popup_action.id = 'restore'; nm_submit_popup(this); return false;"/>
-								<buttononly label="Cancel" onclick="nm_hide_popup(this,'restore_popup');"/>
-							</hbox>
-						</vbox>
-					</box>
+					<et2-box  id="restore_popup" class="action_popup prompt">
+						<et2-vbox  class="prompt">
+							<et2-description  value="Un-delete" class="promptheader"></et2-description>
+							<et2-description  value="Un-delete accessories of selected resources too?"></et2-description>
+							<et2-hbox>
+								<et2-button  label="Yes - Un-delete accessories too" id="restore_accessories" onclick="nm_popup_action.id = 'restore_accessories';nm_submit_popup(this); return false;"></et2-button>
+								<et2-button  label="No - Leave them" id="restore" onclick="nm_popup_action.id = 'restore'; nm_submit_popup(this); return false;"></et2-button>
+								<et2-button  label="Cancel" onclick="nm_hide_popup(this,'restore_popup');" noSubmit="true"></et2-button>
+							</et2-hbox>
+						</et2-vbox>
+					</et2-box>
 				</row>
 			</rows>
 		</grid>
@@ -116,4 +113,4 @@
 }
 		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/resources/templates/mobile/view.xet b/resources/templates/mobile/view.xet
index b06be18f6e..2d7d065155 100644
--- a/resources/templates/mobile/view.xet
+++ b/resources/templates/mobile/view.xet
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="resources.view.page" template="" lang="" group="0" version="">
-		<textbox statustext="Short description of resource" id="short_description"  size="50" maxlength="100" class="et2_fullWidth"/>
+		<et2-textbox  statustext="Short description of resource" id="short_description" maxlength="100"></et2-textbox>
 	</template>
 	<template id="resources.view.custom" template="" lang="" group="0" version="">
 		<grid width="100%" height="245" class="row_on" spacing="0" padding="0" overflow="auto">
@@ -12,7 +11,7 @@
 			</columns>
 			<rows>
 				<row class="th" height="20">
-					<description value="Custom fields"/>
+					<et2-description  value="Custom fields"></et2-description>
 				</row>
 				<row valign="top">
 					<customfields/>
@@ -28,21 +27,17 @@
 			</columns>
 			<rows>
 				<row class="dialogOperators">
-					<description value="Created by"/>
-					<hbox>
-						<menulist>
-							<menupopup type="select-account" id="res_creator" readonly="true"/>
-						</menulist>
-						<date-time id="res_created" readonly="true" align="right"/>
-					</hbox>
-					<description/>
-					<description value="Last modified"/>
-					<hbox>
-						<menulist>
-							<menupopup type="select-account" id="res_modifier" readonly="true"/>
-						</menulist>
-							<date-time  id="res_modified" readonly="true" align="right"/>
-					</hbox>
+					<et2-description  value="Created by"></et2-description>
+					<et2-hbox>
+						<et2-select-account  id="res_creator" readonly="true"></et2-select-account>
+						<et2-date-time  id="res_created" readonly="true" align="right"></et2-date-time>
+					</et2-hbox>
+					<et2-description></et2-description>
+					<et2-description  value="Last modified"></et2-description>
+					<et2-hbox>
+						<et2-select-account  id="res_modifier" readonly="true"></et2-select-account>
+							<et2-date-time  id="res_modified" readonly="true" align="right"></et2-date-time>
+					</et2-hbox>
 				</row>
 			</rows>
 		</grid>
@@ -55,54 +50,51 @@
 			</columns>
 			<rows>
 				<row  class="dialogHeadbar" >
-					<hbox>
-						<textbox type="integer" id="res_id" readonly="true" class="entry_id"/>
-					</hbox>
+					<et2-hbox>
+						<et2-number  id="res_id" readonly="true" class="entry_id" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row>
-					<box>
-						<hbox class="avatar">
-							<image src="picture_thumb" href="$cont[picture_original]" expose_view="true" align="center"/>
-						</hbox>
-					</box>
+					<et2-box>
+						<et2-hbox  class="avatar">
+							<et2-image-expose  src="picture_thumb" href="$cont[picture_original]" align="center"></et2-image-expose>
+						</et2-hbox>
+					</et2-box>
 				</row>
 				<row class="dialogHeader">
-					<description value="Name"/>
-					<textbox statustext="Name of resource" id="name" needed="1" class="et2_fullWidth et2_required" span="4"/>
+					<et2-description  value="Name"></et2-description>
+					<et2-textbox  statustext="Name of resource" id="name" class="et2_required" span="4" required="1"></et2-textbox>
 				</row>
 				<row>
-					<description value="Quantity"/>
-					<textbox statustext="Quantity of resource" id="quantity" size="5" maxlength="10" class="et2_fullWidth"/>
+					<et2-description  value="Quantity"></et2-description>
+					<et2-textbox  statustext="Quantity of resource" id="quantity" maxlength="10"></et2-textbox>
 				</row>
 				<row>
-					<description value="Category"/>
-					<menulist span="3">
-						<menupopup align="right" statustext="Which category does this resource belong to?" id="cat_id" needed="1" no_lang="1" class="et2_fullWidth" />
-					</menulist>
+					<et2-description  value="Category"></et2-description>
+					<et2-select  span="3" align="right" statustext="Which category does this resource belong to?" id="cat_id" required="1" noLang="1"></et2-select>
 				</row>
 				<row>
-					<description value="Usable"/>
-					<textbox statustext="How many of them are useable?" id="useable" size="5" maxlength="10" class="et2_fullWidth"/>
+					<et2-description  value="Usable"></et2-description>
+					<et2-textbox  statustext="How many of them are useable?" id="useable" maxlength="10"></et2-textbox>
 				</row>
 				<row>
-					<description value="Bookable"/>
-					<checkbox statustext="Is resource bookable?" id="bookable" span="3"/>
+					<et2-description  value="Bookable"></et2-description>
+					<et2-checkbox  statustext="Is resource bookable?" id="bookable" span="3"></et2-checkbox>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" width="100%" tab_height="250" align_tabs="v">
-						<tabs>
-							<tab id="page" label="Description (short)" statustext="Informations about the location of resource"/>
-							<tab id="custom" label="Custom" statustext="Pictures or resource"/>
-							<tab id="ownership" label="Ownership"/>
-						</tabs>
-						<tabpanels>
+					<et2-vbox  id="tabs" span="all" width="100%" tabHeight="250">
+						<et2-details  id="page" summary="Description (short)" title="Informations about the location of resource">
 							<template id="resources.view.page"/>
+						</et2-details>
+						<et2-details  id="custom" summary="Custom" title="Pictures or resource">
 							<template id="resources.view.custom"/>
+						</et2-details>
+						<et2-details  id="ownership" summary="Ownership" title="">
 							<template id="resources.view.ownership"/>
-						</tabpanels>
-					</tabbox>
+						</et2-details>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/timesheet/templates/default/config.xet b/timesheet/templates/default/config.xet
index 6270332daa..5e950cf9c3 100644
--- a/timesheet/templates/default/config.xet
+++ b/timesheet/templates/default/config.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="timesheet.config" template="" lang="" group="0" version="16.1">
 		<grid width="100%" class="admin-config egwGridView_grid">
@@ -10,60 +9,60 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="ProjectManager integration" label="%s:"/>
-					<select id="newsettings[pm_integration]">
+					<et2-description  value="ProjectManager integration" label="%s:"></et2-description>
+					<et2-select  id="newsettings[pm_integration]">
 						<option value="">Both: allow to use ProjectManager and free project-names</option>
 						<option value="none">None: use only free project-names</option>
 						<option value="full">Full: use only ProjectManager</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Mode" label="%s:"/>
-					<select id="newsettings[ts_viewtype]">
+					<et2-description  value="Mode" label="%s:"></et2-description>
+					<et2-select  id="newsettings[ts_viewtype]">
 						<option value="normal">Regular</option>
 						<option value="short">Simple</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Show a quantity sum (eg. to sum up negative overtime)" label="%s:"/>
-					<select id="newsettings[quantity_sum]">
+					<et2-description  value="Show a quantity sum (eg. to sum up negative overtime)" label="%s:"></et2-description>
+					<et2-select  id="newsettings[quantity_sum]">
 						<option value="">No</option>
 						<option value="true">Yes</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="History logging" span="all" class="subHeader"/>
+					<et2-description  value="History logging" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Prevent deleting"/>
-					<select id="newsettings[history]">
+					<et2-description  value="Prevent deleting"></et2-description>
+					<et2-select  id="newsettings[history]">
 						<option value="">No</option>
 						<option value="history">Yes, only admins can purge deleted items</option>
 						<option value="userpurge">Yes, users can purge their deleted items</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Working time and timer" span="all" class="subHeader"/>
+					<et2-description  value="Working time and timer" span="all" class="subHeader"></et2-description>
 				</row>
 				<row>
-					<description value="Disable timers"/>
-					<select id="newsettings[disable_timer]" multiple="true">
+					<et2-description  value="Disable timers"></et2-description>
+					<et2-select  id="newsettings[disable_timer]" multiple="true">
 						<option value="overall">Working time</option>
 						<option value="specific">Timer</option>
 						<option value="overwrite">Overwriting start or stop time</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Create a single 'Working time' timesheet per"/>
-					<select id="newsettings[working_time_period]">
+					<et2-description  value="Create a single 'Working time' timesheet per"></et2-description>
+					<et2-select  id="newsettings[working_time_period]">
 						<option value="day">Day</option>
 						<option value="week">Week</option>
 						<option value="month">Month</option>
-					</select>
+					</et2-select>
 				</row>
 				<row>
-					<description value="Category for 'Working time'"/>
-					<select-cat empty_label="Will be created when saving ..." id="newsettings[working_time_cat]"/>
+					<et2-description  value="Category for 'Working time'"></et2-description>
+					<et2-select-cat  id="newsettings[working_time_cat]" emptyLabel="Will be created when saving ..."></et2-select-cat>
 				</row>
 			</rows>
 		</grid>
diff --git a/timesheet/templates/default/editstatus.xet b/timesheet/templates/default/editstatus.xet
index 243b0bdd0d..1616bb5719 100644
--- a/timesheet/templates/default/editstatus.xet
+++ b/timesheet/templates/default/editstatus.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="timesheet.editstatus" template="" lang="" group="0" version="1.7.004">
         <grid width="100%" height="450" overflow="auto">
@@ -19,7 +18,7 @@
                             </columns>
                             <rows>
                                 <row class="row" valign="top">
-                                    <description value="Status"/>
+                                    <et2-description  value="Status"></et2-description>
                                     <grid width="100%" overflow="auto" id="statis">
                                         <columns>
                                             <column/>
@@ -30,24 +29,18 @@
                                         </columns>
                                         <rows>
                                             <row class="th">
-                                                <description value="ID"/>
-                                                <description value="Name"/>
-                                                <description value="Parent"/>
-                                                <description value="Only Admin"/>
-                                                <description value="Actions"/>
+                                                <et2-description  value="ID"></et2-description>
+                                                <et2-description  value="Name"></et2-description>
+                                                <et2-description  value="Parent"></et2-description>
+                                                <et2-description  value="Only Admin"></et2-description>
+                                                <et2-description  value="Actions"></et2-description>
                                             </row>
                                             <row class="row">
-                                                <description id="${row}[id]"/>
-                                                <textbox size="80" maxlength="150" blur="--&gt; enter new name"
-                                                         id="${row}[name]"/>
-                                                <menulist>
-                                                    <menupopup id="${row}[parent]" options="Select one ..."/>
-                                                </menulist>
-                                                <checkbox id="${row}[admin]"
-                                                          statustext="Only admin can edit this status"/>
-                                                <button image="delete" label="Delete" align="center"
-                                                        id="delete[$row_cont[id]]" statustext="Delete this status"
-                                                        onclick="et2_dialog.confirm(widget,'Delete this status','Delete')"/>
+                                                <et2-description  id="${row}[id]"></et2-description>
+                                                <et2-textbox  maxlength="150" id="${row}[name]" placeholder="--&gt; enter new name"></et2-textbox>
+                                                <et2-select  id="${row}[parent]" emptyLabel="Select one ..."></et2-select>
+                                                <et2-checkbox  id="${row}[admin]" statustext="Only admin can edit this status"></et2-checkbox>
+                                                <et2-button  image="delete" label="Delete" align="center" id="delete[$row_cont[id]]" statustext="Delete this status" onclick="et2_dialog.confirm(widget,'Delete this status','Delete')"></et2-button>
                                             </row>
                                         </rows>
                                     </grid>
@@ -58,10 +51,10 @@
                 </row>
             </rows>
         </grid>
-        <hbox class="dialogFooterToolbar">
-            <button label="Save" id="button[save]"/>
-            <button id="button[apply]" label="Apply"/>
-            <button label="Cancel" id="button[cancel]"/>
-        </hbox>
+        <et2-hbox  class="dialogFooterToolbar">
+            <et2-button  label="Save" id="button[save]"></et2-button>
+            <et2-button  id="button[apply]" label="Apply"></et2-button>
+            <et2-button  label="Cancel" id="button[cancel]"></et2-button>
+        </et2-hbox>
     </template>
 </overlay>
\ No newline at end of file
diff --git a/timesheet/templates/default/importexport_wizard_chooseowner.xet b/timesheet/templates/default/importexport_wizard_chooseowner.xet
index 6f24324883..bb530a0652 100644
--- a/timesheet/templates/default/importexport_wizard_chooseowner.xet
+++ b/timesheet/templates/default/importexport_wizard_chooseowner.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="timesheet.importexport_wizard_chooseowner" template="" lang="" group="0" version="1.9.002">
 		<grid>
@@ -9,25 +8,21 @@
 			</columns>
 			<rows>
 				<row>
-					<description id="msg" no_lang="1"/>
+					<et2-description  id="msg" noLang="1"></et2-description>
 				</row>
 				<row class="th">
-					<description value="Owner"/>
+					<et2-description  value="Owner"></et2-description>
 				</row>
 				<row disabled="@no_owner_map">
-					<checkbox label="Use field from CSV if possible" id="owner_from_csv"/>
+					<et2-checkbox  label="Use field from CSV if possible" id="owner_from_csv"></et2-checkbox>
 				</row>
 				<row>
-					<menulist>
-						<menupopup type="select-account" id="record_owner" options="Select"/>
-					</menulist>
+					<et2-select-account  id="record_owner" emptyLabel="Select"></et2-select-account>
 				</row>
 				<row>
-					<menulist>
-						<menupopup type="select-bool" label="Change owner when updating" id="change_owner"/>
-					</menulist>
+					<et2-select-bool  label="Change owner when updating" id="change_owner"></et2-select-bool>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/timesheet/templates/default/index.rows.xet b/timesheet/templates/default/index.rows.xet
deleted file mode 100644
index b1c3bc7eab..0000000000
--- a/timesheet/templates/default/index.rows.xet
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
-<!-- This template is in a seperate file so etemplate can find it for home -->
-<overlay>
-	<template id="timesheet.index.rows" template="" lang="" group="0" version="1.9.001">
-		<grid width="100%">
-			<columns>
-				<column width="50"/>
-				<column width="135"/>
-				<column width="70%"/>
-				<column width="15%"/>
-				<column width="60"/>
-				<column width="60" disabled="@no_ts_quantity"/>
-				<column width="60" disabled="@no_ts_unitprice"/>
-				<column width="60" disabled="@no_ts_total"/>
-				<column width="130" disabled="@no_owner_col"/>
-				<column width="10%" disabled="@no_ts_status"/>
-				<column width="15%"/>
-			</columns>
-			<rows>
-				<row class="th">
-					<nextmatch-sortheader label="ID" id="ts_id"/>
-					<nextmatch-sortheader label="Date" id="ts_start"/>
-					<grid spacing="0" padding="0">
-						<columns>
-							<column/>
-						</columns>
-						<rows>
-							<row disabled="@pm_integration=full">
-								<nextmatch-filterheader id="ts_project" no_lang="1" options="All projects" search="false"/>
-							</row>
-							<row disabled="!@pm_integration=full">
-								<nextmatch-entryheader id="pm_id" no_lang="1" blur="All projects" only_app="projectmanager"/>
-							</row>
-							<row>
-								<nextmatch-entryheader id="linked"/>
-							</row>
-							<row>
-								<nextmatch-sortheader label="Title" id="ts_title"/>
-							</row>
-						</rows>
-					</grid>
-					<nextmatch-sortheader label="Category" id="cat_id"/>
-					<vbox>
-						<nextmatch-sortheader label="Duration" id="ts_duration"/>
-						<date-duration id="duration" readonly="true" options=",h,,,1"/>
-					</vbox>
-					<vbox>
-						<nextmatch-sortheader label="Quantity" id="ts_quantity"/>
-						<textbox type="float" id="quantity" readonly="true" precision="3"/>
-					</vbox>
-					<nextmatch-sortheader label="Price" id="ts_unitprice"/>
-					<vbox>
-						<nextmatch-sortheader label="Total" id="ts_total"/>
-						<textbox type="float" id="price" readonly="true" precision="2"/>
-					</vbox>
-					<nextmatch-filterheader id="ts_owner" no_lang="1" options="User" class="$cont[ownerClass]"/>
-					<nextmatch-filterheader id="ts_status" options="Status"/>
-					<nextmatch-customfields id="customfields"/>
-				</row>
-				<row class="$row_cont[cat_id] $row_cont[class]">
-					<description id="${row}[ts_id]"/>
-					<date-time id="${row}[ts_start]" readonly="true" options=",8"/>
-					<vbox>
-						<link id="${row}[ts_link]" no_lang="1"/>
-						<description id="${row}[ts_title]" no_lang="1" class="ts_title $row_cont[titleClass]"/>
-						<description id="${row}[ts_description]" class="ts_description" no_lang="1"/>
-					</vbox>
-					<menulist class="noWrap">
-						<menupopup type="select-cat" id="${row}[cat_id]" readonly="true"/>
-					</menulist>
-					<date-duration id="${row}[ts_duration]" readonly="true" options=",h,,,1" align="right"/>
-					<textbox type="float" id="${row}[ts_quantity]" no_lang="1" readonly="true" precision="3"/>
-					<description id="${row}[ts_unitprice]" no_lang="1"/>
-					<textbox type="float" id="${row}[ts_total]" no_lang="1" readonly="true" precision="2"/>
-					<menulist class="$cont[ownerClass]">
-						<menupopup type="select-account" id="${row}[ts_owner]" readonly="true"/>
-					</menulist>
-					<menulist>
-						<menupopup id="${row}[ts_status]" readonly="true"/>
-					</menulist>
-					<customfields-list id="$row" readonly="true"/>
-				</row>
-			</rows>
-		</grid>
-	</template>
-</overlay>
diff --git a/timesheet/templates/default/index.xet b/timesheet/templates/default/index.xet
index c52faa543d..a32a7c63b8 100644
--- a/timesheet/templates/default/index.xet
+++ b/timesheet/templates/default/index.xet
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="timesheet.index.dates" template="" lang="" group="0" version="1.2.001" >
-		<hbox>
-			<description value="Start"/>
-			<date id="startdate" onchange="widget.getParent().getWidgetById('enddate').set_min(widget.getValue());return true;"/>
-			<description value="End"/>
-			<date id="enddate"  onchange="widget.getParent().getWidgetById('startdate').set_max(widget.getValue());return true;"/>
-		</hbox>
+		<et2-hbox>
+			<et2-description  value="Start"></et2-description>
+			<et2-date  id="startdate" onchange="widget.getParent().getWidgetById('enddate').set_min(widget.getValue());return true;"></et2-date>
+			<et2-description  value="End"></et2-description>
+			<et2-date  id="enddate" onchange="widget.getParent().getWidgetById('startdate').set_max(widget.getValue());return true;"></et2-date>
+		</et2-hbox>
 	</template>
 	<template id="timesheet.index.add" template="" lang="" group="0" version="1.7.001">
-		<buttononly statustext="Add" id="add" image="add" onclick="app.timesheet.add_with_extras(widget,'','$cont[action]','$cont[action_id]');"/>
+		<et2-button  statustext="Add" id="add" image="add" onclick="app.timesheet.add_with_extras(widget,'','$cont[action]','$cont[action_id]');" noSubmit="true"></et2-button>
 	</template>
 	<template id="timesheet.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -38,10 +37,10 @@
 						</columns>
 						<rows>
 							<row disabled="@pm_integration=full">
-								<nextmatch-filterheader id="ts_project" no_lang="1" options="All projects" search="false"/>
+								<et2-nextmatch-header-filter  id="ts_project" search="false" noLang="1" emptyLabel="All projects"/>
 							</row>
 							<row disabled="!@pm_integration=full">
-								<nextmatch-entryheader id="pm_id" no_lang="1" blur="All projects" only_app="projectmanager"/>
+								<et2-nextmatch-header-entry  id="pm_id" noLang="1" placeholder="All projects" onlyApp="projectmanager"/>
 							</row>
 							<row>
 								<nextmatch-customfilter id="linked" options="link-entry"/>
@@ -52,47 +51,41 @@
 						</rows>
 					</grid>
 					<nextmatch-sortheader label="Category" id="cat_id"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Duration" id="ts_duration"/>
-						<date-duration id="duration" readonly="true" options=",h,,,1"/>
-					</vbox>
-					<vbox>
+						<et2-date-duration  id="duration" readonly="true" ></et2-date-duration>
+					</et2-vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Quantity" id="ts_quantity"/>
-						<textbox type="float" id="quantity" readonly="true" precision="3"/>
-					</vbox>
+						<et2-number  id="quantity" readonly="true" precision="3"></et2-number>
+					</et2-vbox>
 					<nextmatch-sortheader label="Price" id="ts_unitprice"/>
-					<vbox>
+					<et2-vbox>
 						<nextmatch-sortheader label="Total" id="ts_total"/>
-						<textbox type="float" id="price" readonly="true" precision="2"/>
-					</vbox>
-					<nextmatch-filterheader id="ts_owner" no_lang="1" options="User" class="$cont[ownerClass]"/>
+						<et2-number  id="price" readonly="true" precision="2"></et2-number>
+					</et2-vbox>
+					<et2-nextmatch-header-filter  id="ts_owner" class="$cont[ownerClass]" noLang="1" emptyLabel="User"/>
 					<nextmatch-sortheader label="Created" id="ts_created"/>
 					<nextmatch-sortheader label="ID" id="ts_id"/>
-					<nextmatch-filterheader id="ts_status" options="Status"/>
+					<et2-nextmatch-header-filter  id="ts_status" emptyLabel="Status"/>
 					<nextmatch-customfields id="customfields"/>
 				</row>
 				<row class="$row_cont[cat_id] $row_cont[class]">
-                    <date-time id="${row}[ts_start]" readonly="true" options=",8"/>
-                    <vbox>
-                        <link id="${row}[ts_link]" no_lang="1"/>
-                        <description id="${row}[ts_title]" no_lang="1" class="ts_title $row_cont[titleClass]"/>
-                        <description id="${row}[ts_description]" class="ts_description" no_lang="1"/>
-                    </vbox>
-                    <menulist class="noWrap">
-                        <menupopup type="select-cat" id="${row}[cat_id]" readonly="true"/>
-                    </menulist>
-                    <date-duration id="${row}[ts_duration]" readonly="true" display_format="hm" select_unit="false" align="right"/>
-                    <textbox type="float" id="${row}[ts_quantity]" no_lang="1" readonly="true" precision="3"/>
-                    <description id="${row}[ts_unitprice]" no_lang="1"/>
-                    <textbox type="float" id="${row}[ts_total]" no_lang="1" readonly="true" precision="2"/>
-                    <menulist class="$cont[ownerClass]">
-                        <menupopup type="select-account" id="${row}[ts_owner]" readonly="true"/>
-                    </menulist>
-                    <date-time id="${row}[ts_created]" readonly="true"/>
-                    <description id="${row}[ts_id]"/>
-                    <menulist>
-                        <menupopup id="${row}[ts_status]" readonly="true"/>
-                    </menulist>
+                    <et2-date-time  id="${row}[ts_start]" readonly="true" ></et2-date-time>
+                    <et2-vbox>
+                        <et2-link  id="${row}[ts_link]" app="" noLang="1"></et2-link>
+                        <et2-description  id="${row}[ts_title]" class="ts_title $row_cont[titleClass]" noLang="1"></et2-description>
+                        <et2-description  id="${row}[ts_description]" class="ts_description" noLang="1"></et2-description>
+                    </et2-vbox>
+                    <et2-select-cat  class="noWrap" id="${row}[cat_id]" readonly="true"></et2-select-cat>
+                    <et2-date-duration  id="${row}[ts_duration]" readonly="true" align="right" displayFormat="hm" selectUnit="false"></et2-date-duration>
+                    <et2-number  id="${row}[ts_quantity]" readonly="true" precision="3" noLang="1"></et2-number>
+                    <et2-description  id="${row}[ts_unitprice]" noLang="1"></et2-description>
+                    <et2-number  id="${row}[ts_total]" readonly="true" precision="2" noLang="1"></et2-number>
+                    <et2-select-account  class="$cont[ownerClass]" id="${row}[ts_owner]" readonly="true"></et2-select-account>
+                    <et2-date-time  id="${row}[ts_created]" readonly="true"></et2-date-time>
+                    <et2-description  id="${row}[ts_id]"></et2-description>
+                    <et2-select  id="${row}[ts_status]" readonly="true"></et2-select>
                     <customfields-list id="$row" readonly="true"/>
                 </row>
 			</rows>
diff --git a/timesheet/templates/default/timer.xet b/timesheet/templates/default/timer.xet
index c0efc4fa57..96b5d7656e 100644
--- a/timesheet/templates/default/timer.xet
+++ b/timesheet/templates/default/timer.xet
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="timesheet.timer.change" template="" lang="" group="0" version="1.7.002">
-		<et2-date-time id="time" required="true"/>
+		<et2-date-time  id="time" required="true"/>
 	</template>
 	<template id="timesheet.timer" template="" lang="" group="0" version="1.7.002">
 		<grid width="100%" >
@@ -15,32 +15,32 @@
 			</columns>
 			<rows>
 				<row disabled="@disable=/specific/">
-					<description value="Timer"/>
+					<et2-description  value="Timer"></et2-description>
 					<old-box id="specific_timer" value="00:00" class="timesheet_timer"/>
-					<et2-button id="specific[start]" label="Start" image="timesheet/play-blue" onclick="egw.timer_button"/>
-					<et2-button id="specific[pause]" label="Pause" image="timesheet/pause-orange" disabled="true" onclick="egw.timer_button"/>
-					<et2-button id="specific[stop]" label="Stop" image="timesheet/stop" disabled="true" onclick="egw.timer_button"/>
+					<et2-button  id="specific[start]" label="Start" image="timesheet/play-blue" onclick="egw.timer_button"/>
+					<et2-button  id="specific[pause]" label="Pause" image="timesheet/pause-orange" disabled="true" onclick="egw.timer_button"/>
+					<et2-button  id="specific[stop]" label="Stop" image="timesheet/stop" disabled="true" onclick="egw.timer_button"/>
 				</row>
 				<row disabled="@disable=/specific/">
-					<description />
-					<description/>
-					<et2-date-time-today id="times[specific][start]" onclick="egw.change_timer"/>
-					<et2-date-time-today id="times[specific][paused]" onclick="egw.change_timer"/>
-					<et2-date-time-today id="times[specific][stop]" onclick="egw.change_timer"/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-date-time-today  id="times[specific][start]" onclick="egw.change_timer"/>
+					<et2-date-time-today  id="times[specific][paused]" onclick="egw.change_timer"/>
+					<et2-date-time-today  id="times[specific][stop]" onclick="egw.change_timer"/>
 				</row>
 				<row disabled="@disable=/overall/">
-					<description value="Working time"/>
+					<et2-description  value="Working time"></et2-description>
 					<old-box id="overall_timer" value="00:00" class="timesheet_timer overall"/>
-					<et2-button id="overall[start]" label="Start" image="timesheet/play" onclick="egw.timer_button"/>
-					<et2-button id="overall[pause]" label="Pause" image="timesheet/pause-orange" disabled="true" onclick="egw.timer_button"/>
-					<et2-button id="overall[stop]" label="Stop" image="timesheet/stop" disabled="true" onclick="egw.timer_button"/>
+					<et2-button  id="overall[start]" label="Start" image="timesheet/play" onclick="egw.timer_button"/>
+					<et2-button  id="overall[pause]" label="Pause" image="timesheet/pause-orange" disabled="true" onclick="egw.timer_button"/>
+					<et2-button  id="overall[stop]" label="Stop" image="timesheet/stop" disabled="true" onclick="egw.timer_button"/>
 				</row>
 				<row disabled="@disable=/overall/">
-					<description />
-					<description/>
-					<et2-date-time-today id="times[overall][start]" onclick="egw.change_timer"/>
-					<et2-date-time-today id="times[overall][paused]" onclick="egw.change_timer"/>
-					<et2-date-time-today id="times[overall][stop]" onclick="egw.change_timer"/>
+					<et2-description></et2-description>
+					<et2-description></et2-description>
+					<et2-date-time-today  id="times[overall][start]" onclick="egw.change_timer"/>
+					<et2-date-time-today  id="times[overall][paused]" onclick="egw.change_timer"/>
+					<et2-date-time-today  id="times[overall][stop]" onclick="egw.change_timer"/>
 				</row>
 			</rows>
 		</grid>
diff --git a/timesheet/templates/default/wizard_import_options.xet b/timesheet/templates/default/wizard_import_options.xet
index 7c4e089275..768b1d3c04 100644
--- a/timesheet/templates/default/wizard_import_options.xet
+++ b/timesheet/templates/default/wizard_import_options.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="timesheet.wizard_import_options" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -10,25 +9,21 @@
 			</columns>
 			<rows>
 				<row disabled="!@message">
-					<description id="message" span="all" class="message"/>
-					<description/>
+					<et2-description  id="message" span="all" class="message"></et2-description>
+					<et2-description></et2-description>
 				</row>
 				<row>
-					<description value="What should be done with unknown values?" span="all"/>
+					<et2-description  value="What should be done with unknown values?" span="all"></et2-description>
 				</row>
 				<row>
-					<description value="Status"/>
-					<menulist>
-						<menupopup id="translate_status"/>
-					</menulist>
+					<et2-description  value="Status"></et2-description>
+					<et2-select  id="translate_status"></et2-select>
 				</row>
 				<row>
-					<description value="Category"/>
-					<menulist>
-						<menupopup id="translate_cat_id"/>
-					</menulist>
+					<et2-description  value="Category"></et2-description>
+					<et2-select  id="translate_cat_id"></et2-select>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/timesheet/templates/mobile/edit.xet b/timesheet/templates/mobile/edit.xet
index 7b83c9f9ec..56e11e9879 100644
--- a/timesheet/templates/mobile/edit.xet
+++ b/timesheet/templates/mobile/edit.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- $Id: edit.xet 52376 2015-04-01 20:03:04Z nathangray $ -->
 <overlay>
 	<template id="timesheet.edit.general" template="" lang="" group="0" version="1.7.002">
@@ -10,40 +10,38 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Project" for="ts_project"/>
-					<hbox disabled="@pm_integration=none">
-						<link-entry id="pm_id" onchange="app.timesheet.pm_id_changed" only_app='projectmanager' blur='None' class="et2_fullWidth" width="99%"/>
-					</hbox>
-					<hbox disabled="@pm_integration=full" span="all">
-						<textbox blur="@ts_project_blur" id="ts_project" size="65" maxlength="80" class="et2_fullWidth"/>
-					</hbox>
+					<et2-description  value="Project" for="ts_project"></et2-description>
+					<et2-hbox  disabled="@pm_integration=none">
+						<et2-link-entry  id="pm_id" onchange="app.timesheet.pm_id_changed" width="99%" onlyApp="projectmanager" placeholder="None"></et2-link-entry>
+					</et2-hbox>
+					<et2-hbox  disabled="@pm_integration=full" span="all">
+						<et2-textbox  id="ts_project" maxlength="80" placeholder="@ts_project_blur"></et2-textbox>
+					</et2-hbox>
 				</row>
 				<row disabled="@ts_viewtype">
-					<description value="Unitprice" for="ts_unitprice"/>
-					<hbox disabled="@pm_integration=none" >
-						<textbox type="float" id="ts_unitprice" span="all" size="10" width="30%"/>
+					<et2-description  value="Unitprice" for="ts_unitprice"></et2-description>
+					<et2-hbox  disabled="@pm_integration=none" >
+						<et2-number  id="ts_unitprice" span="all" width="30%"></et2-number>
 						<projectmanager-pricelist id="pl_id" width="70%" onchange="window.app.timesheet.et2.getWidgetById('ts_unitprice').set_value(this.options[this.selectedIndex].text.lastIndexOf('(') &lt; 0 ? '' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf('(')+1,-1));" options="None"/>
-					</hbox>
+					</et2-hbox>
 				</row>
 				<row class="row" disabled="!@ts_viewtype">
-					<description value="comment"/>
-					<textbox multiline="true" id="ts_description_short" rows="5" cols="50" class="et2_fullWidth"/>
+					<et2-description  value="comment"></et2-description>
+					<et2-textarea  id="ts_description_short" rows="5" cols="50"></et2-textarea>
 				</row>
 				<row class="row" disabled="@ts_viewtype">
-					<description value="Quantity" for="ts_quantity"/>
-					<textbox type="float" blur="@ts_quantity_blur" statustext="empty if identical to duration" id="ts_quantity" precision="3" class="et2_fullWidth"/>
+					<et2-description  value="Quantity" for="ts_quantity"></et2-description>
+					<et2-number  statustext="empty if identical to duration" id="ts_quantity" precision="3" placeholder="@ts_quantity_blur"></et2-number>
 				</row>
 				<row class="row" disabled="@ts_viewtype">
-					<description value="Category" for="cat_id"/>
-					<menulist span="all">
-						<menupopup type="select-cat" id="cat_id" options="None,,,timesheet"  class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  value="Category" for="cat_id"></et2-description>
+					<et2-select-cat  span="all" id="cat_id" application="timesheet" emptyLabel="None"></et2-select-cat>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="timesheet.edit.notes" template="" lang="" group="0" version="1.5.001">
-		<textbox multiline="true" id="ts_description" rows="9" cols="70" class="et2_fullWidth"  height="250" resize_ratio="0"/>
+		<et2-textarea  id="ts_description" rows="9" cols="70" height="250" resizeRatio="0"></et2-textarea>
 	</template>
 	<template id="timesheet.edit.links" template="" lang="" group="0" version="0.1.001">
 		<grid width="100%">
@@ -52,13 +50,13 @@
 			</columns>
 			<rows>
 				<row disabled="@view">
-					<link-to id="link_to"/>
+					<et2-link-to  id="link_to"></et2-link-to>
 				</row>
 				<row class="th">
-					<description value="Existing links"/>
+					<et2-description  value="Existing links"></et2-description>
 				</row>
 				<row>
-					<link-list id="link_to"/>
+					<et2-link-list  id="link_to"></et2-link-list>
 				</row>
 			</rows>
 		</grid>
@@ -74,24 +72,20 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="User" for="ts_owner"/>
-					<menulist >
-						<menupopup id="ts_owner" no_lang="1" class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  value="User" for="ts_owner"></et2-description>
+					<et2-select  id="ts_owner" noLang="1"></et2-select>
 				</row>
 				<row>
-					<description/>
-					<date-time id="ts_created" readonly="true" align="left"/>
+					<et2-description></et2-description>
+					<et2-date-time  id="ts_created" readonly="true" align="left"></et2-date-time>
 				</row>
 				<row disabled="!@ts_modified">
-					<description value="Last modified"/>
-					<menulist>
-						<menupopup type="select-account" id="ts_modifier" readonly="true"/>
-					</menulist>
+					<et2-description  value="Last modified"></et2-description>
+					<et2-select-account  id="ts_modifier" readonly="true"></et2-select-account>
 				</row>
 				<row>
-					<description/>
-					<date-time id="ts_modified" readonly="true" align="left"/>
+					<et2-description></et2-description>
+					<et2-date-time  id="ts_modified" readonly="true" align="left"></et2-date-time>
 				</row>
 			</rows>
 		</grid>
@@ -104,47 +98,45 @@
 			</columns>
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
-					<hbox  span="all" width="100%">
-						<button statustext="Saves this entry and add a new one" id="button[save_new]" image="save_new"/>
-						<button statustext="Applies the changes made" id="button[apply]" image="apply"/>
-						<button statustext="Delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete')" image="delete"/>
-						<textbox type="integer" id="ts_id" readonly="true" class="entry_id"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button-icon  statustext="Saves this entry and add a new one" id="button[save_new]" image="save_new"></et2-button-icon>
+						<et2-button-icon  statustext="Applies the changes made" id="button[apply]" image="apply"></et2-button-icon>
+						<et2-button-icon  statustext="Delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete')" image="delete"></et2-button-icon>
+						<et2-number  id="ts_id" readonly="true" class="entry_id" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
-					<hbox span="all" width="100%">
-						<button label="Search" id="button[search]" image="search"/>
-						<button label="Cancel" id="button[cancelsearch]" image="cancel"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  label="Search" id="button[search]" image="search"></et2-button>
+						<et2-button  label="Cancel" id="button[cancelsearch]" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 				<row disabled="@ts_viewtype">
-					<description value="Title"/>
-					<textbox blur="@ts_title_blur" id="ts_title" size="65" maxlength="255" class="et2_fullWidth et2_required" tabindex="1"/>
+					<et2-description  value="Title"></et2-description>
+					<et2-textbox  id="ts_title" maxlength="255" class="et2_required" tabindex="1" placeholder="@ts_title_blur"></et2-textbox>
 				</row>
 				<row>
-					<description value="Date"/>
-					<date id="ts_start" needed="1" options=",8"/>
+					<et2-description  value="Date"></et2-description>
+					<et2-date  id="ts_start" required="1" ></et2-date>
 				</row>
 				<row>
-					<description value="Starttime"/>
-					<date-timeonly id="start_time" options="H:i"  class="et2_fullWidth"/>
+					<et2-description  value="Starttime"></et2-description>
+					<et2-date-timeonly  id="start_time" dataFormat="H:i"></et2-date-timeonly>
 				</row>
 				<row>
-					<description value="Duration" for="ts_duration"/>
-					<date-duration id="ts_duration" options=",hm" class="et2_fullWidth" />
+					<et2-description  value="Duration" for="ts_duration"></et2-description>
+					<et2-date-duration  id="ts_duration" ></et2-date-duration>
 				</row>
 				<row>
-					<description value="or endtime" class="et2_noWrap"/>
-					<date-timeonly id="end_time" options="H:i" class="et2_fullWidth"/>
+					<et2-description  value="or endtime" class="et2_noWrap"></et2-description>
+					<et2-date-timeonly  id="end_time" dataFormat="H:i"></et2-date-timeonly>
 				</row>
 				<row>
-					<description value="Status"/>
-					<menulist>
-						<menupopup statustext="select a status of the timesheet" id="ts_status"  class="et2_fullWidth" options="please select" />
-					</menulist>
+					<et2-description  value="Status"></et2-description>
+					<et2-select  statustext="select a status of the timesheet" id="ts_status" emptyLabel="please select"></et2-select>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" width="100%" align_tabs="v">
+					<et2-tabbox  id="tabs" span="all" width="100%" alignTabs="v">
 						<tabs>
 							<tab id="notes" label="Description"/>
 							<tab id="general" label="Details"/>
@@ -159,9 +151,9 @@
 							<template id="timesheet.edit.customfields"/>
 							<template id="timesheet.edit.ownership"/>
 						</tabpanels>
-					</tabbox>
+					</et2-tabbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/timesheet/templates/mobile/index.xet b/timesheet/templates/mobile/index.xet
index b51ebb09b9..746103590e 100644
--- a/timesheet/templates/mobile/index.xet
+++ b/timesheet/templates/mobile/index.xet
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="timesheet.index.dates" template="" lang="" group="0" version="1.2.001" >
-		<hbox>
-			<description value="Start"/>
-			<date id="startdate"/>
-			<description value="End"/>
-			<date statustext="Leave it empty for a full week" id="enddate"/>
-		</hbox>
+		<et2-hbox>
+			<et2-description  value="Start"></et2-description>
+			<et2-date  id="startdate"></et2-date>
+			<et2-description  value="End"></et2-description>
+			<et2-date  statustext="Leave it empty for a full week" id="enddate"></et2-date>
+		</et2-hbox>
 	</template>
 	<template id="timesheet.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -22,34 +21,32 @@
 
 				</row>
 				<row class="$row_cont[class] timesheetRow">
-					<description class=" cat_$row_cont[cat_id] mobile_cat_col"/>
-					<vbox>
+					<et2-description  class="cat_$row_cont[cat_id] mobile_cat_col"></et2-description>
+					<et2-vbox>
 						<customfields-list id="$row" class="customfields" app="timesheet" disabled="true"/>
-						<description id="${row}[ts_title]" no_lang="1" class="ts_title $row_cont[titleClass]"/>
-						<description id="${row}[ts_description]" class="ts_description" no_lang="1"/>
-						<link id="${row}[ts_link]" no_lang="1"/>
-					</vbox>
-					<vbox class="timesheet3Col">
-						<hbox>
-							<time_or_date id="${row}[ts_start]" readonly="true" options=",8" align="left"/>
-						</hbox>
+						<et2-description  id="${row}[ts_title]" class="ts_title $row_cont[titleClass]" noLang="1"></et2-description>
+						<et2-description  id="${row}[ts_description]" class="ts_description" noLang="1"></et2-description>
+						<et2-link  id="${row}[ts_link]" app="" noLang="1"></et2-link>
+					</et2-vbox>
+					<et2-vbox  class="timesheet3Col">
+						<et2-hbox>
+							<et2-date-time-today  id="${row}[ts_start]" readonly="true" options=",8" align="left"></et2-date-time-today>
+						</et2-hbox>
 
-						<hbox>
-							<menulist class="$cont[ownerClass]">
-								<menupopup type="select-account" id="${row}[ts_owner]" readonly="true"/>
-							</menulist>
-						</hbox>
-						<hbox>
-							<date-duration id="${row}[ts_duration]" readonly="true" options=",h,,,1"/>
-						</hbox>
-					</vbox>
+						<et2-hbox>
+							<et2-select-account  class="$cont[ownerClass]" id="${row}[ts_owner]" readonly="true"></et2-select-account>
+						</et2-hbox>
+						<et2-hbox>
+							<et2-date-duration  id="${row}[ts_duration]" readonly="true" ></et2-date-duration>
+						</et2-hbox>
+					</et2-vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="timesheet.index" template="" lang="" group="0" version="1.9.001">
-		<description id="plus_button_container"/>
+		<et2-description  id="plus_button_container"></et2-description>
 		<nextmatch id="nm" options="timesheet.index.rows" header_left="timesheet.index.dates"/>
-		<buttononly id="add"  class="plus_button" onclick="egw.open('timesheet');" />
+		<et2-button  id="add" class="plus_button" onclick="egw.open('timesheet');" noSubmit="true"></et2-button>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/timesheet/templates/mobile/view.xet b/timesheet/templates/mobile/view.xet
index 8c6f63783b..60dbfde79c 100644
--- a/timesheet/templates/mobile/view.xet
+++ b/timesheet/templates/mobile/view.xet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <!-- $Id: edit.xet 52376 2015-04-01 20:03:04Z nathangray $ -->
 <overlay>
 	<template id="timesheet.view.general" template="" lang="" group="0" version="1.7.002">
@@ -10,43 +10,41 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="Project" for="ts_project"/>
-					<hbox disabled="@pm_integration=none">
-						<link-entry id="pm_id" onchange="app.timesheet.pm_id_changed" only_app='projectmanager' blur='None' class="et2_fullWidth"/>
-					</hbox>
-					<hbox disabled="@pm_integration=full" span="all">
-						<textbox blur="@ts_project_blur" id="ts_project" size="65" maxlength="80" class="et2_fullWidth"/>
-					</hbox>
+					<et2-description  value="Project" for="ts_project"></et2-description>
+					<et2-hbox  disabled="@pm_integration=none">
+						<et2-link-entry  id="pm_id" onchange="app.timesheet.pm_id_changed" onlyApp="projectmanager" placeholder="None"></et2-link-entry>
+					</et2-hbox>
+					<et2-hbox  disabled="@pm_integration=full" span="all">
+						<et2-textbox  id="ts_project" maxlength="80" placeholder="@ts_project_blur"></et2-textbox>
+					</et2-hbox>
 				</row>
 				<row disabled="@ts_viewtype">
-					<description value="Unitprice" for="ts_unitprice"/>
-					<hbox disabled="@pm_integration=none" >
-						<textbox type="float" id="ts_unitprice" span="all" size="10" width="30%"/>
+					<et2-description  value="Unitprice" for="ts_unitprice"></et2-description>
+					<et2-hbox  disabled="@pm_integration=none" >
+						<et2-number  id="ts_unitprice" span="all" width="30%"></et2-number>
 						<projectmanager-pricelist id="pl_id" width="70%" onchange="window.app.timesheet.et2.getWidgetById('ts_unitprice').set_value(this.options[this.selectedIndex].text.lastIndexOf('(') &lt; 0 ? '' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf('(')+1,-1));" options="None"/>
-					</hbox>
+					</et2-hbox>
 				</row>
 				<row class="row" disabled="!@ts_viewtype">
-					<description value="comment"/>
-					<textbox multiline="true" id="ts_description_short" rows="5" cols="50" class="et2_fullWidth"/>
+					<et2-description  value="comment"></et2-description>
+					<et2-textarea  id="ts_description_short" rows="5" cols="50"></et2-textarea>
 				</row>
 				<row class="row" disabled="@ts_viewtype">
-					<description value="Quantity" for="ts_quantity"/>
-					<textbox type="float" blur="@ts_quantity_blur" statustext="empty if identical to duration" id="ts_quantity" precision="3" class="et2_fullWidth"/>
+					<et2-description  value="Quantity" for="ts_quantity"></et2-description>
+					<et2-number  statustext="empty if identical to duration" id="ts_quantity" precision="3" placeholder="@ts_quantity_blur"></et2-number>
 				</row>
 				<row class="row" disabled="@ts_viewtype">
-					<description value="Category" for="cat_id"/>
-					<menulist span="all">
-						<menupopup type="select-cat" id="cat_id" options="None,,,timesheet"  class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  value="Category" for="cat_id"></et2-description>
+					<et2-select-cat  span="all" id="cat_id" application="timesheet" emptyLabel="None"></et2-select-cat>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="timesheet.view.notes" template="" lang="" group="0" version="1.5.001">
-		<textbox multiline="true" id="ts_description" rows="9" cols="70" class="et2_fullWidth"  height="250" resize_ratio="0"/>
+		<et2-textarea  id="ts_description" rows="9" cols="70" height="250" resizeRatio="0"></et2-textarea>
 	</template>
 	<template id="timesheet.view.customfields" template="" lang="" group="0" version="1.5.001">
-		<customfields options="@info_type"/>
+		<customfields sub-type="@info_type" />
 	</template>
 	<template id="timesheet.view.ownership" template="" lang="" group="0" version="16.1.00">
 		<grid width="100%">
@@ -56,24 +54,20 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="User" for="ts_owner"/>
-					<menulist >
-						<menupopup id="ts_owner" no_lang="1" class="et2_fullWidth"/>
-					</menulist>
+					<et2-description  value="User" for="ts_owner"></et2-description>
+					<et2-select  id="ts_owner" noLang="1"></et2-select>
 				</row>
 				<row>
-					<description/>
-					<date-time id="ts_created" readonly="true" align="left"/>
+					<et2-description></et2-description>
+					<et2-date-time  id="ts_created" readonly="true" align="left"></et2-date-time>
 				</row>
 				<row disabled="!@ts_modified">
-					<description value="Last modified"/>
-					<menulist>
-						<menupopup type="select-account" id="ts_modifier" readonly="true"/>
-					</menulist>
+					<et2-description  value="Last modified"></et2-description>
+					<et2-select-account  id="ts_modifier" readonly="true"></et2-select-account>
 				</row>
 				<row>
-					<description/>
-					<date-time id="ts_modified" readonly="true" align="left"/>
+					<et2-description></et2-description>
+					<et2-date-time  id="ts_modified" readonly="true" align="left"></et2-date-time>
 				</row>
 			</rows>
 		</grid>
@@ -86,47 +80,45 @@
 			</columns>
 			<rows>
 				<row disabled="@hidebuttons" class="dialogHeadbar" >
-					<hbox  span="all" width="100%">
-						<button statustext="Saves this entry and add a new one" id="button[save_new]" image="save_new" background_image="1"/>
-						<button statustext="Applies the changes made" id="button[apply]" image="apply" background_image="1"/>
-						<button statustext="Delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete')" image="delete" background_image="1"/>
-						<textbox type="integer" id="ts_id" readonly="true" class="entry_id"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  statustext="Saves this entry and add a new one" id="button[save_new]" image="save_new"></et2-button>
+						<et2-button  statustext="Applies the changes made" id="button[apply]" image="apply"></et2-button>
+						<et2-button  statustext="Delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete')" image="delete"></et2-button>
+						<et2-number  id="ts_id" readonly="true" class="entry_id" precision="0"></et2-number>
+					</et2-hbox>
 				</row>
 				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
-					<hbox span="all" width="100%">
-						<button label="Search" id="button[search]" image="search" background_image="1"/>
-						<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
-					</hbox>
+					<et2-hbox  span="all" width="100%">
+						<et2-button  label="Search" id="button[search]" image="search"></et2-button>
+						<et2-button  label="Cancel" id="button[cancelsearch]" image="cancel"></et2-button>
+					</et2-hbox>
 				</row>
 				<row disabled="@ts_viewtype">
-					<description value="Title"/>
-					<textbox blur="@ts_title_blur" id="ts_title" size="65" maxlength="255" class="et2_fullWidth et2_required" tabindex="1"/>
+					<et2-description  value="Title"></et2-description>
+					<et2-textbox  id="ts_title" maxlength="255" class="et2_required" tabindex="1" placeholder="@ts_title_blur"></et2-textbox>
 				</row>
 				<row>
-					<description value="Date"/>
-					<date id="ts_start" needed="1" options=",8"/>
+					<et2-description  value="Date"></et2-description>
+					<et2-date  id="ts_start" required="1" ></et2-date>
 				</row>
 				<row>
-					<description value="Starttime"/>
-					<date-timeonly id="start_time" options="H:i"  class="et2_fullWidth"/>
+					<et2-description  value="Starttime"></et2-description>
+					<et2-date-timeonly  id="start_time" dataFormat="H:i"></et2-date-timeonly>
 				</row>
 				<row>
-					<description value="Duration" for="ts_duration"/>
-					<date-duration id="ts_duration" options=",hm" class="et2_fullWidth" />
+					<et2-description  value="Duration" for="ts_duration"></et2-description>
+					<et2-date-duration  id="ts_duration" ></et2-date-duration>
 				</row>
 				<row>
-					<description value="or endtime" class="et2_noWrap"/>
-					<date-timeonly id="end_time" options="H:i" class="et2_fullWidth"/>
+					<et2-description  value="or endtime" class="et2_noWrap"></et2-description>
+					<et2-date-timeonly  id="end_time" dataFormat="H:i"></et2-date-timeonly>
 				</row>
 				<row>
-					<description value="Status"/>
-					<menulist>
-						<menupopup statustext="select a status of the timesheet" id="ts_status"  class="et2_fullWidth" options="please select" />
-					</menulist>
+					<et2-description  value="Status"></et2-description>
+					<et2-select  statustext="select a status of the timesheet" id="ts_status" emptyLabel="please select"></et2-select>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" width="100%" align_tabs="v">
+					<et2-tabbox  id="tabs" span="all" width="100%" alignTabs="v">
 						<tabs>
 							<tab id="notes" label="Description"/>
 							<tab id="general" label="Details"/>
@@ -139,9 +131,9 @@
 							<template id="timesheet.view.customfields"/>
 							<template id="timesheet.view.ownership"/>
 						</tabpanels>
-					</tabbox>
+					</et2-tabbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file