From 11f96c8fcf2a970b536c7310bd90bca7244e040c Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Sat, 25 Oct 2008 20:52:43 +0000
Subject: [PATCH] new theme

---
 interface/web/admin/templates/dbsync_edit.htm |  60 +++++++++
 interface/web/admin/templates/dbsync_list.htm |  28 +++++
 .../web/admin/templates/filesync_edit.htm     |  48 +++++++
 .../web/admin/templates/filesync_list.htm     |  28 +++++
 .../web/admin/templates/firewall_edit.htm     |  33 +++++
 .../web/admin/templates/firewall_list.htm     |  59 +++++++++
 interface/web/admin/templates/groups_edit.htm |  25 ++++
 interface/web/admin/templates/groups_list.htm |  53 ++++++++
 .../web/admin/templates/language_add.htm      |  32 +++++
 .../web/admin/templates/language_complete.htm |  26 ++++
 .../web/admin/templates/language_edit.htm     |  31 +++++
 .../web/admin/templates/language_export.htm   |  28 +++++
 .../web/admin/templates/language_import.htm   |  32 +++++
 .../web/admin/templates/language_list.htm     |  42 +++++++
 .../templates/server_config_fastcgi_edit.htm  |  45 +++++++
 .../templates/server_config_getmail_edit.htm  |  21 ++++
 .../templates/server_config_jailkit_edit.htm  |  29 +++++
 .../admin/templates/server_config_list.htm    |  49 ++++++++
 .../templates/server_config_mail_edit.htm     |  65 ++++++++++
 .../templates/server_config_server_edit.htm   |  41 ++++++
 .../templates/server_config_web_edit.htm      |  33 +++++
 .../admin/templates/server_edit_config.htm    |  21 ++++
 .../admin/templates/server_edit_services.htm  |  49 ++++++++
 .../web/admin/templates/server_ip_edit.htm    |  29 +++++
 .../web/admin/templates/server_ip_list.htm    |  52 ++++++++
 interface/web/admin/templates/server_list.htm |  67 ++++++++++
 .../admin/templates/software_package_list.htm |  33 +++++
 .../admin/templates/software_repo_edit.htm    |  37 ++++++
 .../admin/templates/software_repo_list.htm    |  55 ++++++++
 .../admin/templates/software_update_list.htm  |  48 +++++++
 .../web/admin/templates/users_groups_edit.htm |  25 ++++
 interface/web/admin/templates/users_list.htm  |  58 +++++++++
 .../web/admin/templates/users_user_edit.htm   |  48 +++++++
 .../client/templates/client_edit_address.htm  |  89 +++++++++++++
 .../client/templates/client_edit_limits.htm   | 117 ++++++++++++++++++
 .../web/client/templates/clients_list.htm     |  58 +++++++++
 interface/web/dns/templates/dns_a_edit.htm    |  35 ++++++
 interface/web/dns/templates/dns_a_list.htm    |  82 ++++++++++++
 .../web/dns/templates/dns_alias_edit.htm      |  35 ++++++
 .../web/dns/templates/dns_cname_edit.htm      |  35 ++++++
 .../web/dns/templates/dns_hinfo_edit.htm      |  35 ++++++
 interface/web/dns/templates/dns_mx_edit.htm   |  39 ++++++
 interface/web/dns/templates/dns_ns_edit.htm   |  35 ++++++
 interface/web/dns/templates/dns_ptr_edit.htm  |  35 ++++++
 .../web/dns/templates/dns_records_edit.htm    |  11 ++
 interface/web/dns/templates/dns_rp_edit.htm   |  35 ++++++
 interface/web/dns/templates/dns_soa_edit.htm  |  74 +++++++++++
 interface/web/dns/templates/dns_soa_list.htm  |  61 +++++++++
 interface/web/dns/templates/dns_srv_edit.htm  |  35 ++++++
 interface/web/dns/templates/dns_txt_edit.htm  |  35 ++++++
 .../help/templates/support_message_edit.htm   |  32 +++++
 .../help/templates/support_message_list.htm   |  52 ++++++++
 .../help/templates/support_message_view.htm   |  25 ++++
 interface/web/login/templates/index.htm       |  32 +++++
 .../web/login/templates/password_reset.htm    |  32 +++++
 .../web/mail/templates/mail_alias_edit.htm    |  30 +++++
 .../web/mail/templates/mail_alias_list.htm    |  56 +++++++++
 .../mail/templates/mail_blacklist_edit.htm    |  34 +++++
 .../mail/templates/mail_blacklist_list.htm    |  59 +++++++++
 .../templates/mail_content_filter_edit.htm    |  41 ++++++
 .../templates/mail_content_filter_list.htm    |  59 +++++++++
 .../templates/mail_domain_catchall_edit.htm   |  30 +++++
 .../templates/mail_domain_catchall_list.htm   |  56 +++++++++
 .../web/mail/templates/mail_domain_edit.htm   |  49 ++++++++
 .../web/mail/templates/mail_domain_list.htm   |  56 +++++++++
 .../web/mail/templates/mail_forward_edit.htm  |  31 +++++
 .../web/mail/templates/mail_forward_list.htm  |  56 +++++++++
 .../web/mail/templates/mail_get_edit.htm      |  51 ++++++++
 .../web/mail/templates/mail_get_list.htm      |  62 ++++++++++
 .../mail/templates/mail_transport_edit.htm    |  45 +++++++
 .../mail/templates/mail_transport_list.htm    |  62 ++++++++++
 .../mail_user_autoresponder_edit.htm          |  25 ++++
 .../templates/mail_user_custom_rules_edit.htm |  21 ++++
 .../mail/templates/mail_user_filter_edit.htm  |  37 ++++++
 .../mail/templates/mail_user_filter_list.htm  |  45 +++++++
 .../web/mail/templates/mail_user_list.htm     |  53 ++++++++
 .../mail/templates/mail_user_mailbox_edit.htm |  46 +++++++
 .../templates/mail_user_mailfilter_edit.htm   |  16 +++
 .../mail/templates/mail_user_stats_list.htm   |  51 ++++++++
 .../mail/templates/mail_whitelist_edit.htm    |  34 +++++
 .../mail/templates/mail_whitelist_list.htm    |  59 +++++++++
 .../templates/spamfilter_blacklist_edit.htm   |  40 ++++++
 .../templates/spamfilter_blacklist_list.htm   |  62 ++++++++++
 .../spamfilter_config_getmail_edit.htm        |  21 ++++
 .../mail/templates/spamfilter_config_list.htm |  50 ++++++++
 .../templates/spamfilter_config_mail_edit.htm |  65 ++++++++++
 .../spamfilter_config_server_edit.htm         |  37 ++++++
 .../mail/templates/spamfilter_other_edit.htm  |  73 +++++++++++
 .../mail/templates/spamfilter_policy_edit.htm |  49 ++++++++
 .../mail/templates/spamfilter_policy_list.htm |  62 ++++++++++
 .../templates/spamfilter_quarantine_edit.htm  |  43 +++++++
 .../templates/spamfilter_taglevel_edit.htm    |  49 ++++++++
 .../mail/templates/spamfilter_users_edit.htm  |  41 ++++++
 .../mail/templates/spamfilter_users_list.htm  |  62 ++++++++++
 .../templates/spamfilter_whitelist_edit.htm   |  40 ++++++
 .../templates/spamfilter_whitelist_list.htm   |  62 ++++++++++
 interface/web/monitor/templates/logview.htm   |  19 +++
 interface/web/monitor/templates/system.htm    |  11 ++
 .../web/sites/templates/database_edit.htm     |  61 +++++++++
 .../web/sites/templates/database_list.htm     |  58 +++++++++
 .../web/sites/templates/ftp_user_advanced.htm |  49 ++++++++
 .../web/sites/templates/ftp_user_edit.htm     |  38 ++++++
 .../web/sites/templates/ftp_user_list.htm     |  58 +++++++++
 .../sites/templates/shell_user_advanced.htm   |  33 +++++
 .../web/sites/templates/shell_user_edit.htm   |  41 ++++++
 .../web/sites/templates/shell_user_list.htm   |  58 +++++++++
 .../sites/templates/web_aliasdomain_edit.htm  |  37 ++++++
 .../sites/templates/web_aliasdomain_list.htm  |  58 +++++++++
 .../sites/templates/web_domain_advanced.htm   |  33 +++++
 .../web/sites/templates/web_domain_edit.htm   |  91 ++++++++++++++
 .../web/sites/templates/web_domain_list.htm   |  55 ++++++++
 .../sites/templates/web_domain_redirect.htm   |  25 ++++
 .../web/sites/templates/web_domain_ssl.htm    |  53 ++++++++
 .../sites/templates/web_subdomain_edit.htm    |  34 +++++
 .../sites/templates/web_subdomain_list.htm    |  59 +++++++++
 interface/web/themes/default/licences.txt     |   8 ++
 .../web/tools/templates/user_settings.htm     |  29 +++++
 117 files changed, 5177 insertions(+)
 create mode 100644 interface/web/admin/templates/dbsync_edit.htm
 create mode 100644 interface/web/admin/templates/dbsync_list.htm
 create mode 100644 interface/web/admin/templates/filesync_edit.htm
 create mode 100644 interface/web/admin/templates/filesync_list.htm
 create mode 100644 interface/web/admin/templates/firewall_edit.htm
 create mode 100644 interface/web/admin/templates/firewall_list.htm
 create mode 100644 interface/web/admin/templates/groups_edit.htm
 create mode 100644 interface/web/admin/templates/groups_list.htm
 create mode 100644 interface/web/admin/templates/language_add.htm
 create mode 100644 interface/web/admin/templates/language_complete.htm
 create mode 100644 interface/web/admin/templates/language_edit.htm
 create mode 100644 interface/web/admin/templates/language_export.htm
 create mode 100644 interface/web/admin/templates/language_import.htm
 create mode 100644 interface/web/admin/templates/language_list.htm
 create mode 100644 interface/web/admin/templates/server_config_fastcgi_edit.htm
 create mode 100644 interface/web/admin/templates/server_config_getmail_edit.htm
 create mode 100644 interface/web/admin/templates/server_config_jailkit_edit.htm
 create mode 100644 interface/web/admin/templates/server_config_list.htm
 create mode 100644 interface/web/admin/templates/server_config_mail_edit.htm
 create mode 100644 interface/web/admin/templates/server_config_server_edit.htm
 create mode 100644 interface/web/admin/templates/server_config_web_edit.htm
 create mode 100644 interface/web/admin/templates/server_edit_config.htm
 create mode 100644 interface/web/admin/templates/server_edit_services.htm
 create mode 100644 interface/web/admin/templates/server_ip_edit.htm
 create mode 100644 interface/web/admin/templates/server_ip_list.htm
 create mode 100644 interface/web/admin/templates/server_list.htm
 create mode 100644 interface/web/admin/templates/software_package_list.htm
 create mode 100644 interface/web/admin/templates/software_repo_edit.htm
 create mode 100644 interface/web/admin/templates/software_repo_list.htm
 create mode 100644 interface/web/admin/templates/software_update_list.htm
 create mode 100644 interface/web/admin/templates/users_groups_edit.htm
 create mode 100644 interface/web/admin/templates/users_list.htm
 create mode 100644 interface/web/admin/templates/users_user_edit.htm
 create mode 100644 interface/web/client/templates/client_edit_address.htm
 create mode 100644 interface/web/client/templates/client_edit_limits.htm
 create mode 100644 interface/web/client/templates/clients_list.htm
 create mode 100644 interface/web/dns/templates/dns_a_edit.htm
 create mode 100644 interface/web/dns/templates/dns_a_list.htm
 create mode 100644 interface/web/dns/templates/dns_alias_edit.htm
 create mode 100644 interface/web/dns/templates/dns_cname_edit.htm
 create mode 100644 interface/web/dns/templates/dns_hinfo_edit.htm
 create mode 100644 interface/web/dns/templates/dns_mx_edit.htm
 create mode 100644 interface/web/dns/templates/dns_ns_edit.htm
 create mode 100644 interface/web/dns/templates/dns_ptr_edit.htm
 create mode 100644 interface/web/dns/templates/dns_records_edit.htm
 create mode 100644 interface/web/dns/templates/dns_rp_edit.htm
 create mode 100644 interface/web/dns/templates/dns_soa_edit.htm
 create mode 100644 interface/web/dns/templates/dns_soa_list.htm
 create mode 100644 interface/web/dns/templates/dns_srv_edit.htm
 create mode 100644 interface/web/dns/templates/dns_txt_edit.htm
 create mode 100644 interface/web/help/templates/support_message_edit.htm
 create mode 100644 interface/web/help/templates/support_message_list.htm
 create mode 100644 interface/web/help/templates/support_message_view.htm
 create mode 100644 interface/web/login/templates/index.htm
 create mode 100644 interface/web/login/templates/password_reset.htm
 create mode 100644 interface/web/mail/templates/mail_alias_edit.htm
 create mode 100644 interface/web/mail/templates/mail_alias_list.htm
 create mode 100644 interface/web/mail/templates/mail_blacklist_edit.htm
 create mode 100644 interface/web/mail/templates/mail_blacklist_list.htm
 create mode 100644 interface/web/mail/templates/mail_content_filter_edit.htm
 create mode 100644 interface/web/mail/templates/mail_content_filter_list.htm
 create mode 100644 interface/web/mail/templates/mail_domain_catchall_edit.htm
 create mode 100644 interface/web/mail/templates/mail_domain_catchall_list.htm
 create mode 100644 interface/web/mail/templates/mail_domain_edit.htm
 create mode 100644 interface/web/mail/templates/mail_domain_list.htm
 create mode 100644 interface/web/mail/templates/mail_forward_edit.htm
 create mode 100644 interface/web/mail/templates/mail_forward_list.htm
 create mode 100644 interface/web/mail/templates/mail_get_edit.htm
 create mode 100644 interface/web/mail/templates/mail_get_list.htm
 create mode 100644 interface/web/mail/templates/mail_transport_edit.htm
 create mode 100644 interface/web/mail/templates/mail_transport_list.htm
 create mode 100644 interface/web/mail/templates/mail_user_autoresponder_edit.htm
 create mode 100644 interface/web/mail/templates/mail_user_custom_rules_edit.htm
 create mode 100644 interface/web/mail/templates/mail_user_filter_edit.htm
 create mode 100644 interface/web/mail/templates/mail_user_filter_list.htm
 create mode 100644 interface/web/mail/templates/mail_user_list.htm
 create mode 100644 interface/web/mail/templates/mail_user_mailbox_edit.htm
 create mode 100644 interface/web/mail/templates/mail_user_mailfilter_edit.htm
 create mode 100644 interface/web/mail/templates/mail_user_stats_list.htm
 create mode 100644 interface/web/mail/templates/mail_whitelist_edit.htm
 create mode 100644 interface/web/mail/templates/mail_whitelist_list.htm
 create mode 100644 interface/web/mail/templates/spamfilter_blacklist_edit.htm
 create mode 100644 interface/web/mail/templates/spamfilter_blacklist_list.htm
 create mode 100644 interface/web/mail/templates/spamfilter_config_getmail_edit.htm
 create mode 100644 interface/web/mail/templates/spamfilter_config_list.htm
 create mode 100644 interface/web/mail/templates/spamfilter_config_mail_edit.htm
 create mode 100644 interface/web/mail/templates/spamfilter_config_server_edit.htm
 create mode 100644 interface/web/mail/templates/spamfilter_other_edit.htm
 create mode 100644 interface/web/mail/templates/spamfilter_policy_edit.htm
 create mode 100644 interface/web/mail/templates/spamfilter_policy_list.htm
 create mode 100644 interface/web/mail/templates/spamfilter_quarantine_edit.htm
 create mode 100644 interface/web/mail/templates/spamfilter_taglevel_edit.htm
 create mode 100644 interface/web/mail/templates/spamfilter_users_edit.htm
 create mode 100644 interface/web/mail/templates/spamfilter_users_list.htm
 create mode 100644 interface/web/mail/templates/spamfilter_whitelist_edit.htm
 create mode 100644 interface/web/mail/templates/spamfilter_whitelist_list.htm
 create mode 100644 interface/web/monitor/templates/logview.htm
 create mode 100644 interface/web/monitor/templates/system.htm
 create mode 100644 interface/web/sites/templates/database_edit.htm
 create mode 100644 interface/web/sites/templates/database_list.htm
 create mode 100644 interface/web/sites/templates/ftp_user_advanced.htm
 create mode 100644 interface/web/sites/templates/ftp_user_edit.htm
 create mode 100644 interface/web/sites/templates/ftp_user_list.htm
 create mode 100644 interface/web/sites/templates/shell_user_advanced.htm
 create mode 100644 interface/web/sites/templates/shell_user_edit.htm
 create mode 100644 interface/web/sites/templates/shell_user_list.htm
 create mode 100644 interface/web/sites/templates/web_aliasdomain_edit.htm
 create mode 100644 interface/web/sites/templates/web_aliasdomain_list.htm
 create mode 100644 interface/web/sites/templates/web_domain_advanced.htm
 create mode 100644 interface/web/sites/templates/web_domain_edit.htm
 create mode 100644 interface/web/sites/templates/web_domain_list.htm
 create mode 100644 interface/web/sites/templates/web_domain_redirect.htm
 create mode 100644 interface/web/sites/templates/web_domain_ssl.htm
 create mode 100644 interface/web/sites/templates/web_subdomain_edit.htm
 create mode 100644 interface/web/sites/templates/web_subdomain_list.htm
 create mode 100644 interface/web/tools/templates/user_settings.htm

diff --git a/interface/web/admin/templates/dbsync_edit.htm b/interface/web/admin/templates/dbsync_edit.htm
new file mode 100644
index 0000000000..7e104b06c4
--- /dev/null
+++ b/interface/web/admin/templates/dbsync_edit.htm
@@ -0,0 +1,60 @@
+<table width="500" border="0" cellspacing="0" cellpadding="2">
+  <tr>
+    <td class="frmText11">{tmpl_var name='jobname_txt'}:</td>
+    <td class="frmText11"><input name="jobname" type="text" class="text" value="{tmpl_var name='jobname'}" size="15" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='sync_interval_minutes_txt'}:</td>
+    <td class="frmText11"><input name="sync_interval_minutes" type="text" class="text" value="{tmpl_var name='sync_interval_minutes'}" size="15" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='db_type_txt'}:</td>
+    <td class="frmText11">
+		<select name="db_type" class="text">
+			{tmpl_var name='db_type'}
+		</select>
+	</td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='db_host_txt'}:</td>
+    <td class="frmText11"><input name="db_host" type="text" class="text" value="{tmpl_var name='db_host'}" size="30" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='db_name_txt'}:</td>
+    <td class="frmText11"><input name="db_name" type="text" class="text" value="{tmpl_var name='db_name'}" size="30" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='db_username_txt'}:</td>
+    <td class="frmText11"><input name="db_username" type="text" class="text" value="{tmpl_var name='db_username'}" size="30" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='db_password_txt'}:</td>
+    <td class="frmText11"><input name="db_password" type="password" class="text" value="{tmpl_var name='db_password'}" size="30" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='db_tables_txt'}:</td>
+    <td class="frmText11">{tmpl_var name='db_tables'}</td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='empty_datalog_txt'}:</td>
+    <td class="frmText11">{tmpl_var name='empty_datalog'}</td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='sync_datalog_external_txt'}:</td>
+    <td class="frmText11">{tmpl_var name='sync_datalog_external'}</td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='active_txt'}:</td>
+    <td class="frmText11">{tmpl_var name='active'}</td>
+  </tr>  <tr>
+    <td class="frmText11">&nbsp;</td>
+    <td class="frmText11">&nbsp;</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/dbsync_edit.php');"><div class="buttonEnding"></div>&nbsp;
+      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/dbsync_list.php');"><div class="buttonEnding"></div>
+    </td>
+  </tr>
+</table>
+<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
diff --git a/interface/web/admin/templates/dbsync_list.htm b/interface/web/admin/templates/dbsync_list.htm
new file mode 100644
index 0000000000..48a1de910b
--- /dev/null
+++ b/interface/web/admin/templates/dbsync_list.htm
@@ -0,0 +1,28 @@
+<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
+<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('admin/dbsync_edit.php');" /><div class="buttonEnding"></div><br /><br />
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
+  <tr>
+    <td class="tblHead"><tmpl_var name="jobname_txt"></td>
+    <td class="tblHead"><tmpl_var name="db_host_txt"></td>
+    <td class="tblHead"><tmpl_var name="db_name_txt"></td>
+    <td class="tblHead">&nbsp;</td>
+  </tr>
+  <tr>
+    <td class="frmText11"><input type="text" name="search_jobname" value="{tmpl_var name='search_jobname'}" class="text" /></td>
+    <td class="frmText11"><input type="text" name="search_db_host" value="{tmpl_var name='search_db_host'}" class="text" /></td>
+    <td class="frmText11"><input type="text" name="search_db_name" value="{tmpl_var name='search_db_name'}" class="text" /></td>
+    <td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','admin/dbsync_list.php');"><div class="buttonEnding"></div></td>
+  </tr>
+  <tmpl_loop name="records">
+  <tr bgcolor="{tmpl_var name="bgcolor"}">
+    <td class="frmText11"><a href="#" onClick="loadContent('admin/dbsync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="jobname"}</a></td>
+    <td class="frmText11"><a href="#" onClick="loadContent('admin/dbsync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="db_host"}</a></td>
+    <td class="frmText11"><a href="#" onClick="loadContent('admin/dbsync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="db_name"}</a></td>
+    <td class="frmText11" align="right"><a href="javascript: del_record('admin/dbsync_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/list_icon_delete.png" alt="{tmpl_var name='delete_txt'}" border="0" /></a></td>
+  </tr>
+  </tmpl_loop>
+
+  <tr>
+  	<td colspan="4" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/interface/web/admin/templates/filesync_edit.htm b/interface/web/admin/templates/filesync_edit.htm
new file mode 100644
index 0000000000..192abfc6b5
--- /dev/null
+++ b/interface/web/admin/templates/filesync_edit.htm
@@ -0,0 +1,48 @@
+<table width="500" border="0" cellspacing="0" cellpadding="2">
+  <tr>
+    <td class="frmText11">{tmpl_var name='jobname_txt'}:</td>
+    <td class="frmText11"><input name="jobname" type="text" class="text" value="{tmpl_var name='jobname'}" size="15" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='sync_interval_minutes_txt'}:</td>
+    <td class="frmText11"><input name="sync_interval_minutes" type="text" class="text" value="{tmpl_var name='sync_interval_minutes'}" size="15" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='ftp_host_txt'}:</td>
+    <td class="frmText11"><input name="ftp_host" type="text" class="text" value="{tmpl_var name='ftp_host'}" size="30" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='ftp_path_txt'}:</td>
+    <td class="frmText11"><input name="ftp_path" type="text" class="text" value="{tmpl_var name='ftp_path'}" size="30" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='ftp_username_txt'}:</td>
+    <td class="frmText11"><input name="ftp_username" type="text" class="text" value="{tmpl_var name='ftp_username'}" size="30" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='ftp_password_txt'}:</td>
+    <td class="frmText11"><input name="ftp_password" type="text" class="text" value="{tmpl_var name='ftp_password'}" size="30" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='local_path_txt'}:</td>
+    <td class="frmText11"><input name="local_path" type="text" class="text" value="{tmpl_var name='local_path'}" size="30" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='wput_options_txt'}:</td>
+    <td class="frmText11"><input name="wput_options" type="text" class="text" value="{tmpl_var name='wput_options'}" size="30" maxlength="255"></td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='active_txt'}:</td>
+    <td class="frmText11">{tmpl_var name='active'}</td>
+  </tr>  <tr>
+    <td class="frmText11">&nbsp;</td>
+    <td class="frmText11">&nbsp;</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/filesync_edit.php');"><div class="buttonEnding"></div>&nbsp;
+      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/filesync_list.php');"><div class="buttonEnding"></div>
+    </td>
+  </tr>
+</table>
+<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
diff --git a/interface/web/admin/templates/filesync_list.htm b/interface/web/admin/templates/filesync_list.htm
new file mode 100644
index 0000000000..73c309c824
--- /dev/null
+++ b/interface/web/admin/templates/filesync_list.htm
@@ -0,0 +1,28 @@
+<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
+<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('admin/filesync_edit.php');" /><div class="buttonEnding"></div><br /><br />
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
+  <tr>
+    <td class="tblHead"><tmpl_var name="jobname_txt"></td>
+    <td class="tblHead"><tmpl_var name="ftp_host_txt"></td>
+    <td class="tblHead"><tmpl_var name="local_path_txt"></td>
+    <td class="tblHead">&nbsp;</td>
+  </tr>
+  <tr>
+    <td class="frmText11"><input type="text" name="search_jobname" value="{tmpl_var name='search_jobname'}" class="text" /></td>
+    <td class="frmText11"><input type="text" name="search_ftp_host" value="{tmpl_var name='search_ftp_host'}" class="text" /></td>
+    <td class="frmText11"><input type="text" name="search_local_path" value="{tmpl_var name='search_local_path'}" class="text" /></td>
+    <td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','admin/filesync_list.php');"><div class="buttonEnding"></div></td>
+  </tr>
+  <tmpl_loop name="records">
+  <tr bgcolor="{tmpl_var name="bgcolor"}">
+    <td class="frmText11"><a href="#" onClick="loadContent('admin/filesync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="jobname"}</a></td>
+    <td class="frmText11"><a href="#" onClick="loadContent('admin/filesync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="ftp_host"}</a></td>
+    <td class="frmText11"><a href="#" onClick="loadContent('admin/filesync_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="local_path"}</a></td>
+    <td class="frmText11" align="right">[<a href="javascript: del_record('admin/filesync_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+  </tr>
+  </tmpl_loop>
+
+  <tr>
+  	<td colspan="4" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/interface/web/admin/templates/firewall_edit.htm b/interface/web/admin/templates/firewall_edit.htm
new file mode 100644
index 0000000000..151d24a56a
--- /dev/null
+++ b/interface/web/admin/templates/firewall_edit.htm
@@ -0,0 +1,33 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_firewall">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_firewall"><legend>Firewall</legend>
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="tcp_port" class="wf_preField">{tmpl_var name='tcp_port_txt'}</label>
+        <input type="text" id="tcp_port" name="tcp_port" value="{tmpl_var name='tcp_port'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="udp_port" class="wf_preField">{tmpl_var name='udp_port_txt'}</label>
+        <input type="text" id="udp_port" name="udp_port" value="{tmpl_var name='udp_port'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/firewall_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/firewall_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/firewall_list.htm b/interface/web/admin/templates/firewall_list.htm
new file mode 100644
index 0000000000..f8e28a5a8d
--- /dev/null
+++ b/interface/web/admin/templates/firewall_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_firewall">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/firewall_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_tcp_port" scope="col"><tmpl_var name="tcp_port_txt"></th>
+            <th class="tbl_col_udp_port" scope="col"><tmpl_var name="udp_port_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','admin/firewall_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','admin/firewall_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_tcp_port"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
+            <td class="tbl_col_udp_port"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/firewall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_tcp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tcp_port"}</a></td>
+            <td class="tbl_col_udp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="udp_port"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('admin/firewall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/admin/templates/groups_edit.htm b/interface/web/admin/templates/groups_edit.htm
new file mode 100644
index 0000000000..4ada31d331
--- /dev/null
+++ b/interface/web/admin/templates/groups_edit.htm
@@ -0,0 +1,25 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_groups">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_groups"><legend>Groups</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="description" class="wf_preField">{tmpl_var name='description_txt'}</label>
+        <textarea id="description" name="description" cols='30' rows='5'>{tmpl_var name='description'}</textarea>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/groups_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/groups_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/groups_list.htm b/interface/web/admin/templates/groups_list.htm
new file mode 100644
index 0000000000..f942c0dd0d
--- /dev/null
+++ b/interface/web/admin/templates/groups_list.htm
@@ -0,0 +1,53 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_groups">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/groups_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+            <th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+            <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/groups_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_name"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+            <td class="tbl_col_description"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/admin/templates/language_add.htm b/interface/web/admin/templates/language_add.htm
new file mode 100644
index 0000000000..a448d933f2
--- /dev/null
+++ b/interface/web/admin/templates/language_add.htm
@@ -0,0 +1,32 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_language_add">
+
+  <tmpl_if name="msg">
+  <div class="box box_msg"><tmpl_var name="msg"></div>
+  </tmpl_if>
+  <tmpl_if name="error">
+  <div class="box box_error"><tmpl_var name="error"></div>
+  </tmpl_if>
+    
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_language_add"><legend>Language Add</legend>
+      <span class="wf_oneField">
+        <span class="wf_oneField">
+          <label for="lng_select" class="wf_preField">{tmpl_var name='language_select_txt'}</label>
+          <select name="lng_select" id="lng_select">{tmpl_var name='language_option'}</select>
+        </span>      
+        <span class="wf_oneField">
+          <label for="lng_new" class="wf_preField">{tmpl_var name='language_new_txt'}</label>
+          <input type="text" id="lng_new" name="lng_new" value="" size="2" maxlength="2">
+        </span>       
+      </span>
+    </fieldset>
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_add.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/language_complete.htm b/interface/web/admin/templates/language_complete.htm
new file mode 100644
index 0000000000..fd1b5b911b
--- /dev/null
+++ b/interface/web/admin/templates/language_complete.htm
@@ -0,0 +1,26 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_language_complete">
+
+  <tmpl_if name="msg">
+  <div class="box box_msg"><tmpl_var name="msg"></div>
+  </tmpl_if>
+  <tmpl_if name="error">
+  <div class="box box_error"><tmpl_var name="error"></div>
+  </tmpl_if>
+  
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_language_complete"><legend>Language Complete</legend>
+      <span class="wf_oneField">
+        <label for="lng_select" class="wf_preField">{tmpl_var name='language_select_txt'}</label>
+        <select name="lng_select" id="lng_select">{tmpl_var name='language_option'}</select>
+      </span>
+    </fieldset>
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_complete.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/language_edit.htm b/interface/web/admin/templates/language_edit.htm
new file mode 100644
index 0000000000..9ff10c453f
--- /dev/null
+++ b/interface/web/admin/templates/language_edit.htm
@@ -0,0 +1,31 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_language_edit">
+  
+  <tmpl_if name="msg">
+  <div class="box box_msg"><tmpl_var name="msg"></div>
+  </tmpl_if>
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_language_edit"><legend>Language Edit</legend>
+      <span class="wf_oneField">
+        <tmpl_loop name="records">
+        <span class="wf_oneField">
+          <label for="records[{tmpl_var name="key"}]" class="wf_preField">{tmpl_var name="key"}</label>
+          <input type="text" id="records[{tmpl_var name="key"}]" name="records[{tmpl_var name="key"}]" value="{tmpl_var name='val'}" size="50" maxlength="255">
+        </span> 
+        </tmpl_loop>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="lang" value="{tmpl_var name='lang'}">
+    <input type="hidden" name="lang_file" value="{tmpl_var name='lang_file'}">
+    <input type="hidden" name="module" value="{tmpl_var name='module'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php?lng_select={tmpl_var name='lang'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/language_export.htm b/interface/web/admin/templates/language_export.htm
new file mode 100644
index 0000000000..84077d6cb6
--- /dev/null
+++ b/interface/web/admin/templates/language_export.htm
@@ -0,0 +1,28 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_language_export">
+
+  <tmpl_if name="msg">
+  <div class="box box_msg"><tmpl_var name="msg"></div>
+  </tmpl_if>
+  <tmpl_if name="error">
+  <div class="box box_error"><tmpl_var name="error"></div>
+  </tmpl_if>
+    
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_language_export"><legend>Language Export</legend>
+      <span class="wf_oneField">
+        <span class="wf_oneField">
+          <label for="lng_select" class="wf_preField">{tmpl_var name='language_select_txt'}</label>
+          <select name="lng_select" id="lng_select">{tmpl_var name='language_option'}</select>
+        </span>
+      </span>
+    </fieldset>
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_export.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/language_import.htm b/interface/web/admin/templates/language_import.htm
new file mode 100644
index 0000000000..1043782c18
--- /dev/null
+++ b/interface/web/admin/templates/language_import.htm
@@ -0,0 +1,32 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_language_import">
+
+  <tmpl_if name="msg">
+  <div class="box box_msg"><tmpl_var name="msg"></div>
+  </tmpl_if>
+  <tmpl_if name="error">
+  <div class="box box_error"><tmpl_var name="error"></div>
+  </tmpl_if>
+    
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_language_import"><legend>Language Import</legend>
+      <span class="wf_oneField">
+        <label for="lng_select" class="wf_preField">{tmpl_var name='language_import_txt'}</label>
+        <input type="file" id="file" name="file">
+      </span>      
+      <span class="wf_oneField">
+        <label class="wf_preField" for="overwrite"><tmpl_var name="language_overwrite_txt"></label>                    
+        <span class="">
+          <input type="checkbox" checked="" value="1" name="overwrite" id="overwrite" />
+        </span>
+      </span>
+    </fieldset>
+    
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_import.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/language_list.htm b/interface/web/admin/templates/language_list.htm
new file mode 100644
index 0000000000..77338afe89
--- /dev/null
+++ b/interface/web/admin/templates/language_list.htm
@@ -0,0 +1,42 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_language_groups">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <span class="wf_oneField">
+          <label for="lng_select" class="wf_preField">{tmpl_var name='language_select_txt'}</label>
+          <select name="lng_select" id="lng_select" onChange="submitForm('pageForm','admin/language_list.php');">{tmpl_var name='language_option'}</select>
+        </span>
+      </div>
+    </fieldset>
+  </div>
+  
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_module" scope="col"><tmpl_var name="module_txt"></th>
+            <th class="tbl_col_lang_file" scope="col"><tmpl_var name="lang_file_txt"></th>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_module"><a href="#" onClick="loadContent('admin/language_edit.php?module={tmpl_var name="module"}&lang_file={tmpl_var name="lang_file"}&lang={tmpl_var name="lang"}');">{tmpl_var name="module"}</a></td>
+            <td class="tbl_col_lang_file"><a href="#" onClick="loadContent('admin/language_edit.php?module={tmpl_var name="module"}&lang_file={tmpl_var name="lang_file"}&lang={tmpl_var name="lang"}');">{tmpl_var name="lang_file"}</a></td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/server_config_fastcgi_edit.htm b/interface/web/admin/templates/server_config_fastcgi_edit.htm
new file mode 100644
index 0000000000..af20a8873d
--- /dev/null
+++ b/interface/web/admin/templates/server_config_fastcgi_edit.htm
@@ -0,0 +1,45 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_server_config">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_server_config"><legend>FastCGI</legend>
+      <span class="wf_oneField">
+        <label for="fastcgi_starter_path" class="wf_preField">{tmpl_var name='fastcgi_starter_path_txt'}</label>
+        <input type="text" id="fastcgi_starter_path" name="fastcgi_starter_path" value="{tmpl_var name='fastcgi_starter_path'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="fastcgi_starter_script" class="wf_preField">{tmpl_var name='fastcgi_starter_script_txt'}</label>
+        <input type="text" id="fastcgi_starter_script" name="fastcgi_starter_script" value="{tmpl_var name='fastcgi_starter_script'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="fastcgi_alias" class="wf_preField">{tmpl_var name='fastcgi_alias_txt'}</label>
+        <input type="text" id="fastcgi_alias" name="fastcgi_alias" value="{tmpl_var name='fastcgi_alias'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="fastcgi_phpini_path" class="wf_preField">{tmpl_var name='fastcgi_phpini_path_txt'}</label>
+        <input type="text" id="fastcgi_phpini_path" name="fastcgi_phpini_path" value="{tmpl_var name='fastcgi_phpini_path'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="fastcgi_children" class="wf_preField">{tmpl_var name='fastcgi_children_txt'}</label>
+        <input type="text" id="fastcgi_children" name="fastcgi_children" value="{tmpl_var name='fastcgi_children'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="fastcgi_max_requests" class="wf_preField">{tmpl_var name='fastcgi_max_requests_txt'}</label>
+        <input type="text" id="fastcgi_max_requests" name="fastcgi_max_requests" value="{tmpl_var name='fastcgi_max_requests'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="fastcgi_bin" class="wf_preField">{tmpl_var name='fastcgi_bin_txt'}</label>
+        <input type="text" id="fastcgi_bin" name="fastcgi_bin" value="{tmpl_var name='fastcgi_bin'}" size="40" maxlength="255">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/server_config_getmail_edit.htm b/interface/web/admin/templates/server_config_getmail_edit.htm
new file mode 100644
index 0000000000..e8f93aa14d
--- /dev/null
+++ b/interface/web/admin/templates/server_config_getmail_edit.htm
@@ -0,0 +1,21 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_server_config">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_server_config"><legend>Getmail</legend>
+      <span class="wf_oneField">
+        <label for="getmail_config_dir" class="wf_preField">{tmpl_var name='getmail_config_dir_txt'}</label>
+        <input type="text" id="getmail_config_dir" name="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" size="40" maxlength="255">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/server_config_jailkit_edit.htm b/interface/web/admin/templates/server_config_jailkit_edit.htm
new file mode 100644
index 0000000000..ddd8540d00
--- /dev/null
+++ b/interface/web/admin/templates/server_config_jailkit_edit.htm
@@ -0,0 +1,29 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_server_config">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_server_config"><legend>Jailkit</legend>
+      <span class="wf_oneField">
+        <label for="jailkit_chroot_home" class="wf_preField">{tmpl_var name='jailkit_chroot_home_txt'}</label>
+        <input type="text" id="jailkit_chroot_home" name="jailkit_chroot_home" value="{tmpl_var name='jailkit_chroot_home'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="jailkit_chroot_app_sections" class="wf_preField">{tmpl_var name='jailkit_chroot_app_sections_txt'}</label>
+        <input type="text" id="jailkit_chroot_app_sections" name="jailkit_chroot_app_sections" value="{tmpl_var name='jailkit_chroot_app_sections'}" size="40" maxlength="1000">
+      </span>
+      <span class="wf_oneField">
+        <label for="jailkit_chroot_app_programs" class="wf_preField">{tmpl_var name='jailkit_chroot_app_programs_txt'}</label>
+        <input type="text" id="jailkit_chroot_app_programs" name="jailkit_chroot_app_programs" value="{tmpl_var name='jailkit_chroot_app_programs'}" size="40" maxlength="1000">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/server_config_list.htm b/interface/web/admin/templates/server_config_list.htm
new file mode 100644
index 0000000000..c03fcdbad9
--- /dev/null
+++ b/interface/web/admin/templates/server_config_list.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_server_config">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_config_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_server_name"><a href="#" onClick="loadContent('admin/server_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('admin/server_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
new file mode 100644
index 0000000000..7b7b682551
--- /dev/null
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -0,0 +1,65 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_server_config">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_server_config"><legend>Mail</legend>
+      <span class="wf_oneField">
+        <label for="module" class="wf_preField">{tmpl_var name='module_txt'}</label>
+        <select id="module" name="module">{tmpl_var name='module'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="maildir_path" class="wf_preField">{tmpl_var name='maildir_path_txt'}</label>
+        <input type="text" id="maildir_path" name="maildir_path" value="{tmpl_var name='maildir_path'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="homedir_path" class="wf_preField">{tmpl_var name='homedir_path_txt'}</label>
+        <input type="text" id="homedir_path" name="homedir_path" value="{tmpl_var name='homedir_path'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="mailuser_uid" class="wf_preField">{tmpl_var name='mailuser_uid_txt'}</label>
+        <input type="text" id="mailuser_uid" name="mailuser_uid" value="{tmpl_var name='mailuser_uid'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="mailuser_gid" class="wf_preField">{tmpl_var name='mailuser_gid_txt'}</label>
+        <input type="text" id="mailuser_gid" name="mailuser_gid" value="{tmpl_var name='mailuser_gid'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="mailuser_name" class="wf_preField">{tmpl_var name='mailuser_name_txt'}</label>
+        <input type="text" id="mailuser_name" name="mailuser_name" value="{tmpl_var name='mailuser_name'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="mailuser_group" class="wf_preField">{tmpl_var name='mailuser_group_txt'}</label>
+        <input type="text" id="mailuser_group" name="mailuser_group" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="relayhost" class="wf_preField">{tmpl_var name='relayhost_txt'}</label>
+        <input type="text" id="relayhost" name="relayhost" value="{tmpl_var name='relayhost'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="relayhost_user" class="wf_preField">{tmpl_var name='relayhost_user_txt'}</label>
+        <input type="text" id="relayhost_user" name="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="relayhost_password" class="wf_preField">{tmpl_var name='relayhost_password_txt'}</label>
+        <input type="text" id="relayhost_password" name="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="mailbox_size_limit" class="wf_preField">{tmpl_var name='mailbox_size_limit_txt'}</label>
+        <input type="text" id="mailbox_size_limit" name="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}" size="10" maxlength="15">
+      </span>
+      <span class="wf_oneField">
+        <label for="message_size_limit" class="wf_preField">{tmpl_var name='message_size_limit_txt'}</label>
+        <input type="text" id="message_size_limit" name="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
new file mode 100644
index 0000000000..07e93c2262
--- /dev/null
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -0,0 +1,41 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_server_config">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_server_config"><legend>Server</legend>
+      <span class="wf_oneField">
+        <label for="auto_network_configuration" class="wf_preField">{tmpl_var name='auto_network_configuration_txt'}</label>                    
+        <span class="">{tmpl_var name='auto_network_configuration'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
+        <input type="text" id="ip_address" name="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="netmask" class="wf_preField">{tmpl_var name='netmask_txt'}</label>
+        <input type="text" id="netmask" name="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="gateway" class="wf_preField">{tmpl_var name='gateway_txt'}</label>
+        <input type="text" id="gateway" name="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="hostname" class="wf_preField">{tmpl_var name='hostname_txt'}</label>
+        <input type="text" id="hostname" name="hostname" value="{tmpl_var name='hostname'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="nameservers" class="wf_preField">{tmpl_var name='nameservers_txt'}</label>
+        <input type="text" id="nameservers" name="nameservers" value="{tmpl_var name='nameservers'}" size="40" maxlength="255">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
new file mode 100644
index 0000000000..21bee81588
--- /dev/null
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -0,0 +1,33 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_server_config">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_server_config"><legend>Web</legend>
+      <span class="wf_oneField">
+        <label for="website_path" class="wf_preField">{tmpl_var name='website_path_txt'}</label>
+        <input type="text" id="website_path" name="website_path" value="{tmpl_var name='website_path'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="website_symlinks" class="wf_preField">{tmpl_var name='website_symlinks_txt'}</label>
+        <input type="text" id="website_symlinks" name="website_symlinks" value="{tmpl_var name='website_symlinks'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="vhost_conf_dir" class="wf_preField">{tmpl_var name='vhost_conf_dir_txt'}</label>
+        <input type="text" id="vhost_conf_dir" name="vhost_conf_dir" value="{tmpl_var name='vhost_conf_dir'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="vhost_conf_enabled_dir" class="wf_preField">{tmpl_var name='vhost_conf_enabled_dir_txt'}</label>
+        <input type="text" id="vhost_conf_enabled_dir" name="vhost_conf_enabled_dir" value="{tmpl_var name='vhost_conf_enabled_dir'}" size="40" maxlength="255">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/server_edit_config.htm b/interface/web/admin/templates/server_edit_config.htm
new file mode 100644
index 0000000000..be914febf1
--- /dev/null
+++ b/interface/web/admin/templates/server_edit_config.htm
@@ -0,0 +1,21 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_server">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_server"><legend>Config</legend>
+      <span class="wf_oneField">
+        <label for="config" class="wf_preField">{tmpl_var name='config_txt'}</label>
+        <textarea id="config" name="config" cols='40' rows='20'>{tmpl_var name='config'}</textarea>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/server_edit_services.htm b/interface/web/admin/templates/server_edit_services.htm
new file mode 100644
index 0000000000..d67288cbef
--- /dev/null
+++ b/interface/web/admin/templates/server_edit_services.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_server">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_server"><legend>Services</legend>
+      <span class="wf_oneField">
+        <label for="server_name" class="wf_preField">{tmpl_var name='server_name_txt'}</label>
+        <input type="text" id="server_name" name="server_name" value="{tmpl_var name='server_name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="mail_server" class="wf_preField">{tmpl_var name='mail_server_txt'}</label>                    
+        <span class="">{tmpl_var name='mail_server'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="web_server" class="wf_preField">{tmpl_var name='web_server_txt'}</label>                    
+        <span class="">{tmpl_var name='web_server'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="dns_server" class="wf_preField">{tmpl_var name='dns_server_txt'}</label>                    
+        <span class="">{tmpl_var name='dns_server'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="file_server" class="wf_preField">{tmpl_var name='file_server_txt'}</label>                    
+        <span class="">{tmpl_var name='file_server'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="db_server" class="wf_preField">{tmpl_var name='db_server_txt'}</label>                    
+        <span class="">{tmpl_var name='db_server'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="vserver_server" class="wf_preField">{tmpl_var name='vserver_server_txt'}</label>                    
+        <span class="">{tmpl_var name='vserver_server'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+        <select id="active" name="active">{tmpl_var name='active'}</select>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/server_ip_edit.htm b/interface/web/admin/templates/server_ip_edit.htm
new file mode 100644
index 0000000000..89c0b785c6
--- /dev/null
+++ b/interface/web/admin/templates/server_ip_edit.htm
@@ -0,0 +1,29 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_server_ip">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_server_ip"><legend>IP Address</legend>
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
+        <input type="text" id="ip_address" name="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="15">
+      </span>
+      <span class="wf_oneField">
+        <label for="virtualhost" class="wf_preField">{tmpl_var name='virtualhost_txt'}</label>                    
+        <span class="">{tmpl_var name='virtualhost'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_ip_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_ip_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm
new file mode 100644
index 0000000000..7f9f069c27
--- /dev/null
+++ b/interface/web/admin/templates/server_ip_list.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_server_ip">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_ip_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','admin/server_ip_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('admin/server_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm
new file mode 100644
index 0000000000..94e7e4f198
--- /dev/null
+++ b/interface/web/admin/templates/server_list.htm
@@ -0,0 +1,67 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_server">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
+            <th class="tbl_col_mail_server" scope="col"><tmpl_var name="mail_server_txt"></th>
+            <th class="tbl_col_web_server" scope="col"><tmpl_var name="web_server_txt"></th>
+            <th class="tbl_col_dns_server" scope="col"><tmpl_var name="dns_server_txt"></th>
+            <th class="tbl_col_file_server" scope="col"><tmpl_var name="file_server_txt"></th>
+            <th class="tbl_col_db_server" scope="col"><tmpl_var name="db_server_txt"></th>
+            <th class="tbl_col_vserver_server" scope="col"><tmpl_var name="vserver_server_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+            <td class="tbl_col_mail_server"><input type="text" name="search_mail_server" value="{tmpl_var name='search_mail_server'}" /></td>
+            <td class="tbl_col_web_server"><input type="text" name="search_web_server" value="{tmpl_var name='search_web_server'}" /></td>
+            <td class="tbl_col_dns_server"><input type="text" name="search_dns_server" value="{tmpl_var name='search_dns_server'}" /></td>
+            <td class="tbl_col_file_server"><input type="text" name="search_file_server" value="{tmpl_var name='search_file_server'}" /></td>
+            <td class="tbl_col_db_server"><input type="text" name="search_db_server" value="{tmpl_var name='search_db_server'}" /></td>
+            <td class="tbl_col_vserver_server"><input type="text" name="search_vserver_server" value="{tmpl_var name='search_vserver_server'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_server_name"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
+            <td class="tbl_col_mail_server"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mail_server"}</a></td>
+            <td class="tbl_col_web_server"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="web_server"}</a></td>
+            <td class="tbl_col_dns_server"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="dns_server"}</a></td>
+            <td class="tbl_col_file_server"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="file_server"}</a></td>
+            <td class="tbl_col_db_server"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="db_server"}</a></td>
+            <td class="tbl_col_vserver_server"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="vserver_server"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('admin/server_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm
new file mode 100644
index 0000000000..83a55c9189
--- /dev/null
+++ b/interface/web/admin/templates/software_package_list.htm
@@ -0,0 +1,33 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_package">
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
+            <th class="tbl_col_package_title" scope="col"><tmpl_var name="package_title_txt"></th>
+            <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_description_txt"></th>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_installed">{tmpl_var name="installed"}</td>
+            <td class="tbl_col_package_title">{tmpl_var name="package_title"}</td>
+            <td class="tbl_col_package_description">{tmpl_var name="package_description"}</td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="3"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/software_repo_edit.htm b/interface/web/admin/templates/software_repo_edit.htm
new file mode 100644
index 0000000000..db6f38e884
--- /dev/null
+++ b/interface/web/admin/templates/software_repo_edit.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_software_repo">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_software_repo"><legend>Repository</legend>
+      <span class="wf_oneField">
+        <label for="repo_name" class="wf_preField">{tmpl_var name='repo_name_txt'}</label>
+        <input type="text" id="repo_name" name="repo_name" value="{tmpl_var name='repo_name'}" size="40" maxlength="40">
+      </span>
+      <span class="wf_oneField">
+        <label for="repo_url" class="wf_preField">{tmpl_var name='repo_url_txt'}</label>
+        <input type="text" id="repo_url" name="repo_url" value="{tmpl_var name='repo_url'}" size="40" maxlength="40">
+      </span>
+      <span class="wf_oneField">
+        <label for="repo_username" class="wf_preField">{tmpl_var name='repo_username_txt'}</label>
+        <input type="text" id="repo_username" name="repo_username" value="{tmpl_var name='repo_username'}" size="30" maxlength="30">
+      </span>
+      <span class="wf_oneField">
+        <label for="repo_password" class="wf_preField">{tmpl_var name='repo_password_txt'}</label>
+        <input type="password" id="repo_password" name="repo_password" value="{tmpl_var name='repo_password'}" size="30" maxlength="30">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/software_repo_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/software_repo_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/software_repo_list.htm b/interface/web/admin/templates/software_repo_list.htm
new file mode 100644
index 0000000000..bebdfb5834
--- /dev/null
+++ b/interface/web/admin/templates/software_repo_list.htm
@@ -0,0 +1,55 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_software_repo">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/software_repo_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_repo_name" scope="col"><tmpl_var name="repo_name_txt"></th>
+            <th class="tbl_col_repo_url" scope="col"><tmpl_var name="repo_url_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','admin/software_repo_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_repo_name"><input type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></td>
+            <td class="tbl_col_repo_url"><input type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/software_repo_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_repo_name"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_name"}</a></td>
+            <td class="tbl_col_repo_url"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_url"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('admin/software_repo_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/admin/templates/software_update_list.htm b/interface/web/admin/templates/software_update_list.htm
new file mode 100644
index 0000000000..219e8b6d4b
--- /dev/null
+++ b/interface/web/admin/templates/software_update_list.htm
@@ -0,0 +1,48 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_software_update">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <span class="wf_oneField">
+          <label for="server_id" class="wf_preField">{tmpl_var name='server_select_txt'}</label>
+          <select name="server_id" id="server_id" onChange="submitForm('pageForm','admin/software_update_list.php');">
+          <tmpl_loop name="servers">
+            <option value="{tmpl_var name='server_id'}" {tmpl_var name='selected'}>{tmpl_var name='server_name'}</option>
+          </tmpl_loop>
+          </select>
+        </span>
+      </div>
+    </fieldset>
+  </div>
+  
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
+            <th class="tbl_col_update_title" scope="col"><tmpl_var name="update_title_txt"></th>
+            <th class="tbl_col_version" scope="col"><tmpl_var name="version_txt"></th>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_installed">{tmpl_var name="installed"}</td>
+            <td class="tbl_col_update_title">{tmpl_var name="update_title"}</td>
+            <td class="tbl_col_version">{tmpl_var name="version"}</td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="3"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/users_groups_edit.htm b/interface/web/admin/templates/users_groups_edit.htm
new file mode 100644
index 0000000000..cc98bb8a72
--- /dev/null
+++ b/interface/web/admin/templates/users_groups_edit.htm
@@ -0,0 +1,25 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_users">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_users"><legend>Groups</legend>
+      <span class="wf_oneField">
+        <label for="default_group" class="wf_preField">{tmpl_var name='default_group_txt'}</label>
+        <select id="default_group" name="default_group">{tmpl_var name='default_group'}</select>
+      </span>
+      <span class="wf_oneField">
+        <span class="wf_label wf_preField">{tmpl_var name='groups_txt'}</span>                    
+        <fieldset>{tmpl_var name='groups'}</fieldset>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm
new file mode 100644
index 0000000000..b222cb6102
--- /dev/null
+++ b/interface/web/admin/templates/users_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_users">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/users_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+            <th class="tbl_col_vorname" scope="col"><tmpl_var name="vorname_txt"></th>
+            <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+            <th class="tbl_col_ort" scope="col"><tmpl_var name="ort_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+            <td class="tbl_col_vorname"><input type="text" name="search_vorname" value="{tmpl_var name='search_vorname'}" /></td>
+            <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+            <td class="tbl_col_ort"><input type="text" name="search_ort" value="{tmpl_var name='search_ort'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_username"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+            <td class="tbl_col_vorname"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="vorname"}</a></td>
+            <td class="tbl_col_name"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+            <td class="tbl_col_ort"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ort"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('admin/users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
new file mode 100644
index 0000000000..b02af601d8
--- /dev/null
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -0,0 +1,48 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_users">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_users"><legend>Users</legend>
+      <span class="wf_oneField">
+        <label for="username" class="wf_preField">{tmpl_var name='username_txt'}</label>
+        <input type="text" id="username" name="username" value="{tmpl_var name='username'}" size="15" maxlength="30">
+      </span>
+      <span class="wf_oneField">
+        <label for="passwort" class="wf_preField">{tmpl_var name='passwort_txt'}</label>
+        <input type="password" id="passwort" name="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100">
+      </span>
+      <span class="wf_oneField">
+        <span class="wf_label wf_preField">{tmpl_var name='modules_txt'}</span>                    
+        <fieldset>{tmpl_var name='modules'}</fieldset>
+      </span>
+      <span class="wf_oneField">
+        <label for="startmodule" class="wf_preField">{tmpl_var name='startmodule_txt'}</label>
+        <select id="startmodule" name="startmodule">{tmpl_var name='startmodule'}</select>
+      </span>      
+      <span class="wf_oneField">
+        <span class="wf_label wf_preField">{tmpl_var name='app_theme_txt'}</span>                    
+        <fieldset>{tmpl_var name='app_theme'}</fieldset>
+      </span>      <span class="wf_oneField">
+        <span class="wf_label wf_preField">{tmpl_var name='typ_txt'}</span>                    
+        <fieldset>{tmpl_var name='typ'}</fieldset>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="language" class="wf_preField">{tmpl_var name='language_txt'}</label>
+        <select id="language" name="language">{tmpl_var name='language'}</select>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
new file mode 100644
index 0000000000..a87e0ce7f2
--- /dev/null
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -0,0 +1,89 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_client">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_client"><legend>Address</legend>
+      <span class="wf_oneField">
+        <label for="company_name" class="wf_preField">{tmpl_var name='company_name_txt'}</label>
+        <input type="text" id="company_name" name="company_name" value="{tmpl_var name='company_name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="contact_name" class="wf_preField">{tmpl_var name='contact_name_txt'}</label>
+        <input type="text" id="contact_name" name="contact_name" value="{tmpl_var name='contact_name'}" size="30" maxlength="255" class="wf_required"><span class="wf_reqMark">*</span><br>
+      </span>
+      <span class="wf_oneField">
+        <label for="username" class="wf_preField">{tmpl_var name='username_txt'}</label>
+        <input type="text" id="username" name="username" value="{tmpl_var name='username'}" size="30" maxlength="255" class="wf_required"><span class="wf_reqMark">*</span><br>
+      </span>
+      <span class="wf_oneField">
+        <label for="password" class="wf_preField">{tmpl_var name='password_txt'}</label>
+        <input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255" class="wf_required"><span class="wf_reqMark">*</span><br>
+      </span>
+      <span class="wf_oneField">
+        <label for="language" class="wf_preField">{tmpl_var name='language_txt'}</label>
+        <select id="language" name="language">{tmpl_var name='language'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="usertheme" class="wf_preField">{tmpl_var name='usertheme_txt'}</label>
+        <select id="usertheme" name="usertheme">{tmpl_var name='usertheme'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="street" class="wf_preField">{tmpl_var name='street_txt'}</label>
+        <input type="text" id="street" name="street" value="{tmpl_var name='street'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="zip" class="wf_preField">{tmpl_var name='zip_txt'}</label>
+        <input type="text" id="zip" name="zip" value="{tmpl_var name='zip'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="city" class="wf_preField">{tmpl_var name='city_txt'}</label>
+        <input type="text" id="city" name="city" value="{tmpl_var name='city'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="state" class="wf_preField">{tmpl_var name='state_txt'}</label>
+        <input type="text" id="state" name="state" value="{tmpl_var name='state'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="country" class="wf_preField">{tmpl_var name='country_txt'}</label>
+        <input type="text" id="country" name="country" value="{tmpl_var name='country'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="telephone" class="wf_preField">{tmpl_var name='telephone_txt'}</label>
+        <input type="text" id="telephone" name="telephone" value="{tmpl_var name='telephone'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="mobile" class="wf_preField">{tmpl_var name='mobile_txt'}</label>
+        <input type="text" id="mobile" name="mobile" value="{tmpl_var name='mobile'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="fax" class="wf_preField">{tmpl_var name='fax_txt'}</label>
+        <input type="text" id="fax" name="fax" value="{tmpl_var name='fax'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="email" class="wf_preField">{tmpl_var name='email_txt'}</label>
+        <input type="text" id="email" name="email" value="{tmpl_var name='email'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="internet" class="wf_preField">{tmpl_var name='internet_txt'}</label>
+        <input type="text" id="internet" name="internet" value="{tmpl_var name='internet'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="icq" class="wf_preField">{tmpl_var name='icq_txt'}</label>
+        <input type="text" id="icq" name="icq" value="{tmpl_var name='icq'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="notes" class="wf_preField">{tmpl_var name='notes_txt'}</label>
+        <textarea id="notes" name="notes" cols='50' rows='10'>{tmpl_var name='notes'}</textarea>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
new file mode 100644
index 0000000000..360311bee9
--- /dev/null
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -0,0 +1,117 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_client">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_client"><legend>Limits</legend>
+      <span class="wf_oneField">
+        <label for="default_mailserver" class="wf_preField">{tmpl_var name='default_mailserver_txt'}</label>
+        <select id="default_mailserver" name="default_mailserver">{tmpl_var name='default_mailserver'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_maildomain" class="wf_preField">{tmpl_var name='limit_maildomain_txt'}</label>
+        <input type="text" id="limit_maildomain" name="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_mailbox" class="wf_preField">{tmpl_var name='limit_mailbox_txt'}</label>
+        <input type="text" id="limit_mailbox" name="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_mailalias" class="wf_preField">{tmpl_var name='limit_mailalias_txt'}</label>
+        <input type="text" id="limit_mailalias" name="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_mailforward" class="wf_preField">{tmpl_var name='limit_mailforward_txt'}</label>
+        <input type="text" id="limit_mailforward" name="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_mailcatchall" class="wf_preField">{tmpl_var name='limit_mailcatchall_txt'}</label>
+        <input type="text" id="limit_mailcatchall" name="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_mailrouting" class="wf_preField">{tmpl_var name='limit_mailrouting_txt'}</label>
+        <input type="text" id="limit_mailrouting" name="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_mailfilter" class="wf_preField">{tmpl_var name='limit_mailfilter_txt'}</label>
+        <input type="text" id="limit_mailfilter" name="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_fetchmail" class="wf_preField">{tmpl_var name='limit_fetchmail_txt'}</label>
+        <input type="text" id="limit_fetchmail" name="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_mailquota" class="wf_preField">{tmpl_var name='limit_mailquota_txt'}</label>
+        <input type="text" id="limit_mailquota" name="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_spamfilter_wblist" class="wf_preField">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
+        <input type="text" id="limit_spamfilter_wblist" name="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_spamfilter_user" class="wf_preField">{tmpl_var name='limit_spamfilter_user_txt'}</label>
+        <input type="text" id="limit_spamfilter_user" name="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_spamfilter_policy" class="wf_preField">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
+        <input type="text" id="limit_spamfilter_policy" name="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="default_webserver" class="wf_preField">{tmpl_var name='default_webserver_txt'}</label>
+        <select id="default_webserver" name="default_webserver">{tmpl_var name='default_webserver'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_web_domain" class="wf_preField">{tmpl_var name='limit_web_domain_txt'}</label>
+        <input type="text" id="limit_web_domain" name="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_web_aliasdomain" class="wf_preField">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
+        <input type="text" id="limit_web_aliasdomain" name="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_web_subdomain" class="wf_preField">{tmpl_var name='limit_web_subdomain_txt'}</label>
+        <input type="text" id="limit_web_subdomain" name="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_ftp_user" class="wf_preField">{tmpl_var name='limit_ftp_user_txt'}</label>
+        <input type="text" id="limit_ftp_user" name="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_shell_user" class="wf_preField">{tmpl_var name='limit_shell_user_txt'}</label>
+        <input type="text" id="limit_shell_user" name="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="default_dnsserver" class="wf_preField">{tmpl_var name='default_dnsserver_txt'}</label>
+        <select id="default_dnsserver" name="default_dnsserver">{tmpl_var name='default_dnsserver'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_dns_zone" class="wf_preField">{tmpl_var name='limit_dns_zone_txt'}</label>
+        <input type="text" id="limit_dns_zone" name="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_dns_record" class="wf_preField">{tmpl_var name='limit_dns_record_txt'}</label>
+        <input type="text" id="limit_dns_record" name="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_client" class="wf_preField">{tmpl_var name='limit_client_txt'}</label>
+        <input type="text" id="limit_client" name="limit_client" value="{tmpl_var name='limit_client'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="default_dbserver" class="wf_preField">{tmpl_var name='default_dbserver_txt'}</label>
+        <select id="default_dbserver" name="default_dbserver">{tmpl_var name='default_dbserver'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="limit_database" class="wf_preField">{tmpl_var name='limit_database_txt'}</label>
+        <input type="text" id="limit_database" name="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm
new file mode 100644
index 0000000000..5b96fe590c
--- /dev/null
+++ b/interface/web/client/templates/clients_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_clients">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
+            <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
+            <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
+            <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
+            <th class="tbl_col_country" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td>
+            <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td>
+            <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td>
+            <td class="tbl_col_country"><input type="text" name="search_country" value="{tmpl_var name='search_country'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_company_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td>
+            <td class="tbl_col_contact_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td>
+            <td class="tbl_col_city"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
+            <td class="tbl_col_country"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/dns/templates/dns_a_edit.htm b/interface/web/dns/templates/dns_a_edit.htm
new file mode 100644
index 0000000000..9b7968e1e4
--- /dev/null
+++ b/interface/web/dns/templates/dns_a_edit.htm
@@ -0,0 +1,35 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_a">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_a"><legend>DNS A</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm
new file mode 100644
index 0000000000..c93d33e2ae
--- /dev/null
+++ b/interface/web/dns/templates/dns_a_list.htm
@@ -0,0 +1,82 @@
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');">
+          <span>A</span>
+        </button>
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}');">
+          <span>ALIAS</span>
+        </button>
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}');">
+          <span>CNAME</span>
+        </button>
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}');">
+          <span>HINFO</span>
+        </button>
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}');">
+          <span>MX</span>
+        </button>
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}');">
+          <span>NS</span>
+        </button>
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');">
+          <span>PTR</span>
+        </button>
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');">
+          <span>RP</span>
+        </button>
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');">
+          <span>SRV</span>
+        </button>
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');">
+          <span>TXT</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
+            <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+            <th class="tbl_col_data" scope="col"><tmpl_var name="data_txt"></th>
+            <th class="tbl_col_aux" scope="col"><tmpl_var name="aux_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_type"><select name="search_server_id" onChange="submitForm('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_type'}</select></td>
+            <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+            <td class="tbl_col_data"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" /></td>
+            <td class="tbl_col_aux"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_type"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_name"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
+            <td class="tbl_col_data"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
+            <td class="tbl_col_aux"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_rr_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
diff --git a/interface/web/dns/templates/dns_alias_edit.htm b/interface/web/dns/templates/dns_alias_edit.htm
new file mode 100644
index 0000000000..e6b593c070
--- /dev/null
+++ b/interface/web/dns/templates/dns_alias_edit.htm
@@ -0,0 +1,35 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_alias">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_alias"><legend>DNS ALIAS</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_alias_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_cname_edit.htm b/interface/web/dns/templates/dns_cname_edit.htm
new file mode 100644
index 0000000000..f3436bad61
--- /dev/null
+++ b/interface/web/dns/templates/dns_cname_edit.htm
@@ -0,0 +1,35 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_cname">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_cname"><legend>DNS CNAME</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_cname_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_hinfo_edit.htm b/interface/web/dns/templates/dns_hinfo_edit.htm
new file mode 100644
index 0000000000..92de577dbf
--- /dev/null
+++ b/interface/web/dns/templates/dns_hinfo_edit.htm
@@ -0,0 +1,35 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_hinfo">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_hinfo"><legend>DNS HINFO</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_hinfo_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_mx_edit.htm b/interface/web/dns/templates/dns_mx_edit.htm
new file mode 100644
index 0000000000..ffc722531f
--- /dev/null
+++ b/interface/web/dns/templates/dns_mx_edit.htm
@@ -0,0 +1,39 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_mx">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_mx"><legend>DNS mx</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="aux" class="wf_preField">{tmpl_var name='aux_txt'}</label>
+        <input type="text" id="aux" name="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_mx_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_ns_edit.htm b/interface/web/dns/templates/dns_ns_edit.htm
new file mode 100644
index 0000000000..3f0e49e814
--- /dev/null
+++ b/interface/web/dns/templates/dns_ns_edit.htm
@@ -0,0 +1,35 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_ns">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_ns"><legend>DNS ns</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_ns_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_ptr_edit.htm b/interface/web/dns/templates/dns_ptr_edit.htm
new file mode 100644
index 0000000000..f31fa12cc3
--- /dev/null
+++ b/interface/web/dns/templates/dns_ptr_edit.htm
@@ -0,0 +1,35 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_ptr">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_ptr"><legend>DNS ptr</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_ptr_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_records_edit.htm b/interface/web/dns/templates/dns_records_edit.htm
new file mode 100644
index 0000000000..5a60043cb7
--- /dev/null
+++ b/interface/web/dns/templates/dns_records_edit.htm
@@ -0,0 +1,11 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_soa">
+
+  {tmpl_var name='dns_records'}
+    
+  <div class="pnl_formsarea">
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_rp_edit.htm b/interface/web/dns/templates/dns_rp_edit.htm
new file mode 100644
index 0000000000..5795aed925
--- /dev/null
+++ b/interface/web/dns/templates/dns_rp_edit.htm
@@ -0,0 +1,35 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_rp">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_rp"><legend>DNS RP</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_rp_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_soa_edit.htm b/interface/web/dns/templates/dns_soa_edit.htm
new file mode 100644
index 0000000000..e7048d9dac
--- /dev/null
+++ b/interface/web/dns/templates/dns_soa_edit.htm
@@ -0,0 +1,74 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_soa">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_soa"><legend>DNS Zone</legend>
+      <tmpl_if name="is_admin">
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
+        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+      </span>
+      </tmpl_if>
+      <tmpl_if name="is_reseller">
+      <span class="wf_oneField">
+        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
+        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+      </span>
+      </tmpl_if>
+      <span class="wf_oneField">
+        <label for="origin" class="wf_preField">{tmpl_var name='origin_txt'}</label>
+        <input type="text" id="origin" name="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ns" class="wf_preField">{tmpl_var name='ns_txt'}</label>
+        <input type="text" id="ns" name="ns" value="{tmpl_var name='ns'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="mbox" class="wf_preField">{tmpl_var name='mbox_txt'}</label>
+        <input type="text" id="mbox" name="mbox" value="{tmpl_var name='mbox'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="refresh" class="wf_preField">{tmpl_var name='refresh_txt'}</label>
+        <input type="text" id="refresh" name="refresh" value="{tmpl_var name='refresh'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="retry" class="wf_preField">{tmpl_var name='retry_txt'}</label>
+        <input type="text" id="retry" name="retry" value="{tmpl_var name='retry'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="expire" class="wf_preField">{tmpl_var name='expire_txt'}</label>
+        <input type="text" id="expire" name="expire" value="{tmpl_var name='expire'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="minimum" class="wf_preField">{tmpl_var name='minimum_txt'}</label>
+        <input type="text" id="minimum" name="minimum" value="{tmpl_var name='minimum'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="xfer" class="wf_preField">{tmpl_var name='xfer_txt'}</label>
+        <input type="text" id="xfer" name="xfer" value="{tmpl_var name='xfer'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input name="serial" type="hidden" value="{tmpl_var name='serial'}">
+  
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_soa_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm
new file mode 100644
index 0000000000..e7711fa7e5
--- /dev/null
+++ b/interface/web/dns/templates/dns_soa_list.htm
@@ -0,0 +1,61 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_dns_soa">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_soa_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
+            <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
+            <th class="tbl_col_mbox" scope="col"><tmpl_var name="mbox_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
+            <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
+            <td class="tbl_col_mbox"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_origin"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
+            <td class="tbl_col_ns"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
+            <td class="tbl_col_mbox"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/dns/templates/dns_srv_edit.htm b/interface/web/dns/templates/dns_srv_edit.htm
new file mode 100644
index 0000000000..40d71da0df
--- /dev/null
+++ b/interface/web/dns/templates/dns_srv_edit.htm
@@ -0,0 +1,35 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_srv">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_srv"><legend>DNS SRV</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_srv_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_txt_edit.htm b/interface/web/dns/templates/dns_txt_edit.htm
new file mode 100644
index 0000000000..5c36bf3fce
--- /dev/null
+++ b/interface/web/dns/templates/dns_txt_edit.htm
@@ -0,0 +1,35 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_txt">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_txt"><legend>DNS TXT</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_txt_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/help/templates/support_message_edit.htm b/interface/web/help/templates/support_message_edit.htm
new file mode 100644
index 0000000000..c222155421
--- /dev/null
+++ b/interface/web/help/templates/support_message_edit.htm
@@ -0,0 +1,32 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_support_message">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_support_message"><legend>Message</legend>
+      <tmpl_if name="is_admin">
+      <span class="wf_oneField">
+        <label for="recipient_id" class="wf_preField">{tmpl_var name='recipient_id_txt'}</label>
+        <select id="recipient_id" name="recipient_id">{tmpl_var name='recipient_id'}</select>
+      </span>
+      </tmpl_if>
+      <span class="wf_oneField">
+        <label for="subject" class="wf_preField">{tmpl_var name='subject_txt'}</label>
+        <input type="text" id="subject" name="subject" value="{tmpl_var name='subject'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="message" class="wf_preField">{tmpl_var name='message_txt'}</label>
+        <textarea id="message" name="message" cols='30' rows='10'>{tmpl_var name='message'}</textarea>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="tstamp" value="{tmpl_var name='tstamp'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','help/support_message_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('help/support_message_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/help/templates/support_message_list.htm b/interface/web/help/templates/support_message_list.htm
new file mode 100644
index 0000000000..b0b7a393c1
--- /dev/null
+++ b/interface/web/help/templates/support_message_list.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_support_message">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('help/support_message_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_sender_id" scope="col"><tmpl_var name="sender_id_txt"></th>
+            <th class="tbl_col_subject" scope="col"><tmpl_var name="subject_txt"></th>
+            <th class="tbl_col_subject" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_sender_id"><select name="search_sender_id" onChange="submitForm('pageForm','help/support_message_list.php');">{tmpl_var name='search_sender_id'}</select></td>
+            <td class="tbl_col_subject"><input type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','help/support_message_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_sender_id"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sender_id"}</a></td>
+            <td class="tbl_col_subject"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="subject"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('help/support_message_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/help/templates/support_message_view.htm b/interface/web/help/templates/support_message_view.htm
new file mode 100644
index 0000000000..86ef139961
--- /dev/null
+++ b/interface/web/help/templates/support_message_view.htm
@@ -0,0 +1,25 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_support_message">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_support_message"><legend>Message</legend>
+      <span class="wf_oneField">
+        <label for="subject" class="wf_preField">{tmpl_var name='subject_txt'}</label>
+        <input type="text" id="subject" name="subject" value="{tmpl_var name='subject'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="message" class="wf_preField">{tmpl_var name='message_txt'}</label>
+        <textarea id="message" name="message" cols='30' rows='10'>{tmpl_var name='message'}</textarea>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','help/support_message_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('help/support_message_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
new file mode 100644
index 0000000000..f846480a39
--- /dev/null
+++ b/interface/web/login/templates/index.htm
@@ -0,0 +1,32 @@
+<h2>Login</h2>
+
+<div class="panel panel_login">
+  
+  <tmpl_if name="error">
+  <tmpl_var name="error">
+  <div class="box box_support">
+    <a href="#" onclick="loadContent('login/password_reset.php');">Password lost?</a>
+  </div>
+  </tmpl_if>
+  
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_login">
+      <span class="wf_oneField">
+        <label for="username" class="wf_preField">Username:</label>
+        <input type="text" id="username" name="username" value="" size="" class="wf_required"><span class="wf_reqMark">*</span><br>
+      </span>
+      <span class="wf_oneField">
+        <label for="passwort" class="wf_preField">Password:</label>
+        <input type="password" id="passwort" name="passwort" value="" size="" class="wf_required" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm');};"><span class="wf_reqMark">*</span><br>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="s_mod" value="login" />
+    <input type="hidden" name="s_pg" value="index" />
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoKey" type="button" value="{tmpl_var name="add_new_record_txt"}" onClick="submitLoginForm('pageForm');"><span>Login</span></button>
+    </div>
+  </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/login/templates/password_reset.htm b/interface/web/login/templates/password_reset.htm
new file mode 100644
index 0000000000..03ae077fb7
--- /dev/null
+++ b/interface/web/login/templates/password_reset.htm
@@ -0,0 +1,32 @@
+<h2>Password Reset</h2>
+
+<div class="panel panel_password_reset">
+  
+  <tmpl_if name="message">
+  <div class="box box_msg">
+    <tmpl_var name="message"><br />
+    <tmpl_var name="pass_reset_txt">
+  </div>
+  </tmpl_if>
+  
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_password_reset">
+      <span class="wf_oneField">
+        <label for="email" class="wf_preField">E-Mail:</label>
+        <input type="text" id="email" name="email" value="" size="" class="wf_required"><span class="wf_reqMark">*</span><br>
+      </span>
+      <span class="wf_oneField">
+        <label for="username" class="wf_preField">Username:</label>
+        <input type="text" id="username" name="username" value="" size="" class="wf_required"><span class="wf_reqMark">*</span><br>
+      </span>
+    </fieldset>
+    
+    <input type="hidden" name="s_mod" value="login" />
+    <input type="hidden" name="s_pg" value="index" />
+    
+    <div class="wf_actions buttons">
+      <button class="positive" type="button" value="{tmpl_var name="add_new_record_txt"}" onClick="submitForm('pageForm','login/password_reset.php');"><span>Resend password</span></button>
+    </div>
+  </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_alias_edit.htm b/interface/web/mail/templates/mail_alias_edit.htm
new file mode 100644
index 0000000000..8ce690a1a3
--- /dev/null
+++ b/interface/web/mail/templates/mail_alias_edit.htm
@@ -0,0 +1,30 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_alias">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_alias"><legend>Email Alias</legend>
+      <span class="wf_oneField">
+        <label for="email_local_part" class="wf_preField">{tmpl_var name='email_txt'}</label>
+        <input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" size="10" maxlength="50"> @ <select id="email_domain" name="email_domain">{tmpl_var name="email_domain"}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="destination" class="wf_preField">{tmpl_var name='destination_txt'}</label>
+        <select id="destination" name="destination">{tmpl_var name='destination'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="type" value="alias">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_alias_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_alias_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm
new file mode 100644
index 0000000000..98c1373f9b
--- /dev/null
+++ b/interface/web/mail/templates/mail_alias_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_alias">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_alias_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_alias_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+            <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_alias_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_alias_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_blacklist_edit.htm b/interface/web/mail/templates/mail_blacklist_edit.htm
new file mode 100644
index 0000000000..16db8e6420
--- /dev/null
+++ b/interface/web/mail/templates/mail_blacklist_edit.htm
@@ -0,0 +1,34 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_blacklist">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_blacklist"><legend>Blacklist</legend>
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="source" class="wf_preField">{tmpl_var name='source_txt'}</label>
+        <input type="text" id="source" name="source" value="{tmpl_var name='source'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
+        <select id="type" name="type">{tmpl_var name='type'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input name="access" type="hidden" value="{tmpl_var name='access'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_blacklist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_blacklist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm
new file mode 100644
index 0000000000..b38a1f5d62
--- /dev/null
+++ b/interface/web/mail/templates/mail_blacklist_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_blacklist">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_blacklist_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+            <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+            <td class="tbl_col_type"><select name="search_type" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_type'}</select></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+            <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_content_filter_edit.htm b/interface/web/mail/templates/mail_content_filter_edit.htm
new file mode 100644
index 0000000000..0fae05bbae
--- /dev/null
+++ b/interface/web/mail/templates/mail_content_filter_edit.htm
@@ -0,0 +1,41 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_content_filter">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_content_filter"><legend>Filter</legend>
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
+        <select id="type" name="type">{tmpl_var name='type'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="pattern" class="wf_preField">{tmpl_var name='pattern_txt'}</label>
+        <input type="text" id="pattern" name="pattern" value="{tmpl_var name='pattern'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="action" class="wf_preField">{tmpl_var name='action_txt'}</label>
+        <select id="action" name="action">{tmpl_var name='action'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_content_filter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_content_filter_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm
new file mode 100644
index 0000000000..4ad767d215
--- /dev/null
+++ b/interface/web/mail/templates/mail_content_filter_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_content_filter">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_content_filter_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_pattern" scope="col"><tmpl_var name="pattern_txt"></th>
+            <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_pattern"><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" /></td>
+            <td class="tbl_col_action"><select name="search_action" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_action'}</select></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_content_filter_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_pattern"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="pattern"}</a></td>
+            <td class="tbl_col_action"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="action"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_content_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_domain_catchall_edit.htm b/interface/web/mail/templates/mail_domain_catchall_edit.htm
new file mode 100644
index 0000000000..2a65a7ce9e
--- /dev/null
+++ b/interface/web/mail/templates/mail_domain_catchall_edit.htm
@@ -0,0 +1,30 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_domain_catchall">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_domain_catchall"><legend>Email Catchall</legend>
+      <span class="wf_oneField">
+        <label for="email_domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
+        @ <select id="email_domain" name="email_domain">{tmpl_var name="email_domain"}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="destination" class="wf_preField">{tmpl_var name='destination_txt'}</label>
+        <select id="destination" name="destination">{tmpl_var name='destination'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="type" value="catchall">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_domain_catchall_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_domain_catchall_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm
new file mode 100644
index 0000000000..69760da04d
--- /dev/null
+++ b/interface/web/mail/templates/mail_domain_catchall_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_domain_catchall">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_catchall_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_domain_catchall_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+            <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_catchall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_catchall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
new file mode 100644
index 0000000000..64332fbc52
--- /dev/null
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_domain">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_domain"><legend>Domain</legend>
+
+      <tmpl_if name="is_admin">
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
+        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+      </span>
+      </tmpl_if>
+      
+      <tmpl_if name="is_reseller">
+      <span class="wf_oneField">
+        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
+        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+      </span>
+      </tmpl_if>
+      
+      <span class="wf_oneField">
+        <label for="domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
+        <input type="text" id="domain" name="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="policy" class="wf_preField">{tmpl_var name='policy_txt'}</label>
+        <select id="policy" name="policy">{tmpl_var name='policy'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="type" value="local">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm
new file mode 100644
index 0000000000..39a37ee49a
--- /dev/null
+++ b/interface/web/mail/templates/mail_domain_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_domain">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_forward_edit.htm b/interface/web/mail/templates/mail_forward_edit.htm
new file mode 100644
index 0000000000..489196b8cc
--- /dev/null
+++ b/interface/web/mail/templates/mail_forward_edit.htm
@@ -0,0 +1,31 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_forward">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_forward"><legend>Email Forward</legend>
+      <span class="wf_oneField">
+        <label for="email_local_part" class="wf_preField">{tmpl_var name='email_txt'}</label>
+        <input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" size="10" maxlength="50"> @ 
+        <select id="email_domain" name="email_domain">{tmpl_var name="email_domain"}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="destination" class="wf_preField">{tmpl_var name='destination_txt'}</label>
+        <input type="text" id="destination" name="destination" value="{tmpl_var name='destination'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="type" value="forward">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_forward_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_forward_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm
new file mode 100644
index 0000000000..f333a76790
--- /dev/null
+++ b/interface/web/mail/templates/mail_forward_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_forward">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_forward_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_forward_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+            <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_forward_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_forward_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_get_edit.htm b/interface/web/mail/templates/mail_get_edit.htm
new file mode 100644
index 0000000000..eb58c0970f
--- /dev/null
+++ b/interface/web/mail/templates/mail_get_edit.htm
@@ -0,0 +1,51 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_get">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_get"><legend>Get Email</legend>
+<!--
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+      </span>
+-->
+      <span class="wf_oneField">
+        <label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
+        <select id="type" name="type">{tmpl_var name='type'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="source_server" class="wf_preField">{tmpl_var name='source_server_txt'}</label>
+        <input type="text" id="source_server" name="source_server" value="{tmpl_var name='source_server'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="source_username" class="wf_preField">{tmpl_var name='source_username_txt'}</label>
+        <input type="text" id="source_username" name="source_username" value="{tmpl_var name='source_username'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="source_password" class="wf_preField">{tmpl_var name='source_password_txt'}</label>
+        <input type="text" id="source_password" name="source_password" value="{tmpl_var name='source_password'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="source_delete" class="wf_preField">{tmpl_var name='source_delete_txt'}</label>
+        <span class="">{tmpl_var name='source_delete'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="destination" class="wf_preField">{tmpl_var name='destination_txt'}</label>
+        <select id="destination" name="destination">{tmpl_var name='destination'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_get_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_get_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm
new file mode 100644
index 0000000000..092a1f704a
--- /dev/null
+++ b/interface/web/mail/templates/mail_get_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_get">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_get_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_source_server" scope="col"><tmpl_var name="source_server_txt"></th>
+            <th class="tbl_col_source_username" scope="col"><tmpl_var name="source_username_txt"></th>
+            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_source_server"><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" /></td>
+            <td class="tbl_col_source_username"><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" /></td>
+            <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_get_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_source_server"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_server"}</a></td>
+            <td class="tbl_col_source_username"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_username"}</a></td>
+            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_get_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_transport_edit.htm b/interface/web/mail/templates/mail_transport_edit.htm
new file mode 100644
index 0000000000..0adc07f475
--- /dev/null
+++ b/interface/web/mail/templates/mail_transport_edit.htm
@@ -0,0 +1,45 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_transport">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_transport"><legend>Email transport</legend>
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
+        <input type="text" id="domain" name="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
+        <select id="type" name="type">{tmpl_var name='type'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="mx" class="wf_preField">{tmpl_var name='mx_txt'}</label>
+        <input type="checkbox" id="mx" name="mx" value="y" {tmpl_var name='mx'}>
+      </span>
+      <span class="wf_oneField">
+        <label for="destination" class="wf_preField">{tmpl_var name='destination_txt'}</label>
+        <input type="text" id="destination" name="destination" value="{tmpl_var name='destination'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="sort_order" class="wf_preField">{tmpl_var name='sort_order_txt'}</label>
+        <select id="sort_order" name="sort_order">{tmpl_var name='sort_order'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_transport_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_transport_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm
new file mode 100644
index 0000000000..247ec03ce1
--- /dev/null
+++ b/interface/web/mail/templates/mail_transport_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_transport">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_transport_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+            <th class="tbl_col_transport" scope="col"><tmpl_var name="transport_txt"></th>
+            <th class="tbl_col_sort_order" scope="col"><tmpl_var name="sort_order_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_transport_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_transport_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+            <td class="tbl_col_transport"><input type="text" name="search_transport" value="{tmpl_var name='search_transport'}" /></td>
+            <td class="tbl_col_sort_order"><input type="text" name="search_sort_order" value="{tmpl_var name='search_sort_order'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_transport_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+            <td class="tbl_col_transport"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="transport"}</a></td>
+            <td class="tbl_col_sort_order"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sort_order"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_transport_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_user_autoresponder_edit.htm b/interface/web/mail/templates/mail_user_autoresponder_edit.htm
new file mode 100644
index 0000000000..3e51e53854
--- /dev/null
+++ b/interface/web/mail/templates/mail_user_autoresponder_edit.htm
@@ -0,0 +1,25 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_user">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_user"><legend>Autoresponder</legend>
+      <span class="wf_oneField">
+        <label for="autoresponder" class="wf_preField">{tmpl_var name='autoresponder_txt'}</label>
+        <span class="">{tmpl_var name='autoresponder'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="autoresponder_text" class="wf_preField">{tmpl_var name='autoresponder_text_txt'}</label>
+        <textarea id="autoresponder_text" name="autoresponder_text" cols='30' rows='15'>{tmpl_var name='autoresponder_text'}</textarea>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_user_custom_rules_edit.htm b/interface/web/mail/templates/mail_user_custom_rules_edit.htm
new file mode 100644
index 0000000000..1d51f99093
--- /dev/null
+++ b/interface/web/mail/templates/mail_user_custom_rules_edit.htm
@@ -0,0 +1,21 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_user">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_user"><legend>Custom Rules</legend>
+      <span class="wf_oneField">
+        <label for="custom_mailfilter" class="wf_preField">{tmpl_var name='custom_mailfilter_txt'}</label>
+        <textarea id="custom_mailfilter" name="custom_mailfilter" cols='30' rows='15'>{tmpl_var name='custom_mailfilter'}</textarea>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_user_filter_edit.htm b/interface/web/mail/templates/mail_user_filter_edit.htm
new file mode 100644
index 0000000000..fcc0071ba4
--- /dev/null
+++ b/interface/web/mail/templates/mail_user_filter_edit.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_user_filter">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_user_filter"><legend>Filter</legend>
+      <span class="wf_oneField">
+        <label for="rulename" class="wf_preField">{tmpl_var name='rulename_txt'}</label>
+        <input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="source" class="wf_preField">{tmpl_var name='source_txt'}</label>
+        <select id="source" name="source">{tmpl_var name='source'}</select>
+        <select id="op" name="op">{tmpl_var name='op'}</select>
+        <input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="action" class="wf_preField">{tmpl_var name='action_txt'}</label>
+        <select id="action" name="action">{tmpl_var name='action'}</select>
+        <input type="text" id="target" name="target" value="{tmpl_var name='target'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input name="mailuser_id" type="hidden" value="{tmpl_var name='mailuser_id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_filter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_filter_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm
new file mode 100644
index 0000000000..a2c7d152d5
--- /dev/null
+++ b/interface/web/mail/templates/mail_user_filter_list.htm
@@ -0,0 +1,45 @@
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_rulename"><a href="#" onClick="loadContent('mail/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm
new file mode 100644
index 0000000000..b9712d6b8b
--- /dev/null
+++ b/interface/web/mail/templates/mail_user_list.htm
@@ -0,0 +1,53 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_user">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+            <th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+            <td class="tbl_col_autoresponder"><input type="text" name="search_autoresponder" value="{tmpl_var name='search_autoresponder'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+            <td class="tbl_col_autoresponder"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="autoresponder"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
new file mode 100644
index 0000000000..f4f986c19b
--- /dev/null
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -0,0 +1,46 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_user">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_user"><legend>Mailbox</legend>
+      <span class="wf_oneField">
+        <label for="email_local_part" class="wf_preField">{tmpl_var name='email_txt'}</label>
+        <input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" size="20" maxlength="50">&nbsp;@&nbsp;
+        <select id="email_domain" name="email_domain">{tmpl_var name="email_domain"}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="password" class="wf_preField">{tmpl_var name='cryptpwd_txt'}</label>
+        <input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="quota" class="wf_preField">{tmpl_var name='quota_txt'}</label>
+        <input type="text" id="quota" name="quota" value="{tmpl_var name='quota'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="policy" class="wf_preField">{tmpl_var name='policy_txt'}</label>
+        <select id="policy" name="policy">{tmpl_var name="policy"}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="postfix" class="wf_preField">{tmpl_var name='postfix_txt'}</label>
+        <span class="">{tmpl_var name='postfix'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="disableimap" class="wf_preField">{tmpl_var name='disableimap_txt'}</label>                    
+        <span class="">{tmpl_var name='disableimap'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="disablepop3" class="wf_preField">{tmpl_var name='disablepop3_txt'}</label>                    
+        <span class="">{tmpl_var name='disablepop3'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_user_mailfilter_edit.htm b/interface/web/mail/templates/mail_user_mailfilter_edit.htm
new file mode 100644
index 0000000000..d6956fc65c
--- /dev/null
+++ b/interface/web/mail/templates/mail_user_mailfilter_edit.htm
@@ -0,0 +1,16 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_user">
+
+  {tmpl_var name='filter_records'}
+
+  <div class="pnl_formsarea">
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_user_stats_list.htm b/interface/web/mail/templates/mail_user_stats_list.htm
new file mode 100644
index 0000000000..fd7253de62
--- /dev/null
+++ b/interface/web/mail/templates/mail_user_stats_list.htm
@@ -0,0 +1,51 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_user_stats">
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+            <th class="tbl_col_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
+            <th class="tbl_col_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
+            <th class="tbl_col_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
+            <th class="tbl_col_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+            <td class="tbl_col_this_month"></td>
+            <td class="tbl_col_last_month"></td>
+            <td class="tbl_col_this_year"></td>
+            <td class="tbl_col_last_year"></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+            <td class="tbl_col_this_month"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_month"} kB</a></td>
+            <td class="tbl_col_last_month"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_month"} kB</a></td>
+            <td class="tbl_col_this_year"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_year"} kB</a></td>
+            <td class="tbl_col_last_year"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_year"} kB</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/mail_whitelist_edit.htm b/interface/web/mail/templates/mail_whitelist_edit.htm
new file mode 100644
index 0000000000..11eec61860
--- /dev/null
+++ b/interface/web/mail/templates/mail_whitelist_edit.htm
@@ -0,0 +1,34 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_whitelist">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_whitelist"><legend>Witelist</legend>
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="source" class="wf_preField">{tmpl_var name='source_txt'}</label>
+        <input type="text" id="source" name="source" value="{tmpl_var name='source'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
+        <select id="type" name="type">{tmpl_var name='type'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input name="access" type="hidden" value="{tmpl_var name='access'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_whitelist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_whitelist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm
new file mode 100644
index 0000000000..8b6edff84c
--- /dev/null
+++ b/interface/web/mail/templates/mail_whitelist_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_whitelist">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_whitelist_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+            <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+            <td class="tbl_col_type"><select name="search_type" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_type'}</select></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+            <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/spamfilter_blacklist_edit.htm b/interface/web/mail/templates/spamfilter_blacklist_edit.htm
new file mode 100644
index 0000000000..9f52ef3ea2
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_blacklist_edit.htm
@@ -0,0 +1,40 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_spamfilter_blacklist">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_spamfilter_blacklist"><legend>Blacklist</legend>
+<!--
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+      </span>
+-->
+      <span class="wf_oneField">
+        <label for="rid" class="wf_preField">{tmpl_var name='rid_txt'}</label>
+        <select id="rid" name="rid">{tmpl_var name='rid'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="email" class="wf_preField">{tmpl_var name='email_txt'}</label>
+        <input type="text" id="email" name="email" value="{tmpl_var name='email'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="priority" class="wf_preField">{tmpl_var name='priority_txt'}</label>
+        <select id="priority" name="priority">{tmpl_var name='priority'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="wb" value="{tmpl_var name='wb'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_blacklist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm
new file mode 100644
index 0000000000..6a91f46682
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_spamfilter_blacklist">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_blacklist_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
+            <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
+            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_priority"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_priority'}</select></td>
+            <td class="tbl_col_rid"><select name="search_rid" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_rid'}</select></td>
+            <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
+            <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
+            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm
new file mode 100644
index 0000000000..a41ced78f5
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm
@@ -0,0 +1,21 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_spamfilter_config">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_spamfilter_config"><legend>Getmail</legend>
+      <span class="wf_oneField">
+        <label for="getmail_config_dir" class="wf_preField">{tmpl_var name='getmail_config_dir_txt'}</label>
+        <input type="text" id="getmail_config_dir" name="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" size="40" maxlength="255">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm
new file mode 100644
index 0000000000..c9d8625662
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_config_list.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_spamfilter_config">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_config_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_server_name"><a href="#" onClick="loadContent('mail/spamfilter_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/spamfilter_config_mail_edit.htm b/interface/web/mail/templates/spamfilter_config_mail_edit.htm
new file mode 100644
index 0000000000..78481af2aa
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_config_mail_edit.htm
@@ -0,0 +1,65 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_spamfilter_config">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_spamfilter_config"><legend>Mail</legend>
+      <span class="wf_oneField">
+        <label for="module" class="wf_preField">{tmpl_var name='module_txt'}</label>
+        <select id="module" name="module">{tmpl_var name='module'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="maildir_path" class="wf_preField">{tmpl_var name='maildir_path_txt'}</label>
+        <input type="text" id="maildir_path" name="maildir_path" value="{tmpl_var name='maildir_path'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="homedir_path" class="wf_preField">{tmpl_var name='homedir_path_txt'}</label>
+        <input type="text" id="homedir_path" name="homedir_path" value="{tmpl_var name='homedir_path'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="mailuser_uid" class="wf_preField">{tmpl_var name='mailuser_uid_txt'}</label>
+        <input type="text" id="mailuser_uid" name="mailuser_uid" value="{tmpl_var name='mailuser_uid'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="mailuser_gid" class="wf_preField">{tmpl_var name='mailuser_gid_txt'}</label>
+        <input type="text" id="mailuser_gid" name="mailuser_gid" value="{tmpl_var name='mailuser_gid'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="mailuser_name" class="wf_preField">{tmpl_var name='mailuser_name_txt'}</label>
+        <input type="text" id="mailuser_name" name="mailuser_name" value="{tmpl_var name='mailuser_name'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="mailuser_group" class="wf_preField">{tmpl_var name='mailuser_group_txt'}</label>
+        <input type="text" id="mailuser_group" name="mailuser_group" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="relayhost" class="wf_preField">{tmpl_var name='relayhost_txt'}</label>
+        <input type="text" id="relayhost" name="relayhost" value="{tmpl_var name='relayhost'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="relayhost_user" class="wf_preField">{tmpl_var name='relayhost_user_txt'}</label>
+        <input type="text" id="relayhost_user" name="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="relayhost_password" class="wf_preField">{tmpl_var name='relayhost_password_txt'}</label>
+        <input type="text" id="relayhost_password" name="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="mailbox_size_limit" class="wf_preField">{tmpl_var name='mailbox_size_limit_txt'}</label>
+        <input type="text" id="mailbox_size_limit" name="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}" size="10" maxlength="15">
+      </span>
+      <span class="wf_oneField">
+        <label for="message_size_limit" class="wf_preField">{tmpl_var name='message_size_limit_txt'}</label>
+        <input type="text" id="message_size_limit" name="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/spamfilter_config_server_edit.htm b/interface/web/mail/templates/spamfilter_config_server_edit.htm
new file mode 100644
index 0000000000..1eb1f1034b
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_config_server_edit.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_spamfilter_config">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_spamfilter_config"><legend>Server</legend>
+      <span class="wf_oneField">
+        <label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
+        <input type="text" id="ip_address" name="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="netmask" class="wf_preField">{tmpl_var name='netmask_txt'}</label>
+        <input type="text" id="netmask" name="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="gateway" class="wf_preField">{tmpl_var name='gateway_txt'}</label>
+        <input type="text" id="gateway" name="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="hostname" class="wf_preField">{tmpl_var name='hostname_txt'}</label>
+        <input type="text" id="hostname" name="hostname" value="{tmpl_var name='hostname'}" size="40" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="nameservers" class="wf_preField">{tmpl_var name='nameservers_txt'}</label>
+        <input type="text" id="nameservers" name="nameservers" value="{tmpl_var name='nameservers'}" size="40" maxlength="255">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/spamfilter_other_edit.htm b/interface/web/mail/templates/spamfilter_other_edit.htm
new file mode 100644
index 0000000000..103bad5949
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_other_edit.htm
@@ -0,0 +1,73 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_spamfilter_policy">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_spamfilter_policy"><legend>Other</legend>
+      <span class="wf_oneField">
+        <label for="addr_extension_virus" class="wf_preField">{tmpl_var name='addr_extension_virus_txt'}</label>
+        <input type="text" id="addr_extension_virus" name="addr_extension_virus" value="{tmpl_var name='addr_extension_virus'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="addr_extension_spam" class="wf_preField">{tmpl_var name='addr_extension_spam_txt'}</label>
+        <input type="text" id="addr_extension_spam" name="addr_extension_spam" value="{tmpl_var name='addr_extension_spam'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="addr_extension_banned" class="wf_preField">{tmpl_var name='addr_extension_banned_txt'}</label>
+        <input type="text" id="addr_extension_banned" name="addr_extension_banned" value="{tmpl_var name='addr_extension_banned'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="addr_extension_bad_header" class="wf_preField">{tmpl_var name='addr_extension_bad_header_txt'}</label>
+        <input type="text" id="addr_extension_bad_header" name="addr_extension_bad_header" value="{tmpl_var name='addr_extension_bad_header'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="warnvirusrecip" class="wf_preField">{tmpl_var name='warnvirusrecip_txt'}</label>
+        <select id="warnvirusrecip" name="warnvirusrecip">{tmpl_var name='warnvirusrecip'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="warnbannedrecip" class="wf_preField">{tmpl_var name='warnbannedrecip_txt'}</label>
+        <select id="warnbannedrecip" name="warnbannedrecip">{tmpl_var name='warnbannedrecip'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="warnbadhrecip" class="wf_preField">{tmpl_var name='warnbadhrecip_txt'}</label>
+        <select id="warnbadhrecip" name="warnbadhrecip">{tmpl_var name='warnbadhrecip'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="newvirus_admin" class="wf_preField">{tmpl_var name='newvirus_admin_txt'}</label>
+        <input type="text" id="newvirus_admin" name="newvirus_admin" value="{tmpl_var name='newvirus_admin'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="virus_admin" class="wf_preField">{tmpl_var name='virus_admin_txt'}</label>
+        <input type="text" id="virus_admin" name="virus_admin" value="{tmpl_var name='virus_admin'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="banned_admin" class="wf_preField">{tmpl_var name='banned_admin_txt'}</label>
+        <input type="text" id="banned_admin" name="banned_admin" value="{tmpl_var name='banned_admin'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="bad_header_admin" class="wf_preField">{tmpl_var name='bad_header_admin_txt'}</label>
+        <input type="text" id="bad_header_admin" name="bad_header_admin" value="{tmpl_var name='bad_header_admin'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="spam_admin" class="wf_preField">{tmpl_var name='spam_admin_txt'}</label>
+        <input type="text" id="spam_admin" name="spam_admin" value="{tmpl_var name='spam_admin'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="message_size_limit" class="wf_preField">{tmpl_var name='message_size_limit_txt'}</label>
+        <input type="text" id="message_size_limit" name="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="banned_rulenames" class="wf_preField">{tmpl_var name='banned_rulenames_txt'}</label>
+        <input type="text" id="banned_rulenames" name="banned_rulenames" value="{tmpl_var name='banned_rulenames'}" size="30" maxlength="255">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/spamfilter_policy_edit.htm b/interface/web/mail/templates/spamfilter_policy_edit.htm
new file mode 100644
index 0000000000..3f7d634fa1
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_policy_edit.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_spamfilter_policy">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_spamfilter_policy"><legend>Policy</legend>
+      <span class="wf_oneField">
+        <label for="policy_name" class="wf_preField">{tmpl_var name='policy_name_txt'}</label>
+        <input type="text" id="policy_name" name="policy_name" value="{tmpl_var name='policy_name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="virus_lover" class="wf_preField">{tmpl_var name='virus_lover_txt'}</label>
+        <select id="virus_lover" name="virus_lover">{tmpl_var name='virus_lover'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="spam_lover" class="wf_preField">{tmpl_var name='spam_lover_txt'}</label>
+        <select id="spam_lover" name="spam_lover">{tmpl_var name='spam_lover'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="banned_files_lover" class="wf_preField">{tmpl_var name='banned_files_lover_txt'}</label>
+        <select id="banned_files_lover" name="banned_files_lover">{tmpl_var name='banned_files_lover'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="bad_header_lover" class="wf_preField">{tmpl_var name='bad_header_lover_txt'}</label>
+        <select id="bad_header_lover" name="bad_header_lover">{tmpl_var name='bad_header_lover'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="bypass_virus_checks" class="wf_preField">{tmpl_var name='bypass_virus_checks_txt'}</label>
+        <select id="bypass_virus_checks" name="bypass_virus_checks">{tmpl_var name='bypass_virus_checks'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="bypass_banned_checks" class="wf_preField">{tmpl_var name='bypass_banned_checks_txt'}</label>
+        <select id="bypass_banned_checks" name="bypass_banned_checks">{tmpl_var name='bypass_banned_checks'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="bypass_header_checks" class="wf_preField">{tmpl_var name='bypass_header_checks_txt'}</label>
+        <select id="bypass_header_checks" name="bypass_header_checks">{tmpl_var name='bypass_header_checks'}</select>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm
new file mode 100644
index 0000000000..0380824ed4
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_policy_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_spamfilter_policy">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_policy_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_policy_name" scope="col"><tmpl_var name="policy_name_txt"></th>
+            <th class="tbl_col_virus_lover" scope="col"><tmpl_var name="virus_lover_txt"></th>
+            <th class="tbl_col_spam_lover" scope="col"><tmpl_var name="spam_lover_txt"></th>
+            <th class="tbl_col_banned_files_lover" scope="col"><tmpl_var name="banned_files_lover_txt"></th>
+            <th class="tbl_col_bad_header_lover" scope="col"><tmpl_var name="bad_header_lover_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_policy_name"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></td>
+            <td class="tbl_col_virus_lover"><select name="search_virus_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_virus_lover'}</select></td>
+            <td class="tbl_col_spam_lover"><select name="search_spam_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_spam_lover'}</select></td>
+            <td class="tbl_col_banned_files_lover"><select name="search_banned_files_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_banned_files_lover'}</select></td>
+            <td class="tbl_col_bad_header_lover"><select name="search_bad_header_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_bad_header_lover'}</select></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_policy_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_policy_name"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_name"}</a></td>
+            <td class="tbl_col_virus_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virus_lover"}</a></td>
+            <td class="tbl_col_spam_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="spam_lover"}</a></td>
+            <td class="tbl_col_banned_files_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="banned_files_lover"}</a></td>
+            <td class="tbl_col_bad_header_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="bad_header_lover"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_policy_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/spamfilter_quarantine_edit.htm b/interface/web/mail/templates/spamfilter_quarantine_edit.htm
new file mode 100644
index 0000000000..eb10a9a0d3
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_quarantine_edit.htm
@@ -0,0 +1,43 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_spamfilter_policy">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_spamfilter_policy"><legend>Quarantine</legend>
+      <span class="wf_oneField">
+        <label for="virus_quarantine_to" class="wf_preField">{tmpl_var name='virus_quarantine_to_txt'}</label>
+        <input type="text" id="virus_quarantine_to" name="virus_quarantine_to" value="{tmpl_var name='virus_quarantine_to'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="spam_quarantine_to" class="wf_preField">{tmpl_var name='spam_quarantine_to_txt'}</label>
+        <input type="text" id="spam_quarantine_to" name="spam_quarantine_to" value="{tmpl_var name='spam_quarantine_to'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="banned_quarantine_to" class="wf_preField">{tmpl_var name='banned_quarantine_to_txt'}</label>
+        <input type="text" id="banned_quarantine_to" name="banned_quarantine_to" value="{tmpl_var name='banned_quarantine_to'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="bad_header_quarantine_to" class="wf_preField">{tmpl_var name='bad_header_quarantine_to_txt'}</label>
+        <input type="text" id="bad_header_quarantine_to" name="bad_header_quarantine_to" value="{tmpl_var name='bad_header_quarantine_to'}" size="30" maxlength="255">
+      </span>
+<!--
+      <span class="wf_oneField">
+        <label for="clean_quarantine_to" class="wf_preField">{tmpl_var name='clean_quarantine_to_txt'}</label>
+        <input type="text" id="clean_quarantine_to" name="clean_quarantine_to" value="{tmpl_var name='clean_quarantine_to'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="other_quarantine_to" class="wf_preField">{tmpl_var name='other_quarantine_to_txt'}</label>
+        <input type="text" id="other_quarantine_to" name="other_quarantine_to" value="{tmpl_var name='other_quarantine_to'}" size="30" maxlength="255">
+      </span>
+-->
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/spamfilter_taglevel_edit.htm b/interface/web/mail/templates/spamfilter_taglevel_edit.htm
new file mode 100644
index 0000000000..dd07fd4b38
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_taglevel_edit.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_spamfilter_policy">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_spamfilter_policy"><legend>Tag-Level</legend>
+      <span class="wf_oneField">
+        <label for="spam_tag_level" class="wf_preField">{tmpl_var name='spam_tag_level_txt'}</label>
+        <input type="text" id="spam_tag_level" name="spam_tag_level" value="{tmpl_var name='spam_tag_level'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="spam_tag2_level" class="wf_preField">{tmpl_var name='spam_tag2_level_txt'}</label>
+        <input type="text" id="spam_tag2_level" name="spam_tag2_level" value="{tmpl_var name='spam_tag2_level'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="spam_kill_level" class="wf_preField">{tmpl_var name='spam_kill_level_txt'}</label>
+        <input type="text" id="spam_kill_level" name="spam_kill_level" value="{tmpl_var name='spam_kill_level'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="spam_dsn_cutoff_level" class="wf_preField">{tmpl_var name='spam_dsn_cutoff_level_txt'}</label>
+        <input type="text" id="spam_dsn_cutoff_level" name="spam_dsn_cutoff_level" value="{tmpl_var name='spam_dsn_cutoff_level'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="spam_quarantine_cutoff_level" class="wf_preField">{tmpl_var name='spam_quarantine_cutoff_level_txt'}</label>
+        <input type="text" id="spam_quarantine_cutoff_level" name="spam_quarantine_cutoff_level" value="{tmpl_var name='spam_quarantine_cutoff_level'}" size="10" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="spam_modifies_subj" class="wf_preField">{tmpl_var name='spam_modifies_subj_txt'}</label>
+        <select id="spam_modifies_subj" name="spam_modifies_subj">{tmpl_var name='spam_modifies_subj'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="spam_subject_tag" class="wf_preField">{tmpl_var name='spam_subject_tag_txt'}</label>
+        <input type="text" id="spam_subject_tag" name="spam_subject_tag" value="{tmpl_var name='spam_subject_tag'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="spam_subject_tag2" class="wf_preField">{tmpl_var name='spam_subject_tag2_txt'}</label>
+        <input type="text" id="spam_subject_tag2" name="spam_subject_tag2" value="{tmpl_var name='spam_subject_tag2'}" size="30" maxlength="255">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/spamfilter_users_edit.htm b/interface/web/mail/templates/spamfilter_users_edit.htm
new file mode 100644
index 0000000000..220b3bcd27
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_users_edit.htm
@@ -0,0 +1,41 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_spamfilter_users">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_spamfilter_users"><legend>Users</legend>
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="priority" class="wf_preField">{tmpl_var name='priority_txt'}</label>
+        <select id="priority" name="priority">{tmpl_var name='priority'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="policy_id" class="wf_preField">{tmpl_var name='policy_id_txt'}</label>
+        <select id="policy_id" name="policy_id">{tmpl_var name='policy_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="email" class="wf_preField">{tmpl_var name='email_txt'}</label>
+        <input type="text" id="email" name="email" value="{tmpl_var name='email'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="fullname" class="wf_preField">{tmpl_var name='fullname_txt'}</label>
+        <input type="text" id="fullname" name="fullname" value="{tmpl_var name='fullname'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="local" class="wf_preField">{tmpl_var name='local_txt'}</label>
+        <select id="local" name="local">{tmpl_var name='local'}</select>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm
new file mode 100644
index 0000000000..cbb7ab9470
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_users_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_spamfilter_users">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_users_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_local" scope="col"><tmpl_var name="local_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
+            <th class="tbl_col_policy_id" scope="col"><tmpl_var name="policy_id_txt"></th>
+            <th class="tbl_col_fullname" scope="col"><tmpl_var name="fullname_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_local"><select name="search_local" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_local'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_priority"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_priority'}</select></td>
+            <td class="tbl_col_policy_id"><select name="search_policy_id" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_policy_id'}</select></td>
+            <td class="tbl_col_fullname"><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_local"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="local"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
+            <td class="tbl_col_policy_id"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_id"}</a></td>
+            <td class="tbl_col_fullname"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="fullname"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/mail/templates/spamfilter_whitelist_edit.htm b/interface/web/mail/templates/spamfilter_whitelist_edit.htm
new file mode 100644
index 0000000000..2e4b5f1bbb
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_whitelist_edit.htm
@@ -0,0 +1,40 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_spamfilter_whitelist">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_spamfilter_whitelist"><legend>Whitelist</legend>
+<!--
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+      </span>
+-->
+      <span class="wf_oneField">
+        <label for="rid" class="wf_preField">{tmpl_var name='rid_txt'}</label>
+        <select id="rid" name="rid">{tmpl_var name='rid'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="email" class="wf_preField">{tmpl_var name='email_txt'}</label>
+        <input type="text" id="email" name="email" value="{tmpl_var name='email'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="priority" class="wf_preField">{tmpl_var name='priority_txt'}</label>
+        <select id="priority" name="priority">{tmpl_var name='priority'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="wb" value="{tmpl_var name='wb'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_whitelist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm
new file mode 100644
index 0000000000..489e5009ac
--- /dev/null
+++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_spamfilter_whitelist">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_whitelist_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
+            <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
+            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_priority"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_priority'}</select></td>
+            <td class="tbl_col_rid"><select name="search_rid" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_rid'}</select></td>
+            <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
+            <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
+            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/monitor/templates/logview.htm b/interface/web/monitor/templates/logview.htm
new file mode 100644
index 0000000000..27007094ef
--- /dev/null
+++ b/interface/web/monitor/templates/logview.htm
@@ -0,0 +1,19 @@
+<h2><tmpl_var name="title"></h2>
+
+<div class="panel panel_logview">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <select name="refreshinterval" id="refreshinterval" onChange="loadContentRefresh('monitor/logview.php?log={tmpl_var name="logfile_id"}')">{tmpl_var name="refresh"}</select>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_formarea">
+    <fieldset><legend><tmpl_var name="logfile"></legend>
+      <div class="codeview"><tmpl_var name="log"></div>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/monitor/templates/system.htm b/interface/web/monitor/templates/system.htm
new file mode 100644
index 0000000000..8b753d9eb8
--- /dev/null
+++ b/interface/web/monitor/templates/system.htm
@@ -0,0 +1,11 @@
+<h2><tmpl_var name="title"></h2>
+
+<div class="panel panel_system">
+
+  <div class="pnl_formarea">
+    <fieldset><legend></legend>
+      <div class="systemmonitor"><tmpl_var name="output"></div>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
new file mode 100644
index 0000000000..35d139f95e
--- /dev/null
+++ b/interface/web/sites/templates/database_edit.htm
@@ -0,0 +1,61 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_database">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_database"><legend>Database</legend>
+      <tmpl_if name="is_admin">
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
+        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+      </span>
+      </tmpl_if>
+      <tmpl_if name="is_reseller">
+      <span class="wf_oneField">
+        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_id_txt'}</label>
+        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+      </span>
+      </tmpl_if>
+      <span class="wf_oneField">
+        <label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
+        <select id="type" name="type">{tmpl_var name='type'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="database_name" class="wf_preField">{tmpl_var name='database_name_txt'}</label>
+        <input type="text" id="database_name" name="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" class="wf_required"><span class="wf_reqMark">*</span><br>
+      </span>
+      <span class="wf_oneField">
+        <label for="database_user" class="wf_preField">{tmpl_var name='database_user_txt'}</label>
+        <input type="text" id="database_user" name="database_user" value="{tmpl_var name='database_user'}" size="30" maxlength="255" class="wf_required"><span class="wf_reqMark">*</span><br>
+      </span>
+      <span class="wf_oneField">
+        <label for="database_password" class="wf_preField">{tmpl_var name='database_password_txt'}</label>
+        <input type="text" id="database_password" name="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" class="wf_required"><span class="wf_reqMark">*</span><br>
+      </span>
+      <span class="wf_oneField">
+        <label for="database_charset" class="wf_preField">{tmpl_var name='database_charset_txt'}</label>
+        <select id="database_charset" name="database_charset">{tmpl_var name='database_charset'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="remote_access" class="wf_preField">{tmpl_var name='remote_access_txt'}</label>                    
+        <span class="">{tmpl_var name='remote_access'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/database_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/database_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm
new file mode 100644
index 0000000000..292daf54e0
--- /dev/null
+++ b/interface/web/sites/templates/database_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_database">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/database_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_remote_access"><select name="search_remote_access" onChange="submitForm('pageForm','sites/database_list.php');">{tmpl_var name='search_remote_access'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/database_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_remote_access"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="remote_access"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_database_name"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_name"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/sites/templates/ftp_user_advanced.htm b/interface/web/sites/templates/ftp_user_advanced.htm
new file mode 100644
index 0000000000..d0321d646f
--- /dev/null
+++ b/interface/web/sites/templates/ftp_user_advanced.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_ftp_user">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_ftp_user"><legend>Options</legend>
+      <span class="wf_oneField">
+        <label for="uid" class="wf_preField">{tmpl_var name='uid_txt'}</label>
+        <input type="text" id="uid" name="uid" value="{tmpl_var name='uid'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="gid" class="wf_preField">{tmpl_var name='gid_txt'}</label>
+        <input type="text" id="gid" name="gid" value="{tmpl_var name='gid'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="dir" class="wf_preField">{tmpl_var name='dir_txt'}</label>
+        <input type="text" id="dir" name="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="quota_files" class="wf_preField">{tmpl_var name='quota_files_txt'}</label>
+        <input type="text" id="quota_files" name="quota_files" value="{tmpl_var name='quota_files'}" size="7" maxlength="7">
+      </span>
+      <span class="wf_oneField">
+        <label for="ul_ratio" class="wf_preField">{tmpl_var name='ul_ratio_txt'}</label>
+        <input type="text" id="ul_ratio" name="ul_ratio" value="{tmpl_var name='ul_ratio'}" size="7" maxlength="7">
+      </span>
+      <span class="wf_oneField">
+        <label for="dl_ratio" class="wf_preField">{tmpl_var name='dl_ratio_txt'}</label>
+        <input type="text" id="dl_ratio" name="dl_ratio" value="{tmpl_var name='dl_ratio'}" size="7" maxlength="7">
+      </span>
+      <span class="wf_oneField">
+        <label for="ul_bandwidth" class="wf_preField">{tmpl_var name='ul_bandwidth_txt'}</label>
+        <input type="text" id="ul_bandwidth" name="ul_bandwidth" value="{tmpl_var name='ul_bandwidth'}" size="7" maxlength="7">
+      </span>
+      <span class="wf_oneField">
+        <label for="dl_bandwidth" class="wf_preField">{tmpl_var name='dl_bandwidth_txt'}</label>
+        <input type="text" id="dl_bandwidth" name="dl_bandwidth" value="{tmpl_var name='dl_bandwidth'}" size="7" maxlength="7">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/ftp_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/ftp_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/ftp_user_edit.htm b/interface/web/sites/templates/ftp_user_edit.htm
new file mode 100644
index 0000000000..7faf040dce
--- /dev/null
+++ b/interface/web/sites/templates/ftp_user_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_ftp_user">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_ftp_user"><legend>FTP User</legend>
+      <span class="wf_oneField">
+        <label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
+        <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="username" class="wf_preField">{tmpl_var name='username_txt'}</label>
+        <input type="text" id="username" name="username" value="{tmpl_var name='username'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="password" class="wf_preField">{tmpl_var name='password_txt'}</label>
+        <input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="quota_size" class="wf_preField">{tmpl_var name='quota_size_txt'}</label>
+        <input type="text" id="quota_size" name="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    <span class="">
+                      {tmpl_var name='active'}
+                    </span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/ftp_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/ftp_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm
new file mode 100644
index 0000000000..a5c3214658
--- /dev/null
+++ b/interface/web/sites/templates/ftp_user_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_ftp_user">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/ftp_user_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+            <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/ftp_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+            <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('sites/ftp_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/sites/templates/shell_user_advanced.htm b/interface/web/sites/templates/shell_user_advanced.htm
new file mode 100644
index 0000000000..803d5f6dfb
--- /dev/null
+++ b/interface/web/sites/templates/shell_user_advanced.htm
@@ -0,0 +1,33 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_shell_user">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_shell_user"><legend>Options</legend>
+      <span class="wf_oneField">
+        <label for="puser" class="wf_preField">{tmpl_var name='puser_txt'}</label>
+        <input type="text" id="puser" name="puser" value="{tmpl_var name='puser'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="pgroup" class="wf_preField">{tmpl_var name='pgroup_txt'}</label>
+        <input type="text" id="pgroup" name="pgroup" value="{tmpl_var name='pgroup'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="shell" class="wf_preField">{tmpl_var name='shell_txt'}</label>
+        <input type="text" id="shell" name="shell" value="{tmpl_var name='shell'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="dir" class="wf_preField">{tmpl_var name='dir_txt'}</label>
+        <input type="text" id="dir" name="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/shell_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/shell_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm
new file mode 100644
index 0000000000..baa47a02bb
--- /dev/null
+++ b/interface/web/sites/templates/shell_user_edit.htm
@@ -0,0 +1,41 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_shell_user">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_shell_user"><legend>Shell User</legend>
+      <span class="wf_oneField">
+        <label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
+        <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="username" class="wf_preField">{tmpl_var name='username_txt'}</label>
+        <input type="text" id="username" name="username" value="{tmpl_var name='username'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="password" class="wf_preField">{tmpl_var name='password_txt'}</label>
+        <input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="chroot" class="wf_preField">{tmpl_var name='chroot_txt'}</label>
+        <select id="chroot" name="chroot">{tmpl_var name='chroot'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="quota_size" class="wf_preField">{tmpl_var name='quota_size_txt'}</label>
+        <input type="text" id="quota_size" name="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/shell_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/shell_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm
new file mode 100644
index 0000000000..463e9773e8
--- /dev/null
+++ b/interface/web/sites/templates/shell_user_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_shell_user">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/shell_user_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+            <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/shell_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+            <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('sites/shell_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/sites/templates/web_aliasdomain_edit.htm b/interface/web/sites/templates/web_aliasdomain_edit.htm
new file mode 100644
index 0000000000..c346bfe02b
--- /dev/null
+++ b/interface/web/sites/templates/web_aliasdomain_edit.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_web_domain">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_web_domain"><legend>Domain</legend>
+      <span class="wf_oneField">
+        <label for="domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
+        <input type="text" id="domain" name="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
+        <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="redirect_type" class="wf_preField">{tmpl_var name='redirect_type_txt'}</label>
+        <select id="redirect_type" name="redirect_type">{tmpl_var name='redirect_type'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="redirect_path" class="wf_preField">{tmpl_var name='redirect_path_txt'}</label>
+        <input type="text" id="redirect_path" name="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/web_aliasdomain_list.htm b/interface/web/sites/templates/web_aliasdomain_list.htm
new file mode 100644
index 0000000000..62a183a7a8
--- /dev/null
+++ b/interface/web/sites/templates/web_aliasdomain_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_web_aliasdomain">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_aliasdomain_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/sites/templates/web_domain_advanced.htm b/interface/web/sites/templates/web_domain_advanced.htm
new file mode 100644
index 0000000000..e62e2ea546
--- /dev/null
+++ b/interface/web/sites/templates/web_domain_advanced.htm
@@ -0,0 +1,33 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_web_domain">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_web_domain"><legend>Options</legend>
+      <span class="wf_oneField">
+        <label for="document_root" class="wf_preField">{tmpl_var name='document_root_txt'}</label>
+        <input type="text" id="document_root" name="document_root" value="{tmpl_var name='document_root'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="system_user" class="wf_preField">{tmpl_var name='system_user_txt'}</label>
+        <input type="text" id="system_user" name="system_user" value="{tmpl_var name='system_user'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="system_group" class="wf_preField">{tmpl_var name='system_group_txt'}</label>
+        <input type="text" id="system_group" name="system_group" value="{tmpl_var name='system_group'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="apache_directives" class="wf_preField">{tmpl_var name='apache_directives_txt'}</label>
+        <input type="text" id="apache_directives" name="apache_directives" value="{tmpl_var name='apache_directives'}" size="30" maxlength="255">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
new file mode 100644
index 0000000000..09666f3be5
--- /dev/null
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -0,0 +1,91 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_web_domain">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_web_domain"><legend>Domain</legend>
+      <tmpl_if name="is_admin">
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">{tmpl_var name='server_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
+        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+      </span>
+      </tmpl_if>
+      <tmpl_if name="is_reseller">
+      <span class="wf_oneField">
+        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_group_id_txt'}</label>
+        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+      </span>
+      </tmpl_if>
+      <span class="wf_oneField">
+        <label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
+        <select id="ip_address" name="ip_address">{tmpl_var name='ip_address'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
+        <input type="text" id="domain" name="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255">
+      </span>
+<!--
+      <span class="wf_oneField">
+        <label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
+        <select id="type" name="type">{tmpl_var name='type'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
+        <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="vhost_type" class="wf_preField">{tmpl_var name='vhost_type_txt'}</label>
+        <select id="vhost_type" name="vhost_type">{tmpl_var name='vhost_type'}</select>
+      </span>
+-->      
+      <span class="wf_oneField">
+        <label for="hd_quota" class="wf_preField">{tmpl_var name='hd_quota_txt'}</label>
+        <input type="text" id="hd_quota" name="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7">
+      </span>
+      <span class="wf_oneField">
+        <label for="traffic_quota" class="wf_preField">{tmpl_var name='traffic_quota_txt'}</label>
+        <input type="text" id="traffic_quota" name="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7">
+      </span>
+      <span class="wf_oneField">
+        <label for="cgi" class="wf_preField">{tmpl_var name='cgi_txt'}</label>                    
+        <span class="">{tmpl_var name='cgi'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="ssi" class="wf_preField">{tmpl_var name='ssi_txt'}</label>                    
+        <span class="">{tmpl_var name='ssi'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="suexec" class="wf_preField">{tmpl_var name='suexec_txt'}</label>                    
+        <span class="">{tmpl_var name='suexec'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="errordocs" class="wf_preField">{tmpl_var name='errordocs_txt'}</label>                    
+        <span class="">{tmpl_var name='errordocs'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="ssl" class="wf_preField">{tmpl_var name='ssl_txt'}</label>                    
+        <span class="">{tmpl_var name='ssl'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="php" class="wf_preField">{tmpl_var name='php_txt'}</label>
+        <select id="php" name="php">{tmpl_var name='php'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/web_domain_list.htm b/interface/web/sites/templates/web_domain_list.htm
new file mode 100644
index 0000000000..7f3bcab882
--- /dev/null
+++ b/interface/web/sites/templates/web_domain_list.htm
@@ -0,0 +1,55 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_web_domain">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/sites/templates/web_domain_redirect.htm b/interface/web/sites/templates/web_domain_redirect.htm
new file mode 100644
index 0000000000..10734bdf09
--- /dev/null
+++ b/interface/web/sites/templates/web_domain_redirect.htm
@@ -0,0 +1,25 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_web_domain">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_web_domain"><legend>Redirect</legend>
+      <span class="wf_oneField">
+        <label for="redirect_type" class="wf_preField">{tmpl_var name='redirect_type_txt'}</label>
+        <select id="redirect_type" name="redirect_type">{tmpl_var name='redirect_type'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="redirect_path" class="wf_preField">{tmpl_var name='redirect_path_txt'}</label>
+        <input type="text" id="redirect_path" name="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255">
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/web_domain_ssl.htm b/interface/web/sites/templates/web_domain_ssl.htm
new file mode 100644
index 0000000000..b6df61ab45
--- /dev/null
+++ b/interface/web/sites/templates/web_domain_ssl.htm
@@ -0,0 +1,53 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_web_domain">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_web_domain"><legend>SSL</legend>
+      <span class="wf_oneField">
+        <label for="ssl_state" class="wf_preField">{tmpl_var name='ssl_state_txt'}</label>
+        <input type="text" id="ssl_state" name="ssl_state" value="{tmpl_var name='ssl_state'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ssl_locality" class="wf_preField">{tmpl_var name='ssl_locality_txt'}</label>
+        <input type="text" id="ssl_locality" name="ssl_locality" value="{tmpl_var name='ssl_locality'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ssl_organisation" class="wf_preField">{tmpl_var name='ssl_organisation_txt'}</label>
+        <input type="text" id="ssl_organisation" name="ssl_organisation" value="{tmpl_var name='ssl_organisation'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ssl_organisation_unit" class="wf_preField">{tmpl_var name='ssl_organisation_unit_txt'}</label>
+        <input type="text" id="ssl_organisation_unit" name="ssl_organisation_unit" value="{tmpl_var name='ssl_organisation_unit'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ssl_country" class="wf_preField">{tmpl_var name='ssl_country_txt'}</label>
+        <input type="text" id="ssl_country" name="ssl_country" value="{tmpl_var name='ssl_country'}" size="2" maxlength="2">
+      </span>
+      <span class="wf_oneField">
+        <label for="ssl_request" class="wf_preField">{tmpl_var name='ssl_request_txt'}</label>
+        <textarea id="ssl_request" name="ssl_request" cols='30' rows='10'>{tmpl_var name='ssl_request'}</textarea>
+      </span>
+      <span class="wf_oneField">
+        <label for="ssl_cert" class="wf_preField">{tmpl_var name='ssl_cert_txt'}</label>
+        <textarea id="ssl_cert" name="ssl_cert" cols='30' rows='10'>{tmpl_var name='ssl_cert'}</textarea>
+      </span>
+      <span class="wf_oneField">
+        <label for="ssl_bundle" class="wf_preField">{tmpl_var name='ssl_bundle_txt'}</label>
+        <textarea id="ssl_bundle" name="ssl_bundle" cols='30' rows='10'>{tmpl_var name='ssl_bundle'}</textarea>
+      </span>
+      <span class="wf_oneField">
+        <label for="ssl_action" class="wf_preField">{tmpl_var name='ssl_action_txt'}</label>
+        <select id="ssl_action" name="ssl_action">{tmpl_var name='ssl_action'}</select>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/web_subdomain_edit.htm b/interface/web/sites/templates/web_subdomain_edit.htm
new file mode 100644
index 0000000000..0e4736fae2
--- /dev/null
+++ b/interface/web/sites/templates/web_subdomain_edit.htm
@@ -0,0 +1,34 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_web_subdomain">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_web_subdomain"><legend>Domain</legend>
+      <span class="wf_oneField">
+        <label for="domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
+        <input type="text" id="domain" name="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255">&nbsp;.&nbsp;
+        <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="redirect_type" class="wf_preField">{tmpl_var name='redirect_type_txt'}</label>
+        <select id="redirect_type" name="redirect_type">{tmpl_var name='redirect_type'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="redirect_path" class="wf_preField">{tmpl_var name='redirect_path_txt'}</label>
+        <input type="text" id="redirect_path" name="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/web_subdomain_list.htm b/interface/web/sites/templates/web_subdomain_list.htm
new file mode 100644
index 0000000000..18a01543bf
--- /dev/null
+++ b/interface/web/sites/templates/web_subdomain_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_web_subdomain">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_subdomain_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+  <div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+      <table class="list">
+        <thead>
+          <tr>
+            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+          </tr>
+          <tr>
+            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_active'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_subdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+          </tr>
+        </thead>
+        <tbody>
+          <tmpl_loop name="records">
+          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+            <td class="tbl_col_buttons">
+              <div class="buttons icons16">    
+                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_subdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+              </div>
+            </td>
+          </tr>
+          </tmpl_loop>
+        </tbody>
+
+        <tfoot>
+          <tr>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+          </tr>
+        </tfoot>
+      </table>
+    </fieldset>
+  </div>
+
+</div>
diff --git a/interface/web/themes/default/licences.txt b/interface/web/themes/default/licences.txt
index e69de29bb2..85fb3c8262 100644
--- a/interface/web/themes/default/licences.txt
+++ b/interface/web/themes/default/licences.txt
@@ -0,0 +1,8 @@
+Theme created by Martin Henne (red-ray.de)
+
+based on:
+
+Templates: http://www.yaml.de
+Web-Forms: http://formassembly.com/blog/category/wforms-documentation
+Icons: http://www.pinvoke.com and http://www.randomjabber.com/static/sizcons
+Know-How: http://particletree.com/features/rediscovering-the-button-element
diff --git a/interface/web/tools/templates/user_settings.htm b/interface/web/tools/templates/user_settings.htm
new file mode 100644
index 0000000000..dfccf17190
--- /dev/null
+++ b/interface/web/tools/templates/user_settings.htm
@@ -0,0 +1,29 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_usersettings">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_usersettings"><legend>Settings</legend>
+      <span class="wf_oneField">
+        <label for="passwort" class="wf_preField">{tmpl_var name='passwort_txt'}</label>
+        <input type="password" id="passwort" name="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100">
+      </span>
+      <span class="wf_oneField">
+        <label for="passwort2" class="wf_preField">{tmpl_var name='passwort_txt'}</label>
+        <input type="password" id="passwort2" name="passwort2" value="" size="15" maxlength="100">
+      </span>      
+      <span class="wf_oneField">
+        <label for="language" class="wf_preField">{tmpl_var name='language_txt'}</label>
+        <select id="language" name="language">{tmpl_var name='language'}</select>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','tools/user_settings.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('tools/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
-- 
GitLab