diff --git a/phpgwapi/inc/class.help.inc.php b/phpgwapi/inc/class.help.inc.php
index 6af6ff3490..15fcc5a685 100644
--- a/phpgwapi/inc/class.help.inc.php
+++ b/phpgwapi/inc/class.help.inc.php
@@ -117,7 +117,7 @@
 				case 'app':
 					if($control != '' && $control_url != '')
 					{
-						$this->setvar($control,$GLOBALS['phpgw']->link($this->check_help_file($control_url)));
+						$this->setvar($control,$this->check_help_file($control_url));
 					}
 					break;
 				default:
@@ -147,10 +147,13 @@
 		{
 			$control_array = array
 			(
-				'intro'		=> True,
-				'note'		=> True
+				'intro'		=> True
 			);
 
+			if($this->app_intro)
+			{
+				$control_array['app_intro'] = True;
+			}
 			if($this->up)
 			{
 				$control_array['up'] = True;
@@ -159,10 +162,9 @@
 			{
 				$control_array['down'] = True;
 			}
-			if($this->app_intro)
-			{
-				$control_array['app_intro'] = True;
-			}
+			$control_array['note'] = True;
+
+			//_debug_array($control_array);
 
 			@reset($control_array);
 			while(list($param,$value) = each($control_array))
@@ -173,10 +175,10 @@
 
 					$control_link[] = array
 					(
-						'param_url' 			=> $this->$param,
-						'link_img'				=> $GLOBALS['phpgw']->common->image('phpgwapi',$param.'_help'),
-						'img_width'				=> $image_width,
-						'lang_param_statustext'	=> lang($param)
+						'param_url' 		=> $this->$param,
+						'link_img'			=> $GLOBALS['phpgw']->common->image('phpgwapi',$param.'_help'),
+						'img_width'			=> $image_width,
+						'lang_param_title'	=> lang($param)
 					);
 				}
 			}
diff --git a/phpgwapi/inc/class.help_helper.inc.php b/phpgwapi/inc/class.help_helper.inc.php
index eb0d93f251..ef98c2fd49 100644
--- a/phpgwapi/inc/class.help_helper.inc.php
+++ b/phpgwapi/inc/class.help_helper.inc.php
@@ -53,7 +53,7 @@
 				{
 					$this->set_controls('app',$key,$value);
 				}
-				$this->set_controls();
+				$this->set_controls('base');
 			}
 		}
 
diff --git a/phpgwapi/templates/default/config.tpl b/phpgwapi/templates/default/config.tpl
deleted file mode 100644
index ec48eff469..0000000000
--- a/phpgwapi/templates/default/config.tpl
+++ /dev/null
@@ -1,125 +0,0 @@
-<!-- BEGIN header -->
-<form method="POST" action="{action_url}">
-<table border="0" align="center" width="85%">
-   <tr bgcolor="{th_bg}">
-    <td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
-   </tr>
-<!-- END header -->
-<!-- BEGIN body -->
-   <tr bgcolor="{th_bg}">
-    <td colspan="2"><font color="{th_text}">&nbsp;<b>{lang_Path_information}</b></font></td>
-   </tr>
-   
-   </tr>
-   <tr bgcolor="{row_off}">
-    <td>{lang_Enter_the_full_path_for_temporary_files.<br>Examples:_/tmp,_C:\TEMP}:</td>
-    <td><input name="newsettings[temp_dir]" value="{value_temp_dir}" size="40"></td>
-   </tr>
-
-   <tr bgcolor="{row_on}">
-    <td>{lang_Enter_the_full_path_for_users_and_group_files.<br>Examples:_/files,_E:\FILES}:</td>
-    <td><input name="newsettings[files_dir]" value="{value_files_dir}" size="40"></td>
-   </tr>
-   
-   <tr bgcolor="{row_off}">
-    <td>{lang_Enter_the_location_of_phpGroupWare's_URL.<br>Example:_http://www.domain.com/phpgroupware_&nbsp;_or_&nbsp;_/phpgroupware<br><b>No_trailing_slash</b>}:</td>
-    <td><input name="newsettings[webserver_url]" value="{value_webserver_url}" size="40"></td>
-   </tr>
-
-   <tr bgcolor="{row_on}">
-    <td>{lang_Image_type_selection_order}:</td>
-    <td>
-     <select name="newsettings[image_type]">
-      <option value="">GIF->JPG->PNG</option>
-      <option value="1"{selected_image_type_1}>PNG->JPG->GIF</option>
-      <option value="2"{selected_image_type_2}>PNG->JPG</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr bgcolor="{row_off}">
-    <td>{lang_read_translations_from}:</td>
-    <td>
-     <select name="newsettings[translation_system]">
-      <option value="sql"{selected_translation_system_sql}>SQL</option>
-      <option value="file"{selected_translation_system_file}>{lang_file}</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr bgcolor="{row_on}">
-    <td colspan="2">&nbsp;</td>
-   </tr>
-
-   <tr bgcolor="{th_bg}">
-    <td colspan="2"><font color="{th_text}">&nbsp;<b>{lang_Host_information}</b></font></td>
-   </tr>
-
-   <tr bgcolor="{row_off}">
-    <td>{lang_Enter_the_hostname_of_the_machine_on_which_this_server_is_running}:</td>
-    <td><input name="newsettings[hostname]" value="{value_hostname}"></td>
-   </tr>
-
-   <tr bgcolor="{row_on}">
-    <td>{lang_Enter_your_default_FTP_server}:</td>
-    <td><input name="newsettings[default_ftp_server]" value="{value_default_ftp_server}"></td>
-   </tr>
-
-   <tr bgcolor="{row_off}">
-    <td>{lang_Attempt_to_use_correct_mimetype_for_FTP_instead_of_default_'application/octet-stream'}:</td>
-    <td>
-     <select name="newsettings[ftp_use_mime]">
-      <option value="">{lang_No}</option>
-      <option value="True"{selected_ftp_use_mime_True}>{lang_Yes}</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr bgcolor="{row_on}">
-    <td>{lang_Datetime_port.<br>If_using_port_13,_please_set_firewall_rules_appropriately_before_submitting_this_page.<br>(Port:_13_/_Host:_129.6.15.28)}</td>
-    <td>
-      <select name="newsettings[daytime_port]">
-       <option value="00"{selected_daytime_port_00}>{lang_00_(disable)}</option>
-       <option value="13"{selected_daytime_port_13}>{lang_13_(ntp)}</option>
-       <option value="80"{selected_daytime_port_80}>{lang_80_(http)}</option>
-      </select>
-    </td>
-   </tr>
-
-   <tr bgcolor="{row_off}">
-    <td>{lang_Enter_your_HTTP_proxy_server}:</td>
-    <td><input name="newsettings[httpproxy_server]" value="{value_httpproxy_server}"></td>
-   </tr>
-
-   <tr bgcolor="{row_on}">
-    <td>{lang_Enter_your_HTTP_proxy_server_port}:</td>
-    <td><input name="newsettings[httpproxy_port]" value="{value_httpproxy_port}"></td>
-   </tr>
-
-   <tr bgcolor="{row_off}">
-    <td>{lang_Enter_the_site_username_for_peer_servers}.</td>
-    <td><input name="newsettings[site_username]" value="{value_site_username}"></td>
-   </tr>
-
-   <tr bgcolor="{row_on}">
-    <td>{lang_Enter_the_site_password_for_peer_servers}.</td>
-    <td><input type="password" name="newsettings[site_password]" value="{value_site_password}"></td>
-   </tr>
-
-<!-- END body -->
-
-<!-- BEGIN footer -->
-  <tr bgcolor="{th_bg}">
-    <td colspan="2">
-&nbsp;
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2" align="center">
-      <input type="submit" name="submit" value="Submit">
-      <input type="submit" name="cancel" value="Cancel">
-    </td>
-  </tr>
-</table>
-</form>
-<!-- END footer -->