diff --git a/phpgwapi/templates/default/app_delete.xsl b/phpgwapi/templates/default/app_delete.xsl
index c87244bcfd..4b8fed9a64 100644
--- a/phpgwapi/templates/default/app_delete.xsl
+++ b/phpgwapi/templates/default/app_delete.xsl
@@ -6,9 +6,30 @@
 
 	<xsl:template match="delete">
 			<table cellpadding="2" cellspacing="2" align="center">
+				<tr>
+					<td align="center" colspan="2"><xsl:value-of select="lang_error_msg"/></td>
+				</tr>
 				<tr>
 					<td align="center" colspan="2"><xsl:value-of select="lang_confirm_msg"/></td>
 				</tr>
+				<xsl:choose>
+					<xsl:when test="subs = 'yes'">
+						<tr>
+							<td align="center" colspan="2">
+								<table>
+									<tr>
+										<td><input type="radio" name="subs" value="move"/></td>
+										<td><xsl:value-of select="lang_sub_select_move"/></td>
+									</tr>
+									<tr>
+										<td><input type="radio" name="subs" value="drop"/></td>
+										<td><xsl:value-of select="lang_sub_select_drop"/></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</xsl:when>
+				</xsl:choose>
 				<tr>
 					<td>
 						<xsl:variable name="delete_url"><xsl:value-of select="delete_url"/></xsl:variable>
diff --git a/phpgwapi/templates/default/cat_filter.xsl b/phpgwapi/templates/default/cat_filter.xsl
index 56cd43a0d4..253fd10de3 100644
--- a/phpgwapi/templates/default/cat_filter.xsl
+++ b/phpgwapi/templates/default/cat_filter.xsl
@@ -1,10 +1,10 @@
 <!-- $Id$ -->
 
 	<xsl:template name="cat_filter">
-		<xsl:variable name="select_action"><xsl:value-of select="select_action"/></xsl:variable>
+		<xsl:variable name="select_url"><xsl:value-of select="select_url"/></xsl:variable>
 		<xsl:variable name="select_name"><xsl:value-of select="select_name"/></xsl:variable>
 		<xsl:variable name="lang_submit"><xsl:value-of select="lang_submit"/></xsl:variable>
-		<form method="post" action="{$select_action}">
+		<form method="post" action="{$select_url}">
 			<select name="{$select_name}" onChange="this.form.submit();" onMouseout="window.status='';return true;">
 				<xsl:attribute name="onMouseover">
 					<xsl:text>window.status='</xsl:text>
@@ -24,7 +24,7 @@
 	<xsl:template match="cat_list">
 	<xsl:variable name="cat_id"><xsl:value-of select="cat_id"/></xsl:variable>
 		<xsl:choose>
-			<xsl:when test="selected">
+			<xsl:when test="selected = 'selected'">
 				<option value="{$cat_id}" selected="selected"><xsl:value-of disable-output-escaping="yes" select="name"/></option>
 			</xsl:when>
 			<xsl:otherwise>
diff --git a/phpgwapi/templates/default/filter_select.xsl b/phpgwapi/templates/default/filter_select.xsl
index da9962f977..46c86f6499 100644
--- a/phpgwapi/templates/default/filter_select.xsl
+++ b/phpgwapi/templates/default/filter_select.xsl
@@ -1,9 +1,9 @@
 <!-- $Id$ -->
 
 	<xsl:template name="filter_select">
-		<xsl:variable name="select_action"><xsl:value-of select="select_action"/></xsl:variable>
+		<xsl:variable name="select_url"><xsl:value-of select="select_url"/></xsl:variable>
 		<xsl:variable name="lang_submit"><xsl:value-of select="lang_submit"/></xsl:variable>
-		<form method="post" action="{$select_action}">
+		<form method="post" action="{$select_url}">
 			<select name="filter" onChange="this.form.submit()" onMouseout="window.status='';return true;">
 				<xsl:attribute name="onMouseover">
 					<xsl:text>window.status='</xsl:text>
diff --git a/phpgwapi/templates/default/search_field.xsl b/phpgwapi/templates/default/search_field.xsl
index 12e44d1417..207290883f 100644
--- a/phpgwapi/templates/default/search_field.xsl
+++ b/phpgwapi/templates/default/search_field.xsl
@@ -1,10 +1,10 @@
 <!-- $Id$ -->
 
 	<xsl:template name="search_field">
-		<xsl:variable name="search_url"><xsl:value-of select="search_url"/></xsl:variable>
+		<xsl:variable name="select_url"><xsl:value-of select="select_url"/></xsl:variable>
 		<xsl:variable name="query"><xsl:value-of select="query"/></xsl:variable>
 		<xsl:variable name="lang_search"><xsl:value-of select="lang_search"/></xsl:variable>
-			<form method="post" action="{$search_url}">
+			<form method="post" action="{$select_url}">
 				<input type="text" name="query" value="{$query}" onMouseout="window.status='';return true;">
 					<xsl:attribute name="onMouseover">
 						<xsl:text>window.status='</xsl:text>
diff --git a/phpgwapi/templates/funkwerk/css/funkwerk.css b/phpgwapi/templates/funkwerk/css/funkwerk.css
index aab6c7ead2..6c939a5f7b 100644
--- a/phpgwapi/templates/funkwerk/css/funkwerk.css
+++ b/phpgwapi/templates/funkwerk/css/funkwerk.css
@@ -39,7 +39,7 @@ td.left
 	color: #FFFFFF;
 }
 
-.admin_info
+.admin_info,a:link.admin_info,a:active.admin_info,a:visited.admin_info,a:hover.admin_info
 {
 	background-color: #0000A0;
 	color: #FFFFFF;
@@ -78,7 +78,7 @@ a:hover.top_menu,a:link.top_menu_selected,a:active.top_menu_selected,a:visited.t
 	color: #FFFFFF;
 }
 
-.row_on,.th_bright
+.row_on,.th_bright,.app_header
 {
 	background-color: #ADADAD;
 }
@@ -93,7 +93,7 @@ a:hover.top_menu,a:link.top_menu_selected,a:active.top_menu_selected,a:visited.t
 	background-color: #FFFFFF;
 }
 
-.th,.app_header,td.app_header
+.th
 {
 	background-color: #FFE000;
 }
diff --git a/phpgwapi/templates/funkwerk/css/phpgw.css b/phpgwapi/templates/funkwerk/css/phpgw.css
index 114b66f112..19612308de 100644
--- a/phpgwapi/templates/funkwerk/css/phpgw.css
+++ b/phpgwapi/templates/funkwerk/css/phpgw.css
@@ -110,7 +110,7 @@ table.login
 	background: url(../../default/images/bg_filler.png);
 }
 
-.user_info,.admin_info,.small_text
+.small_text
 {
 	font-size: 85%;
 }
@@ -125,10 +125,3 @@ table.login
 {
 	font-weight: bold;
 }
-
-.app_header
-{
-	padding: 5px;
-	padding-bottom: 0px;
-	text-align: center;
-}
diff --git a/phpgwapi/templates/funkwerk/css/werft.css b/phpgwapi/templates/funkwerk/css/werft.css
index 633dd9d56c..b67dedcef6 100644
--- a/phpgwapi/templates/funkwerk/css/werft.css
+++ b/phpgwapi/templates/funkwerk/css/werft.css
@@ -39,7 +39,7 @@ td.left
 	color: #FFFFFF;
 }
 
-.admin_info
+.admin_info,a:link.admin_info,a:active.admin_info,a:visited.admin_info,a:hover.admin_info
 {
 	background-color: #000066;
 	color: #FFFFFF;
@@ -78,7 +78,7 @@ a:hover.top_menu,a:link.top_menu_selected,a:active.top_menu_selected,a:visited.t
 	color: #FFFFFF;
 }
 
-.row_on,.th_bright
+.row_on,.th_bright,.app_header
 {
 	background-color: #ADADAD;
 }
@@ -93,7 +93,7 @@ a:hover.top_menu,a:link.top_menu_selected,a:active.top_menu_selected,a:visited.t
 	background-color: #999999;
 }
 
-.th,.app_header
+.th
 {
 	background-color: orange;
 }
diff --git a/phpgwapi/templates/funkwerk/phpgw.xsl b/phpgwapi/templates/funkwerk/phpgw.xsl
index 2bdcf5413c..3b5838bacb 100644
--- a/phpgwapi/templates/funkwerk/phpgw.xsl
+++ b/phpgwapi/templates/funkwerk/phpgw.xsl
@@ -37,16 +37,6 @@
 				<title><xsl:value-of select="website_title"/></title>
 				<link rel="stylesheet" type="text/css" href="{$phpgw_css_file}"/>
 				<link rel="stylesheet" type="text/css" href="{$theme_css_file}"/>
-				<xsl:value-of disable-output-escaping="yes" select="java_script"/>
-				<xsl:choose>
-					<xsl:when test="app_css">
-						<style type="text/css">
-							<xsl:text>&lt;!--</xsl:text>
-								<xsl:value-of disable-output-escaping="yes" select="app_css"/>
-							<xsl:text>--></xsl:text>
-						</style>
-					</xsl:when>
-				</xsl:choose>
 			</head>
 			<body>
 				<!-- BEGIN top_part -->
@@ -57,7 +47,7 @@
 						<xsl:choose>
 							<xsl:when test="current_users">
 								<xsl:variable name="url_current_users"><xsl:value-of select="url_current_users"/></xsl:variable>
-								<td class="admin_info" valign="bottom"><a href="{$url_current_users}">[<xsl:value-of select="current_users"/>]</a></td>
+								<td class="admin_info" valign="bottom"><a href="{$url_current_users}" class="admin_info">[<xsl:value-of select="current_users"/>]</a></td>
 							</xsl:when>
 							<xsl:otherwise>
 								<td class="admin_info"/>
@@ -84,29 +74,27 @@
 				<!-- END top_part -->
 				<table width="100%" height="100%" cellspacing="0" cellpadding="0">
 					<tr valign="top" width="100%">
-						<td width="17%" rowspan="2">
+						<td width="131">
 						<!-- BEGIN left_part -->
-							<table valign="top" cellpadding="2" cellspacing="2">
+							<table valign="top" cellpadding="2" cellspacing="2" width="131">
 								<xsl:apply-templates select="applications"/>
-								<tr>
-									<td/>
-								</tr>
 							</table>
 						<!-- END left_part -->
 						</td>
-						<!-- BEGIN app_header -->
-						<td height="15" colspan="2">
-							<xsl:choose>
-								<xsl:when test="app_header">
-									<xsl:attribute name="class">app_header</xsl:attribute>
-									<xsl:value-of disable-output-escaping="yes" select="app_header"/>
-								</xsl:when>
-							</xsl:choose>
-						</td>
-						<!-- END app_header -->
-					</tr>
-					<tr valign="top">
-						<td height="100%" width="80%" valign="top" align="center">
+						<td height="100%" width="100%" valign="top" align="center">
+							<table valign="top" cellpadding="2" cellspacing="2" width="100%">
+								<tr>
+									<td>
+										<xsl:choose>
+											<xsl:when test="app_header">
+												<xsl:attribute name="class">app_header</xsl:attribute>
+												<xsl:value-of disable-output-escaping="yes" select="app_header"/>
+											</xsl:when>
+										</xsl:choose>
+									</td>
+								</tr>
+								<tr>
+									<td align="center">
 							<xsl:choose>
 								<xsl:when test="msgbox_data">
 									<xsl:call-template name="msgbox"/>
@@ -135,6 +123,9 @@
 									<xsl:value-of disable-output-escaping="yes" select="body_data"/>
 								</xsl:otherwise>
 							</xsl:choose>
+									</td>
+								</tr>
+							</table>
 						</td>
 						<td width="3%"/>
 					</tr>