diff --git a/timesheet/setup/etemplates.inc.php b/timesheet/setup/etemplates.inc.php
index 5fcf605964..158402b9f6 100644
--- a/timesheet/setup/etemplates.inc.php
+++ b/timesheet/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
  * EGroupware - eTemplates for Application timesheet
  * http://www.egroupware.org
- * generated by soetemplate::dump4setup() 2011-07-20 12:56
+ * generated by soetemplate::dump4setup() 2011-08-04 18:39
  *
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package timesheet
@@ -27,7 +27,7 @@ $templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','
 
 $templ_data[] = array('name' => 'timesheet.edit.customfields','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"cols";i:1;s:4:"rows";i:1;s:4:"size";s:17:"100%,165,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"165";i:6;s:4:"auto";}}}','size' => '100%,165,,,,,auto','style' => '','modified' => '1303228015',);
 
-$templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:15:{s:1:"A";s:2:"95";s:1:"B";s:3:"120";s:1:"C";s:15:"80,@ts_viewtype";s:1:"D";s:13:",@ts_viewtype";s:2:"c1";s:3:"row";s:2:"h1";s:13:",@ts_viewtype";s:2:"c2";s:3:"row";s:2:"h2";s:14:",!@ts_viewtype";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:13:",@ts_viewtype";s:2:"c7";s:3:"row";s:2:"h7";s:14:",@no_ts_status";}i:1;a:4:{s:1:"A";a:3:{s:4:"size";s:11:",,,ts_title";s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"size";s:5:"65,80";s:4:"blur";s:14:"@ts_title_blur";s:4:"span";s:13:"all,fullWidth";s:4:"name";s:8:"ts_title";s:4:"type";s:4:"text";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"comment";}s:1:"B";a:4:{s:4:"span";s:13:"all,fullWidth";s:4:"name";s:14:"ts_description";s:4:"type";s:8:"textarea";s:4:"size";s:4:"5,50";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"size";s:9:",,,cat_id";s:4:"type";s:5:"label";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"span";s:3:"all";s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"size";s:11:",,,ts_start";s:4:"type";s:5:"label";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:6:"needed";s:1:"1";s:4:"name";s:8:"ts_start";s:4:"size";s:2:",8";s:4:"type";s:4:"date";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Starttime";}s:1:"D";a:3:{s:4:"name";s:10:"start_time";s:4:"size";s:3:"H:i";s:4:"type";s:13:"date-timeonly";}}i:5;a:4:{s:1:"A";a:3:{s:4:"size";s:14:",,,ts_duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";s:4:"type";s:13:"date-duration";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"or endtime";s:4:"span";s:7:",noWrap";}s:1:"D";a:3:{s:4:"name";s:8:"end_time";s:4:"size";s:3:"H:i";s:4:"type";s:13:"date-timeonly";}}i:6;a:4:{s:1:"A";a:3:{s:4:"size";s:14:",,,ts_quantity";s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"B";a:7:{s:4:"type";s:5:"float";s:4:"blur";s:17:"@ts_quantity_blur";s:9:"precision";s:1:"3";s:4:"span";s:3:"all";s:4:"name";s:11:"ts_quantity";s:4:"size";s:1:",";s:4:"help";s:30:"empty if identical to duration";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:5:{s:4:"name";s:9:"ts_status";s:4:"size";s:13:"please select";s:4:"type";s:6:"select";s:4:"help";s:32:"select a status of the timesheet";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:4;s:4:"rows";i:7;s:4:"size";s:8:"100%,165";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"165";}}}','size' => '100%,165','style' => '','modified' => '1303227457',);
+$templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:15:{s:1:"A";s:2:"95";s:1:"B";s:3:"120";s:1:"C";s:15:"80,@ts_viewtype";s:1:"D";s:13:",@ts_viewtype";s:2:"c1";s:3:"row";s:2:"h1";s:13:",@ts_viewtype";s:2:"c2";s:3:"row";s:2:"h2";s:14:",!@ts_viewtype";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:13:",@ts_viewtype";s:2:"c7";s:3:"row";s:2:"h7";s:14:",@no_ts_status";}i:1;a:4:{s:1:"A";a:3:{s:4:"size";s:11:",,,ts_title";s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"size";s:5:"65,80";s:4:"blur";s:14:"@ts_title_blur";s:4:"span";s:13:"all,fullWidth";s:4:"name";s:8:"ts_title";s:4:"type";s:4:"text";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"comment";}s:1:"B";a:4:{s:4:"span";s:13:"all,fullWidth";s:4:"name";s:14:"ts_description";s:4:"type";s:8:"textarea";s:4:"size";s:4:"5,50";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"size";s:9:",,,cat_id";s:4:"type";s:5:"label";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"span";s:3:"all";s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:16:"None,,,timesheet";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"size";s:11:",,,ts_start";s:4:"type";s:5:"label";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:6:"needed";s:1:"1";s:4:"name";s:8:"ts_start";s:4:"size";s:2:",8";s:4:"type";s:4:"date";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Starttime";}s:1:"D";a:3:{s:4:"name";s:10:"start_time";s:4:"size";s:3:"H:i";s:4:"type";s:13:"date-timeonly";}}i:5;a:4:{s:1:"A";a:3:{s:4:"size";s:14:",,,ts_duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";s:4:"type";s:13:"date-duration";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"or endtime";s:4:"span";s:7:",noWrap";}s:1:"D";a:3:{s:4:"name";s:8:"end_time";s:4:"size";s:3:"H:i";s:4:"type";s:13:"date-timeonly";}}i:6;a:4:{s:1:"A";a:3:{s:4:"size";s:14:",,,ts_quantity";s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"B";a:7:{s:4:"type";s:5:"float";s:4:"blur";s:17:"@ts_quantity_blur";s:9:"precision";s:1:"3";s:4:"span";s:3:"all";s:4:"name";s:11:"ts_quantity";s:4:"size";s:1:",";s:4:"help";s:30:"empty if identical to duration";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:5:{s:4:"name";s:9:"ts_status";s:4:"size";s:13:"please select";s:4:"type";s:6:"select";s:4:"help";s:32:"select a status of the timesheet";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:4;s:4:"rows";i:7;s:4:"size";s:8:"100%,165";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"165";}}}','size' => '100%,165','style' => '','modified' => '1303227457',);
 
 $templ_data[] = array('name' => 'timesheet.edit.history','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:2:{s:4:"name";s:7:"history";s:4:"type";s:10:"historylog";}}}s:4:"cols";i:1;s:4:"rows";i:1;s:4:"size";s:17:"100%,165,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"165";i:6;s:4:"auto";}}}','size' => '100%,165,,,,,auto','style' => '','modified' => '1303228026',);
 
diff --git a/timesheet/templates/default/edit.xet b/timesheet/templates/default/edit.xet
index 53ca0eba86..3398134fd1 100644
--- a/timesheet/templates/default/edit.xet
+++ b/timesheet/templates/default/edit.xet
@@ -25,7 +25,7 @@
 				<row class="row">
 					<description value="Category" options=",,,cat_id"/>
 					<menulist span="all">
-						<menupopup type="select-cat" id="cat_id" options="None"/>
+						<menupopup type="select-cat" id="cat_id" options="None,,,timesheet"/>
 					</menulist>
 				</row>
 				<row class="row">