diff --git a/interface/web/admin/_templates_old/dbsync_edit.htm b/interface/web/admin/_templates_old/dbsync_edit.htm
deleted file mode 100644
index b8966715f0d6226bacf799e149d6130ebd221843..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/dbsync_edit.htm
+++ /dev/null
@@ -1,60 +0,0 @@
-<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_old/dbsync_list.htm b/interface/web/admin/_templates_old/dbsync_list.htm
deleted file mode 100644
index 88e4e48b4aaa943eff9bde1bfd009b224f50ddde..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/dbsync_list.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<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_old/filesync_edit.htm b/interface/web/admin/_templates_old/filesync_edit.htm
deleted file mode 100644
index f06b20a67ee6a30a8922626ae9ff1ae7f6768c2a..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/filesync_edit.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<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_old/filesync_list.htm b/interface/web/admin/_templates_old/filesync_list.htm
deleted file mode 100644
index 54bcc92f39573eb8db5284e3d417a127b8c492d9..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/filesync_list.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<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_old/firewall_edit.htm b/interface/web/admin/_templates_old/firewall_edit.htm
deleted file mode 100644
index 0710b966cb0c396c6079c07f448ae456fdbc9cfe..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/firewall_edit.htm
+++ /dev/null
@@ -1,32 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" class="text">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='tcp_port_txt'}:</td>
-    <td class="frmText11"><input name="tcp_port" type="text" class="text" value="{tmpl_var name='tcp_port'}" size="30" maxlength="255"> ({tmpl_var name='tcp_port_help_txt'})</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='udp_port_txt'}:</td>
-    <td class="frmText11"><input name="udp_port" type="text" class="text" value="{tmpl_var name='udp_port'}" size="30" maxlength="255"> ({tmpl_var name='udp_port_help_txt'})</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/firewall_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/firewall_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_old/firewall_list.htm b/interface/web/admin/_templates_old/firewall_list.htm
deleted file mode 100644
index e2afad689aabb5931097a9298eb942513039d980..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/firewall_list.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<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/firewall_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="tcp_port_txt"></td>
-    <td class="tblHead"><tmpl_var name="udp_port_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','admin/firewall_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','admin/firewall_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" 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/firewall_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/firewall_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="tcp_port"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="udp_port"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('admin/firewall_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="5" 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_old/groups_edit.htm b/interface/web/admin/_templates_old/groups_edit.htm
deleted file mode 100644
index acd34315aaca7774e0d4131522a7cb5ac17389b0..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/groups_edit.htm
+++ /dev/null
@@ -1,20 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='name_txt'}:</td>
-    <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='description_txt'}:</td>
-    <td class="frmText11"><textarea name='description' cols='30' rows='5'>{tmpl_var name='description'}</textarea></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/groups_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/groups_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_old/groups_list.htm b/interface/web/admin/_templates_old/groups_list.htm
deleted file mode 100644
index 9b2e6ec45ed6889a1eb71d5b9af62ead8e56d4ca..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/groups_list.htm
+++ /dev/null
@@ -1,25 +0,0 @@
-<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/groups_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="name_txt"></td>
-    <td class="tblHead"><tmpl_var name="description_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" 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/groups_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/groups_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="name"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="description"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('admin/groups_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="3" 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_old/index.htm b/interface/web/admin/_templates_old/index.htm
deleted file mode 100644
index af992e8819e0c450dcc2a306a8d573b996cd9509..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/index.htm
+++ /dev/null
@@ -1,13 +0,0 @@
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<table width="288" border="0" align="center" cellpadding="4" cellspacing="0">
-  <tr>
-    <td>&nbsp;</td>
-    <td>&nbsp;Admin</td>
-  </tr>
-</table>
diff --git a/interface/web/admin/_templates_old/language_add.htm b/interface/web/admin/_templates_old/language_add.htm
deleted file mode 100644
index f9db2fecdaa04f9acd64cf844897461c7f359a81..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/language_add.htm
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
-<p class="frmText11">
-  <tmpl_var name="language_select_txt">: <select name="lng_select">{tmpl_var name='language_option'}</select>
-  <tmpl_var name="language_new_txt">: <input type="text" name="lng_new" value="" class="text" size="2" maxlength="2" />
-</p>
-<tmpl_if name="msg">
-  <p class="msg" ><tmpl_var name="msg"></p>
-</tmpl_if>
-<tmpl_if name="error">
-  <p class="error" ><tmpl_var name="error"></p>
-</tmpl_if>
-<input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_add.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><div class="buttonEnding"></div>
\ No newline at end of file
diff --git a/interface/web/admin/_templates_old/language_complete.htm b/interface/web/admin/_templates_old/language_complete.htm
deleted file mode 100644
index 144e9ebcc163d1d5f38dbaeacde9455ac415f06f..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/language_complete.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
-<p class="frmText11">
-  <tmpl_var name="language_select_txt">: <select name="lng_select">{tmpl_var name='language_option'}</select>
-</p>
-<tmpl_if name="msg">
-  <p class="msg" ><tmpl_var name="msg"></p>
-</tmpl_if>
-<tmpl_if name="error">
-  <p class="error" ><tmpl_var name="error"></p>
-</tmpl_if>
-<input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_complete.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><div class="buttonEnding"></div>
\ No newline at end of file
diff --git a/interface/web/admin/_templates_old/language_edit.htm b/interface/web/admin/_templates_old/language_edit.htm
deleted file mode 100644
index 3053ee079430baa1713e9e01c41e48ed84bfa567..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/language_edit.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
-<table width="100%" border="0" cellspacing="0" cellpadding="4">
-  <tr>
-    <td class="tblHead"><tmpl_var name="key_txt"></td>
-    <td class="tblHead"><tmpl_var name="value_txt"></td>
-  </tr>
-  <tr>
-  	<td colspan="2">&nbsp;</td>
-  </tr>
-  <tmpl_loop name="records">
-  <tr bgcolor="{tmpl_var name="bgcolor"}">
-    <td class="frmText11">{tmpl_var name="key"}</td>
-    <td class="frmText11"><input name="records[{tmpl_var name="key"}]" type="text" class="text" value="{tmpl_var name='val'}" size="50" maxlength="255"></td>
-  </tr>
-  </tmpl_loop>
-  <tr>
-  	<td colspan="2">&nbsp;</td>
-  </tr>
-  <tmpl_if name="msg">
-  <tr>
-    <td class="msg" colspan="2"><tmpl_var name="msg"></td>
-  </tr>
-  <tr>
-  	<td colspan="2">&nbsp;</td>
-  </tr>
-  </tmpl_if>
-  <tr>
-    <td>&nbsp;</td>
-    <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php?lng_select={tmpl_var name='lang'}');"><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<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'}">
\ No newline at end of file
diff --git a/interface/web/admin/_templates_old/language_export.htm b/interface/web/admin/_templates_old/language_export.htm
deleted file mode 100644
index 732e9e40899623155dd5533518eb176a340ac767..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/language_export.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
-<p class="frmText11">
-  <tmpl_var name="language_select_txt">: <select name="lng_select">{tmpl_var name='language_option'}</select>
-</p>
-<tmpl_if name="msg">
-  <p class="msg" ><tmpl_var name="msg"></p>
-</tmpl_if>
-<tmpl_if name="error">
-  <p class="error" ><tmpl_var name="error"></p>
-</tmpl_if>
-<input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_export.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><div class="buttonEnding"></div>
\ No newline at end of file
diff --git a/interface/web/admin/_templates_old/language_import.htm b/interface/web/admin/_templates_old/language_import.htm
deleted file mode 100644
index 7dbce708e90d08efb7e44fd38baa603ba7164a7d..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/language_import.htm
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
-<p class="frmText11">
-  <tmpl_var name="language_import_txt">: <input type="file" name="file" id="file" /><br />
-  <tmpl_var name="language_overwrite_txt"> <input type="checkbox" name="overwrite" value="1" id="overwrite" />
-</p>
-<input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitUploadForm('pageForm','admin/language_import.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><div class="buttonEnding"></div>
-<tmpl_if name="error">
-  <p class="error" ><tmpl_var name="error"></p>
-</tmpl_if>
-<tmpl_if name="msg">
-  <p class="msg" ><tmpl_var name="msg"></p>
-</tmpl_if>
\ No newline at end of file
diff --git a/interface/web/admin/_templates_old/language_list.htm b/interface/web/admin/_templates_old/language_list.htm
deleted file mode 100644
index 990272a822fffe52f33866df51f010138657bb1c..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/language_list.htm
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
-<p class="frmText11"><tmpl_var name="language_select_txt">: <select name="lng_select" onChange="submitForm('pageForm','admin/language_list.php');">{tmpl_var name='language_option'}</select></p>
-<table width="100%" border="0" cellspacing="0" cellpadding="4">
-  <tr>
-    <td class="tblHead"><tmpl_var name="module_txt"></td>
-    <td class="tblHead"><tmpl_var name="lang_file_txt"></td>
-  </tr>
-  <tmpl_loop name="records">
-  <tr bgcolor="{tmpl_var name="bgcolor"}">
-    <td class="frmText11"><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"}');" class="frmText11">{tmpl_var name="module"}</a></td>
-    <td class="frmText11"><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"}');" class="frmText11">{tmpl_var name="lang_file"}</a></td>
-  </tr>
-  </tmpl_loop>
-  <tr>
-  	<td colspan="2" 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_old/server_config_fastcgi_edit.htm b/interface/web/admin/_templates_old/server_config_fastcgi_edit.htm
deleted file mode 100644
index ac972f4b5ab7e64c1630ef02a5cad08d364e21dc..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/server_config_fastcgi_edit.htm
+++ /dev/null
@@ -1,40 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='fastcgi_starter_path_txt'}:</td>
-    <td class="frmText11"><input name="fastcgi_starter_path" type="text" class="text" value="{tmpl_var name='fastcgi_starter_path'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='fastcgi_starter_script_txt'}:</td>
-    <td class="frmText11"><input name="fastcgi_starter_script" type="text" class="text" value="{tmpl_var name='fastcgi_starter_script'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='fastcgi_alias_txt'}:</td>
-    <td class="frmText11"><input name="fastcgi_alias" type="text" class="text" value="{tmpl_var name='fastcgi_alias'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='fastcgi_phpini_path_txt'}:</td>
-    <td class="frmText11"><input name="fastcgi_phpini_path" type="text" class="text" value="{tmpl_var name='fastcgi_phpini_path'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='fastcgi_children_txt'}:</td>
-    <td class="frmText11"><input name="fastcgi_children" type="text" class="text" value="{tmpl_var name='fastcgi_children'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='fastcgi_max_requests_txt'}:</td>
-    <td class="frmText11"><input name="fastcgi_max_requests" type="text" class="text" value="{tmpl_var name='fastcgi_max_requests'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='fastcgi_bin_txt'}:</td>
-    <td class="frmText11"><input name="fastcgi_bin" type="text" class="text" value="{tmpl_var name='fastcgi_bin'}" size="40" maxlength="255"></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/server_config_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/server_config_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_old/server_config_getmail_edit.htm b/interface/web/admin/_templates_old/server_config_getmail_edit.htm
deleted file mode 100644
index d2b8abbc21d6e69a147a3da36b3b89bf783a1fde..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/server_config_getmail_edit.htm
+++ /dev/null
@@ -1,16 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='getmail_config_dir_txt'}:</td>
-    <td class="frmText11"><input name="getmail_config_dir" type="text" class="text" value="{tmpl_var name='getmail_config_dir'}" size="40" maxlength="255"></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/server_config_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/server_config_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_old/server_config_jailkit_edit.htm b/interface/web/admin/_templates_old/server_config_jailkit_edit.htm
deleted file mode 100644
index aae780c3ed97d1bdb60737522498e1d81cb3f871..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/server_config_jailkit_edit.htm
+++ /dev/null
@@ -1,24 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='jailkit_chroot_home_txt'}:</td>
-    <td class="frmText11"><input name="jailkit_chroot_home" type="text" class="text" value="{tmpl_var name='jailkit_chroot_home'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='jailkit_chroot_app_sections_txt'}:</td>
-    <td class="frmText11"><input name="jailkit_chroot_app_sections" type="text" class="text" value="{tmpl_var name='jailkit_chroot_app_sections'}" size="40" maxlength="1000"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='jailkit_chroot_app_programs_txt'}:</td>
-    <td class="frmText11"><input name="jailkit_chroot_app_programs" type="text" class="text" value="{tmpl_var name='jailkit_chroot_app_programs'}" size="40" maxlength="1000"></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/server_config_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/server_config_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_old/server_config_list.htm b/interface/web/admin/_templates_old/server_config_list.htm
deleted file mode 100644
index d87841000b4b6e858f7d9811e9b7650a5053d96f..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/server_config_list.htm
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
-  <tr>
-    <td class="tblHead"><tmpl_var name="server_name_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_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/server_config_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/server_config_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_name"}</a></td>
-    <td class="frmText11" align="right">[<a href="javascript: del_record('admin/server_config_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="2" 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_old/server_config_mail_edit.htm b/interface/web/admin/_templates_old/server_config_mail_edit.htm
deleted file mode 100644
index 6d40ef3152a867ba1f8f9f858838ae12bdbfee85..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/server_config_mail_edit.htm
+++ /dev/null
@@ -1,64 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='module_txt'}:</td>
-    <td class="frmText11">
-		<select name="module" class="text">
-			{tmpl_var name='module'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='maildir_path_txt'}:</td>
-    <td class="frmText11"><input name="maildir_path" type="text" class="text" value="{tmpl_var name='maildir_path'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='homedir_path_txt'}:</td>
-    <td class="frmText11"><input name="homedir_path" type="text" class="text" value="{tmpl_var name='homedir_path'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mailuser_uid_txt'}:</td>
-    <td class="frmText11"><input name="mailuser_uid" type="text" class="text" value="{tmpl_var name='mailuser_uid'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mailuser_gid_txt'}:</td>
-    <td class="frmText11"><input name="mailuser_gid" type="text" class="text" value="{tmpl_var name='mailuser_gid'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mailuser_name_txt'}:</td>
-    <td class="frmText11"><input name="mailuser_name" type="text" class="text" value="{tmpl_var name='mailuser_name'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mailuser_group_txt'}:</td>
-    <td class="frmText11"><input name="mailuser_group" type="text" class="text" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='relayhost_txt'}:</td>
-    <td class="frmText11"><input name="relayhost" type="text" class="text" value="{tmpl_var name='relayhost'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='relayhost_user_txt'}:</td>
-    <td class="frmText11"><input name="relayhost_user" type="text" class="text" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='relayhost_password_txt'}:</td>
-    <td class="frmText11"><input name="relayhost_password" type="text" class="text" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mailbox_size_limit_txt'}:</td>
-    <td class="frmText11"><input name="mailbox_size_limit" type="text" class="text" value="{tmpl_var name='mailbox_size_limit'}" size="10" maxlength="15"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='message_size_limit_txt'}:</td>
-    <td class="frmText11"><input name="message_size_limit" type="text" class="text" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15"></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/server_config_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/server_config_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_old/server_config_server_edit.htm b/interface/web/admin/_templates_old/server_config_server_edit.htm
deleted file mode 100644
index 0d9d72202dd8b55d386b90a628b5fdc3eb0bc100..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/server_config_server_edit.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='auto_network_configuration_txt'}:</td>
-    <td width="366" class="frmText11">{tmpl_var name='auto_network_configuration'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ip_address_txt'}:</td>
-    <td class="frmText11"><input name="ip_address" type="text" class="text" value="{tmpl_var name='ip_address'}" size="15" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='netmask_txt'}:</td>
-    <td class="frmText11"><input name="netmask" type="text" class="text" value="{tmpl_var name='netmask'}" size="15" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='gateway_txt'}:</td>
-    <td class="frmText11"><input name="gateway" type="text" class="text" value="{tmpl_var name='gateway'}" size="15" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='hostname_txt'}:</td>
-    <td class="frmText11"><input name="hostname" type="text" class="text" value="{tmpl_var name='hostname'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='nameservers_txt'}:</td>
-    <td class="frmText11"><input name="nameservers" type="text" class="text" value="{tmpl_var name='nameservers'}" size="40" maxlength="255"></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/server_config_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/server_config_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_old/server_config_web_edit.htm b/interface/web/admin/_templates_old/server_config_web_edit.htm
deleted file mode 100644
index 59ca5138b0fc89d0b040241f622b40a4fd66617c..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/server_config_web_edit.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='website_path_txt'}:</td>
-    <td class="frmText11"><input name="website_path" type="text" class="text" value="{tmpl_var name='website_path'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='website_symlinks_txt'}:</td>
-    <td class="frmText11"><input name="website_symlinks" type="text" class="text" value="{tmpl_var name='website_symlinks'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='vhost_conf_dir_txt'}:</td>
-    <td class="frmText11"><input name="vhost_conf_dir" type="text" class="text" value="{tmpl_var name='vhost_conf_dir'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='vhost_conf_enabled_dir_txt'}:</td>
-    <td class="frmText11"><input name="vhost_conf_enabled_dir" type="text" class="text" value="{tmpl_var name='vhost_conf_enabled_dir'}" size="40" maxlength="255"></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/server_config_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/server_config_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_old/server_edit_config.htm b/interface/web/admin/_templates_old/server_edit_config.htm
deleted file mode 100644
index 3e1a335d279faf0cf4b39521d04fdd59568a7267..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/server_edit_config.htm
+++ /dev/null
@@ -1,16 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='config_txt'}:</td>
-    <td class="frmText11"><textarea name='config' cols='60' rows='30'>{tmpl_var name='config'}</textarea></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/server_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/server_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_old/server_edit_services.htm b/interface/web/admin/_templates_old/server_edit_services.htm
deleted file mode 100644
index 1c9e3fd28c668c8060d6e2c9efc702b512818247..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/server_edit_services.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_name_txt'}:</td>
-    <td class="frmText11"><input name="server_name" type="text" class="text" value="{tmpl_var name='server_name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mail_server_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='mail_server'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='web_server_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='web_server'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='dns_server_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='dns_server'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='file_server_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='file_server'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='db_server_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='db_server'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='vserver_server_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='vserver_server'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='active_txt'}:</td>
-    <td class="frmText11">
-		<select name="active" class="text">
-			{tmpl_var name='active'}
-		</select>
-	</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/server_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/server_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_old/server_ip_edit.htm b/interface/web/admin/_templates_old/server_ip_edit.htm
deleted file mode 100644
index 6e8ce774a7083fd9861adf03c39de2aeb9f7fafd..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/server_ip_edit.htm
+++ /dev/null
@@ -1,29 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" class="text">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ip_address_txt'}:</td>
-    <td class="frmText11"><input name="ip_address" type="text" class="text" value="{tmpl_var name='ip_address'}" size="15" maxlength="15"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='virtualhost_txt'}:</td>
-    <td width="366" class="frmText11">{tmpl_var name='virtualhost'}</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/server_ip_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/server_ip_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_old/server_ip_list.htm b/interface/web/admin/_templates_old/server_ip_list.htm
deleted file mode 100644
index 374827933a745dd6766bde34854db86f4cda66c6..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/server_ip_list.htm
+++ /dev/null
@@ -1,25 +0,0 @@
-<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/server_ip_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="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="ip_address_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','admin/server_ip_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" 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/server_ip_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/server_ip_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="ip_address"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('admin/server_ip_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="3" 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_old/server_list.htm b/interface/web/admin/_templates_old/server_list.htm
deleted file mode 100644
index 07445f53fc60f191b658fc8cfe9b45726d5a10c3..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/server_list.htm
+++ /dev/null
@@ -1,39 +0,0 @@
-<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
-  <tr>
-    <td class="tblHead"><tmpl_var name="server_name_txt"></td>
-    <td class="tblHead"><tmpl_var name="mail_server_txt"></td>
-    <td class="tblHead"><tmpl_var name="web_server_txt"></td>
-    <td class="tblHead"><tmpl_var name="dns_server_txt"></td>
-    <td class="tblHead"><tmpl_var name="file_server_txt"></td>
-    <td class="tblHead"><tmpl_var name="db_server_txt"></td>
-    <td class="tblHead"><tmpl_var name="vserver_server_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_mail_server" value="{tmpl_var name='search_mail_server'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_web_server" value="{tmpl_var name='search_web_server'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_dns_server" value="{tmpl_var name='search_dns_server'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_file_server" value="{tmpl_var name='search_file_server'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_db_server" value="{tmpl_var name='search_db_server'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_vserver_server" value="{tmpl_var name='search_vserver_server'}" 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/server_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/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_name"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="mail_server"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="web_server"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="dns_server"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="file_server"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="db_server"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="vserver_server"}</a></td>
-    <td class="frmText11" align="right">&nbsp;</td>
-  </tr>
-  </tmpl_loop>
-
-  <tr>
-  	<td colspan="8" 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_old/software_package_list.htm b/interface/web/admin/_templates_old/software_package_list.htm
deleted file mode 100644
index 399d9723aa97ee47b526f4ec250ab218ec759512..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/software_package_list.htm
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
-<table width="100%" border="0" cellspacing="0" cellpadding="4">
-  <tr>
-    <td class="tblHead"><tmpl_var name="installed_txt"></td>
-    <td class="tblHead"><tmpl_var name="package_title_txt"></td>
-    <td class="tblHead"><tmpl_var name="package_description_txt"></td>
-  </tr>
-  <tmpl_loop name="records">
-  <tr bgcolor="{tmpl_var name="bgcolor"}">
-  	<td class="frmText11">{tmpl_var name="installed"}</td>
-    <td class="frmText11">{tmpl_var name="package_title"}</td>
-    <td class="frmText11">{tmpl_var name="package_description"}</td>
-  </tr>
-  </tmpl_loop>
-  <tr>
-  	<td colspan="3" height="40" align="center" class="tblFooter">&nbsp;</td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/admin/_templates_old/software_repo_edit.htm b/interface/web/admin/_templates_old/software_repo_edit.htm
deleted file mode 100644
index eb719e92ac8e19deaa89255b0e981811d69fad26..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/software_repo_edit.htm
+++ /dev/null
@@ -1,32 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='repo_name_txt'}:</td>
-    <td class="frmText11"><input name="repo_name" type="text" class="text" value="{tmpl_var name='repo_name'}" size="40" maxlength="40"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='repo_url_txt'}:</td>
-    <td class="frmText11"><input name="repo_url" type="text" class="text" value="{tmpl_var name='repo_url'}" size="40" maxlength="40"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='repo_username_txt'}:</td>
-    <td class="frmText11"><input name="repo_username" type="text" class="text" value="{tmpl_var name='repo_username'}" size="30" maxlength="30"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='repo_password_txt'}:</td>
-    <td class="frmText11"><input name="repo_password" type="password" class="text" value="{tmpl_var name='repo_password'}" size="30" maxlength="30"></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/software_repo_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/software_repo_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_old/software_repo_list.htm b/interface/web/admin/_templates_old/software_repo_list.htm
deleted file mode 100644
index e3aa1d91d801ef021921fb926121b8d266a9ae0e..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/software_repo_list.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<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/software_repo_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="repo_name_txt"></td>
-    <td class="tblHead"><tmpl_var name="repo_url_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','admin/software_repo_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><input type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" 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/software_repo_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/software_repo_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="repo_name"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="repo_url"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('admin/software_repo_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_old/software_update_list.htm b/interface/web/admin/_templates_old/software_update_list.htm
deleted file mode 100644
index 34aa7792dee4e2387a9f69ee00b2afbdd9e751f0..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/software_update_list.htm
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
-<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>
-<br /><br />
-
-<table width="100%" border="0" cellspacing="0" cellpadding="4">
-  <tr>
-    <td class="tblHead"><tmpl_var name="installed_txt"></td>
-	<td class="tblHead"><tmpl_var name="update_title_txt"></td>
-    <td class="tblHead"><tmpl_var name="version_txt"></td>
-  </tr>
-  <tmpl_loop name="records">
-  <tr bgcolor="{tmpl_var name="bgcolor"}">
-  	<td class="frmText11">{tmpl_var name="installed"}</td>
-	<td class="frmText11">{tmpl_var name="update_title"}</td>
-    <td class="frmText11">{tmpl_var name="version"}</td>
-  </tr>
-  </tmpl_loop>
-  <tr>
-  	<td colspan="3" height="40" align="center" class="tblFooter">&nbsp;</td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/admin/_templates_old/users_address_edit.htm b/interface/web/admin/_templates_old/users_address_edit.htm
deleted file mode 100644
index 8eff0b96b09b671e8b389d0abe3a5e1123c4e029..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/users_address_edit.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='name_txt'}:</td>
-    <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='vorname_txt'}:</td>
-    <td class="frmText11"><input name="vorname" type="text" class="text" value="{tmpl_var name='vorname'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='unternehmen_txt'}:</td>
-    <td class="frmText11"><input name="unternehmen" type="text" class="text" value="{tmpl_var name='unternehmen'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='strasse_txt'}:</td>
-    <td class="frmText11"><input name="strasse" type="text" class="text" value="{tmpl_var name='strasse'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ort_txt'}:</td>
-    <td class="frmText11"><input name="ort" type="text" class="text" value="{tmpl_var name='ort'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='plz_txt'}:</td>
-    <td class="frmText11"><input name="plz" type="text" class="text" value="{tmpl_var name='plz'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='land_txt'}:</td>
-    <td class="frmText11"><input name="land" type="text" class="text" value="{tmpl_var name='land'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='email_txt'}:</td>
-    <td class="frmText11"><input name="email" type="text" class="text" value="{tmpl_var name='email'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='url_txt'}:</td>
-    <td class="frmText11"><input name="url" type="text" class="text" value="{tmpl_var name='url'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='telefon_txt'}:</td>
-    <td class="frmText11"><input name="telefon" type="text" class="text" value="{tmpl_var name='telefon'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='fax_txt'}:</td>
-    <td class="frmText11"><input name="fax" type="text" class="text" value="{tmpl_var name='fax'}" size="30" maxlength="255"></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/users_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/users_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_old/users_groups_edit.htm b/interface/web/admin/_templates_old/users_groups_edit.htm
deleted file mode 100644
index 2fb57fa7f4fff35d8daf64d3a68854a784d43322..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/users_groups_edit.htm
+++ /dev/null
@@ -1,24 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='default_group_txt'}:</td>
-    <td class="frmText11">
-		<select name="default_group" class="text">
-			{tmpl_var name='default_group'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='groups_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='groups'}</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/users_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/users_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_old/users_list.htm b/interface/web/admin/_templates_old/users_list.htm
deleted file mode 100644
index e748add00a44fcfde3b7b0217d47492fb1b1c2bf..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/users_list.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<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/users_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="username_txt"></td>
-    <td class="tblHead"><tmpl_var name="vorname_txt"></td>
-    <td class="tblHead"><tmpl_var name="name_txt"></td>
-    <td class="tblHead"><tmpl_var name="ort_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_vorname" value="{tmpl_var name='search_vorname'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_ort" value="{tmpl_var name='search_ort'}" 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/users_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/users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="username"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="vorname"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="name"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="ort"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('admin/users_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="5" 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_old/users_user_edit.htm b/interface/web/admin/_templates_old/users_user_edit.htm
deleted file mode 100644
index 6b5ab4dea3e5f2c1d463c79d0ca3a28cb07979c8..0000000000000000000000000000000000000000
--- a/interface/web/admin/_templates_old/users_user_edit.htm
+++ /dev/null
@@ -1,52 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='username_txt'}:</td>
-    <td class="frmText11"><input name="username" type="text" class="text" value="{tmpl_var name='username'}" size="15" maxlength="50"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='passwort_txt'}:</td>
-    <td class="frmText11"><input name="passwort" type="password" class="text" value="{tmpl_var name='passwort'}" size="15" maxlength="100"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='modules_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='modules'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='startmodule_txt'}:</td>
-    <td class="frmText11">
-		<select name="startmodule" class="text">
-			{tmpl_var name='startmodule'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='app_theme_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='app_theme'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='typ_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='typ'}</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">{tmpl_var name='language_txt'}:</td>
-    <td class="frmText11">
-		<select name="language" class="text">
-			{tmpl_var name='language'}
-		</select>
-	</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/users_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/users_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/client/_templates_old/client_edit_address.htm b/interface/web/client/_templates_old/client_edit_address.htm
deleted file mode 100644
index 0df4029e1b858cccbb0da7247d5cd18cd5de3ee8..0000000000000000000000000000000000000000
--- a/interface/web/client/_templates_old/client_edit_address.htm
+++ /dev/null
@@ -1,92 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='company_name_txt'}:</td>
-    <td class="frmText11"><input name="company_name" type="text" class="text" value="{tmpl_var name='company_name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='contact_name_txt'}:</td>
-    <td class="frmText11"><input name="contact_name" type="text" class="text" value="{tmpl_var name='contact_name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='username_txt'}:</td>
-    <td class="frmText11"><input name="username" type="text" class="text" value="{tmpl_var name='username'}" size="30" maxlength="50"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='password_txt'}:</td>
-    <td class="frmText11"><input name="password" type="password" class="text" value="{tmpl_var name='password'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='language_txt'}:</td>
-    <td class="frmText11">
-		<select name="language" class="text">
-			{tmpl_var name='language'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='usertheme_txt'}:</td>
-    <td class="frmText11">
-		<select name="usertheme" class="text">
-			{tmpl_var name='usertheme'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='street_txt'}:</td>
-    <td class="frmText11"><input name="street" type="text" class="text" value="{tmpl_var name='street'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='zip_txt'}:</td>
-    <td class="frmText11"><input name="zip" type="text" class="text" value="{tmpl_var name='zip'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='city_txt'}:</td>
-    <td class="frmText11"><input name="city" type="text" class="text" value="{tmpl_var name='city'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='state_txt'}:</td>
-    <td class="frmText11"><input name="state" type="text" class="text" value="{tmpl_var name='state'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='country_txt'}:</td>
-    <td class="frmText11"><input name="country" type="text" class="text" value="{tmpl_var name='country'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='telephone_txt'}:</td>
-    <td class="frmText11"><input name="telephone" type="text" class="text" value="{tmpl_var name='telephone'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mobile_txt'}:</td>
-    <td class="frmText11"><input name="mobile" type="text" class="text" value="{tmpl_var name='mobile'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='fax_txt'}:</td>
-    <td class="frmText11"><input name="fax" type="text" class="text" value="{tmpl_var name='fax'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='email_txt'}:</td>
-    <td class="frmText11"><input name="email" type="text" class="text" value="{tmpl_var name='email'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='internet_txt'}:</td>
-    <td class="frmText11"><input name="internet" type="text" class="text" value="{tmpl_var name='internet'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='icq_txt'}:</td>
-    <td class="frmText11"><input name="icq" type="text" class="text" value="{tmpl_var name='icq'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='notes_txt'}:</td>
-    <td class="frmText11"><textarea name='notes' cols='30' rows='10'>{tmpl_var name='notes'}</textarea></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','client/client_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_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/client/_templates_old/client_edit_limits.htm b/interface/web/client/_templates_old/client_edit_limits.htm
deleted file mode 100644
index f645cda9aa8bd60d581386556491dbba37c8ccc8..0000000000000000000000000000000000000000
--- a/interface/web/client/_templates_old/client_edit_limits.htm
+++ /dev/null
@@ -1,151 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td><h2>Email</h2></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='default_mailserver_txt'}:</td>
-    <td class="frmText11">
-		<select name="default_mailserver" class="text">
-			{tmpl_var name='default_mailserver'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11" width="280">{tmpl_var name='limit_maildomain_txt'}:</td>
-    <td class="frmText11" width="220"><input name="limit_maildomain" type="text" class="text" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='limit_mailbox_txt'}:</td>
-    <td class="frmText11"><input name="limit_mailbox" type="text" class="text" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='limit_mailalias_txt'}:</td>
-    <td class="frmText11"><input name="limit_mailalias" type="text" class="text" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='limit_mailforward_txt'}:</td>
-    <td class="frmText11"><input name="limit_mailforward" type="text" class="text" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='limit_mailcatchall_txt'}:</td>
-    <td class="frmText11"><input name="limit_mailcatchall" type="text" class="text" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='limit_mailrouting_txt'}:</td>
-    <td class="frmText11"><input name="limit_mailrouting" type="text" class="text" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10"></td>
-  </tr>
-  <!--
-  <tr>
-    <td class="frmText11">{tmpl_var name='limit_mailfilter_txt'}:</td>
-    <td class="frmText11"><input name="limit_mailfilter" type="text" class="text" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10"></td>
-  </tr>
-  -->
-  <tr>
-    <td class="frmText11">{tmpl_var name='limit_fetchmail_txt'}:</td>
-    <td class="frmText11"><input name="limit_fetchmail" type="text" class="text" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='limit_mailquota_txt'}:</td>
-    <td class="frmText11"><input name="limit_mailquota" type="text" class="text" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10"> MB</td>
-  </tr>
-  <tr>
-    <td><h2>Spamfilter</h2></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='limit_spamfilter_wblist_txt'}:</td>
-    <td class="frmText11"><input name="limit_spamfilter_wblist" type="text" class="text" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='limit_spamfilter_user_txt'}:</td>
-    <td class="frmText11"><input name="limit_spamfilter_user" type="text" class="text" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='limit_spamfilter_policy_txt'}:</td>
-    <td class="frmText11"><input name="limit_spamfilter_policy" type="text" class="text" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td><h2>Websites</h2></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='default_webserver_txt'}:</td>
-    <td class="frmText11">
-		<select name="default_webserver" class="text">
-			{tmpl_var name='default_webserver'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11" width="280">{tmpl_var name='limit_web_domain_txt'}:</td>
-    <td class="frmText11" width="220"><input name="limit_web_domain" type="text" class="text" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td class="frmText11" width="280">{tmpl_var name='limit_web_subdomain_txt'}:</td>
-    <td class="frmText11" width="220"><input name="limit_web_subdomain" type="text" class="text" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td class="frmText11" width="280">{tmpl_var name='limit_web_aliasdomain_txt'}:</td>
-    <td class="frmText11" width="220"><input name="limit_web_aliasdomain" type="text" class="text" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td class="frmText11" width="280">{tmpl_var name='limit_ftp_user_txt'}:</td>
-    <td class="frmText11" width="220"><input name="limit_ftp_user" type="text" class="text" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td class="frmText11" width="280">{tmpl_var name='limit_shell_user_txt'}:</td>
-    <td class="frmText11" width="220"><input name="limit_shell_user" type="text" class="text" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td><h2>DNS</h2></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='default_dnsserver_txt'}:</td>
-    <td class="frmText11">
-		<select name="default_dnsserver" class="text">
-			{tmpl_var name='default_dnsserver'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11" width="280">{tmpl_var name='limit_dns_zone_txt'}:</td>
-    <td class="frmText11" width="220"><input name="limit_dns_zone" type="text" class="text" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td class="frmText11" width="280">{tmpl_var name='limit_dns_record_txt'}:</td>
-    <td class="frmText11" width="220"><input name="limit_dns_record" type="text" class="text" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td><h2>Database</h2></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='default_dbserver_txt'}:</td>
-    <td class="frmText11">
-		<select name="default_dbserver" class="text">
-			{tmpl_var name='default_dbserver'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11" width="280">{tmpl_var name='limit_database_txt'}:</td>
-    <td class="frmText11" width="220"><input name="limit_database" type="text" class="text" value="{tmpl_var name='limit_database'}" size="10" maxlength="10"></td>
-  </tr>
-  <tmpl_if name='is_reseller' op='!=' value='1'>
-  <tr>
-    <td><h2>Clients</h2></td>
-  </tr>
-  <tr>
-    <td class="frmText11" width="280">{tmpl_var name='limit_client_txt'}:</td>
-    <td class="frmText11" width="220"><input name="limit_client" type="text" class="text" value="{tmpl_var name='limit_client'}" size="10" maxlength="10"></td>
-  </tr>
-  </tmpl_if>
-  <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','client/client_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_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/client/_templates_old/clients_list.htm b/interface/web/client/_templates_old/clients_list.htm
deleted file mode 100644
index 77fdbed0a9a72e1c8349f0fcf3631fa329d42e4f..0000000000000000000000000000000000000000
--- a/interface/web/client/_templates_old/clients_list.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<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('client/client_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="company_name_txt"></td>
-    <td class="tblHead"><tmpl_var name="contact_name_txt"></td>
-    <td class="tblHead"><tmpl_var name="city_txt"></td>
-    <td class="tblHead"><tmpl_var name="country_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_country" value="{tmpl_var name='search_country'}" 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','client/client_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('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="company_name"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="contact_name"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="city"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="country"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('client/client_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="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_a_edit.htm b/interface/web/dns/_templates_old/dns_a_edit.htm
deleted file mode 100644
index 15f1a513307db7bef7103593fec354959419eff3..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_a_edit.htm
+++ /dev/null
@@ -1,30 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='name_txt'}:</td>
-    <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='data_txt'}:</td>
-    <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="15" maxlength="15"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ttl_txt'}:</td>
-    <td class="frmText11"><input name="ttl" type="text" class="text" value="{tmpl_var name='ttl'}" size="10" maxlength="10"></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','dns/dns_a_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div>
-      <input name="type" type="hidden" value="{tmpl_var name='type'}">
-	</td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_a_list.htm b/interface/web/dns/_templates_old/dns_a_list.htm
deleted file mode 100644
index b6949a55726aeba70e7203cf1d1a8ac6438bd69d..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_a_list.htm
+++ /dev/null
@@ -1,42 +0,0 @@
-Add: <input type="button" value="A" class="button" onClick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');" /><div class="buttonEnding"></div>
-<input type="button" value="ALIAS" class="button" onClick="loadContent('dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}');" /><div class="buttonEnding"></div>
-<input type="button" value="CNAME" class="button" onClick="loadContent('dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}');" /><div class="buttonEnding"></div>
-<input type="button" value="HINFO" class="button" onClick="loadContent('dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}');" /><div class="buttonEnding"></div>
-<input type="button" value="MX" class="button" onClick="loadContent('dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}');" /><div class="buttonEnding"></div>
-<input type="button" value="NS" class="button" onClick="loadContent('dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}');" /><div class="buttonEnding"></div>
-<input type="button" value="PTR" class="button" onClick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');" /><div class="buttonEnding"></div>
-<input type="button" value="RP" class="button" onClick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');" /><div class="buttonEnding"></div>
-<input type="button" value="SRV" class="button" onClick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');" /><div class="buttonEnding"></div>
-<input type="button" value="TXT" class="button" onClick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');" /><div class="buttonEnding"></div>
-<br /><br />
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
-  <tr>
-    <td class="tblHead"><tmpl_var name="active_txt"></td>
-	<td class="tblHead"><tmpl_var name="type_txt"></td>
-    <td class="tblHead"><tmpl_var name="name_txt"></td>
-	<td class="tblHead"><tmpl_var name="data_txt"></td>
-	<td class="tblHead"><tmpl_var name="aux_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="changeTab('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_active'}</select></td>
-	<td class="frmText11"><select name="search_type" onChange="changeTab('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_type'}</select></td>
-    <td class="frmText11"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" class="text" size="20" /></td>
-	<td class="frmText11"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" class="text" size="20" /></td>
-	<td class="frmText11"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" class="text" size="5" /></td>
-    <td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="changeTab('dns_records','dns/dns_soa_edit.php');"><div class="buttonEnding"></div></td>
-  </tr>
-  <tmpl_loop name="records">
-  <tr bgcolor="{tmpl_var name="bgcolor"}">
-    <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-	<td class="frmText11"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="type"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="name"}</a></td>
-	<td class="frmText11"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="data"}</a></td>
-	<td class="frmText11"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="aux"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('dns/dns_rr_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="6" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_alias_edit.htm b/interface/web/dns/_templates_old/dns_alias_edit.htm
deleted file mode 100644
index bb12e1f1c0a16eb1d0d02040796ba1ce2cc79324..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_alias_edit.htm
+++ /dev/null
@@ -1,30 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='name_txt'}:</td>
-    <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='data_txt'}:</td>
-    <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ttl_txt'}:</td>
-    <td class="frmText11"><input name="ttl" type="text" class="text" value="{tmpl_var name='ttl'}" size="10" maxlength="10"></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','dns/dns_alias_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div>
-      <input name="type" type="hidden" value="{tmpl_var name='type'}">
-	</td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_cname_edit.htm b/interface/web/dns/_templates_old/dns_cname_edit.htm
deleted file mode 100644
index 8a265d906dcb011fb810d8a42473b2d52a9ea10f..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_cname_edit.htm
+++ /dev/null
@@ -1,30 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='name_txt'}:</td>
-    <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='data_txt'}:</td>
-    <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ttl_txt'}:</td>
-    <td class="frmText11"><input name="ttl" type="text" class="text" value="{tmpl_var name='ttl'}" size="10" maxlength="10"></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','dns/dns_cname_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div>
-      <input name="type" type="hidden" value="{tmpl_var name='type'}">
-	</td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_hinfo_edit.htm b/interface/web/dns/_templates_old/dns_hinfo_edit.htm
deleted file mode 100644
index 4e0e333454b20f9b9d5c4798396a51fc565f4300..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_hinfo_edit.htm
+++ /dev/null
@@ -1,30 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='name_txt'}:</td>
-    <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='data_txt'}:</td>
-    <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"> e.g. "Pentium Pro" Linux</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ttl_txt'}:</td>
-    <td class="frmText11"><input name="ttl" type="text" class="text" value="{tmpl_var name='ttl'}" size="10" maxlength="10"></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','dns/dns_hinfo_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div>
-      <input name="type" type="hidden" value="{tmpl_var name='type'}">
-	</td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_mx_edit.htm b/interface/web/dns/_templates_old/dns_mx_edit.htm
deleted file mode 100644
index 66d802d97ce510ab5c3c4452e799d9a823ad4df6..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_mx_edit.htm
+++ /dev/null
@@ -1,34 +0,0 @@
-<table width="600" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='name_txt'}:</td>
-    <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"> e.g. yourdomain.com.</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='data_txt'}:</td>
-    <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"> e.g. mail.yourdomain.com.</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='aux_txt'}:</td>
-    <td class="frmText11"><input name="aux" type="text" class="text" value="{tmpl_var name='aux'}" size="3" maxlength="3"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ttl_txt'}:</td>
-    <td class="frmText11"><input name="ttl" type="text" class="text" value="{tmpl_var name='ttl'}" size="10" maxlength="10"></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','dns/dns_mx_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div>
-      <input name="type" type="hidden" value="{tmpl_var name='type'}">
-	</td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_ns_edit.htm b/interface/web/dns/_templates_old/dns_ns_edit.htm
deleted file mode 100644
index 10823dfd922240da45312a28e5ac8f44c40607dc..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_ns_edit.htm
+++ /dev/null
@@ -1,30 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='name_txt'}:</td>
-    <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='data_txt'}:</td>
-    <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ttl_txt'}:</td>
-    <td class="frmText11"><input name="ttl" type="text" class="text" value="{tmpl_var name='ttl'}" size="10" maxlength="10"></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','dns/dns_ns_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div>
-      <input name="type" type="hidden" value="{tmpl_var name='type'}">
-	</td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_ptr_edit.htm b/interface/web/dns/_templates_old/dns_ptr_edit.htm
deleted file mode 100644
index 2cd78551ebfec9b5b486803556b5bff4ce218e75..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_ptr_edit.htm
+++ /dev/null
@@ -1,30 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='name_txt'}:</td>
-    <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='data_txt'}:</td>
-    <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ttl_txt'}:</td>
-    <td class="frmText11"><input name="ttl" type="text" class="text" value="{tmpl_var name='ttl'}" size="10" maxlength="10"></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','dns/dns_ptr_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div>
-      <input name="type" type="hidden" value="{tmpl_var name='type'}">
-	</td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_records_edit.htm b/interface/web/dns/_templates_old/dns_records_edit.htm
deleted file mode 100644
index 8b18ab3b55d82305ff0e0546c1a3ddadbbb83e29..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_records_edit.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<table width="600" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11" colspan="2">{tmpl_var name='dns_records'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">&nbsp;</td>
-    <td class="frmText11">&nbsp;</td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_rp_edit.htm b/interface/web/dns/_templates_old/dns_rp_edit.htm
deleted file mode 100644
index ac14f90a9828af61b415ab28ca54ce05633e57a7..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_rp_edit.htm
+++ /dev/null
@@ -1,30 +0,0 @@
-<table width="600" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='name_txt'}:</td>
-    <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='data_txt'}:</td>
-    <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"><br /> example: `webmaster.example.com. contactinfo.example.com.' </td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ttl_txt'}:</td>
-    <td class="frmText11"><input name="ttl" type="text" class="text" value="{tmpl_var name='ttl'}" size="10" maxlength="10"></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','dns/dns_rp_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div>
-      <input name="type" type="hidden" value="{tmpl_var name='type'}">
-	</td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_soa_edit.htm b/interface/web/dns/_templates_old/dns_soa_edit.htm
deleted file mode 100644
index a5d3811c922048578c74f0775014d51fab78d8fe..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_soa_edit.htm
+++ /dev/null
@@ -1,81 +0,0 @@
-<table width="800" border="0" cellspacing="0" cellpadding="2">
-  <tmpl_if name="is_admin">
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" class="text">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='client_txt'}:</td>
-    <td class="frmText11">
-		<select name="client_group_id" class="text">
-			{tmpl_var name='client_group_id'}
-		</select>
-	</td>
-  </tr>
-  </tmpl_if>
-  <tmpl_if name="is_reseller">
-  <tr>
-    <td class="frmText11">{tmpl_var name='client_txt'}:</td>
-    <td class="frmText11">
-		<select name="client_group_id" class="text">
-			{tmpl_var name='client_group_id'}
-		</select>
-	</td>
-  </tr>
-  </tmpl_if>
-  <tr>
-    <td class="frmText11">{tmpl_var name='origin_txt'}:</td>
-    <td class="frmText11"><input name="origin" type="text" class="text" value="{tmpl_var name='origin'}" size="30" maxlength="255"> e.g. mydomain.com.</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ns_txt'}:</td>
-    <td class="frmText11"><input name="ns" type="text" class="text" value="{tmpl_var name='ns'}" size="30" maxlength="255"> e.g. ns1.mydomain.com.</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mbox_txt'}:</td>
-    <td class="frmText11"><input name="mbox" type="text" class="text" value="{tmpl_var name='mbox'}" size="30" maxlength="255"> e.g. postmaster.mydomain.com.</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='refresh_txt'}:</td>
-    <td class="frmText11"><input name="refresh" type="text" class="text" value="{tmpl_var name='refresh'}" size="10" maxlength="10"> Seconds</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='retry_txt'}:</td>
-    <td class="frmText11"><input name="retry" type="text" class="text" value="{tmpl_var name='retry'}" size="10" maxlength="10"> Seconds</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='expire_txt'}:</td>
-    <td class="frmText11"><input name="expire" type="text" class="text" value="{tmpl_var name='expire'}" size="10" maxlength="10"> Seconds</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='minimum_txt'}:</td>
-    <td class="frmText11"><input name="minimum" type="text" class="text" value="{tmpl_var name='minimum'}" size="10" maxlength="10"> Seconds</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ttl_txt'}:</td>
-    <td class="frmText11"><input name="ttl" type="text" class="text" value="{tmpl_var name='ttl'}" size="10" maxlength="10"> Seconds</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='xfer_txt'}:</td>
-    <td class="frmText11"><input name="xfer" type="text" class="text" value="{tmpl_var name='xfer'}" size="30" maxlength="255"> Allow zone transfers to this IP</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','dns/dns_soa_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div>
-      <input name="serial" type="hidden" value="{tmpl_var name='serial'}">
-	</td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_soa_list.htm b/interface/web/dns/_templates_old/dns_soa_list.htm
deleted file mode 100644
index b6be7054a12d4919654158e374cb83be5f4fd9ee..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_soa_list.htm
+++ /dev/null
@@ -1,34 +0,0 @@
-<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('dns/dns_soa_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="origin_txt"></td>
-    <td class="tblHead"><tmpl_var name="ns_txt"></td>
-    <td class="tblHead"><tmpl_var name="mbox_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" 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','dns/dns_soa_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('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="origin"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="ns"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="mbox"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('dns/dns_soa_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="6" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_srv_edit.htm b/interface/web/dns/_templates_old/dns_srv_edit.htm
deleted file mode 100644
index bb0f2e12e5c1f064a2e184d54e8dfbda50603f17..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_srv_edit.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='name_txt'}:</td>
-    <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='data_txt'}:</td>
-    <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"><br />
-	example: `0 9 server.example.com.'</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ttl_txt'}:</td>
-    <td class="frmText11"><input name="ttl" type="text" class="text" value="{tmpl_var name='ttl'}" size="10" maxlength="10"></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','dns/dns_srv_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div>
-      <input name="type" type="hidden" value="{tmpl_var name='type'}">
-	</td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
\ No newline at end of file
diff --git a/interface/web/dns/_templates_old/dns_txt_edit.htm b/interface/web/dns/_templates_old/dns_txt_edit.htm
deleted file mode 100644
index 813d02002aa8dce998368bf1aadb6dcc7c701d98..0000000000000000000000000000000000000000
--- a/interface/web/dns/_templates_old/dns_txt_edit.htm
+++ /dev/null
@@ -1,30 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='name_txt'}:</td>
-    <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='data_txt'}:</td>
-    <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ttl_txt'}:</td>
-    <td class="frmText11"><input name="ttl" type="text" class="text" value="{tmpl_var name='ttl'}" size="10" maxlength="10"></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','dns/dns_txt_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div>
-      <input name="type" type="hidden" value="{tmpl_var name='type'}">
-	</td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
\ No newline at end of file
diff --git a/interface/web/help/_templates_old/support_message_edit.htm b/interface/web/help/_templates_old/support_message_edit.htm
deleted file mode 100644
index 58e46b10600b0730cc3274cb0cbe4901c8eb280f..0000000000000000000000000000000000000000
--- a/interface/web/help/_templates_old/support_message_edit.htm
+++ /dev/null
@@ -1,32 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tmpl_if name="is_admin">
-  <tr>
-    <td class="frmText11">{tmpl_var name='recipient_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="recipient_id" class="text">
-			{tmpl_var name='recipient_id'}
-		</select>
-	</td>
-  </tr>
-  </tmpl_if>
-  <tr>
-    <td class="frmText11">{tmpl_var name='subject_txt'}:</td>
-    <td class="frmText11"><input name="subject" type="text" class="text" value="{tmpl_var name='subject'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='message_txt'}:</td>
-    <td class="frmText11"><textarea name='message' cols='30' rows='10'>{tmpl_var name='message'}</textarea></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','help/support_message_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('help/support_message_list.php');"><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="tstamp" value="{tmpl_var name='tstamp'}">
\ No newline at end of file
diff --git a/interface/web/help/_templates_old/support_message_list.htm b/interface/web/help/_templates_old/support_message_list.htm
deleted file mode 100644
index 207d40ee6300d5c01dd18ce3d4a60c12ba0ee8d7..0000000000000000000000000000000000000000
--- a/interface/web/help/_templates_old/support_message_list.htm
+++ /dev/null
@@ -1,25 +0,0 @@
-<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('help/support_message_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="sender_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="subject_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_sender_id" onChange="submitForm('pageForm','help/support_message_list.php');">{tmpl_var name='search_sender_id'}</select></td>
-    <td class="frmText11"><input type="text" name="search_subject" value="{tmpl_var name='search_subject'}" 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','help/support_message_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('help/support_message_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="sender_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="subject"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('help/support_message_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" 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="3" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/help/_templates_old/support_message_view.htm b/interface/web/help/_templates_old/support_message_view.htm
deleted file mode 100644
index 394682760e93195534133896cac5fbe29f9f2d56..0000000000000000000000000000000000000000
--- a/interface/web/help/_templates_old/support_message_view.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='subject_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='subject'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='message_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='message'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">&nbsp;</td>
-    <td class="frmText11">&nbsp;</td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/login/_templates_old/index.htm b/interface/web/login/_templates_old/index.htm
deleted file mode 100644
index 401912db06d8905439c18d9b13f45dcdabdad644..0000000000000000000000000000000000000000
--- a/interface/web/login/_templates_old/index.htm
+++ /dev/null
@@ -1,30 +0,0 @@
-<div style="margin-top: 100px">
-<table style="width: 248px; margin: 0px auto;" class="table">
-  <tr>
-    <th colspan="2">Login</th>
-  </tr>
-  <tmpl_if name="error">
-  <tr>
-    <td colspan="2"><tmpl_var name="error"></td>
-  </tr>
-  <tr>
-    <td colspan="2" height="30" align="left"><a href="#" onclick="loadContent('login/password_reset.php');">Password lost?</a></td>
-  </tr>
-  </tmpl_if>  
-  <tr>
-    <td>Username</td>
-    <td><input name="username" type="text" id="username" class="text"></td>
-  </tr>
-  <tr>
-    <td>Password</td>
-    <td><input name="passwort" type="password" id="passwort" class="text" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm');};"></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><input type="button" name="submit" id="submit" value="&nbsp;&nbsp;Login&nbsp;&nbsp;" class="button" onclick="submitLoginForm('pageForm');" ><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="s_mod" value="login" />
-<input type="hidden" name="s_pg" value="index" />
-</div>
\ No newline at end of file
diff --git a/interface/web/login/_templates_old/password_reset.htm b/interface/web/login/_templates_old/password_reset.htm
deleted file mode 100644
index 34fbfea52799c2cfc0622d12dd0f404936dce799..0000000000000000000000000000000000000000
--- a/interface/web/login/_templates_old/password_reset.htm
+++ /dev/null
@@ -1,30 +0,0 @@
-<div style="margin-top: 100px">
-<table style="width: 400px; margin: 0px auto;" class="table">
-  <tr>
-    <th colspan="2">Password Reset</th>
-  </tr>
-  <tmpl_if name="message">
-  <tr>
-    <td colspan="2"><b><i><tmpl_var name="message"></i></b></td>
-  </tr>
-  </tmpl_if>  
-  <tr>
-    <td>Email address</td>
-    <td><input name="email" type="text" id="email" class="text"></td>
-  </tr>
-  <tr>
-    <td>Username</td>
-    <td><input name="username" type="text" id="username" class="text"></td>
-  </tr>
-  <tr>
-    <td colspan="2"><tmpl_var name="pass_reset_txt"></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><input type="button" name="submit" id="submit" value="Resend password" class="button" onclick="submitForm('pageForm','login/password_reset.php');" ><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="s_mod" value="login" />
-<input type="hidden" name="s_pg" value="index" />
-</div>
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_alias_edit.htm b/interface/web/mail/_templates_old/mail_alias_edit.htm
deleted file mode 100644
index fe82666383b62438bf4043451dbf06c064ca2de8..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_alias_edit.htm
+++ /dev/null
@@ -1,29 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='email_txt'}:</td>
-    <td width="366" class="frmText11"><input name="email_local_part" type="text" class="text" value="{tmpl_var name='email_local_part'}" size="10" maxlength="50"> @ <select name="email_domain">{tmpl_var name="email_domain"}</select></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='destination_txt'}:</td>
-    <td width="366" class="frmText11">
-		<select name="destination" class="text">
-			{tmpl_var name='destination'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='active_txt'}:</td>
-    <td width="366" 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','mail/mail_alias_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_alias_list.php');"><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="type" value="alias">
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_alias_list.htm b/interface/web/mail/_templates_old/mail_alias_list.htm
deleted file mode 100644
index 22d6b8f0178bc6876dd4b865f90df10f846e98eb..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_alias_list.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<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('mail/mail_alias_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="source_txt"></td>
-    <td class="tblHead"><tmpl_var name="destination_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_alias_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" 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','mail/mail_alias_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('mail/mail_alias_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="destination"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('mail/mail_alias_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/mail/_templates_old/mail_blacklist_edit.htm b/interface/web/mail/_templates_old/mail_blacklist_edit.htm
deleted file mode 100644
index 8b56ff5d5a778abd0735dcee5ad107f3a9806b2f..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_blacklist_edit.htm
+++ /dev/null
@@ -1,37 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" class="text">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='source_txt'}:</td>
-    <td class="frmText11"><input name="source" type="text" class="text" value="{tmpl_var name='source'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='type_txt'}:</td>
-    <td class="frmText11">
-		<select name="type" class="text">
-			{tmpl_var name='type'}
-		</select>
-	</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','mail/mail_blacklist_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_blacklist_list.php');"><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input name="access" type="hidden" value="{tmpl_var name='access'}">
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_blacklist_list.htm b/interface/web/mail/_templates_old/mail_blacklist_list.htm
deleted file mode 100644
index eb1b662cf0b73b074fd2250a91b1de9bdf028a78..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_blacklist_list.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<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('mail/mail_blacklist_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="source_txt"></td>
-    <td class="tblHead"><tmpl_var name="type_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
-    <td class="frmText11"><select name="search_type" onChange="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name='search_type'}</select></td>
-    <td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/mail_blacklist_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('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="type"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('mail/mail_blacklist_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="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_box_mailuser_edit.htm b/interface/web/mail/_templates_old/mail_box_mailuser_edit.htm
deleted file mode 100644
index 3dc2e339df84f7f7aa02ca6aba67feaf535b907b..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_box_mailuser_edit.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td width="366" class="frmText11"><input name="server_id" type="text" class="text" value="{tmpl_var name='server_id'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='email_txt'}:</td>
-    <td width="366" class="frmText11"><input name="email" type="text" class="text" value="{tmpl_var name='email'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='password_txt'}:</td>
-    <td width="366" class="frmText11"><input name="password" type="password" class="text" value="{tmpl_var name='password'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='quota_txt'}:</td>
-    <td width="366" class="frmText11"><input name="quota" type="text" class="text" value="{tmpl_var name='quota'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='maildir_txt'}:</td>
-    <td width="366" class="frmText11"><input name="maildir" type="text" class="text" value="{tmpl_var name='maildir'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='postfix_txt'}:</td>
-    <td width="366" class="frmText11">{tmpl_var name='postfix'}</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','mail/mail_box_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_box_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/mail/_templates_old/mail_content_filter_edit.htm b/interface/web/mail/_templates_old/mail_content_filter_edit.htm
deleted file mode 100644
index 60060dfb6f10acd9f2f0ef3f4d5816fed7807cc3..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_content_filter_edit.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" class="text">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='type_txt'}:</td>
-    <td class="frmText11">
-		<select name="type" class="text">
-			{tmpl_var name='type'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='pattern_txt'}:</td>
-    <td class="frmText11"><input name="pattern" type="text" class="text" value="{tmpl_var name='pattern'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='data_txt'}:</td>
-    <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='action_txt'}:</td>
-    <td class="frmText11">
-		<select name="action" class="text">
-			{tmpl_var name='action'}
-		</select>
-	</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','mail/mail_content_filter_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_content_filter_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/mail/_templates_old/mail_content_filter_list.htm b/interface/web/mail/_templates_old/mail_content_filter_list.htm
deleted file mode 100644
index 601ea2ee3ed26b9e5ce2fb898453a348a42edfc5..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_content_filter_list.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<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('mail/mail_content_filter_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="pattern_txt"></td>
-    <td class="tblHead"><tmpl_var name="action_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" class="text" /></td>
-    <td class="frmText11"><select name="search_action" onChange="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name='search_action'}</select></td>
-    <td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/mail_content_filter_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('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="pattern"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="action"}</a></td>
-    <td class="frmText11" align="right"><a 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'}');" 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="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_domain_catchall_edit.htm b/interface/web/mail/_templates_old/mail_domain_catchall_edit.htm
deleted file mode 100644
index 93dab959be52ae2cab5773bcdd6b74ec4e8c72bd..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_domain_catchall_edit.htm
+++ /dev/null
@@ -1,29 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='domain_txt'}:</td>
-    <td width="366" class="frmText11">@ <select name="email_domain">{tmpl_var name="email_domain"}</select></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='destination_txt'}:</td>
-    <td width="366" class="frmText11">
-		<select name="destination" class="text">
-			{tmpl_var name='destination'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='active_txt'}:</td>
-    <td width="366" 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','mail/mail_domain_catchall_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_domain_catchall_list.php');"><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="type" value="catchall">
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_domain_catchall_list.htm b/interface/web/mail/_templates_old/mail_domain_catchall_list.htm
deleted file mode 100644
index b4b5b1414162e0690066cfcbac3b3d1ac9f22960..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_domain_catchall_list.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<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('mail/mail_domain_catchall_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="source_txt"></td>
-    <td class="tblHead"><tmpl_var name="destination_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_domain_catchall_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" 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','mail/mail_domain_catchall_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('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="destination"}</a></td>
-    <td class="frmText11" align="right"><a 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'}');" 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/mail/_templates_old/mail_domain_edit.htm b/interface/web/mail/_templates_old/mail_domain_edit.htm
deleted file mode 100644
index 2cb315d9e9da4e240e4a1fd53e44a18846d58d4c..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_domain_edit.htm
+++ /dev/null
@@ -1,58 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tmpl_if name="is_admin">
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" class="text">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='client_txt'}:</td>
-    <td class="frmText11">
-		<select name="client_group_id" class="text">
-			{tmpl_var name='client_group_id'}
-		</select>
-	</td>
-  </tr>
-  </tmpl_if>
-  <tmpl_if name="is_reseller">
-  <tr>
-    <td class="frmText11">{tmpl_var name='client_txt'}:</td>
-    <td class="frmText11">
-		<select name="client_group_id" class="text">
-			{tmpl_var name='client_group_id'}
-		</select>
-	</td>
-  </tr>
-  </tmpl_if>
-  <tr>
-    <td class="frmText11">{tmpl_var name='domain_txt'}:</td>
-    <td class="frmText11"><input name="domain" type="text" class="text" value="{tmpl_var name='domain'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='policy_txt'}:</td>
-    <td class="frmText11">
-		<select name="policy" class="text">
-			{tmpl_var name='policy'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">&nbsp;</td>
-    <td class="frmText11">{tmpl_var name='active'} &nbsp; {tmpl_var name='active_txt'}</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','mail/mail_domain_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_domain_list.php');"><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="type" value="local">
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_domain_list.htm b/interface/web/mail/_templates_old/mail_domain_list.htm
deleted file mode 100644
index 10dcba373f67334c97a2915ea2b5b034a841ea74..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_domain_list.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<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('mail/mail_domain_edit.php')" /><div class="buttonEnding"></div><br /><br />
-<table width="100%" border="0" cellspacing="0" cellpadding="4">
-  <tr>
-    <td class="tblHead"><tmpl_var name="active_txt"></td>
-	<td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="domain_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name='search_active'}</select></td>
-	<td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" 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','mail/mail_domain_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('mail/mail_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-	<td class="frmText11"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="domain"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('mail/mail_domain_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>
-<input type="hidden" name="form_target" value="mail/mail_user_list.php" />
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_forward_edit.htm b/interface/web/mail/_templates_old/mail_forward_edit.htm
deleted file mode 100644
index 2d832404249ef96e1028cf0283943bec8c4c3235..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_forward_edit.htm
+++ /dev/null
@@ -1,25 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='email_txt'}:</td>
-    <td width="366" class="frmText11"><input name="email_local_part" type="text" class="text" value="{tmpl_var name='email_local_part'}" size="10" maxlength="50"> @ <select name="email_domain">{tmpl_var name="email_domain"}</select></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='destination_txt'}:</td>
-    <td width="366" class="frmText11"><input name="destination" type="text" class="text" value="{tmpl_var name='destination'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='active_txt'}:</td>
-    <td width="366" 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','mail/mail_forward_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_forward_list.php');"><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="type" value="forward">
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_forward_list.htm b/interface/web/mail/_templates_old/mail_forward_list.htm
deleted file mode 100644
index 8fdaf11030bb10d7d0e13414cce8d9f2aef75350..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_forward_list.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<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('mail/mail_forward_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="source_txt"></td>
-    <td class="tblHead"><tmpl_var name="destination_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_forward_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" 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','mail/mail_forward_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('mail/mail_forward_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="destination"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('mail/mail_forward_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/mail/_templates_old/mail_get_edit.htm b/interface/web/mail/_templates_old/mail_get_edit.htm
deleted file mode 100644
index e89524445fad9190162e8c68bfc2bb4f7b225ac6..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_get_edit.htm
+++ /dev/null
@@ -1,58 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <!--
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" class="text">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  -->
-  <tr>
-    <td class="frmText11">{tmpl_var name='type_txt'}:</td>
-    <td class="frmText11">
-		<select name="type" class="text">
-			{tmpl_var name='type'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='source_server_txt'}:</td>
-    <td class="frmText11"><input name="source_server" type="text" class="text" value="{tmpl_var name='source_server'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='source_username_txt'}:</td>
-    <td class="frmText11"><input name="source_username" type="text" class="text" value="{tmpl_var name='source_username'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='source_password_txt'}:</td>
-    <td class="frmText11"><input name="source_password" type="text" class="text" value="{tmpl_var name='source_password'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='source_delete_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='source_delete'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='destination_txt'}:</td>
-    <td class="frmText11">
-		<select name="destination" class="text">
-			{tmpl_var name='destination'}
-		</select>
-	</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','mail/mail_get_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_get_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/mail/_templates_old/mail_get_list.htm b/interface/web/mail/_templates_old/mail_get_list.htm
deleted file mode 100644
index 89bc3085d73ad23a70eac7d414e8a281f0c6b9e6..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_get_list.htm
+++ /dev/null
@@ -1,34 +0,0 @@
-<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('mail/mail_get_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="source_server_txt"></td>
-    <td class="tblHead"><tmpl_var name="source_username_txt"></td>
-    <td class="tblHead"><tmpl_var name="destination_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" 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','mail/mail_get_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('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source_server"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source_username"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="destination"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('mail/mail_get_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="6" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_spamfilter_edit.htm b/interface/web/mail/_templates_old/mail_spamfilter_edit.htm
deleted file mode 100644
index 8d7d803497479c44c335a7b98692a3b4d516dca2..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_spamfilter_edit.htm
+++ /dev/null
@@ -1,66 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='email_txt'}:</td>
-    <td width="366" class="frmText11"><input name="email_local_part" type="text" class="text" value="{tmpl_var name='email_local_part'}" size="10" maxlength="50"> @ <select name="email_domain">{tmpl_var name="email_domain"}</select></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='active_txt'}:</td>
-    <td width="366" class="frmText11">{tmpl_var name='active'}</td>
-  </tr>
-   <tr>
-    <td colspan="2" class="frmText11">&nbsp;</td>
-  </tr>
-  <tr>
-    <td colspan="2"  height="50" class="frmText11"><b>{tmpl_var name='spam_rewrite_txt'}</b></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='spam_rewrite_score_int_txt'}:</td>
-    <td width="366" class="frmText11"><input name="spam_rewrite_score_int" type="text" class="text" value="{tmpl_var name='spam_rewrite_score_int'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='spam_rewrite_subject_txt'}:</td>
-    <td width="366" class="frmText11"><input name="spam_rewrite_subject" type="text" class="text" value="{tmpl_var name='spam_rewrite_subject'}" size="30" maxlength="255"></td>
-  </tr>
-   <tr>
-    <td colspan="2" class="frmText11">&nbsp;</td>
-  </tr>
-  <tr>
-    <td colspan="2"  height="50" class="frmText11"><b>{tmpl_var name='spam_redirect_txt'}</b></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='spam_redirect_score_int_txt'}:</td>
-    <td width="366" class="frmText11"><input name="spam_redirect_score_int" type="text" class="text" value="{tmpl_var name='spam_redirect_score_int'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='spam_redirect_maildir_txt'}:</td>
-    <td width="366" class="frmText11">
-		<select name="spam_redirect_maildir" class="text">
-			{tmpl_var name='spam_redirect_maildir'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='spam_redirect_maildir_purge_txt'}:</td>
-    <td width="366" class="frmText11"><input name="spam_redirect_maildir_purge" type="text" class="text" value="{tmpl_var name='spam_redirect_maildir_purge'}" size="5" maxlength="10"> {tmpl_var name='days_txt'}</td>
-  </tr>
-   <tr>
-    <td colspan="2" class="frmText11">&nbsp;</td>
-  </tr>
-  <tr>
-    <td colspan="2"  height="50" class="frmText11"><b>{tmpl_var name='spam_delete_txt'}</b></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='spam_delete_score_int_txt'}:</td>
-    <td width="366" class="frmText11"><input name="spam_delete_score_int" type="text" class="text" value="{tmpl_var name='spam_delete_score_int'}" size="10" maxlength="10"></td>
-  </tr>
-  <tr>
-    <td colspan="2"  height="50" class="frmText11">{tmpl_var name='disable_txt'}</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','mail/mail_spamfilter_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_spamfilter_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/mail/_templates_old/mail_transport_edit.htm b/interface/web/mail/_templates_old/mail_transport_edit.htm
deleted file mode 100644
index 57417882e83c24e76fb492f747931ff099d318c5..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_transport_edit.htm
+++ /dev/null
@@ -1,51 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" class="text">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='domain_txt'}:</td>
-    <td class="frmText11"><input name="domain" type="text" class="text" value="{tmpl_var name='domain'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='type_txt'}:</td>
-    <td class="frmText11">
-	  <select name="type" class="text">
-	    {tmpl_var name='type'}
-	  </select></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mx_txt'}:</td>
-    <td class="frmText11"><input name="mx" value="y" {tmpl_var name='mx'} type="checkbox"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='destination_txt'}:</td>
-    <td class="frmText11"><input name="destination" type="text" class="text" value="{tmpl_var name='destination'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='sort_order_txt'}:</td>
-    <td class="frmText11">
-		<select name="sort_order" class="text">
-			{tmpl_var name='sort_order'}
-		</select>
-	</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','mail/mail_transport_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_transport_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/mail/_templates_old/mail_transport_list.htm b/interface/web/mail/_templates_old/mail_transport_list.htm
deleted file mode 100644
index 8f1bf5db52d85f848c1cb027a1ee6f124a46ccd5..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_transport_list.htm
+++ /dev/null
@@ -1,34 +0,0 @@
-<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('mail/mail_transport_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="domain_txt"></td>
-    <td class="tblHead"><tmpl_var name="transport_txt"></td>
-    <td class="tblHead"><tmpl_var name="sort_order_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_transport_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_transport_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_transport" value="{tmpl_var name='search_transport'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_sort_order" value="{tmpl_var name='search_sort_order'}" 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','mail/mail_transport_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('mail/mail_transport_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="domain"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="transport"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="sort_order"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('mail/mail_transport_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="6" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_user_autoresponder_edit.htm b/interface/web/mail/_templates_old/mail_user_autoresponder_edit.htm
deleted file mode 100644
index b45fbc4bc1e748f34989462a0b9c51390e3ead79..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_user_autoresponder_edit.htm
+++ /dev/null
@@ -1,21 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='autoresponder_txt'}:</td>
-    <td width="366" class="frmText11">{tmpl_var name='autoresponder'}</td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='autoresponder_text_txt'}:</td>
-    <td width="366" class="frmText11"><textarea name='autoresponder_text' cols='30' rows='15'>{tmpl_var name='autoresponder_text'}</textarea></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','mail/mail_user_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_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/mail/_templates_old/mail_user_custom_rules_edit.htm b/interface/web/mail/_templates_old/mail_user_custom_rules_edit.htm
deleted file mode 100644
index ac72f4da3e83cba08fe763acb903cc74245336f6..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_user_custom_rules_edit.htm
+++ /dev/null
@@ -1,16 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='custom_mailfilter_txt'}:</td>
-    <td class="frmText11"><textarea name='custom_mailfilter' cols='50' rows='15'>{tmpl_var name='custom_mailfilter'}</textarea></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','mail/mail_user_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_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/mail/_templates_old/mail_user_filter_edit.htm b/interface/web/mail/_templates_old/mail_user_filter_edit.htm
deleted file mode 100644
index 41e2a798d81d2eb57f7e915b83ce328dac066514..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_user_filter_edit.htm
+++ /dev/null
@@ -1,42 +0,0 @@
-<table width="600" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='rulename_txt'}:</td>
-    <td class="frmText11"><input name="rulename" type="text" class="text" value="{tmpl_var name='rulename'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='source_txt'}:</td>
-    <td class="frmText11">
-		<select name="source" class="text">
-			{tmpl_var name='source'}
-		</select>
-		<select name="op" class="text">
-			{tmpl_var name='op'}
-		</select>
-		<input name="searchterm" type="text" class="text" value="{tmpl_var name='searchterm'}" size="30" maxlength="255">
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='action_txt'}:</td>
-    <td class="frmText11">
-		<select name="action" class="text">
-			{tmpl_var name='action'}
-		</select>
-		<input name="target" type="text" class="text" value="{tmpl_var name='target'}" 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','mail/mail_user_filter_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input name="mailuser_id" type="hidden" value="{tmpl_var name='mailuser_id'}">
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_user_filter_list.htm b/interface/web/mail/_templates_old/mail_user_filter_list.htm
deleted file mode 100644
index 8a240ddb26f6f6121820442a1d0a634f6c747980..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_user_filter_list.htm
+++ /dev/null
@@ -1,21 +0,0 @@
-<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}');" /><div class="buttonEnding"></div><br /><br />
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
-  <tr>
-    <td class="tblHead"><tmpl_var name="rulename_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" class="text" /></td>
-    <td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="changeTab('filter_records','mail/mail_user_edit.php');"><div class="buttonEnding"></div></td>
-  </tr>
-  <tmpl_loop name="records">
-  <tr bgcolor="{tmpl_var name="bgcolor"}">
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_user_filter_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="rulename"}</a></td>
-    <td class="frmText11" align="right">[<a 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'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
-  </tr>
-  </tmpl_loop>
-
-  <tr>
-  	<td colspan="2" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_user_list.htm b/interface/web/mail/_templates_old/mail_user_list.htm
deleted file mode 100644
index 74346783255bf27286b9e4ae6cdbc438a6563f24..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_user_list.htm
+++ /dev/null
@@ -1,25 +0,0 @@
-<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('mail/mail_user_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="email_txt"></td>
-    <td class="tblHead"><tmpl_var name="autoresponder_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" class="text" /></td>
-    <td class="frmText11"><input type="text" name="search_autoresponder" value="{tmpl_var name='search_autoresponder'}" 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','mail/mail_user_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('mail/mail_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="email"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="autoresponder"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('mail/mail_user_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="3" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_user_mailbox_edit.htm b/interface/web/mail/_templates_old/mail_user_mailbox_edit.htm
deleted file mode 100644
index 7ee5ce3e07a2552140b3239a98d967fd4964c208..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_user_mailbox_edit.htm
+++ /dev/null
@@ -1,51 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='email_txt'}:</td>
-    <td width="366" class="frmText11"><input name="email_local_part" type="text" class="text" value="{tmpl_var name='email_local_part'}" size="10" maxlength="50"> @ <select name="email_domain">{tmpl_var name="email_domain"}</select></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='cryptpwd_txt'}:</td>
-    <td width="366" class="frmText11"><input name="password" type="password" class="text" value="{tmpl_var name='password'}" size="25" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='quota_txt'}:</td>
-    <td width="366" class="frmText11"><input name="quota" type="text" class="text" value="{tmpl_var name='quota'}" size="5" maxlength="5"> MB</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='policy_txt'}:</td>
-    <td class="frmText11">
-		<select name="policy" class="text">
-			{tmpl_var name='policy'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='postfix_txt'}:</td>
-    <td width="366" class="frmText11">{tmpl_var name='postfix'}</td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='disableimap_txt'}:</td>
-    <td width="366" class="frmText11">{tmpl_var name='disableimap'}</td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='disablepop3_txt'}:</td>
-    <td width="366" class="frmText11">{tmpl_var name='disablepop3'}</td>
-  </tr>
-  <!--
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='access_txt'}:</td>
-    <td width="366" class="frmText11">{tmpl_var name='access'}</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','mail/mail_user_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_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/mail/_templates_old/mail_user_mailfilter_edit.htm b/interface/web/mail/_templates_old/mail_user_mailfilter_edit.htm
deleted file mode 100644
index 76507f9e1c9b6e47fa67d92a0918116b4166b4df..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_user_mailfilter_edit.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11" colspan="2">{tmpl_var name='filter_records'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">&nbsp;</td>
-    <td class="frmText11">&nbsp;</td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_user_mailuser_edit.htm b/interface/web/mail/_templates_old/mail_user_mailuser_edit.htm
deleted file mode 100644
index f51dfae05248542eccf119d21a4a580f292086c2..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_user_mailuser_edit.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td width="366" class="frmText11"><input name="server_id" type="text" class="text" value="{tmpl_var name='server_id'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='email_txt'}:</td>
-    <td width="366" class="frmText11"><input name="email" type="text" class="text" value="{tmpl_var name='email'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='password_txt'}:</td>
-    <td width="366" class="frmText11"><input name="password" type="password" class="text" value="{tmpl_var name='password'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='quota_txt'}:</td>
-    <td width="366" class="frmText11"><input name="quota" type="text" class="text" value="{tmpl_var name='quota'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='maildir_txt'}:</td>
-    <td width="366" class="frmText11"><input name="maildir" type="text" class="text" value="{tmpl_var name='maildir'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td width="126" class="frmText11">{tmpl_var name='postfix_txt'}:</td>
-    <td width="366" class="frmText11">{tmpl_var name='postfix'}</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','mail/mail_user_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_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/mail/_templates_old/mail_user_stats_list.htm b/interface/web/mail/_templates_old/mail_user_stats_list.htm
deleted file mode 100644
index a6e4aaff34e2db4cbeeb229ee2ea4ba2a15853ec..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_user_stats_list.htm
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
-  <tr>
-    <td class="tblHead"><tmpl_var name="email_txt"></td>
-	<td class="tblHead"><tmpl_var name="this_month_txt"></td>
-	<td class="tblHead"><tmpl_var name="last_month_txt"></td>
-	<td class="tblHead"><tmpl_var name="this_year_txt"></td>
-	<td class="tblHead"><tmpl_var name="last_year_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" class="text" /></td>
-	<td class="frmText11">&nbsp;</td>
-	<td class="frmText11">&nbsp;</td>
-	<td class="frmText11">&nbsp;</td>
-	<td class="frmText11">&nbsp;</td>
-    <td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/mail_user_stats.php');"><div class="buttonEnding"></div></td>
-  </tr>
-  <tmpl_loop name="records">
-  <tr bgcolor="{tmpl_var name="bgcolor"}">
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="email"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="this_month"} KB</a></td>
-	<td class="frmText11"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="last_month"} KB</a></td>
-	<td class="frmText11"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="this_year"} KB</a></td>
-	<td class="frmText11"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="last_year"} KB</a></td>
-	<td class="frmText11" align="right">&nbsp;</td>
-  </tr>
-  </tmpl_loop>
-
-  <tr>
-  	<td colspan="6" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_whitelist_edit.htm b/interface/web/mail/_templates_old/mail_whitelist_edit.htm
deleted file mode 100644
index 599d3568655d0867386fff162c2ef6dba5a18fd7..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_whitelist_edit.htm
+++ /dev/null
@@ -1,37 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" class="text">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='source_txt'}:</td>
-    <td class="frmText11"><input name="source" type="text" class="text" value="{tmpl_var name='source'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='type_txt'}:</td>
-    <td class="frmText11">
-		<select name="type" class="text">
-			{tmpl_var name='type'}
-		</select>
-	</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','mail/mail_whitelist_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_whitelist_list.php');"><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input name="access" type="hidden" value="{tmpl_var name='access'}">
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/mail_whitelist_list.htm b/interface/web/mail/_templates_old/mail_whitelist_list.htm
deleted file mode 100644
index 26f129fe452fdd2a27304579177c9f234b2d78c9..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/mail_whitelist_list.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<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('mail/mail_whitelist_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="source_txt"></td>
-    <td class="tblHead"><tmpl_var name="type_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" class="text" /></td>
-    <td class="frmText11"><select name="search_type" onChange="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name='search_type'}</select></td>
-    <td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/mail_whitelist_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('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="source"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="type"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('mail/mail_whitelist_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="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/spamfilter_blacklist_edit.htm b/interface/web/mail/_templates_old/spamfilter_blacklist_edit.htm
deleted file mode 100644
index c658591801847804d9b6987847b15126771c7ffa..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_blacklist_edit.htm
+++ /dev/null
@@ -1,47 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <!--
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" class="text">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  -->
-  <tr>
-    <td class="frmText11">{tmpl_var name='rid_txt'}:</td>
-    <td class="frmText11">
-		<select name="rid" class="text">
-			{tmpl_var name='rid'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='email_txt'}:</td>
-    <td class="frmText11"><input name="email" type="text" class="text" value="{tmpl_var name='email'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='priority_txt'}:</td>
-    <td class="frmText11">
-		<select name="priority" class="text">
-			{tmpl_var name='priority'}
-		</select>
-	</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','mail/spamfilter_blacklist_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_blacklist_list.php');"><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="wb" value="{tmpl_var name='wb'}">
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/spamfilter_blacklist_list.htm b/interface/web/mail/_templates_old/spamfilter_blacklist_list.htm
deleted file mode 100644
index b90ac57a5f039c0f83eafeb03b75840e52530b12..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_blacklist_list.htm
+++ /dev/null
@@ -1,34 +0,0 @@
-<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('mail/spamfilter_blacklist_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="priority_txt"></td>
-    <td class="tblHead"><tmpl_var name="rid_txt"></td>
-    <td class="tblHead"><tmpl_var name="email_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_priority'}</select></td>
-    <td class="frmText11"><select name="search_rid" onChange="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name='search_rid'}</select></td>
-    <td class="frmText11"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" 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','mail/spamfilter_blacklist_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('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="priority"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="rid"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="email"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('mail/spamfilter_blacklist_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="6" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/spamfilter_config_getmail_edit.htm b/interface/web/mail/_templates_old/spamfilter_config_getmail_edit.htm
deleted file mode 100644
index e212657ea95d49b83a936eaedbaacb09f252f006..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_config_getmail_edit.htm
+++ /dev/null
@@ -1,16 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='getmail_config_dir_txt'}:</td>
-    <td class="frmText11"><input name="getmail_config_dir" type="text" class="text" value="{tmpl_var name='getmail_config_dir'}" size="40" maxlength="255"></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','mail/spamfilter_config_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_config_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/mail/_templates_old/spamfilter_config_list.htm b/interface/web/mail/_templates_old/spamfilter_config_list.htm
deleted file mode 100644
index a78bcf2f99ed340ab08264acc361fb6648b3e89d..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_config_list.htm
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
-  <tr>
-    <td class="tblHead"><tmpl_var name="server_name_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_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','mail/spamfilter_config_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('mail/spamfilter_config_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_name"}</a></td>
-    <td class="frmText11" align="right">[<a href="#" onClick="loadContent('mail/spamfilter_config_edit.php?id={tmpl_var name='id'}');" class="frmText11">Edit</a>]</td>
-  </tr>
-  </tmpl_loop>
-
-  <tr>
-  	<td colspan="2" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/spamfilter_config_mail_edit.htm b/interface/web/mail/_templates_old/spamfilter_config_mail_edit.htm
deleted file mode 100644
index 9f8ac0ec88fb29d164fc9710518153b03b470d87..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_config_mail_edit.htm
+++ /dev/null
@@ -1,64 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='module_txt'}:</td>
-    <td class="frmText11">
-		<select name="module" class="text">
-			{tmpl_var name='module'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='maildir_path_txt'}:</td>
-    <td class="frmText11"><input name="maildir_path" type="text" class="text" value="{tmpl_var name='maildir_path'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='homedir_path_txt'}:</td>
-    <td class="frmText11"><input name="homedir_path" type="text" class="text" value="{tmpl_var name='homedir_path'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mailuser_uid_txt'}:</td>
-    <td class="frmText11"><input name="mailuser_uid" type="text" class="text" value="{tmpl_var name='mailuser_uid'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mailuser_gid_txt'}:</td>
-    <td class="frmText11"><input name="mailuser_gid" type="text" class="text" value="{tmpl_var name='mailuser_gid'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mailuser_name_txt'}:</td>
-    <td class="frmText11"><input name="mailuser_name" type="text" class="text" value="{tmpl_var name='mailuser_name'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mailuser_group_txt'}:</td>
-    <td class="frmText11"><input name="mailuser_group" type="text" class="text" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='relayhost_txt'}:</td>
-    <td class="frmText11"><input name="relayhost" type="text" class="text" value="{tmpl_var name='relayhost'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='relayhost_user_txt'}:</td>
-    <td class="frmText11"><input name="relayhost_user" type="text" class="text" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='relayhost_password_txt'}:</td>
-    <td class="frmText11"><input name="relayhost_password" type="text" class="text" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='mailbox_size_limit_txt'}:</td>
-    <td class="frmText11"><input name="mailbox_size_limit" type="text" class="text" value="{tmpl_var name='mailbox_size_limit'}" size="10" maxlength="15"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='message_size_limit_txt'}:</td>
-    <td class="frmText11"><input name="message_size_limit" type="text" class="text" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15"></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','mail/spamfilter_config_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_config_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/mail/_templates_old/spamfilter_config_server_edit.htm b/interface/web/mail/_templates_old/spamfilter_config_server_edit.htm
deleted file mode 100644
index 1a8ca3f7e745a9111d97593bd1f7fac53fdb8a8f..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_config_server_edit.htm
+++ /dev/null
@@ -1,32 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='ip_address_txt'}:</td>
-    <td class="frmText11"><input name="ip_address" type="text" class="text" value="{tmpl_var name='ip_address'}" size="15" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='netmask_txt'}:</td>
-    <td class="frmText11"><input name="netmask" type="text" class="text" value="{tmpl_var name='netmask'}" size="15" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='gateway_txt'}:</td>
-    <td class="frmText11"><input name="gateway" type="text" class="text" value="{tmpl_var name='gateway'}" size="15" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='hostname_txt'}:</td>
-    <td class="frmText11"><input name="hostname" type="text" class="text" value="{tmpl_var name='hostname'}" size="40" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='nameservers_txt'}:</td>
-    <td class="frmText11"><input name="nameservers" type="text" class="text" value="{tmpl_var name='nameservers'}" size="40" maxlength="255"></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','mail/spamfilter_config_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_config_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/mail/_templates_old/spamfilter_other_edit.htm b/interface/web/mail/_templates_old/spamfilter_other_edit.htm
deleted file mode 100644
index 263ec4a4e8871c6cd5cd8f27e66e0180de09b7db..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_other_edit.htm
+++ /dev/null
@@ -1,80 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='addr_extension_virus_txt'}:</td>
-    <td class="frmText11"><input name="addr_extension_virus" type="text" class="text" value="{tmpl_var name='addr_extension_virus'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='addr_extension_spam_txt'}:</td>
-    <td class="frmText11"><input name="addr_extension_spam" type="text" class="text" value="{tmpl_var name='addr_extension_spam'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='addr_extension_banned_txt'}:</td>
-    <td class="frmText11"><input name="addr_extension_banned" type="text" class="text" value="{tmpl_var name='addr_extension_banned'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='addr_extension_bad_header_txt'}:</td>
-    <td class="frmText11"><input name="addr_extension_bad_header" type="text" class="text" value="{tmpl_var name='addr_extension_bad_header'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='warnvirusrecip_txt'}:</td>
-    <td class="frmText11">
-		<select name="warnvirusrecip" class="text">
-			{tmpl_var name='warnvirusrecip'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='warnbannedrecip_txt'}:</td>
-    <td class="frmText11">
-		<select name="warnbannedrecip" class="text">
-			{tmpl_var name='warnbannedrecip'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='warnbadhrecip_txt'}:</td>
-    <td class="frmText11">
-		<select name="warnbadhrecip" class="text">
-			{tmpl_var name='warnbadhrecip'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='newvirus_admin_txt'}:</td>
-    <td class="frmText11"><input name="newvirus_admin" type="text" class="text" value="{tmpl_var name='newvirus_admin'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='virus_admin_txt'}:</td>
-    <td class="frmText11"><input name="virus_admin" type="text" class="text" value="{tmpl_var name='virus_admin'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='banned_admin_txt'}:</td>
-    <td class="frmText11"><input name="banned_admin" type="text" class="text" value="{tmpl_var name='banned_admin'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='bad_header_admin_txt'}:</td>
-    <td class="frmText11"><input name="bad_header_admin" type="text" class="text" value="{tmpl_var name='bad_header_admin'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='spam_admin_txt'}:</td>
-    <td class="frmText11"><input name="spam_admin" type="text" class="text" value="{tmpl_var name='spam_admin'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='message_size_limit_txt'}:</td>
-    <td class="frmText11"><input name="message_size_limit" type="text" class="text" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='banned_rulenames_txt'}:</td>
-    <td class="frmText11"><input name="banned_rulenames" type="text" class="text" value="{tmpl_var name='banned_rulenames'}" size="30" maxlength="255"></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','mail/spamfilter_policy_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_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/mail/_templates_old/spamfilter_policy_edit.htm b/interface/web/mail/_templates_old/spamfilter_policy_edit.htm
deleted file mode 100644
index 9cc31a666ee8ccb0606d9aa0048ece595c67623c..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_policy_edit.htm
+++ /dev/null
@@ -1,72 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='policy_name_txt'}:</td>
-    <td class="frmText11"><input name="policy_name" type="text" class="text" value="{tmpl_var name='policy_name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='virus_lover_txt'}:</td>
-    <td class="frmText11">
-		<select name="virus_lover" class="text">
-			{tmpl_var name='virus_lover'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='spam_lover_txt'}:</td>
-    <td class="frmText11">
-		<select name="spam_lover" class="text">
-			{tmpl_var name='spam_lover'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='banned_files_lover_txt'}:</td>
-    <td class="frmText11">
-		<select name="banned_files_lover" class="text">
-			{tmpl_var name='banned_files_lover'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='bad_header_lover_txt'}:</td>
-    <td class="frmText11">
-		<select name="bad_header_lover" class="text">
-			{tmpl_var name='bad_header_lover'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='bypass_virus_checks_txt'}:</td>
-    <td class="frmText11">
-		<select name="bypass_virus_checks" class="text">
-			{tmpl_var name='bypass_virus_checks'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='bypass_banned_checks_txt'}:</td>
-    <td class="frmText11">
-		<select name="bypass_banned_checks" class="text">
-			{tmpl_var name='bypass_banned_checks'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='bypass_header_checks_txt'}:</td>
-    <td class="frmText11">
-		<select name="bypass_header_checks" class="text">
-			{tmpl_var name='bypass_header_checks'}
-		</select>
-	</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','mail/spamfilter_policy_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_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/mail/_templates_old/spamfilter_policy_list.htm b/interface/web/mail/_templates_old/spamfilter_policy_list.htm
deleted file mode 100644
index dce196c94e632e2d0161283560098c8a0e75f255..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_policy_list.htm
+++ /dev/null
@@ -1,34 +0,0 @@
-<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('mail/spamfilter_policy_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="policy_name_txt"></td>
-    <td class="tblHead"><tmpl_var name="virus_lover_txt"></td>
-    <td class="tblHead"><tmpl_var name="spam_lover_txt"></td>
-    <td class="tblHead"><tmpl_var name="banned_files_lover_txt"></td>
-    <td class="tblHead"><tmpl_var name="bad_header_lover_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" class="text" /></td>
-    <td class="frmText11"><select name="search_virus_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_virus_lover'}</select></td>
-    <td class="frmText11"><select name="search_spam_lover" onChange="submitForm('pageForm','mail/spamfilter_policy_list.php');">{tmpl_var name='search_spam_lover'}</select></td>
-    <td class="frmText11"><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="frmText11"><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="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','mail/spamfilter_policy_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('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="policy_name"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="virus_lover"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="spam_lover"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="banned_files_lover"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="bad_header_lover"}</a></td>
-    <td class="frmText11" align="right">[<a href="javascript: del_record('mail/spamfilter_policy_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="6" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/spamfilter_quarantine_edit.htm b/interface/web/mail/_templates_old/spamfilter_quarantine_edit.htm
deleted file mode 100644
index 76987fcf167bf047d40b3d198c2e6dd0581c82bd..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_quarantine_edit.htm
+++ /dev/null
@@ -1,39 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='virus_quarantine_to_txt'}:</td>
-    <td class="frmText11"><input name="virus_quarantine_to" type="text" class="text" value="{tmpl_var name='virus_quarantine_to'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='spam_quarantine_to_txt'}:</td>
-    <td class="frmText11"><input name="spam_quarantine_to" type="text" class="text" value="{tmpl_var name='spam_quarantine_to'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='banned_quarantine_to_txt'}:</td>
-    <td class="frmText11"><input name="banned_quarantine_to" type="text" class="text" value="{tmpl_var name='banned_quarantine_to'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='bad_header_quarantine_to_txt'}:</td>
-    <td class="frmText11"><input name="bad_header_quarantine_to" type="text" class="text" value="{tmpl_var name='bad_header_quarantine_to'}" size="30" maxlength="255"></td>
-  </tr>
-  <!--
-  <tr>
-    <td class="frmText11">{tmpl_var name='clean_quarantine_to_txt'}:</td>
-    <td class="frmText11"><input name="clean_quarantine_to" type="text" class="text" value="{tmpl_var name='clean_quarantine_to'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='other_quarantine_to_txt'}:</td>
-    <td class="frmText11"><input name="other_quarantine_to" type="text" class="text" value="{tmpl_var name='other_quarantine_to'}" size="30" maxlength="255"></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','mail/spamfilter_policy_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_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/mail/_templates_old/spamfilter_taglevel_edit.htm b/interface/web/mail/_templates_old/spamfilter_taglevel_edit.htm
deleted file mode 100644
index 9dbc448102f6d5c030c2585207c7a035d4981742..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_taglevel_edit.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='spam_tag_level_txt'}:</td>
-    <td class="frmText11"><input name="spam_tag_level" type="text" class="text" value="{tmpl_var name='spam_tag_level'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='spam_tag2_level_txt'}:</td>
-    <td class="frmText11"><input name="spam_tag2_level" type="text" class="text" value="{tmpl_var name='spam_tag2_level'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='spam_kill_level_txt'}:</td>
-    <td class="frmText11"><input name="spam_kill_level" type="text" class="text" value="{tmpl_var name='spam_kill_level'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='spam_dsn_cutoff_level_txt'}:</td>
-    <td class="frmText11"><input name="spam_dsn_cutoff_level" type="text" class="text" value="{tmpl_var name='spam_dsn_cutoff_level'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='spam_quarantine_cutoff_level_txt'}:</td>
-    <td class="frmText11"><input name="spam_quarantine_cutoff_level" type="text" class="text" value="{tmpl_var name='spam_quarantine_cutoff_level'}" size="10" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='spam_modifies_subj_txt'}:</td>
-    <td class="frmText11">
-		<select name="spam_modifies_subj" class="text">
-			{tmpl_var name='spam_modifies_subj'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='spam_subject_tag_txt'}:</td>
-    <td class="frmText11"><input name="spam_subject_tag" type="text" class="text" value="{tmpl_var name='spam_subject_tag'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='spam_subject_tag2_txt'}:</td>
-    <td class="frmText11"><input name="spam_subject_tag2" type="text" class="text" value="{tmpl_var name='spam_subject_tag2'}" size="30" maxlength="255"></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','mail/spamfilter_policy_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_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/mail/_templates_old/spamfilter_users_edit.htm b/interface/web/mail/_templates_old/spamfilter_users_edit.htm
deleted file mode 100644
index 5643f1c02c2dbbf72e5c9ad37d228ef08b8a8625..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_users_edit.htm
+++ /dev/null
@@ -1,50 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" class="text">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='priority_txt'}:</td>
-    <td class="frmText11">
-		<select name="priority" class="text">
-			{tmpl_var name='priority'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='policy_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="policy_id" class="text">
-			{tmpl_var name='policy_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='email_txt'}:</td>
-    <td class="frmText11"><input name="email" type="text" class="text" value="{tmpl_var name='email'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='fullname_txt'}:</td>
-    <td class="frmText11"><input name="fullname" type="text" class="text" value="{tmpl_var name='fullname'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='local_txt'}:</td>
-    <td class="frmText11"><select name="local" class="text">
-			{tmpl_var name='local'}
-		</select></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','mail/spamfilter_users_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_users_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/mail/_templates_old/spamfilter_users_list.htm b/interface/web/mail/_templates_old/spamfilter_users_list.htm
deleted file mode 100644
index f86398ce087e72dcda0e405f68312b7ad7ef1782..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_users_list.htm
+++ /dev/null
@@ -1,34 +0,0 @@
-<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('mail/spamfilter_users_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="local_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="priority_txt"></td>
-    <td class="tblHead"><tmpl_var name="policy_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="fullname_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_local" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_local'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_priority'}</select></td>
-    <td class="frmText11"><select name="search_policy_id" onChange="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name='search_policy_id'}</select></td>
-    <td class="frmText11"><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" 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','mail/spamfilter_users_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('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="local"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="priority"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="policy_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="fullname"}</a></td>
-    <td class="frmText11" align="right">[<a href="javascript: del_record('mail/spamfilter_users_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="6" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/spamfilter_whitelist_edit.htm b/interface/web/mail/_templates_old/spamfilter_whitelist_edit.htm
deleted file mode 100644
index d05796a3243c415d7023151ee86756ace0b50e26..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_whitelist_edit.htm
+++ /dev/null
@@ -1,47 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-<!--
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" class="text">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  -->
-  <tr>
-    <td class="frmText11">{tmpl_var name='rid_txt'}:</td>
-    <td class="frmText11">
-		<select name="rid" class="text">
-			{tmpl_var name='rid'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='email_txt'}:</td>
-    <td class="frmText11"><input name="email" type="text" class="text" value="{tmpl_var name='email'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='priority_txt'}:</td>
-    <td class="frmText11">
-		<select name="priority" class="text">
-			{tmpl_var name='priority'}
-		</select>
-	</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','mail/spamfilter_whitelist_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_whitelist_list.php');"><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="wb" value="{tmpl_var name='wb'}">
\ No newline at end of file
diff --git a/interface/web/mail/_templates_old/spamfilter_whitelist_list.htm b/interface/web/mail/_templates_old/spamfilter_whitelist_list.htm
deleted file mode 100644
index 8c449feddea89a6df8d9067b44a06a16aba31d51..0000000000000000000000000000000000000000
--- a/interface/web/mail/_templates_old/spamfilter_whitelist_list.htm
+++ /dev/null
@@ -1,34 +0,0 @@
-<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('mail/spamfilter_whitelist_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="priority_txt"></td>
-    <td class="tblHead"><tmpl_var name="rid_txt"></td>
-    <td class="tblHead"><tmpl_var name="email_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><select name="search_priority" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_priority'}</select></td>
-    <td class="frmText11"><select name="search_rid" onChange="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name='search_rid'}</select></td>
-    <td class="frmText11"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" 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','mail/spamfilter_whitelist_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('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="priority"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="rid"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="email"}</a></td>
-    <td class="frmText11" align="right">[<a href="javascript: del_record('mail/spamfilter_whitelist_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="6" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/monitor/_templates_old/logview.htm b/interface/web/monitor/_templates_old/logview.htm
deleted file mode 100644
index 222fdc2ed7e9e2d476d456db98925c8dc7ef5ee2..0000000000000000000000000000000000000000
--- a/interface/web/monitor/_templates_old/logview.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<div style="margin-left:30px;margin-top:30px;"><b><tmpl_var name="logfile"></b><br /><br />
-<select name="refreshinterval" id="refreshinterval" onChange="loadContentRefresh('monitor/logview.php?log={tmpl_var name="logfile_id"}')">
-	{tmpl_var name="refresh"}
-</select><br /><br />
-<tmpl_var name="log"></div>
\ No newline at end of file
diff --git a/interface/web/monitor/_templates_old/system.htm b/interface/web/monitor/_templates_old/system.htm
deleted file mode 100644
index 52428d98bfc1d2525363c76ca4e15829f4f8a969..0000000000000000000000000000000000000000
--- a/interface/web/monitor/_templates_old/system.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<div style="margin-left:30px;margin-top:30px;"><h2><tmpl_var name="title"></h2>
-<p><tmpl_var name="description"></p>
-<tmpl_var name="output"></div>
\ No newline at end of file
diff --git a/interface/web/sites/_templates_old/database_edit.htm b/interface/web/sites/_templates_old/database_edit.htm
deleted file mode 100644
index 82129f619db01ad9bd134a2a2de9de5bc57b527a..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/database_edit.htm
+++ /dev/null
@@ -1,76 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tmpl_if name="is_admin">
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" class="text">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='client_txt'}:</td>
-    <td class="frmText11">
-		<select name="client_group_id" class="text">
-			{tmpl_var name='client_group_id'}
-		</select>
-	</td>
-  </tr>
-  </tmpl_if>
-  <tmpl_if name="is_reseller">
-  <tr>
-    <td class="frmText11">{tmpl_var name='client_txt'}:</td>
-    <td class="frmText11">
-		<select name="client_group_id" class="text">
-			{tmpl_var name='client_group_id'}
-		</select>
-	</td>
-  </tr>
-  </tmpl_if>
-  <tr>
-    <td class="frmText11">{tmpl_var name='type_txt'}:</td>
-    <td class="frmText11">
-		<select name="type" class="text">
-			{tmpl_var name='type'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='database_name_txt'}:</td>
-    <td class="frmText11"><input name="database_name" type="text" class="text" value="{tmpl_var name='database_name'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='database_user_txt'}:</td>
-    <td class="frmText11"><input name="database_user" type="text" class="text" value="{tmpl_var name='database_user'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='database_password_txt'}:</td>
-    <td class="frmText11"><input name="database_password" type="password" class="text" value="{tmpl_var name='database_password'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='database_charset_txt'}:</td>
-    <td class="frmText11">
-		<select name="database_charset" class="text">
-			{tmpl_var name='database_charset'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='remote_access_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='remote_access'}</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','sites/database_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/database_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/sites/_templates_old/database_list.htm b/interface/web/sites/_templates_old/database_list.htm
deleted file mode 100644
index 108006052bc3fc0d6131348b6088617279c680b2..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/database_list.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<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('sites/database_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="remote_access_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="database_name_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/database_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_remote_access" onChange="submitForm('pageForm','sites/database_list.php');">{tmpl_var name='search_remote_access'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/database_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_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','sites/database_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('sites/database_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_remote_access_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="database_name"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('sites/database_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="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/sites/_templates_old/ftp_user_advanced.htm b/interface/web/sites/_templates_old/ftp_user_advanced.htm
deleted file mode 100644
index b77b1e0e5ead6fd27d730e00ac6f05750c830f01..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/ftp_user_advanced.htm
+++ /dev/null
@@ -1,44 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='uid_txt'}:</td>
-    <td class="frmText11"><input name="uid" type="text" class="text" value="{tmpl_var name='uid'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='gid_txt'}:</td>
-    <td class="frmText11"><input name="gid" type="text" class="text" value="{tmpl_var name='gid'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='dir_txt'}:</td>
-    <td class="frmText11"><input name="dir" type="text" class="text" value="{tmpl_var name='dir'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='quota_files_txt'}:</td>
-    <td class="frmText11"><input name="quota_files" type="text" class="text" value="{tmpl_var name='quota_files'}" size="7" maxlength="7"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ul_ratio_txt'}:</td>
-    <td class="frmText11"><input name="ul_ratio" type="text" class="text" value="{tmpl_var name='ul_ratio'}" size="7" maxlength="7"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='dl_ratio_txt'}:</td>
-    <td class="frmText11"><input name="dl_ratio" type="text" class="text" value="{tmpl_var name='dl_ratio'}" size="7" maxlength="7"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ul_bandwidth_txt'}:</td>
-    <td class="frmText11"><input name="ul_bandwidth" type="text" class="text" value="{tmpl_var name='ul_bandwidth'}" size="7" maxlength="7"> KB/s</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='dl_bandwidth_txt'}:</td>
-    <td class="frmText11"><input name="dl_bandwidth" type="text" class="text" value="{tmpl_var name='dl_bandwidth'}" size="7" maxlength="7"> KB/s</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','sites/ftp_user_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/ftp_user_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/sites/_templates_old/ftp_user_edit.htm b/interface/web/sites/_templates_old/ftp_user_edit.htm
deleted file mode 100644
index f06e845f604dc97021b9e086caafd0746f531ef1..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/ftp_user_edit.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='parent_domain_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="parent_domain_id" class="text">
-			{tmpl_var name='parent_domain_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='username_txt'}:</td>
-    <td class="frmText11"><input name="username" type="text" class="text" value="{tmpl_var name='username'}" size="20" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='password_txt'}:</td>
-    <td class="frmText11"><input name="password" type="password" class="text" value="{tmpl_var name='password'}" size="20" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='quota_size_txt'}:</td>
-    <td class="frmText11"><input name="quota_size" type="text" class="text" value="{tmpl_var name='quota_size'}" size="7" maxlength="7"> MB</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','sites/ftp_user_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/ftp_user_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/sites/_templates_old/ftp_user_list.htm b/interface/web/sites/_templates_old/ftp_user_list.htm
deleted file mode 100644
index 92e410c3849ecd10ded3bfdb1c40d49ee5613278..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/ftp_user_list.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<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('sites/ftp_user_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="parent_domain_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="username_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><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="frmText11"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" 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','sites/ftp_user_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('sites/ftp_user_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="parent_domain_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="username"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('sites/ftp_user_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="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/sites/_templates_old/shell_user_advanced.htm b/interface/web/sites/_templates_old/shell_user_advanced.htm
deleted file mode 100644
index b7ebc54c9a7a858d207d29ef6043fbe3531fc71a..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/shell_user_advanced.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='uid_txt'}:</td>
-    <td class="frmText11"><input name="puser" type="text" class="text" value="{tmpl_var name='puser'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='gid_txt'}:</td>
-    <td class="frmText11"><input name="pgroup" type="text" class="text" value="{tmpl_var name='pgroup'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='shell_txt'}:</td>
-    <td class="frmText11"><input name="shell" type="text" class="text" value="{tmpl_var name='shell'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='dir_txt'}:</td>
-    <td class="frmText11"><input name="dir" type="text" class="text" value="{tmpl_var name='dir'}" size="30" maxlength="255"></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','sites/shell_user_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/shell_user_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/sites/_templates_old/shell_user_edit.htm b/interface/web/sites/_templates_old/shell_user_edit.htm
deleted file mode 100644
index 784d419d51d4281a77e7ea47a16dd35bd3b6f0b4..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/shell_user_edit.htm
+++ /dev/null
@@ -1,44 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='parent_domain_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="parent_domain_id" class="text">
-			{tmpl_var name='parent_domain_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='username_txt'}:</td>
-    <td class="frmText11"><input name="username" type="text" class="text" value="{tmpl_var name='username'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='password_txt'}:</td>
-    <td class="frmText11"><input name="password" type="password" class="text" value="{tmpl_var name='password'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='chroot_txt'}:</td>
-    <td class="frmText11">
-		<select name="chroot" class="text">
-			{tmpl_var name='chroot'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='quota_size_txt'}:</td>
-    <td class="frmText11"><input name="quota_size" type="text" class="text" value="{tmpl_var name='quota_size'}" size="7" maxlength="7"></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','sites/shell_user_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/shell_user_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/sites/_templates_old/shell_user_list.htm b/interface/web/sites/_templates_old/shell_user_list.htm
deleted file mode 100644
index af76e9eb11f197edfea04973c11cee4ccd0a6b7a..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/shell_user_list.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<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('sites/shell_user_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="parent_domain_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="username_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><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="frmText11"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" 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','sites/shell_user_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('sites/shell_user_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="parent_domain_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="username"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('sites/shell_user_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="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/sites/_templates_old/web_aliasdomain_edit.htm b/interface/web/sites/_templates_old/web_aliasdomain_edit.htm
deleted file mode 100644
index 215153c6b9778dc5bbbedeb57123dcd02d07c6e9..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/web_aliasdomain_edit.htm
+++ /dev/null
@@ -1,40 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='domain_txt'}:</td>
-    <td class="frmText11"><input name="domain" type="text" class="text" value="{tmpl_var name='domain'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='parent_domain_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="parent_domain_id" class="text">
-			{tmpl_var name='parent_domain_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='redirect_type_txt'}:</td>
-    <td class="frmText11">
-		<select name="redirect_type" class="text">
-			{tmpl_var name='redirect_type'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='redirect_path_txt'}:</td>
-    <td class="frmText11"><input name="redirect_path" type="text" class="text" value="{tmpl_var name='redirect_path'}" 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','sites/web_aliasdomain_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_aliasdomain_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/sites/_templates_old/web_aliasdomain_list.htm b/interface/web/sites/_templates_old/web_aliasdomain_list.htm
deleted file mode 100644
index 6abab552d8fa1064332525118fa0e2b48a11805b..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/web_aliasdomain_list.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<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('sites/web_aliasdomain_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="parent_domain_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="domain_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_aliasdomain_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><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="frmText11"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" 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','sites/web_aliasdomain_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('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="parent_domain_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="domain"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('sites/web_aliasdomain_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="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/sites/_templates_old/web_domain_advanced.htm b/interface/web/sites/_templates_old/web_domain_advanced.htm
deleted file mode 100644
index 0f75c426a5268ffc2a4664cae1bd41e051a0bc6d..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/web_domain_advanced.htm
+++ /dev/null
@@ -1,29 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='document_root_txt'}:</td>
-    <td class="frmText11"><input name="document_root" type="text" class="text" value="{tmpl_var name='document_root'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='system_user_txt'}:</td>
-    <td class="frmText11"><input name="system_user" type="text" class="text" value="{tmpl_var name='system_user'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='system_group_txt'}:</td>
-    <td class="frmText11"><input name="system_group" type="text" class="text" value="{tmpl_var name='system_group'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='apache_directives_txt'}:</td>
-    <td class="frmText11"><textarea name="apache_directives" class="text" rows="10" cols="30">{tmpl_var name='apache_directives'}</textarea></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','sites/web_domain_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_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/sites/_templates_old/web_domain_edit.htm b/interface/web/sites/_templates_old/web_domain_edit.htm
deleted file mode 100644
index dbedb95fad8bae890cc2e283b6b61dcff25ae124..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/web_domain_edit.htm
+++ /dev/null
@@ -1,118 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tmpl_if name="is_admin">
-  <tr>
-    <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="server_id" id="server_id" class="text" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
-			{tmpl_var name='server_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='client_txt'}:</td>
-    <td class="frmText11">
-		<select name="client_group_id" class="text">
-			{tmpl_var name='client_group_id'}
-		</select>
-	</td>
-  </tr>
-  </tmpl_if>
-  <tmpl_if name="is_reseller">
-  <tr>
-    <td class="frmText11">{tmpl_var name='client_txt'}:</td>
-    <td class="frmText11">
-		<select name="client_group_id" class="text">
-			{tmpl_var name='client_group_id'}
-		</select>
-	</td>
-  </tr>
-  </tmpl_if>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ip_address_txt'}:</td>
-    <td class="frmText11">
-		<select name="ip_address" id="ip_address" class="text">
-			{tmpl_var name='ip_address'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='domain_txt'}:</td>
-    <td class="frmText11"><input name="domain" type="text" class="text" value="{tmpl_var name='domain'}" size="30" maxlength="255"></td>
-  </tr>
-  <!--
-  <tr>
-    <td class="frmText11">{tmpl_var name='type_txt'}:</td>
-    <td class="frmText11">
-		<select name="type" class="text">
-			{tmpl_var name='type'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='parent_domain_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="parent_domain_id" class="text">
-			{tmpl_var name='parent_domain_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='vhost_type_txt'}:</td>
-    <td class="frmText11">
-		<select name="vhost_type" class="text">
-			{tmpl_var name='vhost_type'}
-		</select>
-	</td>
-  </tr>
-  -->
-  <tr>
-    <td class="frmText11">{tmpl_var name='hd_quota_txt'}:</td>
-    <td class="frmText11"><input name="hd_quota" type="text" class="text" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7"> MB</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='traffic_quota_txt'}:</td>
-    <td class="frmText11"><input name="traffic_quota" type="text" class="text" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7"> MB</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='cgi_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='cgi'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ssi_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='ssi'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='suexec_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='suexec'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ssl_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='ssl'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='php_txt'}:</td>
-    <td class="frmText11">
-		<select name="php" class="text">
-			{tmpl_var name='php'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='errordocs_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='errordocs'}</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','sites/web_domain_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_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/sites/_templates_old/web_domain_list.htm b/interface/web/sites/_templates_old/web_domain_list.htm
deleted file mode 100644
index 83bed62837d5f713165a5ce177199e069e66210d..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/web_domain_list.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<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('sites/web_domain_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="domain_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_domain_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" 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','sites/web_domain_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('sites/web_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="domain"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('sites/web_domain_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/sites/_templates_old/web_domain_redirect.htm b/interface/web/sites/_templates_old/web_domain_redirect.htm
deleted file mode 100644
index 97000edea89bc3e618dc3855ae2d710826ae6d8e..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/web_domain_redirect.htm
+++ /dev/null
@@ -1,24 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='redirect_type_txt'}:</td>
-    <td class="frmText11">
-		<select name="redirect_type" class="text">
-			{tmpl_var name='redirect_type'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='redirect_path_txt'}:</td>
-    <td class="frmText11"><input name="redirect_path" type="text" class="text" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255"></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','sites/web_domain_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_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/sites/_templates_old/web_domain_ssl.htm b/interface/web/sites/_templates_old/web_domain_ssl.htm
deleted file mode 100644
index f43101b21d9e80cbb3db544366cf0f2f155ae74e..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/web_domain_ssl.htm
+++ /dev/null
@@ -1,52 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='ssl_state_txt'}:</td>
-    <td class="frmText11"><input name="ssl_state" type="text" class="text" value="{tmpl_var name='ssl_state'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ssl_locality_txt'}:</td>
-    <td class="frmText11"><input name="ssl_locality" type="text" class="text" value="{tmpl_var name='ssl_locality'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ssl_organisation_txt'}:</td>
-    <td class="frmText11"><input name="ssl_organisation" type="text" class="text" value="{tmpl_var name='ssl_organisation'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ssl_organisation_unit_txt'}:</td>
-    <td class="frmText11"><input name="ssl_organisation_unit" type="text" class="text" value="{tmpl_var name='ssl_organisation_unit'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ssl_country_txt'}:</td>
-    <td class="frmText11"><input name="ssl_country" type="text" class="text" value="{tmpl_var name='ssl_country'}" size="2" maxlength="2"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ssl_request_txt'}:</td>
-    <td class="frmText11"><textarea name='ssl_request' cols='50' rows='10'>{tmpl_var name='ssl_request'}</textarea></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ssl_cert_txt'}:</td>
-    <td class="frmText11"><textarea name='ssl_cert' cols='50' rows='10'>{tmpl_var name='ssl_cert'}</textarea></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ssl_bundle_txt'}:</td>
-    <td class="frmText11"><textarea name='ssl_bundle' cols='50' rows='10'>{tmpl_var name='ssl_bundle'}</textarea></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ssl_action_txt'}:</td>
-    <td class="frmText11">
-		<select name="ssl_action" class="text">
-			{tmpl_var name='ssl_action'}
-		</select>
-	</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','sites/web_domain_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_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/sites/_templates_old/web_subdomain_edit.htm b/interface/web/sites/_templates_old/web_subdomain_edit.htm
deleted file mode 100644
index 794183e641eefdb91256fbaf7c0c6724d5748043..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/web_subdomain_edit.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='domain_txt'}:</td>
-    <td class="frmText11"><input name="domain" type="text" class="text" value="{tmpl_var name='domain'}" size="10" maxlength="255">
-		. <select name="parent_domain_id" class="text">
-			{tmpl_var name='parent_domain_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='redirect_type_txt'}:</td>
-    <td class="frmText11">
-		<select name="redirect_type" class="text">
-			{tmpl_var name='redirect_type'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='redirect_path_txt'}:</td>
-    <td class="frmText11"><input name="redirect_path" type="text" class="text" value="{tmpl_var name='redirect_path'}" 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','sites/web_subdomain_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_subdomain_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/sites/_templates_old/web_subdomain_list.htm b/interface/web/sites/_templates_old/web_subdomain_list.htm
deleted file mode 100644
index 701c17e17ad66bf4672c46f87a4eb28755ae45a6..0000000000000000000000000000000000000000
--- a/interface/web/sites/_templates_old/web_subdomain_list.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<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('sites/web_subdomain_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="active_txt"></td>
-    <td class="tblHead"><tmpl_var name="server_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="parent_domain_id_txt"></td>
-    <td class="tblHead"><tmpl_var name="domain_txt"></td>
-    <td class="tblHead">&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_active'}</select></td>
-    <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_subdomain_list.php');">{tmpl_var name='search_server_id'}</select></td>
-    <td class="frmText11"><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="frmText11"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" 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','sites/web_subdomain_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('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="parent_domain_id"}</a></td>
-    <td class="frmText11"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="domain"}</a></td>
-    <td class="frmText11" align="right"><a href="javascript: del_record('sites/web_subdomain_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="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/interface/web/themes/old/graphics licence.txt b/interface/web/themes/old/graphics licence.txt
deleted file mode 100644
index 390a6ca164ae73553aaab4d4d3dfcc103a1adb91..0000000000000000000000000000000000000000
--- a/interface/web/themes/old/graphics licence.txt	
+++ /dev/null
@@ -1 +0,0 @@
-The icons and graphics in this theme may only be used for ISPConfig 3 software. The graphic files are not licensed under BSD license and may not be copied or used for other projects.
\ No newline at end of file
diff --git a/interface/web/themes/old/icons/folder.png b/interface/web/themes/old/icons/folder.png
deleted file mode 100644
index c5df8d8a1f41b21b263d5829dfa29e7b05e4332f..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/icons/folder.png and /dev/null differ
diff --git a/interface/web/themes/old/icons/folder_closed.png b/interface/web/themes/old/icons/folder_closed.png
deleted file mode 100644
index caad126826f4bfdafde2ced9ac73129ae0b8d9ff..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/icons/folder_closed.png and /dev/null differ
diff --git a/interface/web/themes/old/icons/list_icon_delete.png b/interface/web/themes/old/icons/list_icon_delete.png
deleted file mode 100644
index 1294132968da8a359cc0a3d87c617d7015921829..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/icons/list_icon_delete.png and /dev/null differ
diff --git a/interface/web/themes/old/icons/list_icon_false.png b/interface/web/themes/old/icons/list_icon_false.png
deleted file mode 100644
index d33897164ea14f8d8b9b06f2209a19136151aebc..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/icons/list_icon_false.png and /dev/null differ
diff --git a/interface/web/themes/old/icons/list_icon_true.png b/interface/web/themes/old/icons/list_icon_true.png
deleted file mode 100644
index deefc129d2f4df81b59d8d264391c9e3b9285890..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/icons/list_icon_true.png and /dev/null differ
diff --git a/interface/web/themes/old/images/bg_nav_1.jpg b/interface/web/themes/old/images/bg_nav_1.jpg
deleted file mode 100644
index 24606688eab72be6783655c367edcd2f8579bb45..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/images/bg_nav_1.jpg and /dev/null differ
diff --git a/interface/web/themes/old/images/btn_back.png b/interface/web/themes/old/images/btn_back.png
deleted file mode 100644
index ad23b343c9119d58d11787192d3deef46985669c..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/images/btn_back.png and /dev/null differ
diff --git a/interface/web/themes/old/images/btn_filter.png b/interface/web/themes/old/images/btn_filter.png
deleted file mode 100644
index 9a4f775364c6b7e03881bb068aa123473968d378..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/images/btn_filter.png and /dev/null differ
diff --git a/interface/web/themes/old/images/btn_left.png b/interface/web/themes/old/images/btn_left.png
deleted file mode 100644
index a89d52b7be34b2e4ef295e7d1e52111b08a0987c..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/images/btn_left.png and /dev/null differ
diff --git a/interface/web/themes/old/images/btn_next.png b/interface/web/themes/old/images/btn_next.png
deleted file mode 100644
index d59e21391ef8051508c435170d1c2480d79ec671..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/images/btn_next.png and /dev/null differ
diff --git a/interface/web/themes/old/images/btn_right.png b/interface/web/themes/old/images/btn_right.png
deleted file mode 100644
index 2ce5cd27ea3f842469980ecbc30d15d3f2cd0461..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/images/btn_right.png and /dev/null differ
diff --git a/interface/web/themes/old/images/button_bg.gif b/interface/web/themes/old/images/button_bg.gif
deleted file mode 100644
index 5054b643073a0bad06ad77f295a5f3bd52237a4e..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/images/button_bg.gif and /dev/null differ
diff --git a/interface/web/themes/old/images/button_end.gif b/interface/web/themes/old/images/button_end.gif
deleted file mode 100644
index 44dd5b0068fe652a15d78ae7e67f1ca371dd9e72..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/images/button_end.gif and /dev/null differ
diff --git a/interface/web/themes/old/images/login_logout.gif b/interface/web/themes/old/images/login_logout.gif
deleted file mode 100644
index bd20c11df21d2a454712b6132d10988d4d209df8..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/images/login_logout.gif and /dev/null differ
diff --git a/interface/web/themes/old/images/mydnsconfig_logo.gif b/interface/web/themes/old/images/mydnsconfig_logo.gif
deleted file mode 100644
index f80196fe5bdcdcec4faeb04c949f1af492e042eb..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/images/mydnsconfig_logo.gif and /dev/null differ
diff --git a/interface/web/themes/old/images/nav_top_bg.gif b/interface/web/themes/old/images/nav_top_bg.gif
deleted file mode 100644
index 9e00a875d9f9cff2e3a9c9d11956454a7fed2186..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/images/nav_top_bg.gif and /dev/null differ
diff --git a/interface/web/themes/old/images/x.gif b/interface/web/themes/old/images/x.gif
deleted file mode 100644
index 26a55c8d56447a84011fdf5f1de37565036af4f3..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/old/images/x.gif and /dev/null differ
diff --git a/interface/web/themes/old/style.css b/interface/web/themes/old/style.css
deleted file mode 100644
index 195b54f1cdb1c1e62c0f0a4f1700c9f7bfd1c151..0000000000000000000000000000000000000000
--- a/interface/web/themes/old/style.css
+++ /dev/null
@@ -1,340 +0,0 @@
-html, body{
-	height: 100%;
-	margin: 0;
-	padding: 0;
-}
-
-body{
-    /*margin: 0px auto;*/
-    background-color: #ffffff;
-    font-family: sans-serif;    
-}
-
-.navTopSelected {
-	background-color: #FFFFFF;
-	border-top: 1px solid #BFCBD9;
-	border-right: 1px solid #BFCBD9;
-	border-bottom: 1px none #BFCBD9;
-	border-left: 1px solid #BFCBD9;
-	text-align: center;
-
-
-}
-.navTop {
-	border-top: 1px none #BFCBD9;
-	border-right: 1px none #BFCBD9;
-	border-bottom: 1px solid #BFCBD9;
-	border-left: 1px none #BFCBD9;
-
-}
-.navTopDefault {
-	background-color: #DEE4F2;
-	/*border: 1px solid #FFFFFF;*/
-	border-top: 1px solid #FFFFFF;
-	border-right: 1px none #FFFFFF;
-	border-bottom: 0px none #BFCBD9;
-	border-left: 1px solid #FFFFFF;
-	text-align: center;
-
-
-}
-.mainContent {
-	background-color: #FFFFFF;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-left-style: solid;
-	border-top-color: #BFCBD9;
-	border-right-color: #BFCBD9;
-	border-bottom-color: #BFCBD9;
-	border-left-color: #BFCBD9;
-}
-.txtNavTopDefault {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight: bold;
-	color: #496FA8;
-	text-decoration: none;
-}
-.txtNavTopSelected {
-
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight: bold;
-	color: #496FA8;
-	text-decoration: none;
-}
-.navLeftHead {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight: bold;
-	color: #4E70A7;
-	text-decoration: none;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-top-style: none;
-	border-right-style: none;
-	border-bottom-style: solid;
-	border-left-style: none;
-	border-top-color: #999999;
-	border-right-color: #999999;
-	border-bottom-color: #4E70A7;
-	border-left-color: #999999;
-	text-align: left;
-}
-.navLeftHead a {
-	text-decoration: none;
-	color: #4E70A7;
-}
-.navLeftItem {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	color: #4E70A7;
-	text-decoration: none;
-	line-height: 15px;
-
-}
-.txtNavTopHelp {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	color: #FFFFFF;
-	text-decoration: none;
-}
-
-/* Listing table  */
-table.table{
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-table.table th{
-    color: #496FA8;
-    font-size: 10pt;
-    text-align: left;
-    background-color: #DEE4F2;
-    border: 1px solid #C0CCDA;
-    padding: 2px 2px 2px 5px;
-}
-
-table.table td{
-    font-size: 8pt;
-    padding: 3px;
-}
-
-.tblHead {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	color: #496FA8;
-	background-color: #DEE4F2;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-top-style: solid;
-	border-right-style: none;
-	border-bottom-style: solid;
-	border-left-style: solid;
-	border-top-color: #C0CCDA;
-	border-right-color: #C0CCDA;
-	border-bottom-color: #C0CCDA;
-	border-left-color: #C0CCDA;
-}
-.tblFooter {
-
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight: normal;
-	color: #666666;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-top-style: solid;
-	border-right-style: none;
-	border-bottom-style: none;
-	border-left-style: none;
-	border-top-color: #C0CCDA;
-	border-right-color: #999999;
-	border-bottom-color: #999999;
-	border-left-color: #999999;
-}
-.frmText11 {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #333333;
-	text-decoration: none;
-
-}
-.frmText11:Hover {
-	text-decoration: underline;
-
-}
-textarea,input.text,select,option{
-	color:#000000;
-	font-family:CourierNew,Courier,monospace;
-	background-color:#FCFCFC;
-	font-size:14px;
-	font-style:normal;
-	font-variant:normal;
-	font-weight:normal;
-	scrollbar-arrow-color:#FFFFFF;
-	scrollbar-track-color:#BFCBD9;
-	scrollbar-face-color:#BFCBD9;
-	scrollbar-base-color:#BFCBD9;
-	scrollbar-3dlight-color:#BFCBD9;
-	border: 1 solid ##BFCBD9;
-	position: relative;
-}
-.frmTextHead {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	font-size: 18px;
-	color: #496FA8;
-	text-decoration: none;
-	display:inline-block;
-	margin-bottom:10px;
-}
-
-.frmTextSubHead {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	font-size: 12px;
-	color: #496FA8;
-	text-decoration: none;
-
-}
-/*
-.button {
-	border-color : #666699 #666699 #666699 #666699;
-	border-width : 1 1 1 1; color : Black; 
-	background-color : #FFFFFF; 
-	height : 19px; 
-	font-size : 12px; 
-}
-*/
-
-.frmTab {
-	border-top: 1px none #999999;
-	border-right: 1px none #999999;
-	border-bottom: 1px solid #C0CCDA;
-	border-left: 1px none #999999;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 16px;
-
-}
-.frmTabSelected {
-	background-color: #FFFFFF;
-	border-top: 1px solid #C0CCDA;
-	border-right: 1px solid #C0CCDA;
-	border-bottom: 1px none #999999;
-	border-left: 1px solid #C0CCDA;
-	text-align: center;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 16px;
-
-}
-.frmTabDefault {
-	background-color: #DEE4F2;
-	border: 1px solid #C0CCDA;
-	text-align: center;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 16px;
-
-}
-.frmHead {
-
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	color: #666666;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-top-style: none;
-	border-right-style: none;
-	border-bottom-style: solid;
-	border-left-style: none;
-	border-top-color: #999999;
-	border-right-color: #999999;
-	border-bottom-color: #999999;
-	border-left-color: #999999;
-}
-.frmSubHead {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #666666;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-top-style: none;
-	border-right-style: none;
-	border-bottom-style: solid;
-	border-left-style: none;
-	border-top-color: #999999;
-	border-right-color: #999999;
-	border-bottom-color: #999999;
-	border-left-color: #999999;
-	font-weight: bold;
-
-}
-.error {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border: 1px solid #CC0000;
-	text-decoration: none;
-
-}
-.msg {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border: 1px solid #00CC00;
-	text-decoration: none;
-
-}
-INPUT {
-	border: 1px solid #BFCBD9;
-	/*
-	height: 26px;
-	font-size:20px;
-	*/
-}
-TEXTAREA {
-	border: 1px solid #BFCBD9;
-}
-
-.button {
-    border: 0;
-    background: #fff url("../../themes/default/images/button_bg.gif") no-repeat;
-    height: 26px;
-	font-size:14px;
-    /* used to catch the buttonEnding */
-    position: relative;
-	margin-right:0px
-}
-
-.buttonEnding {
-    position: absolute;
-    display: inline;
-    width: 2px;
-    height: 26px;
-    background: url("../../themes/default/images/button_end.gif") no-repeat;
-}
-
-h2 {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 16px;
-	font-weight:bold;
-}
-
-
diff --git a/interface/web/themes/old/templates/_form.tpl.htm b/interface/web/themes/old/templates/_form.tpl.htm
deleted file mode 100644
index c2b60a242ab83ae66fbf59a1cbdbc0adf166c5bb..0000000000000000000000000000000000000000
--- a/interface/web/themes/old/templates/_form.tpl.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-<script language="JavaScript">
-<!--
-
-function del_record(link) {
-  if(window.confirm("<tmpl_var name='delete_confirmation'>")) {
-          location.href = link;
-  }
-}
-
-//-->
-</script>
-<tmpl_dyninclude name="content_tpl">
\ No newline at end of file
diff --git a/interface/web/themes/old/templates/form.tpl.htm b/interface/web/themes/old/templates/form.tpl.htm
deleted file mode 100644
index 429bfd9f2497cae91ebd8b996f6897c6950ee1c0..0000000000000000000000000000000000000000
--- a/interface/web/themes/old/templates/form.tpl.htm
+++ /dev/null
@@ -1 +0,0 @@
-<tmpl_dyninclude name="content_tpl">
\ No newline at end of file
diff --git a/interface/web/themes/old/templates/listpage.tpl.htm b/interface/web/themes/old/templates/listpage.tpl.htm
deleted file mode 100644
index 429bfd9f2497cae91ebd8b996f6897c6950ee1c0..0000000000000000000000000000000000000000
--- a/interface/web/themes/old/templates/listpage.tpl.htm
+++ /dev/null
@@ -1 +0,0 @@
-<tmpl_dyninclude name="content_tpl">
\ No newline at end of file
diff --git a/interface/web/themes/old/templates/main.tpl.htm b/interface/web/themes/old/templates/main.tpl.htm
deleted file mode 100644
index 918c2814dcff7655ad7ad42d38ff8b78eaaf1333..0000000000000000000000000000000000000000
--- a/interface/web/themes/old/templates/main.tpl.htm
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>ISPConfig</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="themes/default/style.css" rel="stylesheet" type="text/css">
-<script src="js/yui/yahoo/yahoo-min.js"></script>
-<script src="js/yui/connection/connection-min.js"></script>
-<script src="js/scrigo.js"></script>
-</head>
-<body bgcolor="#FFFFFF" leftmargin=0 topmargin=0 marginwidth=0 marginheight=0 onLoad="loadInitContent()">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr bgcolor="#496FA8">
-    <td height="30" colspan="2" align="right" valign="top" background="themes/default/images/bg_nav_1.jpg"><!--<img src="themes/default/images/mydnsconfig_logo.gif" border="0" alt="">--></td>
-  </tr>
-  <tr>
-    <td width="128" height="18" align="left" valign="middle" bgcolor="#496FA8"><img src="themes/default/images/login_logout.gif" width="115" height="10" border="0" usemap="#Map"><br>
-    </td>
-    <td height="18" align="left" valign="bottom" bgcolor="#496FA8"><div id="topNav">&nbsp;</div></td>
-  </tr>
-  <tr>
-    <td width="128" height="26" background="themes/default/images/nav_top_bg.gif">&nbsp;</td>
-    <td rowspan="3" class="mainContent"><form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" style="margin:10px; width:99%; height:100%;"><div id="pageContent" style="width:100%; height:100%;"></div></form></td>
-  </tr>
-  <tr>
-    <td width="128" align="right" valign="top" bgcolor="#DEE4F2"><div id="sideNav">&nbsp;</div></td>
-  </tr>
-  <tr>
-    <td align="left" valign="bottom" bgcolor="#DEE4F2">&nbsp;</td>
-  </tr>
-</table>
-<map name="Map">
-  <area shape="rect" coords="66,1,106,19" href="login/logout.php?phpsessid=d4307711e9e4905b0bf590198a1fc4a5">
-  <area shape="rect" coords="5,1,50,10" href="help/index.php?phpsessid=d4307711e9e4905b0bf590198a1fc4a5" target="content">
-</map>
-</body>
-</html>
\ No newline at end of file
diff --git a/interface/web/themes/old/templates/main_prototype.tpl.htm b/interface/web/themes/old/templates/main_prototype.tpl.htm
deleted file mode 100644
index b1b1a671c84a90de7367ac51bf49765914954e23..0000000000000000000000000000000000000000
--- a/interface/web/themes/old/templates/main_prototype.tpl.htm
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>ISPConfig</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="themes/default/style.css" rel="stylesheet" type="text/css">
-<script src="js/prototype.js"></script>
-<script language= "JavaScript">
-
-
-
-function submitLoginForm(formname) {
-	var params = Form.serialize($('pageForm'));
-	var req1 = new Ajax.Request( 
-		'content.php', 
-		{
-			method:'post',
-			asynchronous: false, 
-			parameters: params,
-			onFailure: reportError,
-			onComplete: showLoginResponse
-		}
-	); 
-}
-
-function showLoginResponse(request) {
-	$('pageContent').innerHTML = request.responseText;
-	loadMenus('');
-}
-
-
-
-
-function submitForm(formname) {
-	var params = Form.serialize($('pageForm'));
-	var req1 = new Ajax.Request( 
-		'content.php', 
-		{
-			method:'post',
-			asynchronous: false, 
-			parameters: params,
-			onFailure: reportError,
-			onComplete: showResponse
-		}
-	); 
-}
-
-function showResponse(request) {
-	$('pageContent').innerHTML = request.responseText;
-}
-
-
-/*
-function showResponse(request) {
-	if(request.responseText.indexOf("HEADER_REDIRECT:") > -1) {
-		var parts = request.responseText.split(":");
-		//alert(parts[1]);
-		loadContent2(parts[1],'');
-	} else {
-		$('pageContent').innerHTML = request.responseText;
-	}
-}
-*/
-
-function loadContent2(pagename,params) {
-	
-	var req1 = new Ajax.Request( 
-		'admin/index.php', 
-		{
-			method:'post',
-			asynchronous: false, 
-			parameters: params,
-			onFailure: reportError,
-			onComplete: showResponse
-		}
-	); 
-
-}
-
-function loadContent(pagename,params) {
-	
-	var contentAjax = new Ajax.Updater(
-			'pageContent', 
-			pagename, 
-			{
-				method: 'post', 
-				parameters: parameters,
-				asynchronous: false,
-				onFailure: reportError
-			});
-
-}
-
-function loadInitContent() {
-	
-	var contentAjax = new Ajax.Updater(
-			'pageContent', 
-			'content.php?s_mod=login&s_pg=index', 
-			{
-				method: 'get', 
-				parameters: '',
-				onFailure: reportError
-			});
-	
-	loadMenus();
-
-}
-
-function loadMenus() {
-	
-	var sideNavAjax2 = new Ajax.Updater(
-			'sideNav', 
-			'nav.php', 
-			{
-				method: 'get', 
-				parameters: 'nav=side',
-				onFailure: reportError
-			});
-	
-	var topNavAjax2 = new Ajax.Updater(
-			'topNav', 
-			'nav.php', 
-			{
-				method: 'get', 
-				parameters: 'nav=top',
-				onFailure: reportError
-			});
-}
-
-function reportError(request)
-	{
-		alert('Sorry. There was an error.');
-	}
-
-</script>
-</head>
-<body bgcolor="#FFFFFF" leftmargin=0 topmargin=0 marginwidth=0 marginheight=0 onLoad="loadInitContent()"><form method="post" action="" id="pageForm" enctype="multipart/form-data" style="margin:0px;">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr bgcolor="#496FA8">
-    <td height="30" colspan="2" align="right" valign="top" background="themes/default/images/bg_nav_1.jpg"><img src="themes/default/images/mydnsconfig_logo.gif" border="0" alt=""></td>
-  </tr>
-  <tr bgcolor="#FFFFFF">
-    <td height="1" colspan="2" align="center" valign="bottom"><img src="themes/default/images/x.gif" width="1" height="1"></td>
-  </tr>
-  <tr>
-    <td width="128" height="18" align="left" valign="middle" bgcolor="#496FA8"><img src="themes/default/images/login_logout.gif" width="115" height="10" border="0" usemap="#Map"><br>
-    </td>
-    <td height="18" align="left" valign="bottom" bgcolor="#496FA8"><div id="topNav">&nbsp;</div></td>
-  </tr>
-  <tr>
-    <td width="128" height="26" background="themes/default/images/nav_top_bg.gif">&nbsp;</td>
-    <td rowspan="3" class="mainContent"><div id="pageContent" style="width:100%; height:100%;"></div></td>
-  </tr>
-  <tr>
-    <td width="128" align="right" valign="top" bgcolor="#DEE4F2"><div id="sideNav">&nbsp;</div></td>
-  </tr>
-  <tr>
-    <td align="left" valign="bottom" bgcolor="#DEE4F2">&nbsp;</td>
-  </tr>
-</table></form>
-<map name="Map">
-  <area shape="rect" coords="66,1,106,19" href="login/logout.php?phpsessid=d4307711e9e4905b0bf590198a1fc4a5">
-  <area shape="rect" coords="5,1,50,10" href="help/index.php?phpsessid=d4307711e9e4905b0bf590198a1fc4a5" target="content">
-</map>
-</body>
-</html>
\ No newline at end of file
diff --git a/interface/web/themes/old/templates/module.tpl.htm b/interface/web/themes/old/templates/module.tpl.htm
deleted file mode 100644
index 36cdd09c73687ae1d87f3dde00cecaec8cd5167e..0000000000000000000000000000000000000000
--- a/interface/web/themes/old/templates/module.tpl.htm
+++ /dev/null
@@ -1,37 +0,0 @@
-  <tr>
-    <td width="128" height="26" background="themes/{tmpl_var name="theme"}/images/nav_top_bg.gif">&nbsp;</td>
-    <td rowspan="3" class="mainContent">
-		<table width="100%" height="100%" border="0" cellpadding="20" cellspacing="0">
-			<tr>
-				<td><iframe height="100%" width="100%" frameborder="0" name="content" src="{tmpl_var name="startpage"}"></iframe></td>
-      		</tr>
-    	</table>
-	</td>
-  </tr>
-  <tr>
-    <td width="128" align="right" valign="top" bgcolor="#DEE4F2"><table width="128" border="0" cellspacing="0" cellpadding="2">
-      <tr>
-        <td height="10">&nbsp;</td>
-      </tr>
-	  <tr><td align="center">
-	  <tmpl_loop name="nav_left">
-	  <table bgcolor="#F4F6FB" width="115">
-      <tr>
-        <td class="navLeftHead"><tmpl_var name="title"></td>
-        </tr>
-      <tr>
-        <td>
-		  <tmpl_loop name="items">
-		  <a href="<tmpl_var name='link'>" class="navLeftItem" target="<tmpl_var name='target'>"><tmpl_var name="title"></a><br>
-		  </tmpl_loop>
-		</td>
-      </tr>
-	  </table>
-	  <br />
-	  </tmpl_loop>
-	  </td></tr>
-    </table></td>
-  </tr>
-  <tr>
-    <td align="left" valign="bottom" bgcolor="#DEE4F2">&nbsp;</td>
-  </tr>
\ No newline at end of file
diff --git a/interface/web/themes/old/templates/module_tree.tpl.htm b/interface/web/themes/old/templates/module_tree.tpl.htm
deleted file mode 100644
index b0895789ab97c225f126acfdf811ee10602989af..0000000000000000000000000000000000000000
--- a/interface/web/themes/old/templates/module_tree.tpl.htm
+++ /dev/null
@@ -1,38 +0,0 @@
-  <tr>
-    <td width="128" height="26" background="themes/{tmpl_var name="theme"}/images/nav_top_bg.gif">&nbsp;</td>
-    <td rowspan="3" class="mainContent">
-		<table width="100%" height="100%" border="0" cellpadding="20" cellspacing="0">
-			<tr>
-        		<td width="200"><iframe height="100%" width="100%" frameborder="0" name="navframe" src="{tmpl_var name="navframe_page"}"></iframe></td>
-				<td><iframe height="100%" width="100%" frameborder="0" name="content" src="{tmpl_var name="startpage"}"></iframe></td>
-      		</tr>
-    	</table>
-	</td>
-  </tr>
-  <tr>
-    <td width="128" align="right" valign="top" bgcolor="#DEE4F2"><table width="128" border="0" cellspacing="0" cellpadding="2">
-      <tr>
-        <td height="10">&nbsp;</td>
-      </tr>
-	  <tr><td align="center">
-	  <tmpl_loop name="nav_left">
-	  <table bgcolor="#F4F6FB" width="115">
-      <tr>
-        <td class="navLeftHead"><tmpl_var name="title"></td>
-        </tr>
-      <tr>
-        <td>
-		  <tmpl_loop name="items">
-		  <a href="<tmpl_var name='link'>" class="navLeftItem" target="<tmpl_var name='target'>"><tmpl_var name="title"></a><br>
-		  </tmpl_loop>
-		</td>
-      </tr>
-	  </table>
-	  <br />
-	  </tmpl_loop>
-	  </td></tr>
-    </table></td>
-  </tr>
-  <tr>
-    <td align="left" valign="bottom" bgcolor="#DEE4F2">&nbsp;</td>
-  </tr>
\ No newline at end of file
diff --git a/interface/web/themes/old/templates/sidenav.tpl.htm b/interface/web/themes/old/templates/sidenav.tpl.htm
deleted file mode 100644
index 445026d827be699890deaef74a9266c5f54de6ed..0000000000000000000000000000000000000000
--- a/interface/web/themes/old/templates/sidenav.tpl.htm
+++ /dev/null
@@ -1,22 +0,0 @@
-	<table width="128" border="0" cellspacing="0" cellpadding="2">
-      <tr>
-        <td height="10">&nbsp;</td>
-      </tr>
-	  <tr><td align="center">
-	  <tmpl_loop name="nav_left">
-	  <table bgcolor="#F4F6FB" width="115">
-      <tr>
-        <td class="navLeftHead"><a href="#" onClick="loadContent('<tmpl_var name='startpage'>')"><tmpl_var name="title"></a></td>
-        </tr>
-      <tr>
-        <td>
-		  <tmpl_loop name="items">
-		  <a href="#" class="navLeftItem" onClick="loadContent('<tmpl_var name='link'>')"><tmpl_var name="title"></a><br>
-		  </tmpl_loop>
-		</td>
-      </tr>
-	  </table>
-	  <br />
-	  </tmpl_loop>
-	  </td></tr>
-    </table>
\ No newline at end of file
diff --git a/interface/web/themes/old/templates/tabbed_form.tpl.htm b/interface/web/themes/old/templates/tabbed_form.tpl.htm
deleted file mode 100644
index 8a2d496821cee7065c8e0f486b1f1ad9840aa872..0000000000000000000000000000000000000000
--- a/interface/web/themes/old/templates/tabbed_form.tpl.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<table width="100%" border="0" cellspacing="0" cellpadding="2">
-  <tmpl_if name="form_hint">
-  <tr>
-    <td class="frmText11"><tmpl_var name="form_hint"></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  </tmpl_if>
-  <tr>
-    <td><table width="100%" border="0" cellspacing="0" cellpadding="0">
-      <tr>
-	    <td width="2" class="frmTab">&nbsp;</td>
-		<tmpl_loop name="formTab">
-		<tmpl_if name="active">
-        <td width="<tmpl_var name='width'>" align="center" class="frmTabSelected"><a href="javascript:changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')" class="frmText11"><tmpl_var name='title'></a></td>
-        <td width="2" class="frmTab">&nbsp;</td>
-		<tmpl_else>
-        <td width="<tmpl_var name='width'>" class="frmTabDefault"><a href="javascript:changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')" class="frmText11"><tmpl_var name='title'></a></td>
-        <td width="2" class="frmTab">&nbsp;</td>
-		</tmpl_if>
-		</tmpl_loop>
-        <td class="frmTab">&nbsp;</td>
-      </tr>
-    </table></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  <tmpl_if name="error">
-  <tr>
-    <td class="error"><tmpl_var name="error"></td>
-  </tr>
-  </tmpl_if>
-  <tr>
-    <td>
-		<tmpl_dyninclude name="content_tpl">
-	</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="tblFooter">&nbsp;</td>
-  </tr>
-</table>
-<input type="hidden" name="next_tab" value="">
-<input type="hidden" name="phpsessid" value="{tmpl_var name='phpsessid'}">
\ No newline at end of file
diff --git a/interface/web/themes/old/templates/topnav.tpl.htm b/interface/web/themes/old/templates/topnav.tpl.htm
deleted file mode 100644
index 81b41f02319d8807c27ccd9c89de6b2377dfdac3..0000000000000000000000000000000000000000
--- a/interface/web/themes/old/templates/topnav.tpl.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-	<table width="100%" height="18" border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <tmpl_loop name="nav_top">
-        <tmpl_if name="active">
-        <td width="{tmpl_var name='tab_width'}" class="navTopSelected"><a href="#" class="txtNavTopSelected"><tmpl_var name="title"></a></td>
-        <tmpl_else>
-        <td width="{tmpl_var name='tab_width'}" class="navTopDefault"><a href="#" onClick="capp('<tmpl_var name='module'>')" class="txtNavTopDefault"><tmpl_var name="title"></a></td>
-        </tmpl_if>
-        </tmpl_loop>
-        <td align="right" valign="middle" class="navTop"><img src="themes/{tmpl_var name="theme"}/images/x.gif" width="123" height="1"> </td>
-          </tr>
-    </table>
\ No newline at end of file
diff --git a/interface/web/themes/old/templates/vorlage_gesamt.tpl.htm b/interface/web/themes/old/templates/vorlage_gesamt.tpl.htm
deleted file mode 100644
index cc014ecbf24b2ab5ab0f0ff4620813e48d6c2cb4..0000000000000000000000000000000000000000
--- a/interface/web/themes/old/templates/vorlage_gesamt.tpl.htm
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>42go</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="../style.css" rel="stylesheet" type="text/css">
-<script language= "JavaScript">
-function breakout()
-{
-if (window.top != window.self)
- {
- window.top.location="index.php"
- }
-}
-</script>
-</head>
-
-<body bgcolor="#FFFFFF" leftmargin=0 topmargin=0 marginwidth=0 marginheight=0 onload="breakout()">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr bgcolor="#7F99A6">
-    <td height="30" colspan="2" align="center" valign="top"><table width="100%" height="30" border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <td align="left" valign="top"><img src="../images/mb_logo.gif" width="149" height="23"></td>
-        <td align="right" valign="top"><img src="../images/nav_de_en.gif" width="125" height="23"></td>
-      </tr>
-    </table></td>
-  </tr>
-  <tr bgcolor="#FFFFFF">
-    <td height="1" colspan="2" align="center" valign="bottom"><img src="../images/x.gif" width="1" height="1"></td>
-  </tr>
-  <tr>
-    <td width="128" height="18" align="left" valign="middle" bgcolor="#003050"><img src="../images/login_logout.gif" width="109" height="18"><br>
-    </td>
-    <td height="18" align="left" valign="bottom" bgcolor="#003050">
-        <table width="100%" height="18" border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <tmpl_loop name="nav_top">
-        <tmpl_if name="active">
-        <td width="100" class="navTopSelected"><a href="#" class="txtNavTopSelected"><tmpl_var name="title"></a></td>
-        <td width="2" class="navTop">&nbsp;</td>
-        <tmpl_else>
-        <td width="100" class="navTopDefault"><a href="capp.php?mod=<tmpl_var name='module'>&phpsessid=<tmpl_var name='phpsessid'>" class="txtNavTopDefault"><tmpl_var name="title"></a></td>
-        <td width="2" class="navTop">&nbsp;</td>
-        </tmpl_if>
-        </tmpl_loop>
-        <td align="right" valign="middle" class="navTop"><img src="../images/mp_logo.gif" width="111" height="18"> </td>
-          </tr>
-    </table>
-    </td>
-  </tr>
-  <!-- BEGIN MODULE -->
-  <tr>
-    <td width="128" height="26" background="themes/{tmpl_var name="theme"}/images/nav_top_bg.gif">&nbsp;</td>
-    <td rowspan="3" class="mainContent">
-		<table width="100%" height="100%" border="0" cellpadding="20" cellspacing="0">
-			<tr>
-        		<td><iframe height="100%" width="100%" frameborder="0" name="content" src="{tmpl_var name="startpage"}"></iframe></td>
-      		</tr>
-    	</table>
-	</td>
-  </tr>
-  <tr>
-    <td width="128" align="right" valign="top" bgcolor="#EEEEEE"><table width="115" border="0" cellspacing="0" cellpadding="2">
-      <tr>
-        <td height="34">&nbsp;</td>
-      </tr>
-	  <tmpl_loop name="nav_left">
-      <tr>
-        <td class="navLeftHead"><tmpl_var name="title"></td>
-        </tr>
-      <tr>
-        <td>
-		  <tmpl_loop name="items">
-		  <a href="<tmpl_var name='link'>" class="navLeftItem" target="<tmpl_var name='target'>"><tmpl_var name="title"></a><br>
-		  </tmpl_loop>
-		</td>
-      </tr>
-	  </tmpl_loop>
-    </table></td>
-  </tr>
-  <tr>
-    <td align="left" valign="bottom" bgcolor="#EEEEEE"><img src="../images/ipr_logo.gif" width="121" height="53"></td>
-  </tr>
-  <!-- END MODULE -->
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/interface/web/tools/_templates_old/user_settings.htm b/interface/web/tools/_templates_old/user_settings.htm
deleted file mode 100644
index 32d8f4d29875be4fa41f33f12688cf9433896748..0000000000000000000000000000000000000000
--- a/interface/web/tools/_templates_old/user_settings.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
-  <tr>
-    <td class="frmText11">{tmpl_var name='passwort_txt'}:</td>
-    <td class="frmText11"><input name="passwort" type="password" class="text" value="{tmpl_var name='passwort'}" size="15" maxlength="100"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='passwort_txt'}:</td>
-    <td class="frmText11"><input name="passwort2" type="password" class="text" value="" size="15" maxlength="100"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='language_txt'}:</td>
-    <td class="frmText11">
-		<select name="language" class="text">
-			{tmpl_var name='language'}
-		</select>
-	</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','tools/user_settings.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('tools/index.php');"><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file