diff --git a/etemplate/inc/class.editor.inc.php b/etemplate/inc/class.editor.inc.php
index b278e44ef9..71cd46d2cc 100644
--- a/etemplate/inc/class.editor.inc.php
+++ b/etemplate/inc/class.editor.inc.php
@@ -455,8 +455,8 @@
 			{
 				$file .= '.' . $this->etemplate->lang;
 			}
-			$old_file = $file . '.old.xul';
-			$file .= '.xul';
+			$old_file = $file . '.old.xet';
+			$file .= '.xet';
 			if (file_exists($file))
 			{
 				rename($file,$old_file);
diff --git a/etemplate/templates/default/editor.xul b/etemplate/templates/default/editor.xet
similarity index 100%
rename from etemplate/templates/default/editor.xul
rename to etemplate/templates/default/editor.xet
diff --git a/etemplate/templates/default/nextmatch_widget.xul b/etemplate/templates/default/nextmatch_widget.xet
similarity index 100%
rename from etemplate/templates/default/nextmatch_widget.xul
rename to etemplate/templates/default/nextmatch_widget.xet
diff --git a/etemplate/templates/default/tab_widget.test.xul b/etemplate/templates/default/tab_widget.test.xet
similarity index 100%
rename from etemplate/templates/default/tab_widget.test.xul
rename to etemplate/templates/default/tab_widget.test.xet
diff --git a/etemplate/templates/default/test.xul b/etemplate/templates/default/test.xul
deleted file mode 100644
index 3e31e2656a..0000000000
--- a/etemplate/templates/default/test.xul
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0"?>
-<overlay>
-  <grid id="etemplate.test.keys" template="" lang="" group="0" version="0.9.13.003">
-    <columns>
-      <column/>
-      <column/>
-      <column/>
-      <column/>
-    </columns>
-    <rows>
-      <row>
-        <textbox size="30" label="Name" id="name" statustext="name of the eTemplate, should be in form application.function[.subTemplate]"/>
-        <textbox size="12" label="Template" id="template" statustext="name of phpgw-template set (e.g. verdilak): '' = default (will read pref. template, us 'default' to read default template '')"/>
-        <textbox size="7" maxlength="5" label="Lang" id="lang" statustext="language-short (eg. 'en' for english) for language-dependent template ('' reads your pref. languages or the default, us 'default' to read the default template '')"/>
-        <textbox size="12" maxlength="10" label="Version" id="version" statustext="version-number, should be in the form: major.minor.revision.number (eg. 0.9.13.001 all numbers filled up with zeros)"/>
-      </row>
-    </rows>
-  </grid>
-  <grid id="etemplate.test.edit-buttons" template="" lang="" group="0" version="0.9.15.002">
-    <columns>
-      <column/>
-      <column/>
-      <column/>
-      <column/>
-      <column/>
-      <column/>
-      <column/>
-      <column/>
-      <column/>
-    </columns>
-    <rows>
-      <row>
-        <button label="Read" id="read" statustext="read eTemplate from database (for the keys above)"/>
-        <button label="Show (no save)" id="show" statustext="shows/displays eTemplate for testing, does NOT save it before"/>
-        <button label="Save" id="save" statustext="save the eTemplate under the above keys (name, ...), change them for a SaveAs"/>
-        <button label="Delete" id="delete" statustext="deletes the eTemplate spez. above"/>
-        <button label="Dump4Setup" id="dump" statustext="writes a 'etemplates.inc.php' file (for application in Name) in the setup-dir of the app"/>
-        <button label="Write Langfile" id="langfile" statustext="creates an english ('en') langfile from label and helptexts (for application in Name)"/>
-        <button label="Export XML" id="export_xml" statustext="export the loaded eTemplate into a xml-file"/>
-        <button label="Import XML" id="import_xml" statustext="import an eTemplate from a xml-file"/>
-        <file id="file" statustext="xml-file to import"/>
-      </row>
-    </rows>
-  </grid>
-  <grid id="etemplate.test.col_header" template="" lang="" group="0" version="0.9.13.003" width="100%">
-    <columns>
-      <column width="5%"/>
-      <column width="5%"/>
-      <column width="60%"/>
-      <column width="30%"/>
-      <column/>
-      <column/>
-    </columns>
-    <rows>
-      <row>
-        <button label="+" no_lang="1" id="insert_col[0]" statustext="insert new column in front of all"/>
-        <button label="&gt;|&lt;" no_lang="1" id="exchange_col[$c_]" statustext="exchange this two columns"/>
-        <description options="b" no_lang="1" align="center" id=".col"/>
-        <textbox size="5" label="Width" align="right" id="width[$col_]" statustext="width of column (in percent or pixel)"/>
-        <button label="-" no_lang="1" align="right" id="delete_col[$c_]" statustext="delete whole column (can NOT be undone!!!)"/>
-        <button label="+" no_lang="1" align="right" id="insert_col[$c_]" statustext="insert new column behind this one"/>
-      </row>
-    </rows>
-  </grid>
-  <grid id="etemplate.test.row_header" template="" lang="" group="0" version="0.9.13.005" height="100%">
-    <columns>
-      <column/>
-      <column/>
-    </columns>
-    <rows>
-      <row>
-        <button label="+" no_lang="1" id="insert_row[0]" statustext="insert new row in front of first Line"/>
-        <description value="Height" align="center"/>
-      </row>
-      <row>
-        <description options="b" no_lang="1" align="center" id=".row"/>
-        <textbox size="5" id="height[h$row_]" statustext="height of row (in percent or pixel)"/>
-      </row>
-      <row>
-        <button label="-" no_lang="1" align="center" id="delete_row[$row_]" statustext="remove Row (can NOT be undone!!!)"/>
-        <description value="class, Valign" align="center"/>
-      </row>
-      <row>
-        <button label="+" no_lang="1" id="insert_row[$row_]" statustext="insert new row after this one"/>
-        <textbox size="5" id="class[c$row_]" statustext="CSS-class name for this row, preset: 'nmh' = NextMatch header, 'nmr' = alternating NM row, 'nmr0'+'nmr1' NM rows"/>
-      </row>
-    </rows>
-  </grid>
-  <grid id="etemplate.test.cell_opts" template="" lang="" group="0" version="0.9.13.004" width="100%">
-    <columns>
-      <column/>
-      <column/>
-      <column/>
-      <column/>
-    </columns>
-    <rows>
-      <row>
-        <checkbox label="%s needed" align="center" id="needed" statustext="check if field has to be filled by user"/>
-        <checkbox label="%s readonly" align="center" id="readonly" statustext="check if content should only be displayed but not altered (the content is not send back then!)"/>
-        <checkbox label="%s disabled" align="center" id="disabled" statustext="if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell"/>
-        <checkbox label="%s onChange" align="center" id="onchange" statustext="enable JavaScript onChange submit"/>
-      </row>
-    </rows>
-  </grid>
-  <grid id="etemplate.test.cell" template="" lang="" group="0" version="0.9.15.001" height="100%">
-    <columns>
-      <column/>
-      <column/>
-      <column/>
-      <column/>
-      <column/>
-      <column/>
-    </columns>
-    <rows>
-      <row class="nmr">
-        <description value="Type"/>
-        <menulist statustext="type of the field (select Label if field should be empty)">
-          <menupopup id="type"/>
-        </menulist>
-        <description value="Options" align="center"/>
-        <textbox size="10" id="size" statustext="Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. 'Y-m-d']"/>
-        <description value="Span, Class" align="center"/>
-        <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)"/>
-      </row>
-      <row class="nmr">
-        <description 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)"/>
-        <checkbox span="2" label="%s NoTranslation" align="center" id="no_lang" statustext="select if content of field should not be translated (label gets always translated)"/>
-        <description value="Align" align="center"/>
-        <menulist statustext="alignment of label and input-field in table-cell">
-          <menupopup id="align"/>
-        </menulist>
-      </row>
-      <row class="nmr">
-        <description value="Name"/>
-        <textbox id="name" statustext="index/name of returned content (name of the Template, Link / Method for Image)"/>
-        <grid span="4" id="etemplate.test.cell_opts"/>
-      </row>
-      <row class="nmr">
-        <description value="Help"/>
-        <textbox size="50" span="all" id="help" statustext="displayed in statusline of browser if input-field gets focus"/>
-      </row>
-    </rows>
-  </grid>
-  <grid id="etemplate.test.edit" template="" lang="" group="0" version="0.9.13.002" border="1" class="editorEdit">
-    <columns>
-      <column/>
-      <column/>
-    </columns>
-    <rows>
-      <row class="nmh">
-        <image src="navbar.gif" align="center"/>
-        <grid content="Col$col," id="etemplate.test.col_header"/>
-      </row>
-      <row>
-        <grid content="Row$row," class="nmh" id="etemplate.test.row_header"/>
-        <grid content="$col$row" id="etemplate.test.cell"/>
-      </row>
-    </rows>
-    <styles>
-      .editorEdit { border-color: black }
-    </styles>
-  </grid>
-  <grid id="etemplate.test" template="" lang="" group="" version="0.9.15.002" width="100%">
-    <columns>
-      <column/>
-      <column/>
-    </columns>
-    <rows>
-      <row>
-        <description options="bi" value="Editable Templates - Editor" no_lang="1" id="msg"/>
-        <button label="DB-Tools" align="right" id="db_tools" statustext="to start the DB-Tools"/>
-      </row>
-      <row>
-        <hrule span="all"/>
-      </row>
-      <row>
-        <grid span="all" id="etemplate.test.keys"/>
-      </row>
-      <row>
-        <grid span="all" id="etemplate.test.edit-buttons"/>
-      </row>
-      <row>
-        <textbox span="all" label="Width, Height, Border, class, Spacing, Padding" id="size" statustext="width, height, border-line-thickness, CSS-class name, Celspaceing, Cellpadding (for TABLE tag)"/>
-      </row>
-      <row>
-        <grid span="all" id="etemplate.test.edit"/>
-      </row>
-      <row>
-        <description span="all" value="CSS-styles"/>
-      </row>
-      <row>
-        <textbox multiline="true" cols="10" rows="80" span="all" id="style" statustext="embeded CSS styles, eg. '.red { background: red; }' (note the '.' before the class-name) or '@import url(...)' (class names are global for the whole page!)"/>
-      </row>
-    </rows>
-  </grid>
-</overlay>
\ No newline at end of file
diff --git a/etemplate/templates/default/xslt_widget.test.xet b/etemplate/templates/default/xslt_widget.test.xet
new file mode 100644
index 0000000000..a3c116e72c
--- /dev/null
+++ b/etemplate/templates/default/xslt_widget.test.xet
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<overlay>
+  <grid id="etemplate.xslt_widget.test" template="" lang="" group="" version="">
+    <columns>
+      <column/>
+    </columns>
+    <rows>
+      <row>
+        <xslt options="etemplate.test" class="test" label="Test" id="test" statustext="This is a help message"/>
+      </row>
+    </rows>
+  </grid>
+</overlay>
\ No newline at end of file