diff --git a/phpgwapi/templates/default/help.xsl b/phpgwapi/templates/default/help.xsl
new file mode 100644
index 0000000000..0c41df086d
--- /dev/null
+++ b/phpgwapi/templates/default/help.xsl
@@ -0,0 +1,72 @@
+<!-- $Id$ -->
+
+	<xsl:template name="help">
+		<xsl:apply-templates select="help_data"/>
+	</xsl:template>
+
+	<xsl:template match="help_data">
+		<table cellpadding="0" cellspacing="0" class="portal">
+ 			<tr>
+  				<td class="portal_text">
+					<xsl:value-of disable-output-escaping="yes" select="space"/>
+					<xsl:value-of select="title"/>
+				</td>
+				<td valign="middle" align="right" class="portal_text">
+					<xsl:apply-templates select="control_link"/>
+				</td>
+			</tr>
+ 			<tr>
+  				<td colspan="2">
+					<table cellpadding="3" cellspacing="0" class="portal">
+						<xsl:choose>
+							<xsl:when test="listbox != ''">
+								<tr>
+									<td>
+										<ul>
+											<xsl:apply-templates select="listbox"/>
+										</ul>
+									</td>
+								</tr>
+							</xsl:when>
+						</xsl:choose>
+						<xsl:choose>
+							<xsl:when test="extrabox != ''">
+								<tr>
+									<td>
+										<xsl:value-of disable-output-escaping="yes" select="extrabox"/>
+									</td>
+								</tr>
+							</xsl:when>
+							<xsl:when test="xextrabox != ''">
+								<tr>
+									<td>
+										<xsl:call-template name="extrabox"/>
+									</td>
+								</tr>
+							</xsl:when>
+						</xsl:choose>
+   					</table>
+  				</td>
+ 			</tr>
+		</table>
+	</xsl:template>
+
+	<xsl:template match="control_link">
+		<xsl:variable name="param_url"><xsl:value-of select="param_url"/></xsl:variable>
+		<xsl:variable name="link_img"><xsl:value-of select="link_img"/></xsl:variable>
+		<xsl:variable name="img_width"><xsl:value-of select="img_width"/></xsl:variable>
+		<xsl:variable name="lang_param_statustext"><xsl:value-of select="lang_param_statustext"/></xsl:variable>
+		<a href="{$param_url}" onMouseover="window.status='{$lang_param_statustext}';return true;" onMouseout="window.status='';return true;">
+			<img src="{$link_img}" border="0" width="{img_width}" height="15" onMouseover="window.status='{$lang_param_statustext}';return true;" onMouseout="window.status='';return true;" alt="{$lang_param_statustext}"/>
+		</a>
+	</xsl:template>
+
+	<xsl:template match="listbox">
+		<xsl:variable name="link"><xsl:value-of select="link"/></xsl:variable>
+		<xsl:variable name="lang_link_statustext"><xsl:value-of select="lang_link_statustext"/></xsl:variable>
+			<li>
+				<a href="{$link}" onMouseover="window.status='{$lang_link_statustext}';return true;" onMouseout="window.status='';return true;">
+					<xsl:value-of select="text"/>
+				</a>
+			</li>
+	</xsl:template>
diff --git a/phpgwapi/templates/default/images/help.gif b/phpgwapi/templates/default/images/help.gif
new file mode 100644
index 0000000000..7f067ddf73
Binary files /dev/null and b/phpgwapi/templates/default/images/help.gif differ
diff --git a/phpgwapi/templates/default/images/help.png b/phpgwapi/templates/default/images/help.png
new file mode 100644
index 0000000000..2f341b3040
Binary files /dev/null and b/phpgwapi/templates/default/images/help.png differ
diff --git a/phpgwapi/templates/default/phpgw.xsl b/phpgwapi/templates/default/phpgw.xsl
index 25589605ab..2afd8315c6 100644
--- a/phpgwapi/templates/default/phpgw.xsl
+++ b/phpgwapi/templates/default/phpgw.xsl
@@ -9,19 +9,20 @@
 	<xsl:variable name="prefs_link" select="prefs_link"/>
 	<xsl:variable name="logout_link" select="logout_link"/>
 	<xsl:variable name="about_link" select="about_link"/>
-	<xsl:variable name="manual_link" select="manual_link"/>
+	<xsl:variable name="help_link" select="help_link"/>
 	<xsl:variable name="home_img" select="home_img"/>
 	<xsl:variable name="prefs_img" select="prefs_img"/>
 	<xsl:variable name="logout_img" select="logout_img"/>
 	<xsl:variable name="about_img" select="about_img"/>
-	<xsl:variable name="manual_img" select="manual_img"/>
+	<xsl:variable name="help_img" select="help_img"/>
 	<xsl:variable name="home_title" select="home_title"/>
 	<xsl:variable name="prefs_title" select="prefs_title"/>
 	<xsl:variable name="logout_title" select="logout_title"/>
 	<xsl:variable name="about_title" select="about_title"/>
-	<xsl:variable name="manual_title" select="manual_title"/>
+	<xsl:variable name="help_title" select="help_title"/>
 	<xsl:variable name="navbar_format" select="navbar_format"/>
 	<xsl:variable name="app_tpl" select="app_tpl"/>
+	<xsl:variable name="current_app" select="current_app"/>
 		<html>
 			<head>
 				<meta http-equiv="Content-Type" content="text/html; charset={$charset}"/>
@@ -84,7 +85,7 @@
 														<td><a href="{$prefs_link}" onMouseOver="" onMouseOut=""><img src="{$prefs_img}" border="0" name="ten" alt="{$prefs_title}" title="{$prefs_title}"/></a></td>
 														<td><a href="{$logout_link}" onMouseOver="" onMouseOut=""><img src="{$logout_img}" border="0" name="eleven" alt="{$logout_title}" title="{$logout_title}"/></a></td>
 														<td><a href="{$about_link}" onMouseOver="" onMouseOut=""><img src="{$about_img}" border="0" name="about" alt="{$about_title}" title="{$about_title}"/></a></td>
-														<td><a href="{$manual_link}" onMouseOver="" onMouseOut=""><img src="{$manual_img}" border="0" name="manual" alt="{$manual_title}" title="{$manual_title}"/></a></td>
+														<td><a href="{$help_link}" onMouseOver="" onMouseOut="" target="_blank"><img src="{$help_img}" border="0" name="help" alt="{$help_title}" title="{$help_title}"/></a></td>
 													</tr>
 												</table>
 											</td>
@@ -102,10 +103,10 @@
 								</xsl:when>
 							</xsl:choose>
 							<xsl:choose>
-								<xsl:when test="home">
+								<xsl:when test="$current_app = 'home'">
 									<xsl:call-template name="portal"/>
 								</xsl:when>
-								<xsl:when test="about">
+								<xsl:when test="$current_app = 'about'">
 									<xsl:call-template name="about"/>
 								</xsl:when>
 							</xsl:choose>
diff --git a/phpgwapi/templates/default/phpgw_header.xsl b/phpgwapi/templates/default/phpgw_header.xsl
new file mode 100644
index 0000000000..e5510048de
--- /dev/null
+++ b/phpgwapi/templates/default/phpgw_header.xsl
@@ -0,0 +1,51 @@
+<!-- $Id$ -->
+
+	<xsl:template match="phpgw">
+	<xsl:variable name="phpgw_css_file" select="phpgw_css_file"/>
+	<xsl:variable name="theme_css_file" select="theme_css_file"/>
+	<xsl:variable name="charset" select="charset"/>
+	<xsl:variable name="current_app" select="current_app"/>
+		<html>
+			<head>
+				<meta http-equiv="Content-Type" content="text/html; charset={$charset}"/>
+				<meta name="author" content="phpGroupWare http://www.phpgroupware.org"/>
+				<meta name="description" content="phpGroupWare"/>
+				<meta name="keywords" content="phpGroupWare"/>
+				<meta name="robots" content="noindex"/>
+				<link rel="icon" href="favicon.ico" type="image/x-ico"/>
+				<link rel="shortcut icon" href="favicon.ico"/>
+				<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}"/>
+			</head>
+			<body>
+				<table width="100%" height="100%" cellspacing="0" cellpadding="0">
+					<tr valign="top" width="100%">
+						<td>
+							<xsl:choose>
+								<xsl:when test="$current_app = 'help'">
+									<xsl:call-template name="help"/>
+								</xsl:when>
+							</xsl:choose>
+						</td>
+					</tr>
+					<tr valign="top">
+						<td align="center" valign="top" class="bottom">
+						<!-- BEGIN bottom_part -->
+							<xsl:value-of select="lang_powered_by"/>
+							<a href="http://www.phpgroupware.org" target="blank" onMouseout="window.status='';return true;">
+								<xsl:attribute name="onMouseover">
+									<xsl:text>window.status='</xsl:text>
+									<xsl:value-of select="lang_phpgw_statustext"/>
+									<xsl:text>'; return true;</xsl:text>
+								</xsl:attribute>
+								<xsl:text> phpGroupWare </xsl:text>
+							</a>
+							<xsl:text> </xsl:text><xsl:value-of select="lang_version"/><xsl:text> </xsl:text><xsl:value-of select="phpgw_version"/>
+						<!-- END bottom_part -->
+						</td>
+					</tr>
+				</table>
+			</body>
+		</html>
+	</xsl:template>
diff --git a/phpgwapi/templates/funkwerk/phpgw.xsl b/phpgwapi/templates/funkwerk/phpgw.xsl
index 3096e54918..20cf6d36b0 100644
--- a/phpgwapi/templates/funkwerk/phpgw.xsl
+++ b/phpgwapi/templates/funkwerk/phpgw.xsl
@@ -10,20 +10,21 @@
 	<xsl:variable name="prefs_link"><xsl:value-of select="prefs_link"/></xsl:variable>
 	<xsl:variable name="logout_link"><xsl:value-of select="logout_link"/></xsl:variable>
 	<xsl:variable name="about_link"><xsl:value-of select="about_link"/></xsl:variable>
-	<xsl:variable name="manual_link"><xsl:value-of select="manual_link"/></xsl:variable>
+	<xsl:variable name="help_link"><xsl:value-of select="help_link"/></xsl:variable>
 	<xsl:variable name="about_img"><xsl:value-of select="about_img"/></xsl:variable>
-	<xsl:variable name="manual_img"><xsl:value-of select="manual_img"/></xsl:variable>
+	<xsl:variable name="help_img"><xsl:value-of select="help_img"/></xsl:variable>
 	<xsl:variable name="home_statustext"><xsl:value-of select="home_statustext"/></xsl:variable>
 	<xsl:variable name="prefs_statustext"><xsl:value-of select="prefs_statustext"/></xsl:variable>
 	<xsl:variable name="logout_statustext"><xsl:value-of select="logout_statustext"/></xsl:variable>
 	<xsl:variable name="about_statustext"><xsl:value-of select="about_statustext"/></xsl:variable>
-	<xsl:variable name="manual_statustext"><xsl:value-of select="manual_statustext"/></xsl:variable>
+	<xsl:variable name="help_statustext"><xsl:value-of select="help_statustext"/></xsl:variable>
 	<xsl:variable name="top_css_home"><xsl:value-of select="top_css_home"/></xsl:variable>
 	<xsl:variable name="top_css_prefs"><xsl:value-of select="top_css_prefs"/></xsl:variable>
 	<xsl:variable name="top_css_about"><xsl:value-of select="top_css_about"/></xsl:variable>
-	<xsl:variable name="top_css_manual"><xsl:value-of select="top_css_manual"/></xsl:variable>
+	<xsl:variable name="top_css_help"><xsl:value-of select="top_css_help"/></xsl:variable>
 	<xsl:variable name="top_css"><xsl:value-of select="top_css"/></xsl:variable>
 	<xsl:variable name="app_tpl"><xsl:value-of select="app_tpl"/></xsl:variable>
+	<xsl:variable name="current_app" select="current_app"/>
 		<html>
 			<head>
 				<meta http-equiv="Content-Type" content="text/html; charset={$charset}"/>
@@ -62,7 +63,7 @@
 									<td class="top_menu"><a href="{$prefs_link}" onMouseOver="window.status='{$prefs_statustext}'; return true;" onMouseOut="window.status='';return true;" class="{$top_css_prefs}">[<xsl:value-of select="prefs_title"/>]</a></td>
 									<td class="top_menu"><a href="{$logout_link}" onMouseOver="window.status='{$logout_statustext}'; return true;" onMouseOut="window.status='';return true;" class="{$top_css}">[<xsl:value-of select="logout_title"/>]</a></td>
 									<td class="top_menu"><a href="{$about_link}" onMouseOver="window.status='{$about_statustext}'; return true;" onMouseOut="window.status='';return true;" class="{$top_css_about}">[<xsl:value-of select="about_img"/>]</a></td>
-									<td class="top_menu"><a href="{$manual_link}" onMouseOver="window.status='{$manual_statustext}'; return true;" onMouseOut="window.status='';return true;" class="{$top_css_manual}">[<xsl:value-of select="manual_img"/>]</a></td>
+									<td class="top_menu"><a href="{$help_link}" onMouseOver="window.status='{$help_statustext}'; return true;" onMouseOut="window.status='';return true;" class="{$top_css_help}" target="_blank">[<xsl:value-of select="help_img"/>]</a></td>
 								</tr>
 							</table>
 						</td>
@@ -88,10 +89,10 @@
 								</xsl:when>
 							</xsl:choose>
 							<xsl:choose>
-								<xsl:when test="home">
+								<xsl:when test="$current_app = 'home'">
 									<xsl:call-template name="portal"/>
 								</xsl:when>
-								<xsl:when test="about">
+								<xsl:when test="$current_app = 'about'">
 									<xsl:call-template name="about"/>
 								</xsl:when>
 							</xsl:choose>
diff --git a/phpgwapi/templates/idsociety/images/help.gif b/phpgwapi/templates/idsociety/images/help.gif
index ea3c9284f8..ea851a95e5 100755
Binary files a/phpgwapi/templates/idsociety/images/help.gif and b/phpgwapi/templates/idsociety/images/help.gif differ
diff --git a/phpgwapi/templates/idsociety/images/help_over.gif b/phpgwapi/templates/idsociety/images/help_over.gif
new file mode 100644
index 0000000000..6e61b21222
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/help_over.gif differ
diff --git a/phpgwapi/templates/idsociety/images/help_over.png b/phpgwapi/templates/idsociety/images/help_over.png
new file mode 100644
index 0000000000..ffc92e8fe1
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/help_over.png differ
diff --git a/phpgwapi/templates/idsociety/phpgw.xsl b/phpgwapi/templates/idsociety/phpgw.xsl
index 33925447a2..b07199133f 100644
--- a/phpgwapi/templates/idsociety/phpgw.xsl
+++ b/phpgwapi/templates/idsociety/phpgw.xsl
@@ -12,23 +12,24 @@
 	<xsl:variable name="prefs_link"><xsl:value-of select="prefs_link"/></xsl:variable>
 	<xsl:variable name="logout_link"><xsl:value-of select="logout_link"/></xsl:variable>
 	<xsl:variable name="about_link"><xsl:value-of select="about_link"/></xsl:variable>
-	<xsl:variable name="manual_link"><xsl:value-of select="manual_link"/></xsl:variable>
+	<xsl:variable name="help_link"><xsl:value-of select="help_link"/></xsl:variable>
 	<xsl:variable name="home_img_hover"><xsl:value-of select="home_img_hover"/></xsl:variable>
 	<xsl:variable name="prefs_img_hover"><xsl:value-of select="prefs_img_hover"/></xsl:variable>
 	<xsl:variable name="logout_img_hover"><xsl:value-of select="logout_img_hover"/></xsl:variable>
 	<xsl:variable name="about_img_hover"><xsl:value-of select="about_img_hover"/></xsl:variable>
-	<xsl:variable name="manual_img_hover"><xsl:value-of select="manual_img_hover"/></xsl:variable>
+	<xsl:variable name="help_img_hover"><xsl:value-of select="help_img_hover"/></xsl:variable>
 	<xsl:variable name="home_img"><xsl:value-of select="home_img"/></xsl:variable>
 	<xsl:variable name="prefs_img"><xsl:value-of select="prefs_img"/></xsl:variable>
 	<xsl:variable name="logout_img"><xsl:value-of select="logout_img"/></xsl:variable>
 	<xsl:variable name="about_img"><xsl:value-of select="about_img"/></xsl:variable>
-	<xsl:variable name="manual_img"><xsl:value-of select="manual_img"/></xsl:variable>
+	<xsl:variable name="help_img"><xsl:value-of select="help_img"/></xsl:variable>
 	<xsl:variable name="home_title"><xsl:value-of select="home_title"/></xsl:variable>
 	<xsl:variable name="prefs_title"><xsl:value-of select="prefs_title"/></xsl:variable>
 	<xsl:variable name="logout_title"><xsl:value-of select="logout_title"/></xsl:variable>
 	<xsl:variable name="about_title"><xsl:value-of select="about_title"/></xsl:variable>
-	<xsl:variable name="manual_title"><xsl:value-of select="manual_title"/></xsl:variable>
+	<xsl:variable name="help_title"><xsl:value-of select="help_title"/></xsl:variable>
 	<xsl:variable name="app_tpl"><xsl:value-of select="app_tpl"/></xsl:variable>
+	<xsl:variable name="current_app" select="current_app"/>
 		<html>
 			<head>
 				<meta http-equiv="Content-Type" content="text/html; charset={$charset}"/>
@@ -82,7 +83,7 @@
 												<td><a href="{$prefs_link}" onMouseOver="ten.src='{$prefs_img_hover}'" onMouseOut="ten.src='{$prefs_img}'"><img src="{$prefs_img}" border="0" name="ten" alt="{$prefs_title}" title="{$prefs_title}"/></a></td>
 												<td><a href="{$logout_link}" onMouseOver="eleven.src='{$logout_img_hover}'" onMouseOut="eleven.src='{$logout_img}'"><img src="{$logout_img}" border="0" name="eleven" alt="{$logout_title}" title="{$logout_title}"/></a></td>
 												<td><a href="{$about_link}" onMouseOver="about.src='{$about_img_hover}'" onMouseOut="about.src='{$about_img}'"><img src="{$about_img}" border="0" name="about" alt="{$about_title}" title="{$about_title}"/></a></td>
-												<td><a href="{$manual_link}" onMouseOver="manual.src='{$manual_img_hover}'" onMouseOut="manual.src='{$manual_img}'"><img src="{$manual_img}" border="0" name="manual" alt="{$manual_title}" title="{$manual_title}"/></a></td>
+												<td><a href="{$help_link}" onMouseOver="help.src='{$help_img_hover}'" onMouseOut="help.src='{$help_img}'" target="_blank"><img src="{$help_img}" border="0" name="help" alt="{$help_title}" title="{$help_title}"/></a></td>
 											</tr>
 										</table>
 									</td>
@@ -109,10 +110,10 @@
 								</xsl:when>
 							</xsl:choose>
 							<xsl:choose>
-								<xsl:when test="home">
+								<xsl:when test="$current_app = 'home'">
 									<xsl:call-template name="portal"/>
 								</xsl:when>
-								<xsl:when test="about">
+								<xsl:when test="$current_app = 'about'">
 									<xsl:call-template name="about"/>
 								</xsl:when>
 							</xsl:choose>
diff --git a/phpgwapi/templates/justweb/phpgw.xsl b/phpgwapi/templates/justweb/phpgw.xsl
index 63715eb5bc..faf5148725 100644
--- a/phpgwapi/templates/justweb/phpgw.xsl
+++ b/phpgwapi/templates/justweb/phpgw.xsl
@@ -12,18 +12,19 @@
 	<xsl:variable name="prefs_link"><xsl:value-of select="prefs_link"/></xsl:variable>
 	<xsl:variable name="logout_link"><xsl:value-of select="logout_link"/></xsl:variable>
 	<xsl:variable name="about_link"><xsl:value-of select="about_link"/></xsl:variable>
-	<xsl:variable name="manual_link"><xsl:value-of select="manual_link"/></xsl:variable>
+	<xsl:variable name="help_link"><xsl:value-of select="help_link"/></xsl:variable>
 	<xsl:variable name="home_img"><xsl:value-of select="home_img"/></xsl:variable>
 	<xsl:variable name="prefs_img"><xsl:value-of select="prefs_img"/></xsl:variable>
 	<xsl:variable name="logout_img"><xsl:value-of select="logout_img"/></xsl:variable>
 	<xsl:variable name="about_img"><xsl:value-of select="about_img"/></xsl:variable>
-	<xsl:variable name="manual_img"><xsl:value-of select="manual_img"/></xsl:variable>
+	<xsl:variable name="help_img"><xsl:value-of select="help_img"/></xsl:variable>
 	<xsl:variable name="home_title"><xsl:value-of select="home_title"/></xsl:variable>
 	<xsl:variable name="prefs_title"><xsl:value-of select="prefs_title"/></xsl:variable>
 	<xsl:variable name="logout_title"><xsl:value-of select="logout_title"/></xsl:variable>
 	<xsl:variable name="about_title"><xsl:value-of select="about_title"/></xsl:variable>
-	<xsl:variable name="manual_title"><xsl:value-of select="manual_title"/></xsl:variable>
+	<xsl:variable name="help_title"><xsl:value-of select="help_title"/></xsl:variable>
 	<xsl:variable name="app_tpl"><xsl:value-of select="app_tpl"/></xsl:variable>
+	<xsl:variable name="current_app" select="current_app"/>
 		<html>
 			<head>
 				<meta http-equiv="Content-Type" content="text/html; charset={$charset}"/>
@@ -52,7 +53,7 @@
 									<td valign="bottom" width="85" class="top"><a href="{$prefs_link}"><img src="{$prefs_img}" width="85" height="23" border="0" alt="{$prefs_title}" title="{$prefs_title}"/></a></td>
 									<td valign="bottom" width="56" class="top"><a href="{$logout_link}"><img src="{$logout_img}" width="56" height="23" border="0" alt="{$logout_title}" title="{$logout_title}"/></a></td>
 									<td valign="bottom" width="39" class="top"><a href="{$about_link}"><img src="{$about_img}" width="39" height="23" border="0" alt="{$about_title}" title="{$about_title}"/></a></td>
-									<td valign="bottom" width="39" class="top"><a href="{$manual_link}"><img src="{$manual_img}" width="39" height="23" border="0" alt="{$manual_title}" title="{$manual_title}"/></a></td>
+									<td valign="bottom" width="39" class="top"><a href="{$help_link}" target="_blank"><img src="{$help_img}" width="39" height="23" border="0" alt="{$help_title}" title="{$help_title}"/></a></td>
 								</tr>
 							</table>
 						</td>
@@ -111,10 +112,10 @@
 								</xsl:when>
 							</xsl:choose>
 							<xsl:choose>
-								<xsl:when test="home">
+								<xsl:when test="$current_app = 'home'">
 									<xsl:call-template name="portal"/>
 								</xsl:when>
-								<xsl:when test="about">
+								<xsl:when test="$current_app = 'about'">
 									<xsl:call-template name="about"/>
 								</xsl:when>
 							</xsl:choose>
diff --git a/phpgwapi/templates/verdilak/images/help.gif b/phpgwapi/templates/verdilak/images/help.gif
new file mode 100644
index 0000000000..85f78e0f83
Binary files /dev/null and b/phpgwapi/templates/verdilak/images/help.gif differ
diff --git a/phpgwapi/templates/verdilak/images/help.png b/phpgwapi/templates/verdilak/images/help.png
new file mode 100644
index 0000000000..a92c688ae8
Binary files /dev/null and b/phpgwapi/templates/verdilak/images/help.png differ
diff --git a/phpgwapi/templates/verdilak/phpgw.xsl b/phpgwapi/templates/verdilak/phpgw.xsl
index 8b5d4931c4..13e2235e56 100644
--- a/phpgwapi/templates/verdilak/phpgw.xsl
+++ b/phpgwapi/templates/verdilak/phpgw.xsl
@@ -9,21 +9,22 @@
 	<xsl:variable name="prefs_link" select="prefs_link"/>
 	<xsl:variable name="logout_link" select="logout_link"/>
 	<xsl:variable name="about_link" select="about_link"/>
-	<xsl:variable name="manual_link" select="manual_link"/>
+	<xsl:variable name="help_link" select="help_link"/>
 	<xsl:variable name="home_img" select="home_img"/>
 	<xsl:variable name="prefs_img" select="prefs_img"/>
 	<xsl:variable name="logout_img" select="logout_img"/>
 	<xsl:variable name="about_img" select="about_img"/>
-	<xsl:variable name="manual_img" select="manual_img"/>
+	<xsl:variable name="help_img" select="help_img"/>
 	<xsl:variable name="home_title" select="home_title"/>
 	<xsl:variable name="prefs_title" select="prefs_title"/>
 	<xsl:variable name="logout_title" select="logout_title"/>
 	<xsl:variable name="about_title" select="about_title"/>
-	<xsl:variable name="manual_title" select="manual_title"/>
+	<xsl:variable name="help_title" select="help_title"/>
 	<xsl:variable name="phpgw_body" select="phpgw_body"/>
 	<xsl:variable name="greybar" select="greybar"/>
 	<xsl:variable name="phpgw_statustext" select="lang_phpgw_statustext"/>
 	<xsl:variable name="app_tpl" select="app_tpl"/>
+	<xsl:variable name="current_app" select="current_app"/>
 		<html>
 			<head>
 				<meta http-equiv="Content-Type" content="text/html; charset={$charset}"/>
@@ -58,7 +59,7 @@
 												<td><a href="{$prefs_link}"><img src="{$prefs_img}" border="0" alt="{$prefs_title}" title="{$prefs_title}"/></a></td>
 												<td><a href="{$logout_link}"><img src="{$logout_img}" border="0" alt="{$logout_title}" title="{$logout_title}"/></a></td>
 												<td><a href="{$about_link}"><img src="{$about_img}" border="0" alt="{$about_title}" title="{$about_title}"/></a></td>
-												<td><a href="{$manual_link}"><img src="{$manual_img}" border="0" alt="{$manual_title}" title="{$manual_title}"/></a></td>			
+												<td><a href="{$help_link}" target="_blank"><img src="{$help_img}" border="0" alt="{$help_title}" title="{$help_title}"/></a></td>			
 											</tr>
 										</table>
 									</td>
@@ -103,10 +104,10 @@
 								</xsl:when>
 							</xsl:choose>
 							<xsl:choose>
-								<xsl:when test="home">
+								<xsl:when test="$current_app = 'home'">
 									<xsl:call-template name="portal"/>
 								</xsl:when>
-								<xsl:when test="about">
+								<xsl:when test="$current_app = 'about'">
 									<xsl:call-template name="about"/>
 								</xsl:when>
 							</xsl:choose>