diff --git a/etemplate/inc/class.soetemplate.inc.php b/etemplate/inc/class.soetemplate.inc.php
index aca6c11b55..1405a25a2d 100644
--- a/etemplate/inc/class.soetemplate.inc.php
+++ b/etemplate/inc/class.soetemplate.inc.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * eGroupWare EditableTemplates - Storage Objects
+ * EGroupware EditableTemplates - Storage Objects
  *
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
- * @copyright 2002-10 by RalfBecker@outdoor-training.de
+ * @copyright 2002-11 by RalfBecker@outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package etemplate
  * @subpackage api
@@ -890,15 +890,15 @@ class soetemplate
 		}
 		fwrite($f,'<?php
 /**
-	* eGroupWare - eTemplates for Application '. $app. '
-	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() '.date('Y-m-d H:i'). '
-	*
-	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-	* @package '. $app. '
-	* @subpackage setup
-	* @version $Id$
-	*/'."\n\n\$templ_version=1;\n\n");
+ * EGroupware - eTemplates for Application '. $app. '
+ * http://www.egroupware.org
+ * generated by soetemplate::dump4setup() '.date('Y-m-d H:i'). '
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package '. $app. '
+ * @subpackage setup
+ * @version $Id'.'$
+ */'."\n\n\$templ_version=1;\n\n");
 
 		$n = 0;
 		$exported = array();
diff --git a/etemplate/inc/class.xul_io.inc.php b/etemplate/inc/class.xul_io.inc.php
index c018a078f5..ad064012f7 100644
--- a/etemplate/inc/class.xul_io.inc.php
+++ b/etemplate/inc/class.xul_io.inc.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * eGroupWare - eTemplates - XUL/XML Import & Export
+ * EGroupware - eTemplates - XUL/XML Import & Export
  *
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package etemplate
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
- * @copyright 2002-9 by RalfBecker@outdoor-training.de
+ * @copyright 2002-11 by RalfBecker@outdoor-training.de
  * @version $Id$
  */
 
@@ -154,12 +154,15 @@ class xul_io
 	 */
 	function &add_widget(&$parent,$cell,&$embeded_too)
 	{
+		// sort attributes, to stop xet files from changing because of changed attribute order
+		ksort($cell, SORT_STRING);
+
 		$type = $cell['type'];
 		if (is_array($type))
 		{
 			list(,$type) = each($type);
 		}
-		if (!$type) $cell['type'] = $type = 'hugo';
+		if (!$type) $cell['type'] = $type = 'unknown';
 		if (substr($type,0,6) == 'select')
 		{
 			$type = $cell['size'] > 1 ? 'select-multi' : 'select';