diff --git a/install/froxlor.sql b/install/froxlor.sql
index 442d5e68..15a5da7f 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -8,7 +8,7 @@ CREATE TABLE `ftp_groups` (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `groupname` (`groupname`),
   KEY `customerid` (`customerid`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -32,7 +32,7 @@ CREATE TABLE `ftp_users` (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `username` (`username`),
   KEY `customerid` (`customerid`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -55,7 +55,7 @@ CREATE TABLE `mail_users` (
   `imap` tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `email` (`email`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -71,7 +71,7 @@ CREATE TABLE `mail_virtual` (
   `iscatchall` tinyint(1) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `email` (`email`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -126,7 +126,7 @@ CREATE TABLE `panel_admins` (
   `theme` varchar(255) NOT NULL default 'Froxlor',
    PRIMARY KEY  (`adminid`),
    UNIQUE KEY `loginname` (`loginname`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -191,7 +191,7 @@ CREATE TABLE `panel_customers` (
   `backup_enabled` TINYINT( 1 ) NOT NULL DEFAULT '0',
    PRIMARY KEY  (`customerid`),
    UNIQUE KEY `loginname` (`loginname`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -205,7 +205,7 @@ CREATE TABLE `panel_databases` (
   `apsdb` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -251,7 +251,7 @@ CREATE TABLE `panel_domains` (
   KEY `customerid` (`customerid`),
   KEY `parentdomain` (`parentdomainid`),
   KEY `domain` (`domain`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -273,7 +273,7 @@ CREATE TABLE `panel_ipsandports` (
   `ssl_cert_chainfile` varchar(255) NOT NULL,
   `docroot` varchar(255) NOT NULL default '',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -289,7 +289,7 @@ CREATE TABLE `panel_htaccess` (
   `error401path` varchar(255) NOT NULL default '',
   `options_cgi` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -303,7 +303,7 @@ CREATE TABLE `panel_htpasswds` (
   `authname` varchar(255) NOT NULL default 'Restricted Area',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -332,7 +332,7 @@ CREATE TABLE `panel_settings` (
   `varname` varchar(255) NOT NULL default '',
   `value` text NOT NULL,
   PRIMARY KEY  (`settingid`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -541,7 +541,7 @@ CREATE TABLE `panel_tasks` (
   `type` int(11) NOT NULL default '0',
   `data` text NOT NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -555,7 +555,7 @@ CREATE TABLE `panel_templates` (
   `value` longtext NOT NULL,
   PRIMARY KEY  (id),
   KEY adminid (adminid)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -573,7 +573,7 @@ CREATE TABLE `panel_traffic` (
   `mail` bigint(30) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -591,7 +591,7 @@ CREATE TABLE `panel_traffic_admins` (
   `mail` bigint(30) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `adminid` (`adminid`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -608,7 +608,7 @@ CREATE TABLE `panel_diskspace` (
   `mysql` bigint(30) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -625,7 +625,7 @@ CREATE TABLE `panel_diskspace_admins` (
   `mysql` bigint(30) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `adminid` (`adminid`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -636,7 +636,7 @@ CREATE TABLE `panel_languages` (
   `iso` char(3) NOT NULL DEFAULT 'foo',
   `file` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -680,7 +680,7 @@ CREATE TABLE `panel_tickets` (
   `archived` enum('0','1') NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -691,7 +691,7 @@ CREATE TABLE `panel_ticket_categories` (
   `adminid` int(11) NOT NULL,
   `logicalorder` int(3) NOT NULL default '1',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -704,7 +704,7 @@ CREATE TABLE IF NOT EXISTS `panel_syslog` (
   `user` varchar(50) NOT NULL,
   `text` text NOT NULL,
   PRIMARY KEY  (`logid`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -720,7 +720,7 @@ CREATE TABLE `mail_autoresponder` (
   PRIMARY KEY  (`email`),
   KEY `customerid` (`customerid`),
   FULLTEXT KEY `message` (`message`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -734,7 +734,7 @@ CREATE TABLE `panel_phpconfigs` (
   `mod_fcgid_maxrequests` int(4) NOT NULL DEFAULT '-1',
   `phpsettings` text NOT NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -750,7 +750,7 @@ CREATE TABLE IF NOT EXISTS `aps_instances` (
   `PackageID` int(4) NOT NULL,
   `Status` int(4) NOT NULL,
   PRIMARY KEY  (`ID`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -763,7 +763,7 @@ CREATE TABLE IF NOT EXISTS `aps_packages` (
   `Release` int(4) NOT NULL,
   `Status` int(1) NOT NULL default '1',
   PRIMARY KEY  (`ID`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -774,7 +774,7 @@ CREATE TABLE IF NOT EXISTS `aps_settings` (
   `Name` varchar(250) NOT NULL,
   `Value` varchar(250) NOT NULL,
   PRIMARY KEY  (`ID`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -784,7 +784,7 @@ CREATE TABLE IF NOT EXISTS `aps_tasks` (
   `InstanceID` int(4) NOT NULL,
   `Task` int(4) NOT NULL,
   PRIMARY KEY  (`ID`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -796,7 +796,7 @@ CREATE TABLE IF NOT EXISTS `aps_temp_settings` (
   `Name` varchar(250) NOT NULL,
   `Value` varchar(250) NOT NULL,
   PRIMARY KEY  (`ID`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -810,7 +810,7 @@ CREATE TABLE IF NOT EXISTS `cronjobs_run` (
   `isactive` tinyint(1) DEFAULT '1',
   `desc_lng_key` varchar(100) NOT NULL DEFAULT 'cron_unknown_desc',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -839,7 +839,7 @@ CREATE TABLE IF NOT EXISTS `ftp_quotalimits` (
   `files_in_avail` int(10) unsigned NOT NULL,
   `files_out_avail` int(10) unsigned NOT NULL,
   `files_xfer_avail` int(10) unsigned NOT NULL
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -858,7 +858,7 @@ CREATE TABLE IF NOT EXISTS `ftp_quotatallies` (
   `files_in_used` int(10) unsigned NOT NULL,
   `files_out_used` int(10) unsigned NOT NULL,
   `files_xfer_used` int(10) unsigned NOT NULL
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -869,7 +869,7 @@ CREATE TABLE IF NOT EXISTS `redirect_codes` (
   `desc` varchar(200) NOT NULL,
   `enabled` tinyint(1) DEFAULT '1',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -887,7 +887,7 @@ CREATE TABLE IF NOT EXISTS `domain_redirect_codes` (
   `rid` int(5) NOT NULL,
   `did` int(11) unsigned NOT NULL,
   UNIQUE KEY `rc` (`rid`, `did`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -897,7 +897,7 @@ CREATE TABLE IF NOT EXISTS `ipsandports_docrootsettings` (
   `fid` int(11) NOT NULL,
   `docrootsettings` text NOT NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -907,5 +907,5 @@ CREATE TABLE IF NOT EXISTS `domain_docrootsettings` (
   `fid` int(11) NOT NULL,
   `docrootsettings` text NOT NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM SET utf8 COLLATE utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index f759c382..83d33b99 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -1929,9 +1929,31 @@ if(isFroxlorVersion('0.9.28-svn3'))
 	showUpdateStep("Updating from 0.9.28-svn3 to 0.9.28-svn4", true);
 	lastStepStatus(0);
 
-	$update_default_theme = isset($_POST['update_default_theme']) ? $_POST['update_default_theme'] : 'Froxlor';
-	showUpdateStep('Setting default panel theme \'' . $update_default_theme . '\'', true);
-	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '".$db->escape($update_default_theme)."' WHERE varname = 'default_theme';");
+	if (isset($_POST['classic_theme_replacement']) && $_POST['classic_theme_replacement'] != '')
+	{
+		$classic_theme_replacement = $_POST['classic_theme_replacement'];
+	}
+	else
+	{
+		$classic_theme_replacement = 'Froxlor';
+	}
+	showUpdateStep('Setting replacement for the discontinued and removed Classic theme (if active)', true);
+
+	// Updating default theme setting
+	if ($settings['panel']['default_theme'] == 'Classic')
+	{
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '".$db->escape($classic_theme_replacement)."' WHERE varname = 'default_theme';");
+	}
+
+	// Updating admin's theme setting
+	$db->query('UPDATE `' . TABLE_PANEL_ADMINS . '` SET `theme` = \'' . $db->escape($classic_theme_replacement) . '\' WHERE `theme` = \'Classic\'');
+
+	// Updating customer's theme setting
+	$db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `theme` = \'' . $db->escape($classic_theme_replacement) . '\' WHERE `theme` = \'Classic\'');
+
+	// Updating theme setting of active sessions
+	$db->query('UPDATE `' . TABLE_PANEL_SESSIONS . '` SET `theme` = \'' . $db->escape($classic_theme_replacement) . '\' WHERE `theme` = \'Classic\'');
+
 	lastStepStatus(0);
 
 	showUpdateStep('Altering Froxlor database and tables to use UTF-8. This may take a while..', true);
diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
index 993c4a9b..e6b90d38 100644
--- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php
+++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
@@ -440,8 +440,8 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 		$description .= 'Even though this is already tested, we <span style="color:#ff0000;font-weight:bold;">strongly recommend</span> to ';
 		$description .= 'test this update in a testing environment using your existing data.<br /><br />';
 
-		$question = '<strong>Select your default panel theme:</strong>&nbsp;';
-		$question.= '<select name="update_default_theme">';
+		$question = '<strong>Select your preferred Classic Theme replacement:</strong>&nbsp;';
+		$question.= '<select name="classic_theme_replacement">';
 		$themes = getThemes();
 		foreach($themes as $cur_theme)
 		{
diff --git a/templates/Classic/admin/admins/admins.tpl b/templates/Classic/admin/admins/admins.tpl
deleted file mode 100644
index fd751480..00000000
--- a/templates/Classic/admin/admins/admins.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'admins'))}" method="post">
-                <input type="hidden" name="s" value="$s"/>
-                <input type="hidden" name="page" value="$page"/>
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left" colspan="3"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['admins']}</b>&nbsp;({$admincount})</td>
-				<td class="maintitle_search_right" colspan="<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >7<else>6</if>">{$searchcode}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left">{$lng['login']['username']}<br />{$arrowcode['loginname']}</td>
-				<td class="field_display">{$lng['customer']['name']}<br />{$arrowcode['name']}</td>
-				<td class="field_display">{$lng['admin']['customers']}<br />{$lng['admin']['domains']}</td>
-				<td class="field_display">{$lng['customer']['diskspace']}<br />{$lng['customer']['traffic']}</td>
-				<td class="field_display">{$lng['customer']['mysqls']}<br />{$lng['customer']['ftps']}</td>
-				<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >
-					<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 0) >
-						<td class="field_display">{$lng['customer']['tickets']}</td>
-					</if>
-					<if ($settings['ticket']['enabled'] == 0 && $settings['autoresponder']['autoresponder_active'] == 1) >
-						<td class="field_display">{$lng['customer']['autoresponder']}</td>
-					</if>
-					<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 1) >
-						<td class="field_display">{$lng['customer']['tickets']}<br />{$lng['customer']['autoresponder']}</td>
-					</if>
-				</if>
-				<td class="field_display">{$lng['customer']['emails']}<br />{$lng['customer']['subdomains']}</td>
-				<td class="field_display">{$lng['customer']['accounts']}<br />{$lng['customer']['forwarders']}</td>
-				<td class="field_display">{$lng['admin']['deactivated']}<br />{$arrowcode['deactivated']}</td>
-				<td class="field_display_search">{$sortcode}</td>
-			</tr>
-			$admins
-			<if $pagingcode != ''>
-			<tr>
-				<td class="field_display_border_left" colspan="10" style=" text-align: center; ">{$pagingcode}</td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left" colspan="<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >10<else>9</if>"><a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['admin_add']}</a></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/admins/admins_add.tpl b/templates/Classic/admin/admins/admins_add.tpl
deleted file mode 100644
index 941cc07b..00000000
--- a/templates/Classic/admin/admins/admins_add.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'admins'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$admin_add_form}
-		</table>
-	</form>
-	<br />
-	<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-		<tr>
-			<td class="main_field_name">*: {$lng['admin']['valuemandatory']}</td>
-		</tr>
-		<tr>
-			<td class="main_field_name">**: {$lng['admin']['valuemandatorycompany']}</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/admins/admins_admin.tpl b/templates/Classic/admin/admins/admins_admin.tpl
deleted file mode 100644
index cd86acd8..00000000
--- a/templates/Classic/admin/admins/admins_admin.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left"><if $row['adminid'] != $userinfo['userid']><a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'su', 'id' => $row['adminid']))}" target="_blank">{$row['loginname']}</a></if><if $row['adminid'] == $userinfo['userid']>{$row['loginname']}</if></td>
-	<td class="field_name">{$row['name']}</td>
-	<td class="field_name"><b><font color="green">{$row['customers_used']}</font></b>/<b><font color="#FD6204">{$row['customers']}</font></b><br /><b><font color="green">{$row['domains_used']}</font></b>/<b><font color="#FD6204">{$row['domains']}</font></b></td>
-	<td class="field_name"><b><font color="green">{$row['diskspace_used']}</font></b>/<b><font color="#FD6204">{$row['diskspace']}</font></b> (MB)<br /><b><font color="green">{$row['traffic_used']}</font></b>/<b><font color="#FD6204">{$row['traffic']}</font></b> (GB)</td>
-	<td class="field_name"><b><font color="green">{$row['mysqls_used']}</font></b>/<b><font color="#FD6204">{$row['mysqls']}</font></b><br /><b><font color="green">{$row['ftps_used']}</font></b>/<b><font color="#FD6204">{$row['ftps']}</font></b></td>
-	<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >
-		<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 0) >
-			<td class="field_name"><b><font color="green">{$row['tickets_used']}</font></b>/<b><font color="#FD6204">{$row['tickets']}</font></b></td>
-		</if>
-		<if ($settings['ticket']['enabled'] == 0 && $settings['autoresponder']['autoresponder_active'] == 1) >
-			<td class="field_name"><b><font color="green">{$row['email_autoresponder_used']}</font></b>/<b><font color="#FD6204">{$row['email_autoresponder']}</font></b></td>
-		</if>
-		<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 1) >
-			<td class="field_name">
-				<b><font color="green">{$row['tickets_used']}</font></b>/<b><font color="#FD6204">{$row['tickets']}</font></b>
-				<br />
-				<b><font color="green">{$row['email_autoresponder_used']}</font></b>/<b><font color="#FD6204">{$row['email_autoresponder']}</font></b>
-			</td>
-		</if>
-	</if>
-	<td class="field_name"><b><font color="green">{$row['emails_used']}</font></b>/<b><font color="#FD6204">{$row['emails']}</font></b><br /><b><font color="green">{$row['subdomains_used']}</font></b>/<b><font color="#FD6204">{$row['subdomains']}</font></b></td>
-	<td class="field_name"><b><font color="green">{$row['email_accounts_used']}</font></b>/<b><font color="#FD6204">{$row['email_accounts']}</font></b><br /><b><font color="green">{$row['email_forwarders_used']}</font></b>/<b><font color="#FD6204">{$row['email_forwarders']}</font></b></td>
-	<td class="field_name" style=" text-align: center; "><if $row['deactivated'] == '1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'edit', 'id' => $row['adminid']))}">{$lng['panel']['edit']}</a><br /><a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'delete', 'id' => $row['adminid']))}">{$lng['panel']['delete']}</a></td>
-</tr>
diff --git a/templates/Classic/admin/admins/admins_edit.tpl b/templates/Classic/admin/admins/admins_edit.tpl
deleted file mode 100644
index 1d5f7492..00000000
--- a/templates/Classic/admin/admins/admins_edit.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'admins'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$admin_edit_form}
-		</table>
-	</form>
-	<br />
-	<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-		<tr>
-			<td class="main_field_name">*: {$lng['admin']['valuemandatory']}</td>
-		</tr>
-		<tr>
-			<td class="main_field_name">**: {$lng['admin']['valuemandatorycompany']}</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/aps/askyesno.tpl b/templates/Classic/admin/aps/askyesno.tpl
deleted file mode 100644
index 7a0e231e..00000000
--- a/templates/Classic/admin/aps/askyesno.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable" style="border: solid 1px #B7B7B7;">
-	<tr>
-		<td width="30" valign="top" style="padding: 15px; background-color: #EBECF5;"><img src="templates/{$theme}/assets/img/info.png" alt="" /></td>
-		<td>
-		$Message
-		<form name="continue" action="$filename" method="post">
-			<input type="submit" name="answer" value="{$lng['panel']['yes']}" />
-			<input type="hidden" name="save" value="1"/>
-			<input type="hidden" name="s" value="$s"/>
-			<input type="hidden" name="action" value="$action"/>
-			$Ids
-		</form>
-		<br/>
-		<form name="back" action="$filename" method="post">
-			<input type="submit" name="submit" value="{$lng['panel']['no']}" />
-			<input type="hidden" name="action" value="$action"/>
-			<input type="hidden" name="s" value="$s"/>
-		</form>
-		<br/>
-		</td>
-	</tr>
-</table>
-<br/>
diff --git a/templates/Classic/admin/aps/footer.tpl b/templates/Classic/admin/aps/footer.tpl
deleted file mode 100644
index 35ee6c15..00000000
--- a/templates/Classic/admin/aps/footer.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$footer
diff --git a/templates/Classic/admin/aps/header.tpl b/templates/Classic/admin/aps/header.tpl
deleted file mode 100644
index 6af88b30..00000000
--- a/templates/Classic/admin/aps/header.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$header
diff --git a/templates/Classic/admin/aps/infobox.tpl b/templates/Classic/admin/aps/infobox.tpl
deleted file mode 100644
index e8db19bf..00000000
--- a/templates/Classic/admin/aps/infobox.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable" style="border: solid 1px #B7B7B7;">
-	<tr>
-		<td width="30" valign="top" style="padding: 15px; background-color: #EBECF5;"><img src="templates/{$theme}/assets/img/info.png" alt="" /></td>
-		<td>$Message</td>
-	</tr>
-</table>
-<br/>
diff --git a/templates/Classic/admin/aps/manage_instances.tpl b/templates/Classic/admin/aps/manage_instances.tpl
deleted file mode 100644
index cf408e69..00000000
--- a/templates/Classic/admin/aps/manage_instances.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-	<tr>
-		<td  class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['aps']['specialoptions']}</b></td>
-	</tr>
-	<tr>
-		<td class="field_name_border_left" valign="top" width="15%"><strong>{$lng['aps']['statistics']}</strong></td>
-		<td class="field_name">$Statistics</td>
-	</tr>
-</table>
-<br/>
-<form method="post" action="$filename">
-	<input type="hidden" name="s" value="$s" />
-	<input type="hidden" name="action" value="$action" />
-	<input type="hidden" name="page" value="$page" />
-
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td  class="maintitle" colspan="3"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['aps']['manageinstances']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_display_border_left">{$lng['aps']['packagenameandstatus']}</td>
-			<td class="field_display" width="7%">{$lng['aps']['stopinstall']}</td>
-			<td class="field_display" width="7%">{$lng['aps']['uninstall']}</td>
-		</tr>
-		{$Instances}
-			<td  class="maintitle_apply_right" colspan="3"><input class="bottom" type="reset" value="{$lng['panel']['reset']}"/>&nbsp;<input class="bottom" type="submit" name="save" value="{$lng['panel']['save']}"/></td>
-		</tr>
-	</table>
-</form>
-<br />
-<br />
diff --git a/templates/Classic/admin/aps/manage_instances_detail.tpl b/templates/Classic/admin/aps/manage_instances_detail.tpl
deleted file mode 100644
index e085df7b..00000000
--- a/templates/Classic/admin/aps/manage_instances_detail.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<tr>
-	<td  class="field_name_border_left" style="padding-left: 2em;">{$Row['name']}, {$Row['firstname']} <if $Row['company'] != ''> | {$Row['company']}</if> ({$Row['loginname']}): {$database}; {$main_domain}</td>
-	<td class="field_name" style="text-align:center;"><if isset($Stop) == true>$Stop</if></td>
-	<td class="field_name" style="text-align:center;"><if isset($Remove) == true>$Remove</if></td>
-</tr>
diff --git a/templates/Classic/admin/aps/manage_instances_package.tpl b/templates/Classic/admin/aps/manage_instances_package.tpl
deleted file mode 100644
index f2e4e06e..00000000
--- a/templates/Classic/admin/aps/manage_instances_package.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td  class="field_display_border_left" colspan="3"><strong>{$Row['Name']} {$Row['Version']} (Release {$Row['Release']})</strong></td>
-</tr>
\ No newline at end of file
diff --git a/templates/Classic/admin/aps/manage_instances_status.tpl b/templates/Classic/admin/aps/manage_instances_status.tpl
deleted file mode 100644
index 9e0e3822..00000000
--- a/templates/Classic/admin/aps/manage_instances_status.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td  class="title" colspan="3" style="font-size: 1.1em;"><strong>{$Caption}</strong></td>
-</tr>
diff --git a/templates/Classic/admin/aps/manage_packages.tpl b/templates/Classic/admin/aps/manage_packages.tpl
deleted file mode 100644
index fe2f28f0..00000000
--- a/templates/Classic/admin/aps/manage_packages.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-	<tr>
-		<td  class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['aps']['specialoptions']}</b></td>
-	</tr>
-	<tr>
-		<td class="field_name_border_left" valign="top" width="15%"><strong>{$lng['admin']['phpsettings']['actions']}</strong></td>
-		<td class="field_name">
-			<form method="post" action="$filename" style="float:left;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="downloadallpackages" value="{$lng['aps']['downloadallpackages']}" />
-			</form>
-			<form method="post" action="$filename" style="float:left; padding-left: 2em;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="updateallpackages" value="{$lng['aps']['updateallpackages']}" />
-			</form>
-			<br/>
-			<br/>
-			<form method="post" action="$filename" style="float:left;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="enablenewest" value="{$lng['aps']['enablenewest']}" />
-			</form>
-			<form method="post" action="$filename" style="float:left; padding-left: 2em;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="removeunused" value="{$lng['aps']['removeunused']}" />
-			</form>
-		</td>
-	</tr>
-	<tr>
-		<td class="field_name_border_left" valign="top"><strong>{$lng['aps']['statistics']}</strong></td>
-		<td class="field_name">$Statistics</td>
-	</tr>
-</table>
-<br/>
-<form method="post" action="$filename">
-	<input type="hidden" name="s" value="$s" />
-	<input type="hidden" name="action" value="$action" />
-	<input type="hidden" name="page" value="$page" />
-
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td  class="maintitle" colspan="6"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['aps']['managepackages']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_display_border_left" width="30%">{$lng['aps']['packagenameandversion']}</td>
-			<td class="field_display">{$lng['ticket']['status']}</td>
-			<td class="field_display">{$lng['aps']['installations']}</td>
-			<td class="field_display" width="7%">{$lng['aps']['lock']}</td>
-			<td class="field_display" width="7%">{$lng['aps']['unlock']}</td>
-			<td class="field_display" width="7%">{$lng['aps']['remove']}</td>
-		</tr>
-		$Packages
-		<tr>
-			<td class="field_display_border_left" colspan="3">{$lng['aps']['allpackages']}</td>
-			<td class="field_display" width="7%" style="text-align:center;"><input type="radio" name="all" value="lock"/></td>
-			<td class="field_display" width="7%" style="text-align:center;"><input type="radio" name="all" value="unlock"/></td>
-			<td class="field_display" width="7%" style="text-align:center;"><input type="radio" name="all" value="remove"/></td>
-		</tr>
-		<tr>
-			<td  class="maintitle_apply_right" colspan="6"><input class="bottom" type="reset" value="{$lng['panel']['reset']}"/>&nbsp;<input class="bottom" type="submit" name="save" value="{$lng['panel']['save']}"/></td>
-		</tr>
-	</table>
-</form>
-<br />
-<br />
diff --git a/templates/Classic/admin/aps/manage_packages_detail.tpl b/templates/Classic/admin/aps/manage_packages_detail.tpl
deleted file mode 100644
index ccc4f9e3..00000000
--- a/templates/Classic/admin/aps/manage_packages_detail.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<tr>
-	<td class="field_name_border_left">{$Row2['Version']} (Release {$Row2['Release']})</td>
-	<td class="field_name"><if $Row2['Status'] == PACKAGE_LOCKED>{$lng['aps']['package_locked']}</if><if $Row2['Status'] == PACKAGE_ENABLED>{$lng['aps']['package_enabled']}</if></td>
-	<td class="field_name">{$Installations}</td>
-	<td class="field_name" style="text-align:center;">$Lock</td>
-	<td class="field_name" style="text-align:center;">$Unlock</td>
-	<td class="field_name" style="text-align:center;"><if $Installations == 0>$Remove</if></td>
-</tr>
diff --git a/templates/Classic/admin/aps/manage_packages_download.tpl b/templates/Classic/admin/aps/manage_packages_download.tpl
deleted file mode 100644
index 131e6266..00000000
--- a/templates/Classic/admin/aps/manage_packages_download.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-	<tr>
-		<td  class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['aps']['specialoptions']}</b></td>
-	</tr>
-	<tr>
-		<td class="field_name_border_left" valign="top" width="15%"><strong>{$lng['admin']['phpsettings']['actions']}</strong></td>
-		<td class="field_name">
-			<form method="post" action="$filename" style="float:left;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="downloadallpackages" value="{$lng['aps']['downloadallpackages']}" />
-			</form>
-		</td>
-	</tr>
-</table>
-<br/>
-<br/>
diff --git a/templates/Classic/admin/aps/manage_packages_row.tpl b/templates/Classic/admin/aps/manage_packages_row.tpl
deleted file mode 100644
index f84e5fb7..00000000
--- a/templates/Classic/admin/aps/manage_packages_row.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td class="title" colspan="6"><strong>{$Row['Name']}</strong></td>
-</tr>
diff --git a/templates/Classic/admin/aps/upload.tpl b/templates/Classic/admin/aps/upload.tpl
deleted file mode 100644
index f6133442..00000000
--- a/templates/Classic/admin/aps/upload.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<form method="post" action="$filename" enctype="multipart/form-data">
-	<input type="hidden" name="s" value="$s" />
-	<input type="hidden" name="page" value="$page" />
-	<input type="hidden" name="action" value="$action" />
-	<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['aps']['upload']}</b></td>
-		</tr>
-		<tr>
-			<td class="main_field_name" nowrap="nowrap">{$lng['aps']['upload_description']} <a href="http://www.apsstandard.org/" target="_blank">http://www.apsstandard.org/</a></td>
-		</tr>
-		<tr>
-			<td class="main_field_display" nowrap="nowrap"><br/>$Output</td>
-		</tr>
-		<tr>
-			<td class="main_field_confirm"><input class="bottom" type="submit" value="{$lng['aps']['upload']}" /></td>
-		</tr>
-	</table>
-</form>
diff --git a/templates/Classic/admin/configfiles/choose.tpl b/templates/Classic/admin/configfiles/choose.tpl
deleted file mode 100644
index 56164e45..00000000
--- a/templates/Classic/admin/configfiles/choose.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable_40">
-		<tr>
-			<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b> [<a href={$linker->getLink(array('section' => 'configfiles', 'page' => 'configfiles'))}">{$lng['admin']['configfiles']['wizard']}</a>]</td>
-		</tr>
-		$distributions
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/configfiles/choose_daemon.tpl b/templates/Classic/admin/configfiles/choose_daemon.tpl
deleted file mode 100644
index f96fde68..00000000
--- a/templates/Classic/admin/configfiles/choose_daemon.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-&nbsp;&nbsp;&nbsp;&raquo;&nbsp;<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution_name, 'service' => $service_name, 'daemon' => $daemon_name))}">{$daemon_details['label']}</a>
-<br />
\ No newline at end of file
diff --git a/templates/Classic/admin/configfiles/choose_distribution.tpl b/templates/Classic/admin/configfiles/choose_distribution.tpl
deleted file mode 100644
index 6ccf50e8..00000000
--- a/templates/Classic/admin/configfiles/choose_distribution.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<tr>
-	<td class="field_display_border_left">
-		<table cellpadding="5" cellspacing="0" border="0" align="center">
-			<tr>
-				<td class="maintitle">&raquo;&nbsp;{$distribution_details['label']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left">$services</td>
-			</tr>
-		</table>
-	</td>
-</tr>
\ No newline at end of file
diff --git a/templates/Classic/admin/configfiles/choose_service.tpl b/templates/Classic/admin/configfiles/choose_service.tpl
deleted file mode 100644
index 93d0d7bf..00000000
--- a/templates/Classic/admin/configfiles/choose_service.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-&nbsp;&raquo;&nbsp;{$service_details['label']}
-<br />
-$daemons
\ No newline at end of file
diff --git a/templates/Classic/admin/configfiles/configfiles.tpl b/templates/Classic/admin/configfiles/configfiles.tpl
deleted file mode 100644
index 870585fa..00000000
--- a/templates/Classic/admin/configfiles/configfiles.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable_60">
-		<tr>
-			<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$configfiles[$distribution]['label']}&nbsp;&raquo;&nbsp;{$configfiles[$distribution]['services'][$service]['label']}&nbsp;&raquo;&nbsp;{$configfiles[$distribution]['services'][$service]['daemons'][$daemon]['label']}</b> [<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution, 'service' => $service))}">{$lng['panel']['back']}</a>]</td>
-		</tr>
-		{$configpage}
-		<if $restart != ''>
-		<tr>
-			<td class="field_display_border_left">{$lng['admin']['configfiles']['restart']}<br /><br /><textarea class="textarea_border" rows="3" cols="70" readonly="readonly">$restart</textarea></td>
-		</tr>
-		</if>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/configfiles/configfiles_commands.tpl b/templates/Classic/admin/configfiles/configfiles_commands.tpl
deleted file mode 100644
index 3ef27e70..00000000
--- a/templates/Classic/admin/configfiles/configfiles_commands.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td class="field_display_border_left">{$lng['admin']['configfiles']['commands']}<br /><br /><textarea class="textarea_border" rows="6" cols="70" readonly="readonly">{$commands}</textarea></td>
-</tr>
diff --git a/templates/Classic/admin/configfiles/configfiles_file.tpl b/templates/Classic/admin/configfiles/configfiles_file.tpl
deleted file mode 100644
index cd5260c8..00000000
--- a/templates/Classic/admin/configfiles/configfiles_file.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<p>
-	<b>{$realname}:</b><br />
-	<textarea rows="<if $numbrows <= 8 >{$numbrows}</if><if 8 < $numbrows >8</if>" cols="70" readonly="readonly">{$file_content}</textarea>
-</p>
diff --git a/templates/Classic/admin/configfiles/configfiles_files.tpl b/templates/Classic/admin/configfiles/configfiles_files.tpl
deleted file mode 100644
index 7a967848..00000000
--- a/templates/Classic/admin/configfiles/configfiles_files.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td class="field_display_border_left">{$lng['admin']['configfiles']['files']}<br />{$files}</td>
-</tr>
\ No newline at end of file
diff --git a/templates/Classic/admin/configfiles/wizard.tpl b/templates/Classic/admin/configfiles/wizard.tpl
deleted file mode 100644
index de33f0e3..00000000
--- a/templates/Classic/admin/configfiles/wizard.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-$header
-	<form method="get" action="$filename">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_40">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b> [<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview'))}">{$lng['admin']['configfiles']['overview']}</a>]</td>
-			</tr>
-			<tr>
-				<td class="main_field_name"><b>{$lng['admin']['configfiles']['distribution']}:</b></td>
-				<td class="main_field_display" nowrap="nowrap"><if $distribution != ''><input type="hidden" name="distribution" value="$distribution"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}">{$configfiles[$distribution]['label']}</a><else><select id="config_distribution" name="distribution"><option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>{$distributions_select}</select></if></td>
-			</tr>
-			<tr>
-				<td class="main_field_name"><b>{$lng['admin']['configfiles']['service']}:</b></td>
-				<td class="main_field_display" nowrap="nowrap"><if $service != ''><input type="hidden" name="service" value="$service"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}">{$configfiles[$distribution]['services'][$service]['label']}</a><else><select id="config_service" name="service"><option value="choose">{$lng['admin']['configfiles']['chooseservice']}</option>{$services_select}</select></if></td>
-			</tr>
-			<tr>
-				<td class="main_field_name"><b>{$lng['admin']['configfiles']['daemon']}:</b></td>
-				<td class="main_field_display" nowrap="nowrap"><select id="config_daemon" name="daemon"><option value="choose">{$lng['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input class="bottom" type="submit" value="{$lng['panel']['next']}" /></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/cronjobs/cronjob_edit.tpl b/templates/Classic/admin/cronjobs/cronjob_edit.tpl
deleted file mode 100644
index 09d22d92..00000000
--- a/templates/Classic/admin/cronjobs/cronjob_edit.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'cronjobs'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$cronjobs_edit_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/cronjobs/cronjobs.tpl b/templates/Classic/admin/cronjobs/cronjobs.tpl
deleted file mode 100644
index d3c1dc34..00000000
--- a/templates/Classic/admin/cronjobs/cronjobs.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-$header
-	<form action="$filename" method="post">
-		<input type="hidden" name="s" value="$s"/>
-		<input type="hidden" name="page" value="$page"/>
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['warning']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left">
-					<span style="font-weight: bold; color: #ff0000;">
-						{$lng['cron']['changewarning']}
-					</span>
-				</td>
-			</tr>
-		</table>
-		<br />
-		<br />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="5"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['cron']['cronsettings']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left">{$lng['cron']['description']}</td>
-				<td class="field_display">{$lng['cron']['lastrun']}</td>
-				<td class="field_display">{$lng['cron']['interval']}</td>
-				<td class="field_display">{$lng['cron']['isactive']}</td>
-				<td class="field_display">{$lng['panel']['options']}</td>
-			</tr>
-			$crons
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/cronjobs/cronjobs_cronjob.tpl b/templates/Classic/admin/cronjobs/cronjobs_cronjob.tpl
deleted file mode 100644
index 5583d739..00000000
--- a/templates/Classic/admin/cronjobs/cronjobs_cronjob.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left">{$description}</td>
-	<td class="field_name">{$row['lastrun']}</td>
-	<td class="field_name">{$row['interval']}</td>
-	<td class="field_name">{$row['isactive']}</td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'cronjobs', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
-</tr>
diff --git a/templates/Classic/admin/customers/customers.tpl b/templates/Classic/admin/customers/customers.tpl
deleted file mode 100644
index 18a59807..00000000
--- a/templates/Classic/admin/customers/customers.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'customers'))}" method="post">
-                <input type="hidden" name="s" value="$s"/>
-                <input type="hidden" name="page" value="$page"/>
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left" colspan="3" ><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['customers']}</b>&nbsp;({$customercount})</td>
-				<td class="maintitle_search_right" colspan="<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >8<else>7</if>">{$searchcode}</td>
-			</tr>
-			<if ($userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1') && 15 < $userinfo['customers_used']>
-			<tr>
-				<td colspan="11" class="field_display_border_left"><a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a></td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left">{$lng['login']['username']}<br />{$arrowcode['c.loginname']}</td>
-				<td class="field_display">{$lng['admin']['admin']}<br />{$arrowcode['a.loginname']}</td>
-				<td class="field_display">{$lng['customer']['name']}&nbsp;&nbsp;{$arrowcode['c.name']}<br />{$lng['customer']['firstname']}&nbsp;&nbsp;{$arrowcode['c.firstname']}</td>
-				<td class="field_display">{$lng['customer']['domains']}</td>
-				<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >
-					<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 0) >
-						<td class="field_display">{$lng['customer']['tickets']}</td>
-					</if>
-					<if ($settings['ticket']['enabled'] == 0 && $settings['autoresponder']['autoresponder_active'] == 1) >
-						<td class="field_display">{$lng['customer']['autoresponder']}</td>
-					</if>
-					<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 1) >
-						<td class="field_display">{$lng['customer']['tickets']}<br />{$lng['customer']['autoresponder']}</td>
-					</if>
-				</if>
-				<td class="field_display">{$lng['customer']['diskspace']}<br />{$lng['customer']['traffic']}</td>
-				<td class="field_display">{$lng['customer']['mysqls']}<br />{$lng['customer']['ftps']}</td>
-				<td class="field_display">{$lng['customer']['emails']}<br />{$lng['customer']['subdomains']}</td>
-				<td class="field_display">{$lng['customer']['accounts']}<br />{$lng['customer']['forwarders']}</td>
-				<td class="field_display">{$lng['admin']['deactivated']}<br />{$lng['admin']['lastlogin_succ']}</td>
-				<td class="field_display_search">{$sortcode}</td>
-			</tr>
-			$customers
-			<if $pagingcode != ''>
-			<tr>
-				<td class="field_display_border_left" colspan="11" style=" text-align: center; ">{$pagingcode}</td>
-			</tr>
-			</if>
-			<if $userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1'>
-			<tr>
-				<td colspan="<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >11<else>10</if>" class="field_display_border_left"><a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a></td>
-			</tr>
-			</if>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/customers/customers_add.tpl b/templates/Classic/admin/customers/customers_add.tpl
deleted file mode 100644
index 396f2f07..00000000
--- a/templates/Classic/admin/customers/customers_add.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'customers'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$customer_add_form}
-		</table>
-	</form>
-	<br />
-	<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-		<tr>
-			<td class="main_field_name">*: {$lng['admin']['valuemandatory']}</td>
-		</tr>
-		<tr>
-			<td class="main_field_name">**: {$lng['admin']['valuemandatorycompany']}</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/customers/customers_customer.tpl b/templates/Classic/admin/customers/customers_customer.tpl
deleted file mode 100644
index d2077f49..00000000
--- a/templates/Classic/admin/customers/customers_customer.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<tr>
-	<td class="field_name_border_left"{$column_style}><a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'su', 'id' => $row['customerid']))}" target="_blank">{$row['loginname']}</a></td>
-	<td class="field_name">{$row['adminname']}</td>
-	<td class="field_name"><if $row['name'] != '' && $row['firstname'] != ''>{$row['name']}<br />{$row['firstname']}</if><if ($row['name'] == '' || $row['firstname'] == '') && $row['company'] != ''>{$row['company']}</if></td>
-	<td class="field_name"><if $row['domains'] != 0><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'searchfield' => 'c.loginname', 'searchtext' => $row['loginname']))}">{$row['domains']}</a><else>{$row['domains']}</if></td>
-	<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >
-		<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 0) >
-			<td class="field_name"><span<if $row['tickets'] < $row['tickets_used'] && $row['tickets'] != 'UL'> style="color:red"</if><if $row['tickets_used'] < $row['tickets'] || $row['tickets'] == 'UL'> style="color:green"</if>><b>{$row['tickets_used']}</b>/<b><font color="#FD6204">{$row['tickets']}</font></b></span></td>
-		</if>
-		<if ($settings['ticket']['enabled'] == 0 && $settings['autoresponder']['autoresponder_active'] == 1) >
-			<td class="field_name"><span<if $row['email_autoresponder'] < $row['email_autoresponder_used'] && $row['email_autoresponder'] != 'UL'> style="color:red"</if><if $row['email_autoresponder_used'] < $row['email_autoresponder'] || $row['email_autoresponder'] == 'UL'> style="color:green"</if>><b>{$row['email_autoresponder_used']}</b>/<b><font color="#FD6204">{$row['email_autoresponder']}</font></b></span></td>
-		</if>
-		<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 1) >
-			<td class="field_name">
-				<span<if $row['tickets'] < $row['tickets_used'] && $row['tickets'] != 'UL'> style="color:red"</if><if $row['tickets_used'] < $row['tickets'] || $row['tickets'] == 'UL'> style="color:green"</if>><b>{$row['tickets_used']}</b>/<b><font color="#FD6204">{$row['tickets']}</font></b></span>
-				<br />
-				<span<if $row['email_autoresponder'] < $row['email_autoresponder_used'] && $row['email_autoresponder'] != 'UL'> style="color:red"</if><if $row['email_autoresponder_used'] < $row['email_autoresponder'] || $row['email_autoresponder'] == 'UL'> style="color:green"</if>><b>{$row['email_autoresponder_used']}</b>/<b><font color="#FD6204">{$row['email_autoresponder']}</font></b></span>
-			</td>
-		</if>
-	</if>
-	<td class="field_name">
-	<span<if $row['diskspace'] < $row['diskspace_used'] && $row['diskspace'] != 'UL'> style="color:red"</if><if $row['diskspace_used'] < $row['diskspace'] || $row['diskspace'] == 'UL'> style="color:green"</if>><b>{$row['diskspace_used']}</b>/<b><font color="#FD6204">{$row['diskspace']}</font></b></span> (MB)
-	<br />
-	<span<if $row['traffic'] < $row['traffic_used'] && $row['traffic'] != 'UL'> style="color:red"</if><if $row['traffic_used'] < $row['traffic'] || $row['traffic'] == 'UL'> style="color:green"</if>><b>{$row['traffic_used']}</b>/<b><font color="#FD6204">{$row['traffic']}</font></b></span> (GB)
-	</td>
-	<td class="field_name"><b><font color="green">{$row['mysqls_used']}</font></b>/<b><font color="#FD6204">{$row['mysqls']}</font></b><br /><b><font color="green">{$row['ftps_used']}</font></b>/<b><font color="#FD6204">{$row['ftps']}</font></b></td>
-	<td class="field_name"><b><font color="green">{$row['emails_used']}</font></b>/<b><font color="#FD6204">{$row['emails']}</font></b><br /><b><font color="green">{$row['subdomains_used']}</font></b>/<b><font color="#FD6204">{$row['subdomains']}</font></b></td>
-	<td class="field_name"><b><font color="green">{$row['email_accounts_used']}</font></b>/<b><font color="#FD6204">{$row['email_accounts']}</font></b><br /><b><font color="green">{$row['email_forwarders_used']}</font></b>/<b><font color="#FD6204">{$row['email_forwarders']}</font></b></td>
-	<td class="field_name" style=" text-align: center; "><if $row['deactivated'] == '1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if><br />{$last_login}</td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'edit', 'id' => $row['customerid']))}">{$lng['panel']['edit']}</a><br /><a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'delete', 'id' => $row['customerid']))}">{$lng['panel']['delete']}</a></td>
-</tr>
diff --git a/templates/Classic/admin/customers/customers_edit.tpl b/templates/Classic/admin/customers/customers_edit.tpl
deleted file mode 100644
index 1deb8636..00000000
--- a/templates/Classic/admin/customers/customers_edit.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'customers'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$title}</b></td>
-			</tr>
-			{$customer_edit_form}
-		</table>
-	</form>
-	<br />
-	<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-		<tr>
-			<td class="main_field_name">*: {$lng['admin']['valuemandatory']}</td>
-		</tr>
-		<tr>
-			<td class="main_field_name">**: {$lng['admin']['valuemandatorycompany']}</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/domains/domains.tpl b/templates/Classic/admin/domains/domains.tpl
deleted file mode 100644
index e9ac9c11..00000000
--- a/templates/Classic/admin/domains/domains.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'domains'))}" method="post">
-		<input type="hidden" name="s" value="$s"/>
-		<input type="hidden" name="page" value="$page"/>
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['domains']}</b>&nbsp;({$domainscount})</td>
-				<td class="maintitle_search_right" colspan="4">{$searchcode}</td>
-			</tr>
-			<if ($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && 15 < $count && 0 < $countcustomers >
-			<tr>
-				<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['domain_add']}</a></td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left">{$lng['domains']['domainname']}&nbsp;&nbsp;{$arrowcode['d.domain']}</td>
-				<td class="field_display">{$lng['admin']['ipsandports']['ip']}&nbsp;&nbsp;{$arrowcode['ip.ip']}&nbsp;:&nbsp;{$lng['admin']['ipsandports']['port']}&nbsp;&nbsp;{$arrowcode['ip.port']}</td>
-				<td class="field_display">{$lng['admin']['customer']}&nbsp;&nbsp;{$arrowcode['c.loginname']}</td>
-				<td class="field_display_search" colspan="2">{$sortcode}</td>
-			</tr>
-			$domains
-			<if $pagingcode != ''>
-			<tr>
-				<td class="field_display_border_left" colspan="5" style=" text-align: center; ">{$pagingcode}</td>
-			</tr>
-			</if>
-			<if ($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && $countcustomers !=0 >
-			<tr>
-				<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['domain_add']}</a></td>
-			</tr>
-			</if>
-			<if $countcustomers == 0 >
-			<tr>
-				<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'add'))}">{$lng['admin']['domain_nocustomeraddingavailable']}</a></td>
-			</tr>
-			</if>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/domains/domains_add.tpl b/templates/Classic/admin/domains/domains_add.tpl
deleted file mode 100644
index 293dc204..00000000
--- a/templates/Classic/admin/domains/domains_add.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'domains'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$domain_add_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/domains/domains_domain.tpl b/templates/Classic/admin/domains/domains_domain.tpl
deleted file mode 100644
index 8080f9c4..00000000
--- a/templates/Classic/admin/domains/domains_domain.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left"><font size="-1">{$row['domain']}<if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])> ({$lng['admin']['stdsubdomain']})</if></font></td>
-	<td class="field_name"><font size="-1">{$row['ipandport']}</font></td>
-	<td class="field_name"><font size="-1">{$row['customername']} (<a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $row['customerid']))}" target="_blank">{$row['loginname']}</a>)</font></td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
-	<td class="field_name">
-		<if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)>
-			<if !(isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
-				<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a>
-			</if>
-		</if>
-		<if isset($row['domainaliasid']) && $row['domainaliasid'] != 0>
-			<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'searchfield' => 'd.aliasdomain', 'searchtext' => $row['id']))}">{$lng['domains']['hasaliasdomains']}</a>
-		</if>
-	</td>
-</tr>
diff --git a/templates/Classic/admin/domains/domains_edit.tpl b/templates/Classic/admin/domains/domains_edit.tpl
deleted file mode 100644
index 025278bc..00000000
--- a/templates/Classic/admin/domains/domains_edit.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'domains'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$title}</b></td>
-			</tr>
-			{$domain_edit_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/froxlorclients/froxlorclient_settings.tpl b/templates/Classic/admin/froxlorclients/froxlorclient_settings.tpl
deleted file mode 100644
index e639c4e9..00000000
--- a/templates/Classic/admin/froxlorclients/froxlorclient_settings.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclient_settings']}&nbsp;"{$client->Get('name')}"</b>
-				[<a href="$filename?page=clients&amp;action=settings&amp;part=&amp;s=$s&amp;id={$id}">{$lng['admin']['configfiles']['compactoverview']}</a>]</td>
-			</tr>
-			$fields
-			<tr>
-				<td class="maintitle_apply_right" nowrap="nowrap" colspan="2">
-					<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
-				</td>
-			</tr>
-		</table>
diff --git a/templates/Classic/admin/froxlorclients/froxlorclient_settingsend.tpl b/templates/Classic/admin/froxlorclients/froxlorclient_settingsend.tpl
deleted file mode 100644
index 27b0931d..00000000
--- a/templates/Classic/admin/froxlorclients/froxlorclient_settingsend.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-		<if $_part != ''>
-			<input type="hidden" name="part" value="{$_part}" />
-		</if>
-		<input type="hidden" name="id" value="{$id}" />
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/froxlorclients/froxlorclient_settingsoverview.tpl b/templates/Classic/admin/froxlorclients/froxlorclient_settingsoverview.tpl
deleted file mode 100644
index c5c579b4..00000000
--- a/templates/Classic/admin/froxlorclients/froxlorclient_settingsoverview.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" align="center" colspan="3">
-					<b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}&nbsp;"{$client->Get('name')}"</b>
-					[<a href="$filename?page=clients&amp;action=settings&amp;part=all&amp;s=$s&amp;id={$id}">{$lng['admin']['configfiles']['overview']}</a>]
-				</td>
-			</tr>
-			$fields
-			<tr>
-				<td class="maintitle_apply_right" nowrap="nowrap" colspan="3">
-					<input class="bottom" type="reset" value="{$lng['panel']['reset']}" />&nbsp;<input class="bottom" type="submit" value="{$lng['panel']['save']}" />
-				</td>
-			</tr>
-		</table>
diff --git a/templates/Classic/admin/froxlorclients/froxlorclient_settingsoverviewgroup.tpl b/templates/Classic/admin/froxlorclients/froxlorclient_settingsoverviewgroup.tpl
deleted file mode 100644
index 0c0434a9..00000000
--- a/templates/Classic/admin/froxlorclients/froxlorclient_settingsoverviewgroup.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-			<tr>
-				<td class="maintitle_apply_left">
-					<b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$title}</b>
-				</td>
-				<td class="main_field_display_small" nowrap="nowrap">{$option}</td>
-				<td class="main_field_display_small" nowrap="nowrap">
-					<if $activated == 1>
-						<a href="$filename?page=clients&amp;action=settings&amp;part=$part&amp;s=$s&amp;id={$server_id}">{$lng['admin']['configfiles']['serverconfiguration']}</a>
-					</if>
-				</td>
-			</tr>
-
diff --git a/templates/Classic/admin/froxlorclients/froxlorclients.tpl b/templates/Classic/admin/froxlorclients/froxlorclients.tpl
deleted file mode 100644
index 0747f5b3..00000000
--- a/templates/Classic/admin/froxlorclients/froxlorclients.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-$header
-	<form action="$filename" method="post">
-                <input type="hidden" name="s" value="$s"/>
-                <input type="hidden" name="page" value="$page"/>
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left" colspan="3"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['multiserver']['clients']}</b></td>
-				<td class="maintitle_search_right" colspan="1">{$searchcode}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" style="width:70px;">#</td>
-				<td class="field_display">{$lng['admin']['froxlorclients']['name']}&nbsp;{$arrowcode['name']}<br />{$lng['admin']['froxlorclients']['desc']}</td>
-				<td class="field_display" style="width:35px;">{$lng['admin']['froxlorclients']['enabled']}&nbsp;{$arrowcode['enabled']}</td>
-				<td class="field_display_search" style="width:250px;">{$sortcode}</td>
-			</tr>
-			$froxlorclients
-			<if $pagingcode != ''>
-			<tr>
-				<td class="field_display_border_left" colspan="4" style=" text-align: center; ">{$pagingcode}</td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left" colspan="4"><a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['froxlorclients']['add']}</a></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/froxlorclients/froxlorclients_add.tpl b/templates/Classic/admin/froxlorclients/froxlorclients_add.tpl
deleted file mode 100644
index f3cad1d6..00000000
--- a/templates/Classic/admin/froxlorclients/froxlorclients_add.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-$header
-	<form method="post" action="$filename">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclients']['add']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name" colspan="2">
-					<!-- tell people what this is about -->
-					{$lng['admin']['froxlorclients']['longdesc_add']}
-				</td>
-			</tr>
-			<tr>
-				<td class="maintitle_apply_left">
-					<b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclients']['client']}</b>
-				</td>
-				<td class="maintitle_apply_right" nowrap="nowrap">
-					<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
-				</td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['admin']['froxlorclients']['name']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="name" value="" size="255" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name" valign="top">{$lng['admin']['froxlorclients']['desc']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><textarea class="textarea_border" rows="12" cols="60" name="desc"></textarea></td>
-			</tr>
-			<tr>
-				<td class="main_field_name" valign="top">{$lng['admin']['froxlorclients']['enabled']}:</td>
-				<td class="main_field_display" nowrap="nowrap">$client_enabled</td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" /></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/froxlorclients/froxlorclients_client.tpl b/templates/Classic/admin/froxlorclients/froxlorclients_client.tpl
deleted file mode 100644
index b7b5c695..00000000
--- a/templates/Classic/admin/froxlorclients/froxlorclients_client.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left">
-		<img src="templates/{$theme}/assets/img/multiserver/server.png" alt="Client #{$row['id']}" /></td>
-	<td class="field_name">{$row['name']}<br /><span style="font-size:80%">{$row['desc']}</span></td>
-	<td class="field_name">
-		<if $row['enabled'] == 1 >
-			<img src="templates/{$theme}/assets/img/multiserver/tick.png" alt="{$lng['panel']['yes']}" />
-		<else>
-			<img src="templates/{$theme}/assets/img/multiserver/no.png" alt="{$lng['panel']['no']}" />
-		</if>
-	</td>
-	<td class="field_name">
-		<a href="$filename?s=$s&amp;page=$page&amp;action=view&amp;id={$row['id']}">
-			<img src="templates/{$theme}/assets/img/multiserver/view.png" alt="{$lng['admin']['froxlorclients']['view']}" style="border:0;" />
-		</a>
-	</td>
-</tr>
diff --git a/templates/Classic/admin/froxlorclients/froxlorclients_edit.tpl b/templates/Classic/admin/froxlorclients/froxlorclients_edit.tpl
deleted file mode 100644
index 3af4c5a5..00000000
--- a/templates/Classic/admin/froxlorclients/froxlorclients_edit.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-$header
-	<form method="post" action="$filename">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclients']['edit']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name" colspan="2">
-					<!-- tell people what this is about -->
-					{$lng['admin']['froxlorclients']['longdesc_add']}
-				</td>
-			</tr>
-			<tr>
-				<td class="maintitle_apply_left">
-					<b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclients']['client']}</b>
-				</td>
-				<td class="maintitle_apply_right" nowrap="nowrap">
-					<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
-				</td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['admin']['froxlorclients']['name']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="name" value="{$client->Get('name')}" size="255" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name" valign="top">{$lng['admin']['froxlorclients']['desc']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><textarea class="textarea_border" rows="12" cols="60" name="desc">{$client->Get('desc')}</textarea></td>
-			</tr>
-			<tr>
-				<td class="main_field_name" valign="top">{$lng['admin']['froxlorclients']['enabled']}:</td>
-				<td class="main_field_display" nowrap="nowrap">$client_enabled</td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input class="bottom" type="submit" value="{$lng['panel']['save']}" /></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/froxlorclients/froxlorclients_view.tpl b/templates/Classic/admin/froxlorclients/froxlorclients_view.tpl
deleted file mode 100644
index 3bf2e02e..00000000
--- a/templates/Classic/admin/froxlorclients/froxlorclients_view.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-$header
-	<form action="$filename" method="post">
-                <input type="hidden" name="s" value="$s"/>
-                <input type="hidden" name="page" value="$page"/>
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left" colspan="4"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['multiserver']['clients']}&nbsp;"{$client->Get('name')}"</b></td>
-			</tr>
-			<tr>
-				<td colspan="4">@TODO infos about client "{$client->Get('name')}"</td>
-			<tr>
-				<td colspan="4">
-					<a href="$filename?s=$s&amp;page=$page&amp;action=settings&amp;id={$id}">{$lng['admin']['froxlorclients']['settings']}</a>&nbsp;
-					<a href="$filename?s=$s&amp;page=$page&amp;action=deploy&amp;id={$id}">{$lng['admin']['froxlorclients']['deploy']}</a>&nbsp;
-					<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$id}">{$lng['panel']['edit']}</a>&nbsp;
-					<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$id}">{$lng['panel']['delete']}</a>
-				</td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/index/change_language.tpl b/templates/Classic/admin/index/change_language.tpl
deleted file mode 100644
index dbdcf870..00000000
--- a/templates/Classic/admin/index/change_language.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'index'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="none" rowspan="4"><img src="templates/{$theme}/assets/img/changelanguage.gif" alt="" /></td>
-			</tr>
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['main']['changelanguage']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['login']['language']}</td>
-				<td class="main_field_display" nowrap="nowrap"><select class="dropdown_noborder" name="def_language">$language_options</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottom" type="submit" value="{$lng['menue']['main']['changelanguage']}" /></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/index/change_password.tpl b/templates/Classic/admin/index/change_password.tpl
deleted file mode 100644
index 2f1c21ad..00000000
--- a/templates/Classic/admin/index/change_password.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'index'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="none" rowspan="6"><img src="templates/{$theme}/assets/img/logininternal.gif" alt="" /></td>
-			</tr>
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['main']['changepassword']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['changepassword']['old_password']}</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="password" name="old_password" maxlength="50" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['changepassword']['new_password']}</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="password" name="new_password" maxlength="50" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['changepassword']['new_password_confirm']}</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="password" name="new_password_confirm" maxlength="50" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottom" type="submit" value="{$lng['menue']['main']['changepassword']}" /></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/index/change_theme.tpl b/templates/Classic/admin/index/change_theme.tpl
deleted file mode 100644
index bee7f614..00000000
--- a/templates/Classic/admin/index/change_theme.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'index'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-                        <tr>
-                                <td class="none" rowspan="4"><img src="templates/{$theme}/assets/img/changetheme.png" alt="" /></td>
-                        </tr>
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['main']['changetheme']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['panel']['theme']}</td>
-				<td class="main_field_display" nowrap="nowrap"><select class="dropdown_noborder" name="theme">$theme_options</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottom" type="submit" value="{$lng['menue']['main']['changetheme']}" /></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/index/index.tpl b/templates/Classic/admin/index/index.tpl
deleted file mode 100644
index ce75809d..00000000
--- a/templates/Classic/admin/index/index.tpl
+++ /dev/null
@@ -1,153 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td colspan="2" class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['ressourcedetails']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['admin']['customers']}:</td>
-			<td class="field_display">{$overview['number_customers']} ({$userinfo['customers']})</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['domains']}:</td>
-			<td class="field_display">{$overview['number_domains']} ({$userinfo['domains']})</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['subdomains']}:</td>
-			<td class="field_display">{$overview['subdomains_used']} ({$userinfo['subdomains_used']}/{$userinfo['subdomains']})</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['diskspace']}:</td>
-			<td class="field_display">{$overview['diskspace_used']} ({$userinfo['diskspace_used']}/{$userinfo['diskspace']})</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['traffic']}:</td>
-			<td class="field_display">{$overview['traffic_used']} ({$userinfo['traffic_used']}/{$userinfo['traffic']})</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['mysqls']}:</td>
-			<td class="field_display">{$overview['mysqls_used']} ({$userinfo['mysqls_used']}/{$userinfo['mysqls']})</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['emails']}:</td>
-			<td class="field_display">{$overview['emails_used']} ({$userinfo['emails_used']}/{$userinfo['emails']})</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['accounts']}:</td>
-			<td class="field_display">{$overview['email_accounts_used']} ({$userinfo['email_accounts_used']}/{$userinfo['email_accounts']})</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['forwarders']}:</td>
-			<td class="field_display">{$overview['email_forwarders_used']} ({$userinfo['email_forwarders_used']}/{$userinfo['email_forwarders']})</td>
-		</tr>
-		<if $settings['system']['mail_quota_enabled'] == 1>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['email_quota']}:</td>
-			<td class="field_display">{$overview['email_quota_used']} ({$userinfo['email_quota_used']}/{$userinfo['email_quota']})</td>
-		</tr>
-		</if>
-		<if $settings['autoresponder']['autoresponder_active'] == 1>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['autoresponder']}:</td>
-			<td class="field_display">{$userinfo['email_autoresponder_used']} ({$userinfo['email_autoresponder']})</td>
-		</tr>
-		</if>
-		<if (int)$settings['aps']['aps_active'] == 1>
-		<tr>
-			<td class="field_name_border_left">{$lng['aps']['numberofapspackages']}:</td>
-			<td class="field_display">{$overview['aps_packages_used']} ({$userinfo['aps_packages_used']}/{$userinfo['aps_packages']})</td>
-		</tr>
-		</if>
-		<if $settings['ticket']['enabled'] == 1>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['ftps']}:</td>
-			<td class="field_display">{$overview['ftps_used']} ({$userinfo['ftps_used']}/{$userinfo['ftps']})</td>
-		</tr>
-		<tr>
-			<td class="field_name_nobordersmall">{$lng['customer']['tickets']}:</td>
-			<td class="field_display_nobordersmall">{$overview['tickets_used']} ({$userinfo['tickets_used']}/{$userinfo['tickets']})</td>
-		</tr>
-		<else>
-		<tr>
-			<td class="field_name_nobordersmall">{$lng['customer']['ftps']}:</td>
-			<td class="field_display_nobordersmall">{$overview['ftps_used']} ({$userinfo['ftps_used']}/{$userinfo['ftps']})</td>
-		</tr>
-		</if>
-		<if 0 < $awaitingtickets && $settings['ticket']['enabled'] == 1 >
-		<tr>
-			<td class="field_name_border_left" colspan="2"><b>{$awaitingtickets_text}</b></td>
-		</tr>
-		</if>
-		<tr>
-			<td colspan="2" class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['systemdetails']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['admin']['serversoftware']}:</td>
-			<td class="field_display">{$_SERVER['SERVER_SOFTWARE']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['admin']['phpversion']}:</td>
-			<td class="field_display">$phpversion</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['admin']['phpmemorylimit']}:</td>
-			<td class="field_display">$phpmemorylimit</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['admin']['mysqlserverversion']}:</td>
-			<td class="field_display">$mysqlserverversion</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['admin']['mysqlclientversion']}:</td>
-			<td class="field_display">$mysqlclientversion</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['admin']['webserverinterface']}:</td>
-			<td class="field_display">$webserverinterface</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['admin']['sysload']}:</td>
-			<td class="field_display">$load</td>
-		</tr>
-		<if $showkernel == 1>
-			<tr>
-				<td class="field_name_border_left">Kernel:</td>
-				<td class="field_display">$kernel</td>
-			</tr>
-		</if>
-		<if $uptime != ''>
-		<tr>
-			<td class="field_name_nobordersmall">Uptime:</td>
-			<td class="field_display_nobordersmall">$uptime</td>
-		</tr>
-		</if>
-		<tr>
-			<td colspan="2" class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['froxlordetails']}</b></td>
-		</tr>
-		{$outstanding_tasks}
-		{$cron_last_runs}
-		<tr>
-			<td class="field_name_border_left">{$lng['admin']['installedversion']}:</td>
-			<td class="field_display">{$version}{$branding}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['admin']['latestversion']}:</td>
-			<if $isnewerversion != 0 >
-				<td class="field_display"><a href="$lookfornewversion_link"><strong>$lookfornewversion_lable</strong></a></td>
-			<else>
-				<td class="field_display"><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td>
-			</if>
-		</tr>
-		<if $isnewerversion != 0 >
-		<tr>
-			<td class="field_name_border_left" colspan="2"><strong>{$lng['admin']['newerversionavailable']}</strong></td>
-		</tr>
-			<if $lookfornewversion_addinfo != ''>
-			<tr>
-				<td class="field_name_border_left" colspan="2">$lookfornewversion_addinfo</td>
-			</tr>
-			</if>
-		</if>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/index/overview_item.tpl b/templates/Classic/admin/index/overview_item.tpl
deleted file mode 100644
index 09ccf36e..00000000
--- a/templates/Classic/admin/index/overview_item.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<tr>
-	<td class="field_name_border_left">{$text}:</td>
-	<td class="field_display">{$value}</td>
-</tr>
diff --git a/templates/Classic/admin/ipsandports/ipsandports.tpl b/templates/Classic/admin/ipsandports/ipsandports.tpl
deleted file mode 100644
index d64fce4a..00000000
--- a/templates/Classic/admin/ipsandports/ipsandports.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'ipsandports'))}" method="post">
-                <input type="hidden" name="s" value="$s"/>
-                <input type="hidden" name="page" value="$page"/>
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left" colspan="5"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['ipsandports']['ipsandports']}</b></td>
-				<td class="maintitle_search_right" colspan="5">{$searchcode}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left">{$lng['admin']['ipsandports']['ip']}&nbsp;&nbsp;{$arrowcode['ip']}&nbsp;:&nbsp;{$lng['admin']['ipsandports']['port']}&nbsp;&nbsp;{$arrowcode['port']}</td>
-				<td class="field_display">Listen</td>
-				<td class="field_display">NameVirtualHost</td>
-				<td class="field_display">vHost-Container</td>
-				<td class="field_display">Specialsettings</td>
-				<td class="field_display">ServerName</td>
-				<td class="field_display">SSL</td>
-				<td class="field_display_search" colspan="2">{$sortcode}</td>
-			</tr>
-			$ipsandports
-			<if $pagingcode != ''>
-			<tr>
-				<td class="field_display_border_left" colspan="9" style=" text-align: center; ">{$pagingcode}</td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left" colspan="9"><a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['ipsandports']['add']}</a></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/ipsandports/ipsandports_add.tpl b/templates/Classic/admin/ipsandports/ipsandports_add.tpl
deleted file mode 100644
index 9987f54d..00000000
--- a/templates/Classic/admin/ipsandports/ipsandports_add.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'ipsandports'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$ipsandports_add_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/ipsandports/ipsandports_edit.tpl b/templates/Classic/admin/ipsandports/ipsandports_edit.tpl
deleted file mode 100644
index c56269a7..00000000
--- a/templates/Classic/admin/ipsandports/ipsandports_edit.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'ipsandports'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$ipsandports_edit_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/ipsandports/ipsandports_ipandport.tpl b/templates/Classic/admin/ipsandports/ipsandports_ipandport.tpl
deleted file mode 100644
index 5543f6e8..00000000
--- a/templates/Classic/admin/ipsandports/ipsandports_ipandport.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left"><font size="-1">{$row['ip']}:{$row['port']}</font></td>
-	<td class="field_name"><font size="-1"><if $row['listen_statement']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></font></td>
-	<td class="field_name"><font size="-1"><if $row['namevirtualhost_statement']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></font></td>
-	<td class="field_name"><font size="-1"><if $row['vhostcontainer']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></font></td>
-	<td class="field_name"><font size="-1"><if $row['specialsettings']!=''>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></font></td>
-	<td class="field_name"><font size="-1"><if $row['vhostcontainer_servername_statement']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></font></td>
-	<td class="field_name"><font size="-1"><if $row['ssl']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></font></td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></td>
-</tr>
diff --git a/templates/Classic/admin/logger/logger.tpl b/templates/Classic/admin/logger/logger.tpl
deleted file mode 100644
index ee187efb..00000000
--- a/templates/Classic/admin/logger/logger.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'logger'))}" method="post">
-		<input type="hidden" name="s" value="$s"/>
-		<input type="hidden" name="page" value="$page"/>
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['logger']['logger']}</b></td>
-				<td class="maintitle_search_right" colspan="2">{$searchcode}</td>
-			</tr>
-			<if 15 < $log_count >
-			<tr>
-				<td class="field_display_border_left" colspan="4"><a href="{$linker->getLink(array('section' => 'logger', 'page' => 'log', 'action' => 'truncate'))}">{$lng['logger']['truncate']}</a></td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left" width="120">{$lng['logger']['date']}&nbsp;&nbsp;{$arrowcode['date']}</td>
-				<td class="field_display">{$lng['logger']['type']}&nbsp;&nbsp;{$arrowcode['type']}</td>
-				<td class="field_display">{$lng['logger']['user']}&nbsp;&nbsp;{$arrowcode['user']}</td>
-				<td class="field_display_search">{$sortcode}</td>
-			</tr>
-			$log
-			<tr>
-				<td class="field_display_border_left" colspan="4"><a href="{$linker->getLink(array('section' => 'logger', 'page' => 'log', 'action' => 'truncate'))}">{$lng['logger']['truncate']}</a></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/logger/logger_action.tpl b/templates/Classic/admin/logger/logger_action.tpl
deleted file mode 100644
index 0649d4b7..00000000
--- a/templates/Classic/admin/logger/logger_action.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td class="field_name_border_left" colspan="4"><strong>{$row['action']}</strong></td>
-</tr>
\ No newline at end of file
diff --git a/templates/Classic/admin/logger/logger_log.tpl b/templates/Classic/admin/logger/logger_log.tpl
deleted file mode 100644
index e1eec3ab..00000000
--- a/templates/Classic/admin/logger/logger_log.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<tr  class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left">{$row['date']}</td>
-	<td class="field_name">{$row['type']}</td>
-	<td class="field_name">{$row['user']}</td>
-  <td class="field_name">{$row['text']}</td>
-</tr>
diff --git a/templates/Classic/admin/message/message.tpl b/templates/Classic/admin/message/message.tpl
deleted file mode 100644
index b960d6f2..00000000
--- a/templates/Classic/admin/message/message.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-$header
-	<form method="post" action="$filename">
-		<input type="hidden" name="s" value="$s"/>
-		<input type="hidden" name="page" value="$page"/>
-		<input type="hidden" name="action" value="$action"/>
-		<if 0 < $success >
-			<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-				<tr>
-					<td class="maintitle" colspan="2">&nbsp;<b>{$successmessage}</b></td>
-				</tr>
-			</table>
-			<br />
-			<br />
-		</if>
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['message']}</b></td>
-		</tr>
-		<tr>
-			<td class="main_field_name">{$lng['admin']['receipient']}</td>
-			<td class="main_field_display" nowrap="nowrap"><select name="receipient">$receipients</select></td>
-		</tr>
-		<tr>
-			<td class="main_field_name">{$lng['admin']['subject']}</td>
-			<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="subject" value="{$lng['admin']['nosubject']}"/></td>
-		</tr>
-		<tr>
-			<td class="main_field_name" valign="top">{$lng['admin']['text']}</td>
-			<td class="main_field_display" nowrap="nowrap"><textarea class="textarea_noborder" rows="12" cols="80" name="message"></textarea></td>
-		</tr>
-		<tr>
-			<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send"/><input class="bottom" type="submit" value="{$lng['panel']['send']}" /></td>
-		</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
-
diff --git a/templates/Classic/admin/phpconfig/overview.tpl b/templates/Classic/admin/phpconfig/overview.tpl
deleted file mode 100644
index 0582453b..00000000
--- a/templates/Classic/admin/phpconfig/overview.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle_search_left" colspan="4"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['phpsettings']['maintitle']}</b></td>
-			<td class="maintitle_search_right">&nbsp;</td>
-		</tr>
-		<tr>
-			<td class="field_display_border_left">{$lng['admin']['phpsettings']['description']}</td>
-			<td class="field_display">{$lng['admin']['phpsettings']['activedomains']}</td>
-			<td class="field_display">{$lng['admin']['phpsettings']['binary']}</td>
-			<td class="field_display">{$lng['admin']['phpsettings']['file_extensions']}</td>
-			<td class="field_display">{$lng['admin']['phpsettings']['actions']}</td>
-		</tr>
-		$tablecontent
-		<tr>
-			<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a></td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/phpconfig/overview_add.tpl b/templates/Classic/admin/phpconfig/overview_add.tpl
deleted file mode 100644
index 018bef65..00000000
--- a/templates/Classic/admin/phpconfig/overview_add.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'phpsettings'))}" method="post">
-		<input type="hidden" name="s" value="$s"/>
-		<input type="hidden" name="page" value="$page"/>
-		<input type="hidden" name="action" value="add"/>
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$phpconfig_add_form}
-		</table>
-	</form>
-	<br />
-	<br />
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle" colspan="2"><b>&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['phpconfig']['template_replace_vars']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{SAFE_MODE}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['safe_mode']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{PEAR_DIR}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['pear_dir']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{OPEN_BASEDIR_C}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['open_basedir_c']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{OPEN_BASEDIR}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['open_basedir']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{OPEN_BASEDIR_GLOBAL}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['open_basedir_global']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{TMP_DIR}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['tmp_dir']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{CUSTOMER_EMAIL}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['customer_email']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{ADMIN_EMAIL}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['admin_email']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{DOMAIN}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['domain']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{CUSTOMER}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['customer']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{ADMIN}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['admin']}</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/phpconfig/overview_edit.tpl b/templates/Classic/admin/phpconfig/overview_edit.tpl
deleted file mode 100644
index 0ee6760b..00000000
--- a/templates/Classic/admin/phpconfig/overview_edit.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'phpsettings'))}" method="post">
-		<input type="hidden" name="s" value="$s"/>
-		<input type="hidden" name="page" value="$page"/>
-		<input type="hidden" name="action" value="edit"/>
-		<input type="hidden" name="id" value="$id"/>
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$phpconfig_edit_form}
-		</table>
-	</form>
-	<br />
-	<br />
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle" colspan="2"><b>&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['phpconfig']['template_replace_vars']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{SAFE_MODE}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['safe_mode']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{PEAR_DIR}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['pear_dir']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{OPEN_BASEDIR_C}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['open_basedir_c']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{OPEN_BASEDIR}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['open_basedir']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{OPEN_BASEDIR_GLOBAL}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['open_basedir_global']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{TMP_DIR}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['tmp_dir']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{CUSTOMER_EMAIL}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['customer_email']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{ADMIN_EMAIL}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['admin_email']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{DOMAIN}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['domain']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{CUSTOMER}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['customer']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left"><i>{ADMIN}</i></td>
-			<td class="field_name">{$lng['admin']['phpconfig']['admin']}</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/phpconfig/overview_overview.tpl b/templates/Classic/admin/phpconfig/overview_overview.tpl
deleted file mode 100644
index 64fdb4b9..00000000
--- a/templates/Classic/admin/phpconfig/overview_overview.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<tr>
-	<td class="field_name_border_left" valign="top">{$row['description']}</td>
-	<td class="field_name" valign="top">{$domains}</td>
-	<td class="field_name" valign="top">{$row['binary']}</td>
-	<td class="field_name" valign="top">{$row['file_extensions']}</td>
-	<td class="field_name" valign="top">
-		<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a><br/>
-		<if $row['id'] != 1><a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a><br/></if>
-	</td>
-</tr>
diff --git a/templates/Classic/admin/settings/settings.tpl b/templates/Classic/admin/settings/settings.tpl
deleted file mode 100644
index ecafc7ea..00000000
--- a/templates/Classic/admin/settings/settings.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['serversettings']}</b>
-				[<a href="$filename?page=overview&amp;part=&amp;s=$s">{$lng['admin']['configfiles']['compactoverview']}</a>]</td>
-			</tr>
-			$fields
-			<tr>
-				<td class="maintitle_apply_right" nowrap="nowrap" colspan="2">
-					<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
-				</td>
-			</tr>
-		</table>
diff --git a/templates/Classic/admin/settings/settings_form_begin.tpl b/templates/Classic/admin/settings/settings_form_begin.tpl
deleted file mode 100644
index 3aea38a6..00000000
--- a/templates/Classic/admin/settings/settings_form_begin.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-$header
-	<form method="post" action="$filename">
-		<input type="hidden" name="send" value="send" />
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Classic/admin/settings/settings_form_end.tpl b/templates/Classic/admin/settings/settings_form_end.tpl
deleted file mode 100644
index a9a6eab1..00000000
--- a/templates/Classic/admin/settings/settings_form_end.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-		<if $_part != ''>
-			<input type="hidden" name="part" value="{$_part}" />
-		</if>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/settings/settings_group.tpl b/templates/Classic/admin/settings/settings_group.tpl
deleted file mode 100644
index 2b52e513..00000000
--- a/templates/Classic/admin/settings/settings_group.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<tr>
-	<td class="maintitle_apply_left">
-		<b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$groupdetails['title']}</b>
-	</td>
-	<td class="maintitle_apply_right" nowrap="nowrap">
-		<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
-	</td>
-</tr>
diff --git a/templates/Classic/admin/settings/settings_overview.tpl b/templates/Classic/admin/settings/settings_overview.tpl
deleted file mode 100644
index 1be1168b..00000000
--- a/templates/Classic/admin/settings/settings_overview.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" align="center" colspan="3">
-					<b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b>
-					[<a href="$filename?page=overview&amp;part=all&amp;s=$s">{$lng['admin']['configfiles']['overview']}</a>]
-				</td>
-			</tr>
-			$fields
-			<tr>
-				<td class="maintitle_apply_right" nowrap="nowrap" colspan="3">
-					<input class="bottom" type="reset" value="{$lng['panel']['reset']}" />&nbsp;<input class="bottom" type="submit" value="{$lng['panel']['save']}" />
-				</td>
-			</tr>
-		</table>
diff --git a/templates/Classic/admin/settings/settings_overviewgroup.tpl b/templates/Classic/admin/settings/settings_overviewgroup.tpl
deleted file mode 100644
index 390677bf..00000000
--- a/templates/Classic/admin/settings/settings_overviewgroup.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-			<tr>
-				<td class="maintitle_apply_left">
-					<b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$title}</b>
-				</td>
-				<td class="main_field_display_small" nowrap="nowrap">{$option}</td>
-				<td class="main_field_display_small" nowrap="nowrap">
-					<if $activated == 1>
-						<a href="$filename?page=overview&amp;part=$part&amp;s=$s">{$lng['admin']['configfiles']['serverconfiguration']}</a>
-					</if>
-				</td>
-			</tr>
diff --git a/templates/Classic/admin/settings/updatecounters.tpl b/templates/Classic/admin/settings/updatecounters.tpl
deleted file mode 100644
index bb1dea84..00000000
--- a/templates/Classic/admin/settings/updatecounters.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle" colspan="2">
-				<b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['updatecounters']}: {$lng['admin']['customers']}</b>
-			</td>
-		</tr>
-{$customers}
-		<tr>
-			<td class="maintitle" colspan="2">
-				<b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['updatecounters']}: {$lng['admin']['admins']}</b>
-			</td>
-		</tr>
-{$admins}
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/settings/updatecounters_row_admin.tpl b/templates/Classic/admin/settings/updatecounters_row_admin.tpl
deleted file mode 100644
index bb0e4fa2..00000000
--- a/templates/Classic/admin/settings/updatecounters_row_admin.tpl
+++ /dev/null
@@ -1,73 +0,0 @@
-		<tr>
-			<td class="main_field_name" style="width: 40%;">
-				<b><if $admin['adminid'] != $userinfo['userid']><a href="{$linker->getLink(array('section' => 'admins', 'page' => 'admins', 'action' => 'su', 'id' => $admin['adminid']))}" target="_blank">{$admin['loginname']}</a></if><if $admin['adminid'] == $userinfo['userid']>{$admin['loginname']}</if>:</b>
-			</td>
-			<td class="main_field_name">
-				<table border="0" style="text-align: left;">
-					<tr>
-						<td>{$lng['admin']['customers']}:</td>
-						<td><span <if $admin['customers_used'] == $admin['customers_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['customers_used']} -&gt; {$admin['customers_used_new']}</b></span></td>
-					</tr>
-					<tr>
-						<td>{$lng['customer']['domains']}:</td>
-						<td><span <if $admin['domains_used'] == $admin['domains_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['domains_used']} -&gt; {$admin['domains_used_new']}</b></span></td>
-					</tr>
-					<tr>
-						<td>{$lng['customer']['subdomains']}:</td>
-						<td><span <if $admin['subdomains_used'] == $admin['subdomains_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['subdomains_used']} -&gt; {$admin['subdomains_used_new']}</b></span></td>
-					</tr>
-					<tr>
-						<td>{$lng['customer']['diskspace']}:</td>
-						<td><span <if $admin['diskspace_used'] == $admin['diskspace_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['diskspace_used']} -&gt; {$admin['diskspace_used_new']}</b></span></td>
-					</tr>
-					<tr>
-						<td>{$lng['customer']['traffic']}:</td>
-						<td><span <if $admin['traffic_used'] == $admin['traffic_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['traffic_used']} -&gt; {$admin['traffic_used_new']}</b></span></td>
-					</tr>
-					<tr>
-						<td>{$lng['customer']['mysqls']}:</td>
-						<td><span <if $admin['mysqls_used'] == $admin['mysqls_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['mysqls_used']} -&gt; {$admin['mysqls_used_new']}</b></span></td>
-					</tr>
-					<tr>
-						<td>{$lng['customer']['emails']}:</td>
-						<td><span <if $admin['emails_used'] == $admin['emails_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['emails_used']} -&gt; {$admin['emails_used_new']}</b></span></td>
-					</tr>
-					<tr>
-						<td>{$lng['customer']['accounts']}:</td>
-						<td><span <if $admin['email_accounts_used'] == $admin['email_accounts_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_accounts_used']} -&gt; {$admin['email_accounts_used_new']}</b></span></td>
-					</tr>
-					<tr>
-						<td>{$lng['customer']['forwarders']}:</td>
-						<td><span <if $admin['email_forwarders_used'] == $admin['email_forwarders_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_forwarders_used']} -&gt; {$admin['email_forwarders_used_new']}</b></span></td>
-					</tr>
-					<if $settings['system']['mail_quota_enabled'] == 1>
-					<tr>
-						<td>{$lng['customer']['email_quota']}:</td>
-						<td><span <if $admin['email_quota_used'] == $admin['email_quota_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_quota_used']} -&gt; {$admin['email_quota_used_new']}</b></span></td>
-					</tr>
-					</if>
-					<if $settings['autoresponder']['autoresponder_active'] == 1>
-					<tr>
-						<td>{$lng['customer']['autoresponder']}:</td>
-						<td><span <if $admin['email_autoresponder_used'] == $admin['email_autoresponder_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_autoresponder_used']} -&gt; {$admin['email_autoresponder_used_new']}</b></span></td>
-					</tr>
-					</if>
-					<tr>
-						<td>{$lng['customer']['ftps']}:</td>
-						<td><span <if $admin['ftps_used'] == $admin['ftps_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['ftps_used']} -&gt; {$admin['ftps_used_new']}</b></span></td>
-					</tr>
-					<if $settings['ticket']['enabled'] == '1'>
-					<tr>
-						<td>{$lng['customer']['tickets']}:</td>
-						<td><span <if $admin['tickets_used'] == $admin['tickets_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['tickets_used']} -&gt; {$admin['tickets_used_new']}</b></span></td>
-					</tr>
-					</if>
-					<if $settings['aps']['aps_active'] == '1'>
-					<tr>
-						<td>{$lng['customer']['aps']}:</td>
-						<td><span <if $admin['aps_packages_used'] == $admin['aps_packages_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['aps_packages_used']} -&gt; {$admin['aps_packages_used_new']}</b></span></td>
-					</tr>
-					</if>
-				</table>
-			</td>
-		</tr>
diff --git a/templates/Classic/admin/settings/updatecounters_row_customer.tpl b/templates/Classic/admin/settings/updatecounters_row_customer.tpl
deleted file mode 100644
index 10415744..00000000
--- a/templates/Classic/admin/settings/updatecounters_row_customer.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-		<tr>
-			<td class="main_field_name" style="width: 40%;">
-				<b><if $customer['name'] != '' && $customer['firstname'] != ''>{$customer['name']}, {$customer['firstname']}</if><if $customer['name'] != '' && $customer['firstname'] != '' && $customer['company'] != ''> | </if><if $customer['company'] != ''>{$customer['company']}</if> (<a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $customer['customerid']))}" target="_blank">{$customer['loginname']}</a>):</b>
-			</td>
-			<td class="main_field_name">
-				<table border="0" style="text-align: left;">
-					<tr>
-						<td>{$lng['customer']['subdomains']}:</td>
-						<td><span <if $customer['subdomains_used'] == $customer['subdomains_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['subdomains_used']} -&gt; {$customer['subdomains_used_new']}</b></span></td>
-					</tr>
-					<tr>
-						<td>{$lng['customer']['mysqls']}:</td>
-						<td><span <if $customer['mysqls_used'] == $customer['mysqls_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['mysqls_used']} -&gt; {$customer['mysqls_used_new']}</b></span></td>
-					</tr>
-					<tr>
-						<td>{$lng['customer']['emails']}:</td>
-						<td><span <if $customer['emails_used'] == $customer['emails_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['emails_used']} -&gt; {$customer['emails_used_new']}</b></span></td>
-					</tr>
-					<tr>
-						<td>{$lng['customer']['accounts']}:</td>
-						<td><span <if $customer['email_accounts_used'] == $customer['email_accounts_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_accounts_used']} -&gt; {$customer['email_accounts_used_new']}</b></span></td>
-					</tr>
-					<tr>
-						<td>{$lng['customer']['forwarders']}:</td>
-						<td><span <if $customer['email_forwarders_used'] == $customer['email_forwarders_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_forwarders_used']} -&gt; {$customer['email_forwarders_used_new']}</b></span></td>
-					</tr>
-					<if $settings['system']['mail_quota_enabled'] == 1>
-					<tr>
-						<td>{$lng['customer']['email_quota']}:</td>
-						<td><span <if $customer['email_quota_used'] == $customer['email_quota_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_quota_used']} -&gt; {$customer['email_quota_used_new']}</b></span></td>
-					</tr>
-					</if>
-					<if $settings['autoresponder']['autoresponder_active'] == 1>
-					<tr>
-						<td>{$lng['customer']['autoresponder']}:</td>
-						<td><span <if $customer['email_autoresponder_used'] == $customer['email_autoresponder_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_autoresponder_used']} -&gt; {$customer['email_autoresponder_used_new']}</b></span></td>
-					</tr>
-					</if>
-					<tr>
-						<td>{$lng['customer']['ftps']}:</td>
-						<td><span <if $customer['ftps_used'] == $customer['ftps_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['ftps_used']} -&gt; {$customer['ftps_used_new']}</b></span></td>
-					</tr>
-					<if $settings['ticket']['enabled'] == '1'>
-					<tr>
-						<td>{$lng['customer']['tickets']}:</td>
-						<td><span <if $customer['tickets_used'] == $customer['tickets_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['tickets_used']} -&gt; {$customer['tickets_used_new']}</b></span></td>
-					</tr>
-					</if>
-					<if $settings['aps']['aps_active'] == '1'>
-					<tr>
-						<td>{$lng['customer']['aps']}:</td>
-						<td><span <if $customer['aps_packages_used'] == $customer['aps_packages_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['aps_packages_used']} -&gt; {$customer['aps_packages_used_new']}</b></span></td>
-					</tr>
-					</if>
-				</table>
-			</td>
-		</tr>
diff --git a/templates/Classic/admin/templates/filetemplates_add.tpl b/templates/Classic/admin/templates/filetemplates_add.tpl
deleted file mode 100644
index fcbaff9f..00000000
--- a/templates/Classic/admin/templates/filetemplates_add.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'templates'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['templates']['template_add']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['admin']['templates']['action']}</td>
-				<td class="main_field_display" nowrap="nowrap"><select class="dropdown_noborder" name="template">$free_templates</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_name" valign="top" nowrap="nowrap">{$lng['admin']['templates']['filecontent']}</td>
-				<td class="main_field_display" nowrap="nowrap"><textarea class="textarea_border" name="filecontent" rows="20" cols="75"></textarea></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="filesend" value="filesend" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" /></td>
-			</tr>
-		</table>
-	<br />
-	<br />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b>&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['templates']['template_replace_vars']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['index_html']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{SERVERNAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['SERVERNAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{CUSTOMER}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['CUSTOMER']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{ADMIN}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['ADMIN']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{CUSTOMER_EMAIL}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['CUSTOMER_EMAIL']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{ADMIN_EMAIL}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['ADMIN_EMAIL']}</td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/templates/filetemplates_edit.tpl b/templates/Classic/admin/templates/filetemplates_edit.tpl
deleted file mode 100644
index 096d1765..00000000
--- a/templates/Classic/admin/templates/filetemplates_edit.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'templates'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['templates']['template_add']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['admin']['templates']['action']}</td>
-				<td class="main_field_display" nowrap="nowrap">{$lng['admin']['templates'][$row['varname']]}</td>
-			</tr>
-			<tr>
-				<td class="main_field_name" valign="top" nowrap="nowrap">{$lng['admin']['templates']['filecontent']}</td>
-				<td class="main_field_display" nowrap="nowrap"><textarea class="textarea_border" name="filecontent" rows="20" cols="75">{$row['value']}</textarea></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="filesend" value="filesend" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" /></td>
-			</tr>
-		</table>
-	<br />
-	<br />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b>&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['templates']['template_replace_vars']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['index_html']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{SERVERNAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['SERVERNAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{CUSTOMER}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['CUSTOMER']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{ADMIN}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['ADMIN']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{CUSTOMER_EMAIL}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['CUSTOMER_EMAIL']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{ADMIN_EMAIL}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['ADMIN_EMAIL']}</td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/templates/templates.tpl b/templates/Classic/admin/templates/templates.tpl
deleted file mode 100644
index 63f05d49..00000000
--- a/templates/Classic/admin/templates/templates.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td colspan="4" class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['templates']['templates']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_display_border_left">{$lng['login']['language']}</td>
-			<td class="field_display">{$lng['admin']['templates']['action']}</td>
-			<td class="field_display" colspan="2">&nbsp;</td>
-		</tr>
-		$templates
-		<if $add>
-		<tr>
-			<td colspan="4" class="field_display_border_left"><a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['templates']['template_add']}</a></td>
-		</tr>
-		</if>
-	</table>
-	<br/>
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td colspan="3" class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['templates']['filetemplates']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_display_border_left">{$lng['admin']['templates']['action']}</td>
-			<td class="field_display">&nbsp;</td>
-			<td class="field_display">&nbsp;</td>
-		</tr>
-		$filetemplates
-		<if $filetemplateadd>
-		<tr>
-			<td colspan="4" class="field_display_border_left"><a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'add', 'files' => 'files'))}">{$lng['admin']['templates']['template_add']}</a></td>
-		</tr>
-		</if>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/templates/templates_add_1.tpl b/templates/Classic/admin/templates/templates_add_1.tpl
deleted file mode 100644
index 2024db70..00000000
--- a/templates/Classic/admin/templates/templates_add_1.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'templates'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_40">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['templates']['template_add']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['login']['language']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><select class="dropdown_noborder" name="language">$language_options</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="prepare" value="prepare" /><input class="bottom" type="submit" value="{$lng['panel']['next']}" /></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/templates/templates_add_2.tpl b/templates/Classic/admin/templates/templates_add_2.tpl
deleted file mode 100644
index 113a6d59..00000000
--- a/templates/Classic/admin/templates/templates_add_2.tpl
+++ /dev/null
@@ -1,209 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'templates'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['templates']['template_add']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['login']['language']}</td>
-				<td class="main_field_display" nowrap="nowrap"><b>$language</b><input type="hidden" name="language" value="$language" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['admin']['templates']['action']}</td>
-				<td class="main_field_display" nowrap="nowrap"><select class="dropdown_noborder" name="template">$template_options</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_name" nowrap="nowrap">{$lng['admin']['templates']['subject']}</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="subject" value="" maxlength="255" size="75" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name" valign="top" nowrap="nowrap">{$lng['admin']['templates']['mailbody']}</td>
-				<td class="main_field_display" nowrap="nowrap"><textarea class="textarea_border" name="mailbody" rows="20" cols="75"></textarea></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" /></td>
-			</tr>
-		</table>
-	<br />
-	<br />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b>&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['templates']['template_replace_vars']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['createcustomer']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{SALUTATION}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['SALUTATION']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{FIRSTNAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['FIRSTNAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{NAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['NAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{COMPANY}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['COMPANY']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USERNAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USERNAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{PASSWORD}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['PASSWORD']}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['pop_success']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{EMAIL}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['EMAIL']}</td>
-			</tr>
-			<if $settings['panel']['sendalternativemail'] == 1>
-				<tr>
-					<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['pop_success_alternative']}</b></td>
-				</tr>
-				<tr>
-					<td class="field_name_border_left"><i>{EMAIL}</i>:</td>
-					<td class="field_name">{$lng['admin']['templates']['EMAIL']}</td>
-				</tr>
-				<tr>
-					<td class="field_name_border_left"><i>{PASSWORD}</i>:</td>
-					<td class="field_name">{$lng['admin']['templates']['EMAIL_PASSWORD']}</td>
-				</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['forgotpwd']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{SALUTATION}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['SALUTATION']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USERNAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USERNAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{PASSWORD}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['PASSWORD']}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['trafficmaxpercent']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{TRAFFIC}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['TRAFFIC']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{TRAFFICUSED}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['TRAFFICUSED']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{MAX_PERCENT}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['MAX_PERCENT']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USAGE_PERCENT}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USAGE_PERCENT']}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['diskmaxpercent']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{DISKAVAILABLE}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['DISKAVAILABLE']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{DISKUSED}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['DISKUSED']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{MAX_PERCENT}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['MAX_PERCENT']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USAGE_PERCENT}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USAGE_PERCENT']}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['ticket']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{SUBJECT}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['SUBJECT']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{SALUTATION}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['SALUTATION']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{FIRSTNAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['FIRSTNAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{NAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['NAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{COMPANY}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['COMPANY']}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['newdatabase']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{CUST_NAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['CUST_NAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{DB_NAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['DB_NAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{DB_PASS}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['DB_PASS']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{DB_DESC}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['DB_DESC']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{DB_SRV}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['DB_SRV']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{PMA_URI}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['PMA_URI']}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['newftpuser']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{CUST_NAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['CUST_NAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USR_NAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USR_NAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USR_PASS}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USR_PASS']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USR_PATH}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USR_PATH']}</td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/templates/templates_edit.tpl b/templates/Classic/admin/templates/templates_edit.tpl
deleted file mode 100644
index 2b294d98..00000000
--- a/templates/Classic/admin/templates/templates_edit.tpl
+++ /dev/null
@@ -1,211 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'templates'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="subjectid" value="$subjectid" />
-		<input type="hidden" name="mailbodyid" value="$mailbodyid" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['templates']['template_edit']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['login']['language']}</td>
-				<td class="main_field_display" nowrap="nowrap"><b>{$result['language']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['admin']['templates']['action']}</td>
-				<td class="main_field_display" nowrap="nowrap"><b>$template</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name" nowrap="nowrap">{$lng['admin']['templates']['subject']}</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="subject" value="$subject" maxlength="255" size="75" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name" valign="top" nowrap="nowrap">{$lng['admin']['templates']['mailbody']}</td>
-				<td class="main_field_display" nowrap="nowrap"><textarea class="textarea_border" name="mailbody" rows="20" cols="75">$mailbody</textarea></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" /></td>
-			</tr>
-		</table>
-	<br />
-	<br />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b>&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['templates']['template_replace_vars']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['createcustomer']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{SALUTATION}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['SALUTATION']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{FIRSTNAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['FIRSTNAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{NAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['NAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{COMPANY}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['COMPANY']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USERNAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USERNAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{PASSWORD}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['PASSWORD']}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['pop_success']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{EMAIL}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['EMAIL']}</td>
-			</tr>
-			<if $settings['panel']['sendalternativemail'] == 1>
-				<tr>
-					<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['pop_success_alternative']}</b></td>
-				</tr>
-				<tr>
-					<td class="field_name_border_left"><i>{EMAIL}</i>:</td>
-					<td class="field_name">{$lng['admin']['templates']['EMAIL']}</td>
-				</tr>
-				<tr>
-					<td class="field_name_border_left"><i>{PASSWORD}</i>:</td>
-					<td class="field_name">{$lng['admin']['templates']['EMAIL_PASSWORD']}</td>
-				</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['forgotpwd']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{SALUTATION}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['SALUTATION']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USERNAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USERNAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{PASSWORD}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['PASSWORD']}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['trafficmaxpercent']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{TRAFFIC}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['TRAFFIC']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{TRAFFICUSED}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['TRAFFICUSED']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{MAX_PERCENT}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['MAX_PERCENT']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USAGE_PERCENT}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USAGE_PERCENT']}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['diskmaxpercent']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{DISKAVAILABLE}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['DISKAVAILABLE']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{DISKUSED}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['DISKUSED']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{MAX_PERCENT}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['MAX_PERCENT']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USAGE_PERCENT}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USAGE_PERCENT']}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['ticket']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{SUBJECT}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['SUBJECT']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{SALUTATION}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['SALUTATION']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{FIRSTNAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['FIRSTNAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{NAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['NAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{COMPANY}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['COMPANY']}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['newdatabase']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{CUST_NAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['CUST_NAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{DB_NAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['DB_NAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{DB_PASS}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['DB_PASS']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{DB_DESC}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['DB_DESC']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{DB_SRV}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['DB_SRV']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{PMA_URI}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['PMA_URI']}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['newftpuser']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{CUST_NAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['CUST_NAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USR_NAME}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USR_NAME']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USR_PASS}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USR_PASS']}</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left"><i>{USR_PATH}</i>:</td>
-				<td class="field_name">{$lng['admin']['templates']['USR_PATH']}</td>
-			</tr>
-		</table>
-	</form>
-<br />
-<br />
-$footer
diff --git a/templates/Classic/admin/templates/templates_filetemplate.tpl b/templates/Classic/admin/templates/templates_filetemplate.tpl
deleted file mode 100644
index 594eb432..00000000
--- a/templates/Classic/admin/templates/templates_filetemplate.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-		<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-			<td class="field_name_border_left">{$lng['admin']['templates'][$row['varname']]}</td>
-			<td class="field_name"><a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'deletef', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></td>
-			<td class="field_name"><a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'editf', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
-		</tr>
diff --git a/templates/Classic/admin/templates/templates_template.tpl b/templates/Classic/admin/templates/templates_template.tpl
deleted file mode 100644
index b9c44990..00000000
--- a/templates/Classic/admin/templates/templates_template.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-		<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-			<td class="field_name_border_left">{$language}</td>
-			<td class="field_name">{$template}</td>
-			<td class="field_name"><a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'delete', 'subjectid' => $subjectid, 'mailbodyid' => $mailbodyid))}">{$lng['panel']['delete']}</a></td>
-			<td class="field_name"><a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'edit', 'subjectid' => $subjectid, 'mailbodyid' => $mailbodyid))}">{$lng['panel']['edit']}</a></td>
-		</tr>
diff --git a/templates/Classic/admin/tickets/archive.tpl b/templates/Classic/admin/tickets/archive.tpl
deleted file mode 100644
index c7d5059a..00000000
--- a/templates/Classic/admin/tickets/archive.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post">
-		<input type="hidden" name="s" value="$s"/>
-		<input type="hidden" name="page" value="$page"/>
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle_search_left"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['ticket']['lastarchived']}</b></td>
-        		<td class="maintitle_search_right" colspan="5">&nbsp;</td>
-		</tr>
-		<tr>
-			<td class="field_display_border_left">{$lng['ticket']['archivedtime']}</td>
-			<td class="field_display">{$lng['ticket']['ticket_answers']}</td>
-			<td class="field_display">{$lng['ticket']['subject']}</td>
-			<td class="field_display">{$lng['ticket']['lastreplier']}</td>
-			<td class="field_display">{$lng['ticket']['priority']}</td>
-        		<td class="field_display_search">&nbsp;</td>
-		</tr>
-		$tickets
-		</table>
-	</form>
-	<br />
-	<br />
-	<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post">
-		<input type="hidden" name="s" value="$s"/>
-		<input type="hidden" name="page" value="$page"/>
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['ticket']['search']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['ticket']['subject']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" name="subject" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['ticket']['priority']}:</td>
-				<td class="main_field_display" nowrap="nowrap">{$priorities_options}</td>
-			</tr>
- 			<tr>
-				<td class="main_field_name">{$lng['ticket']['category']}:</td>
-				<td class="main_field_display" nowrap="nowrap">{$category_options}</td>
- 			</tr>
- 			<tr>
-				<td class="main_field_name">{$lng['ticket']['lastchange']}:</td>
-				<td class="main_field_display" nowrap="nowrap">{$lng['ticket']['lastchange_from']}<br /><input type="text" name="fromdate" /><br />{$lng['ticket']['lastchange_to']}<br /><input type="text" name="todate" /></td>
- 			</tr>
-			<tr>
-				<td class="main_field_name" colspan="2">{$lng['ticket']['message']}:</td>
-			</tr>
-			<tr>
-				<td class="main_field_display" nowrap="nowrap" colspan="2"><textarea class="textarea_border" rows="12" cols="60" name="message"></textarea></td>
-			</tr>
- 			<tr>
-				<td class="main_field_name">{$lng['ticket']['customer']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><select class="tendina_nobordo"  name="customer">$customers</select></td>
- 			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['panel']['search']}" /></td>
-			</tr>
-		</table>
-	</form>
-$footer
diff --git a/templates/Classic/admin/tickets/archived_tickets.tpl b/templates/Classic/admin/tickets/archived_tickets.tpl
deleted file mode 100644
index cb8336a4..00000000
--- a/templates/Classic/admin/tickets/archived_tickets.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<tr  class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left">{$ticket['lastchange']}</td>
-	<td class="field_name">{$ticket['ticket_answers']}</td>
-	<td class="field_name">{$ticket['subject']}</td>
-	<td class="field_name">{$ticket['lastreplier']}</td>
-	<td class="field_name"><span class="ticket_{$ticket['display']}">{$ticket['priority']}</span></td>
-	<td class="field_name">
-    <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'archive', 'action' => 'view', 'id' => $ticket['id']))}">{$lng['ticket']['show']}</a>
-  </td>  
-</tr>
diff --git a/templates/Classic/admin/tickets/archivesearch.tpl b/templates/Classic/admin/tickets/archivesearch.tpl
deleted file mode 100644
index 11855a36..00000000
--- a/templates/Classic/admin/tickets/archivesearch.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post">
-		<input type="hidden" name="s" value="$s"/>
-		<input type="hidden" name="page" value="$page"/>
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left" colspan="5"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['ticket']['archivesearch']}</b></td>
-				<td class="maintitle_search_right">&nbsp;</td>
-			</tr>
-      		<if 0 < $tickets_count >
-				<tr>
-					<td class="field_display_border_left">{$lng['ticket']['archivedtime']}</td>
-					<td class="field_display">{$lng['ticket']['ticket_answers']}</td>
-					<td class="field_display">{$lng['ticket']['subject']}</td>
-					<td class="field_display">{$lng['ticket']['lastreplier']}</td>
-					<td class="field_display">{$lng['ticket']['priority']}</td>
-	        			<td class="field_display_search">&nbsp;</td>
-				</tr>
-				$tickets
-      		</if>
-      		<if $tickets_count < 1 >
-        		<tr>
-				<td class="field_display_border_left" colspan="6">{$lng['ticket']['noresults']}</td>
-				</tr>
-			</if>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/tickets/categories.tpl b/templates/Classic/admin/tickets/categories.tpl
deleted file mode 100644
index 6b8d3bdf..00000000
--- a/templates/Classic/admin/tickets/categories.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post">
-		<input type="hidden" name="s" value="$s"/>
-		<input type="hidden" name="page" value="$page"/>
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['ticket']['categories']}</b></td>
-				<td class="maintitle_search_right" colspan="4">{$searchcode}</td>
-			</tr>
-			<if 15 < $categories_count >
-			<tr>
-				<td class="field_display_border_left" colspan="4"><a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'categories', 'action' => 'addcategory'))}">{$lng['ticket']['ticket_newcateory']}</a></td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left">{$lng['ticket']['category']}&nbsp;&nbsp;{$arrowcode['name']}</td>
-				<td class="field_display">{$lng['ticket']['logicalorder']}&nbsp;&nbsp;{$arrowcode['logicalorder']}</td>
-				<td class="field_display">{$lng['ticket']['ticketcount']}&nbsp;&nbsp;<if $categories_count < 0 >{$arrowcode['ticketcount']}</if></td>
-				<td class="field_display_search" colspan="2">{$sortcode}</td>
-			</tr>
-			$ticketcategories
-			<if $pagingcode != ''>
-			<tr>
-				<td class="field_display_border_left" colspan="5" style=" text-align: center; ">{$pagingcode}</td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'categories', 'action' => 'addcategory'))}">{$lng['ticket']['ticket_newcateory']}</a></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/tickets/tickets.tpl b/templates/Classic/admin/tickets/tickets.tpl
deleted file mode 100644
index 53a20e4c..00000000
--- a/templates/Classic/admin/tickets/tickets.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post">
-		<input type="hidden" name="s" value="$s"/>
-		<input type="hidden" name="page" value="$page"/>
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['ticket']['ticket']}</b></td>
-				<td class="maintitle_search_right" colspan="9">{$searchcode}</td>
-			</tr>
-			<if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && 15 < $tickets_count >
-			<tr>
-				<td class="field_display_border_left" colspan="10"><a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a></td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left">{$lng['ticket']['lastchange']}&nbsp;&nbsp;{$arrowcode['lastchange']}</td>
-				<td class="field_display">{$lng['ticket']['ticket_answers']}&nbsp;&nbsp;{$arrowcode['ticket_answers']}</td>
-				<td class="field_display">{$lng['ticket']['subject']}&nbsp;&nbsp;{$arrowcode['subject']}</td>
-				<td class="field_display">{$lng['ticket']['status']}&nbsp;&nbsp;{$arrowcode['status']}</td>
-				<td class="field_display">{$lng['ticket']['lastreplier']}&nbsp;&nbsp;{$arrowcode['lastreplier']}</td>
-				<td class="field_display">{$lng['ticket']['priority']}&nbsp;&nbsp;{$arrowcode['priority']}</td>
-				<td class="field_display_search" colspan="4">{$sortcode}</td>
-			</tr>
-			$tickets
-			<if $pagingcode != ''>
-			<tr>
-				<td class="field_display_border_left" colspan="10" style=" text-align: center; ">{$pagingcode}</td>
-			</tr>
-			</if>
-			<if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && $countcustomers !=0 >
-			<tr>
-				<td class="field_display_border_left" colspan="10"><a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a></td>
-			</tr>
-			</if>
-			<if $countcustomers == 0 >
-			<tr>
-				<td class="field_display_border_left" colspan="10"><a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'add'))}">{$lng['admin']['ticket_nocustomeraddingavailable']}</a></td>
-			</tr>
-			</if>			
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/tickets/tickets_categories.tpl b/templates/Classic/admin/tickets/tickets_categories.tpl
deleted file mode 100644
index 9dba7c1d..00000000
--- a/templates/Classic/admin/tickets/tickets_categories.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left">{$row['name']}</td>
-	<td class="field_name">{$row['logicalorder']}</td>
-	<td class="field_name">{$row['ticketcount']}&nbsp;({$row['ticketcountnotclosed']}&nbsp;{$lng['ticket']['open']}&nbsp;|&nbsp;{$closedtickets_count}&nbsp;{$lng['ticket']['closed']})</td>
-	<td class="field_name">
-		<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'categories', 'action' => 'editcategory', 'id' => $row['id']))}">{$lng['panel']['edit']}</a>
-	</td>
-	<td class="field_name">
-		<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'categories', 'action' => 'deletecategory', 'id' => $row['id']))}">{$lng['panel']['delete']}</a>
-	</td>
-</tr>
diff --git a/templates/Classic/admin/tickets/tickets_customer.tpl b/templates/Classic/admin/tickets/tickets_customer.tpl
deleted file mode 100644
index 2168ea9b..00000000
--- a/templates/Classic/admin/tickets/tickets_customer.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td class="field_name_border_left" colspan="10"><strong>{$customer}</strong></td>
-</tr>
diff --git a/templates/Classic/admin/tickets/tickets_editcategory.tpl b/templates/Classic/admin/tickets/tickets_editcategory.tpl
deleted file mode 100644
index 31ab5d76..00000000
--- a/templates/Classic/admin/tickets/tickets_editcategory.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'tickets'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$category_edit_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/tickets/tickets_new.tpl b/templates/Classic/admin/tickets/tickets_new.tpl
deleted file mode 100644
index a80efcd0..00000000
--- a/templates/Classic/admin/tickets/tickets_new.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'tickets'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-	 		{$ticket_new_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/tickets/tickets_newcategory.tpl b/templates/Classic/admin/tickets/tickets_newcategory.tpl
deleted file mode 100644
index 84eef559..00000000
--- a/templates/Classic/admin/tickets/tickets_newcategory.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'tickets'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$category_new_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/tickets/tickets_reply.tpl b/templates/Classic/admin/tickets/tickets_reply.tpl
deleted file mode 100644
index f83cad4e..00000000
--- a/templates/Classic/admin/tickets/tickets_reply.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'tickets'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
- 		<input type="hidden" name="id" value="$id" />
-		<if 0 < $ticket_replies_count >
-		$ticket_replies
-		</if>
-		<if $isclosed < 1 >
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$ticket_reply_form}
-		</table>
-		</if>
-		<if 0 < $isclosed >
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['ticket']['ticket_reopen']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm"><a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'reopen', 'id' => $id))}">{$lng['ticket']['ticket_reopen']}</a></td>
-			</tr>
-		</table>
-		</if>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/tickets/tickets_tickets.tpl b/templates/Classic/admin/tickets/tickets_tickets.tpl
deleted file mode 100644
index 1750d351..00000000
--- a/templates/Classic/admin/tickets/tickets_tickets.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<tr  class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left">{$row['lastchange']}</td>
-	<td class="field_name">{$row['ticket_answers']}</td>
-	<td class="field_name">{$row['subject']}</td>
-	<td class="field_name">{$row['status']}</td>
-	<td class="field_name">{$row['lastreplier']}</td>
-	<td class="field_name">{$row['priority']}</td>
-	<td class="field_name">
-    <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'answer', 'id' => $row['id']))}">
-    <if $cananswer < 1 >{$lng['ticket']['show']}</if>
-    <if 0 < $cananswer >{$lng['ticket']['answer']}</if>
-    </a>
-  </td>
-	<td class="field_name">
-    <if $reopen < 1 >
-      <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'close', 'id' => $row['id']))}">{$lng['ticket']['close']}</a>
-    </if>
-    <if 0 < $reopen >
-      <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'reopen', 'id' => $row['id']))}">{$lng['ticket']['reopen']}</a>
-    </if>
-  </td>
-  <td class="field_name">
-    <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'archive', 'id' => $row['id']))}">{$lng['ticket']['archive']}</a>
-  </td>  
-  <td class="field_name">
-    <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a>
-  </td>
-</tr>
diff --git a/templates/Classic/admin/tickets/tickets_tickets_list.tpl b/templates/Classic/admin/tickets/tickets_tickets_list.tpl
deleted file mode 100644
index 3966dba9..00000000
--- a/templates/Classic/admin/tickets/tickets_tickets_list.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-  <tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-    <td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;&nbsp;{$lastchange}&nbsp;{$lng['ticket']['by']}&nbsp;{$by}</b></td>
-	</tr>
-  <tr>
-    <td class="main_field_display">{$subject}</td>
-  </tr>
-  <tr>
-	  <td class="main_field_name">{$message}</td>
-  </tr>
-</table>
diff --git a/templates/Classic/admin/tickets/tickets_tickets_main.tpl b/templates/Classic/admin/tickets/tickets_tickets_main.tpl
deleted file mode 100644
index d380b887..00000000
--- a/templates/Classic/admin/tickets/tickets_tickets_main.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-  <tr>
-    <td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;&nbsp;{$dt}&nbsp;{$lng['ticket']['by']}&nbsp;{$by}&nbsp;({$status})</b></td>
-	</tr>
-  <tr>
-    <td class="main_field_display">{$subject}</td>
-  </tr>
-  <tr>
-	  <td class="main_field_name">{$message}</td>
-  </tr>
-</table>
diff --git a/templates/Classic/admin/tickets/tickets_view.tpl b/templates/Classic/admin/tickets/tickets_view.tpl
deleted file mode 100644
index 599bc223..00000000
--- a/templates/Classic/admin/tickets/tickets_view.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-		<tr>
-  			<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['ticket']['ticket_delete']}</b></td>
-		</tr>
-		<tr>
-  			<td class="main_field_confirm"><a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'archive', 'action' => 'delete', 'id' => $id))}">{$lng['panel']['delete']}</a></td>
-		</tr>
-	</table>
-	<br />
-	<br />
-	<if 0 < $ticket_replies_count >
-	$ticket_replies
-	</if>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/traffic/index.tpl b/templates/Classic/admin/traffic/index.tpl
deleted file mode 100644
index f63e612c..00000000
--- a/templates/Classic/admin/traffic/index.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-$header
-	<script type="text/javascript" src="js/jquery.tablesorter.min.js"></script>
-        <script type="text/javascript">
-                $.tablesorter.addParser( {
-                        id: 'filesize',
-                        is: function(s) {
-                                return s.match( new RegExp( /[0-9]+(\.[0-9]+)?\ (KiB|B|GiB|MiB|TiB)/ ) );
-                        },
-                        format: function(s) {
-                                var suf = s.match( new RegExp( /(KiB|B|GiB|MiB|TiB)/) )[1];
-                                var num = parseFloat( s.match( new RegExp( /^[0-9]+(\.[0-9]+)?/ ) )[0] );
-                                switch( suf ) {
-                                        case 'B':
-                                                return num;
-                                        case 'KiB':
-                                                return num * 1024;
-                                        case 'MiB':
-                                                return num * 1024 * 1024;
-                                        case 'GiB':
-                                                return num * 1024 * 1024 * 1024;
-                                        case 'TiB':
-                                                return num * 1024 * 1024 * 1024 * 1024;
-                                }
-                        },
-                        type: 'numeric'
-                });
-        </script>
-	{$stats_tables}
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/traffic/index_table.tpl b/templates/Classic/admin/traffic/index_table.tpl
deleted file mode 100644
index c8a90d2e..00000000
--- a/templates/Classic/admin/traffic/index_table.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable" id="stats{$overview['year']}">
-		<thead>
-			<tr>
-				<td colspan="13" class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['traffic']['trafficoverview']}&nbsp;{$overview['type']}&nbsp;{$overview['year']}</b></td>
-			</tr>
-			<tr>
-				<th class="field_display_border_left" style="text-align:left;">{$overview['type']}</th>
-				<th class="field_display" style="text-align:right;">{$lng['traffic']['months']['jan']}</td>
-				<th class="field_display" style="text-align:right;">{$lng['traffic']['months']['feb']}</td>
-				<th class="field_display" style="text-align:right;">{$lng['traffic']['months']['mar']}</td>
-				<th class="field_display" style="text-align:right;">{$lng['traffic']['months']['apr']}</td>
-				<th class="field_display" style="text-align:right;">{$lng['traffic']['months']['may']}</td>
-				<th class="field_display" style="text-align:right;">{$lng['traffic']['months']['jun']}</td>
-				<th class="field_display" style="text-align:right;">{$lng['traffic']['months']['jul']}</td>
-				<th class="field_display" style="text-align:right;">{$lng['traffic']['months']['aug']}</td>
-				<th class="field_display" style="text-align:right;">{$lng['traffic']['months']['sep']}</td>
-				<th class="field_display" style="text-align:right;">{$lng['traffic']['months']['oct']}</td>
-				<th class="field_display" style="text-align:right;">{$lng['traffic']['months']['nov']}</td>
-				<th class="field_display" style="text-align:right;">{$lng['traffic']['months']['dec']}</td>
-			</tr>
-		</thead>
-		<tbody>
-			{$domain_list}
-		</tbody>
-		<tfoot>
-			{$total_list}
-			<tr>
-				<td colspan="13">&nbsp;</td>
-			</tr>
-		</tfoot>
-	</table>
-	<script type="text/javascript">
-		var myTextExtraction = function(node)  
-		{  
-		    // extract data from markup and return it  
-		    if(node.innerHTML != '-') {
-			return 1 + node.innerHTML.substr(0,node.innerHTML.length); 
-		    } else {
-			return '0 B';
-		    }
-		} 
-		$(document).ready(function() 
-		{ 
-                        $("#stats{$overview['year']}").tablesorter( {
-                                textExtraction: myTextExtraction,
-                                headers: {
-                                        1: {sorter: 'filesize'},
-                                        2: {sorter: 'filesize'},
-                                        3: {sorter: 'filesize'},
-                                        4: {sorter: 'filesize'},
-                                        5: {sorter: 'filesize'},
-                                        6: {sorter: 'filesize'},
-                                        7: {sorter: 'filesize'},
-                                        8: {sorter: 'filesize'},
-                                        9: {sorter: 'filesize'},
-                                        10: {sorter: 'filesize'},
-                                        11: {sorter: 'filesize'},
-                                        12: {sorter: 'filesize'}
-                                },
-                        });
-		}); 
-	</script>
-	<br />
-	<br />
-
diff --git a/templates/Classic/admin/traffic/index_table_row.tpl b/templates/Classic/admin/traffic/index_table_row.tpl
deleted file mode 100644
index abc3a491..00000000
--- a/templates/Classic/admin/traffic/index_table_row.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-		<tr>
-			<th class="field_name_border_left">{$virtual_host['name']}<if $customerview == 1>&nbsp;<a href="{$linker->getLink(array('section' => 'traffic', 'page' => $page, 'action' => 'su', 'id' => $virtual_host['customerid']))}">[{$lng['traffic']['details']}]</a></if></th>
-			<td class="field_name" style="text-align:right;background-color:white;">{$virtual_host['jan']}</td>
-			<td class="field_name" style="text-align:right;">{$virtual_host['feb']}</td>
-			<td class="field_name" style="text-align:right;background-color:white;">{$virtual_host['mar']}</td>
-			<td class="field_name" style="text-align:right;">{$virtual_host['apr']}</td>
-			<td class="field_name" style="text-align:right;background-color:white;">{$virtual_host['may']}</td>
-			<td class="field_name" style="text-align:right;">{$virtual_host['jun']}</td>
-			<td class="field_name" style="text-align:right;background-color:white;">{$virtual_host['jul']}</td>
-			<td class="field_name" style="text-align:right;">{$virtual_host['aug']}</td>
-			<td class="field_name" style="text-align:right;background-color:white;">{$virtual_host['sep']}</td>
-			<td class="field_name" style="text-align:right;">{$virtual_host['oct']}</td>
-			<td class="field_name" style="text-align:right;background-color:white;">{$virtual_host['nov']}</td>
-			<td class="field_name" style="text-align:right;">{$virtual_host['dec']}</td>
-		</tr>
diff --git a/templates/Classic/admin/update/index.tpl b/templates/Classic/admin/update/index.tpl
deleted file mode 100644
index 2380a4cb..00000000
--- a/templates/Classic/admin/update/index.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'updates'))}" method="post">
-		<input type="hidden" name="s" value="$s"/>
-		<input type="hidden" name="page" value="$page"/>
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['update']['update']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_center">{$update_information}</td>
-			</tr>
-			<tr>
-				<td class="field_name_center"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['update']['proceed']}" /></td>
-			</tr>
-			</if>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/update/noupdatesavail.tpl b/templates/Classic/admin/update/noupdatesavail.tpl
deleted file mode 100644
index cc95e160..00000000
--- a/templates/Classic/admin/update/noupdatesavail.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable_60">
-		<tr>
-			<td class="maintitle" colspan="2"><b>&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['update']['update']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_center_noborder"><img src="templates/{$theme}/assets/img/info.png" alt="" /></td>
-			<td class="field_name">$success_message<if $redirect_url != ''><br /><a href="{$redirect_url}">{$lng['success']['clickheretocontinue']}</if></td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/update/preconfigitem.tpl b/templates/Classic/admin/update/preconfigitem.tpl
deleted file mode 100644
index 5bf40f2c..00000000
--- a/templates/Classic/admin/update/preconfigitem.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="preconfigitem">
-	<p>
-		<span class="preconfdesc">{$description}</span>
-		{$question}
-	</p>
-</div>
diff --git a/templates/Classic/admin/update/update_end.tpl b/templates/Classic/admin/update/update_end.tpl
deleted file mode 100644
index 5cde0659..00000000
--- a/templates/Classic/admin/update/update_end.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td class="field_name_center"><a href="{$redirect_url}">{$lng['success']['clickheretocontinue']}</a></td>
-		</tr>		
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/admin/update/update_start.tpl b/templates/Classic/admin/update/update_start.tpl
deleted file mode 100644
index 62d97172..00000000
--- a/templates/Classic/admin/update/update_start.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['update']['update']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_center">
-				<div class="update_progess">
diff --git a/templates/Classic/assets/css/main.css b/templates/Classic/assets/css/main.css
deleted file mode 100644
index 7390cbd8..00000000
--- a/templates/Classic/assets/css/main.css
+++ /dev/null
@@ -1,492 +0,0 @@
-body {
-	color				: #000000;
-	font-family			: Verdana, Arial, Helvetica, sans-serif;
-	font-size			: 12px;
-}
-
-.header {
-	background-image	: url( '../img/header_r.gif' );
-	background-repeat	: repeat-x;
-}
-
-.footer {
-	text-align			: center;
-	border-color		: #EBECF5;
-	border-style		: solid;
-	border-width		: 1px;
-	border-right		: none;
-	border-left			: none;
-	background			: url('../img/footer.gif') repeat-y #FFFFFF;
-}
-
-a,a:visited,a:active {
-	color				: #000000;
-	text-decoration		: underline;
-}
-
-a:hover {
-	color				: #F89826;
-	text-decoration		: none;
-}
-
-input {
-	color				: black;
-	text-decoration		: none;
-	font-family			: Verdana, Arial, Helvetica, sans-serif;
-	font-size			: 12px;
-	font-weight			: bold;
-	border				: 1px solid #ABC9E8;
-	background-color	: #C6DEFF;
-}
-
-input.text {
-	color				: black;
-	text-decoration		: none;
-	font-family			: Verdana, Arial, Helvetica, sans-serif;
-	font-size			: 12px;
-	font-weight			: bold;
-	border				: 1px solid #ABC9E8;
-	background-color	: #C6DEFF;
-	width				: 95%;
-}
-
-input.textul {
-	color				: black;
-	text-decoration		: none;
-	font-family			: Verdana, Arial, Helvetica, sans-serif;
-	font-size			: 12px;
-	font-weight			: bold;
-	border				: 1px solid #ABC9E8;
-	background-color	: #C6DEFF;
-	width				: 55%;
-}
-
-select,textarea {
-	color				: black;
-	text-decoration		: none;
-	font-family			: Verdana, Arial, Helvetica, sans-serif;
-	font-size			: 12px;
-	font-weight			: bold;
-	border				: 1px solid #B7B7B7;
-	background-color	: #C6DEFF;
-}
-
-input.bottom {
-	color				: black;
-	text-decoration		: none;
-	font-family			: Verdana, Arial, Helvetica, sans-serif;
-	font-size			: 12px;
-	font-weight			: bold;
-	border				: 1px solid #000000;
-	background-color	: #C6DEFF;
-}
-
-ul {
-	list-style			: none;
-	padding				: 0;
-	margin				: 0;
-}
-
-.title {
-	background-color	: #ABC9E8;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	border-top			: none;
-	text-align			: left;
-}
-
-.line_shadow {
-	background-image	: url( '../img/shadow.gif' );
-	background-repeat	: repeat-y;
-	background-position	: top left;
-}
-
-.section {
-	height				: 25px;
-	background-image	: url( '../img/section.gif' );
-}
-
-.subsection {
-	padding-top			: 8px;
-	background-image	: url( '../img/subsection.gif' );
-}
-
-.endsection {
-	height				: 10px;
-	background-image	: url( '../img/endsection.gif' );
-	background-position : bottom;
-}
-
-.maintable {
-	width				: 90%;
-}
-
-.maintable_60 {
-	width				: 60%;
-}
-
-.maintable_40 {
-	width				: 40%;
-}
-
-.maintitle {
-	width				: 90%;
-	background-color	: #ABC9E8;
-	border-color		: #000000;
-	border-style		: solid;
-	border-width		: 1px;
-	text-align			: left;
-	font-size			: 1.3em;
-}
-
-.main_field_name {
-	width				: 50%;
-	background-color	: #EBECF5;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	text-align			: left;
-}
-
-.main_field_confirm {
-	width				: 84%;
-	background-color	: #EBECF5;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	text-align			: right;
-}
-
-.field_name {
-	background-color	: #EBECF5;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	text-align			: left;
-	border-top			: none;
-	border-left			: none;
-}
-
-.field_name_foggy { /*nomecampo*/
-	color				: #555;
-	text-decoration		: line-through;
-	background-color	: #EBECF5;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	text-align			: left;
-	border-top			: none;
-	border-left			: none;
-}
-
-.field_name_red { /*nomecampo*/
-	background-color	: #FFA0A0;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	text-align			: left;
-	border-top			: none;
-	border-left			: none;
-}
-
-.field_name_nobordersmall {
-	background-color	: #EBECF5;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	text-align			: left;
-	border-top			: none;
-	border-bottom		: none;
-}
-
-.field_name_center {
-	background-color	: #EBECF5;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	text-align			: center;
-	border-top			: none;
-}
-
-.field_name_center_noborder {
-	height				: 30px;
-	background-color	: #EBECF5;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	text-align			: center;
-	border-top			: none;
-	border-right		: none;
-}
-
-.field_name_border_left {
-	background-color	: #EBECF5;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	text-align			: left;
-	border-top			: none;
-}
-
-.field_name_border_left_foggy { /*nomecampo_bordosx*/
-	color				: #555;
-	text-decoration		: line-through;
-	background-color	: #EBECF5;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	text-align			: left;
-	border-top			: none;
-}
-
-.field_name_border_left_red { /*nomecampo_bordosx*/
-	background-color	: #FFA0A0;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	text-align			: left;
-	border-top			: none;
-}
-
-.field_name_search {
-	background-color	: #EBECF5;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	border-top			: none;
-	border-left			: none;
-	text-align			: right;
-}
-
-.main_field_display_red { /*install_campodisplay*/
-	width				: 6%;
-	background-color	: #FFA0A0;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-}
-
-.main_field_display {
-	width				: 50%;
-	background-color	: #C6DEFF;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-}
-
-.main_field_display_small {
-	width				: 25%;
-	background-color	: #C6DEFF;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-}
-
-.field_display {
-	background-color	: #C6DEFF;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	border-top			: none;
-	border-left			: none;
-}
-
-.field_display_search {
-	background-color	: #C6DEFF;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	border-top			: none;
-	border-left			: none;
-	text-align			: right;
-}
-
-.field_display_border_left {
-	background-color	: #C6DEFF;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	border-top			: none;
-}
-
-.field_display_nobordersmall {
-	background-color	: #C6DEFF;
-	border-color		: #B7B7B7;
-	border-style		: solid;
-	border-width		: 1px;
-	border-top			: none;
-	border-left			: none;
-	border-bottom		: none;
-}
-
-select.dropdown_noborder {
-	color				: black;
-	text-decoration		: none;
-	font-family			: Verdana, Arial, Helvetica, sans-serif;
-	font-size			: 12px;
-	font-weight			: bold;
-	border				: 0px solid #B7B7B7;
-	background-color	: #C6DEFF;
-}
-
-textarea.textarea_noborder {
-	color				: black;
-	text-decoration		: none;
-	font-family			: Verdana, Arial, Helvetica, sans-serif;
-	font-size			: 12px;
-	font-weight			: bold;
-	border				: 0px solid #B7B7B7;
-	background-color	: #C6DEFF;
-}
-
-textarea.textarea_border {
-	width				: 95%;
-	color				: black;
-	text-decoration		: none;
-	font-family			: Verdana, Arial, Helvetica, sans-serif;
-	font-size			: 12px;
-	font-weight			: bold;
-	border				: 1px solid #B7B7B7;
-	background-color	: #C6DEFF;
-}
-
-.maintitle_search_left {
-	background-color	: #ABC9E8;
-	border-color		: #000000;
-	border-style		: solid;
-	border-width		: 1px;
-	border-right-width	: 0px;
-	text-align			: left;
-	font-size			: 1.3em;
-}
-
-.maintitle_search_right {
-	background-color	: #ABC9E8;
-	border-color		: #000000;
-	border-style		: solid;
-	border-width		: 1px;
-	border-left-width	: 0px;
-	text-align			: right;
-}
-
-
-.maintitle_apply_left {
-    background-color    : #ABC9E8;
-    border-color        : #000000;
-    border-style        : solid;
-    border-width        : 1px;
-    text-align          : left;
-}
-
-.maintitle_apply_right {
-    background-color    : #ABC9E8;
-    border-color        : #000000;
-    border-style        : solid;
-    border-width        : 1px;
-    text-align          : right;
-}
-
-.ticket_high {
-    color		   : #ff0000;
-    font-weight         : bold;
-}
-
-.ticket_normal {
-    color		   : #ff9a38;
-    font-weight         : bold;
-}
-
-.ticket_low {
-    color		   : #5bc949;
-    font-weight         : bold;
-}
-
-TR {
-        background-color        : #EBECF5;
-}
-
-TR.RowOverSelected {
-	background-color : #FFFFFF;
-}
-
-/* ADDED WITH APS INSTALLER */
-
-.dataerror
-{
-	font-weight: bold;
-	color: #DD2222;
-	margin: 15px;
-	padding: 20px 20px 20px 60px;
-	background-color: #f1baba;
-	border: 1px solid #ce1d1d;
-	background-image: url('../img/error.png');
-	background-repeat: no-repeat;
-	background-position: 15px 50%;
-}
-
-.fielderror
-{
-	font-weight: bold;
-	color: #DD2222;
-	background-color: #f1baba;
-	border: 1px solid #DD2222;
-	padding: 8px;
-	margin: 8px 0 8px 0;
-}
-
-.pageitem
-{
-	padding: 6px;
-	border: 1px solid #666666;
-	margin-right: 3px;
-	background-color: #C6DEFF;
-}
-
-.update_progess
-{
-        padding: 2em;
-        text-align: left;
-}
-
-.preconfig
-{
-        text-align: left;
-        margin-top: 20px;
-        margin-bottom: 5px;
-        margin-right: 15px;
-        margin-left: 15px;
-}
-
-.preconfigitem
-{
-        padding: 0.15em;
-        border-bottom: 1px solid #cccccc;
-}
-
-.preconfdesc
-{
-        display: block;
-        margin-bottom: 0.5em;
-		font-size: 120%;
-}
-
-.strikethrough {
-	text-decoration: line-through;
-}
-
-
-table.maintable th.field_display .header {
-	background-color: #000000;
-}
-
-.headerSortUp {
-	background-image: url(../img/asc.gif);
-	background-position: right bottom;
-	background-repeat: no-repeat;
-}
-.headerSortDown {
-	background-image: url(../img/desc.gif);
-	background-position: right top;
-	background-repeat: no-repeat;
-}
diff --git a/templates/Classic/assets/img/ball.gif b/templates/Classic/assets/img/ball.gif
deleted file mode 100644
index 2a681e4f..00000000
Binary files a/templates/Classic/assets/img/ball.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/changelanguage.gif b/templates/Classic/assets/img/changelanguage.gif
deleted file mode 100644
index dc6071b5..00000000
Binary files a/templates/Classic/assets/img/changelanguage.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/changetheme.png b/templates/Classic/assets/img/changetheme.png
deleted file mode 100644
index 806d4edc..00000000
Binary files a/templates/Classic/assets/img/changetheme.png and /dev/null differ
diff --git a/templates/Classic/assets/img/default.png b/templates/Classic/assets/img/default.png
deleted file mode 100644
index a6848e09..00000000
Binary files a/templates/Classic/assets/img/default.png and /dev/null differ
diff --git a/templates/Classic/assets/img/endsection.gif b/templates/Classic/assets/img/endsection.gif
deleted file mode 100644
index 5e26ce7c..00000000
Binary files a/templates/Classic/assets/img/endsection.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/error.gif b/templates/Classic/assets/img/error.gif
deleted file mode 100644
index 694a789d..00000000
Binary files a/templates/Classic/assets/img/error.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/error.png b/templates/Classic/assets/img/error.png
deleted file mode 100644
index 164cd032..00000000
Binary files a/templates/Classic/assets/img/error.png and /dev/null differ
diff --git a/templates/Classic/assets/img/favicon.ico b/templates/Classic/assets/img/favicon.ico
deleted file mode 100644
index 84b71747..00000000
Binary files a/templates/Classic/assets/img/favicon.ico and /dev/null differ
diff --git a/templates/Classic/assets/img/footer.gif b/templates/Classic/assets/img/footer.gif
deleted file mode 100644
index ab1a51a2..00000000
Binary files a/templates/Classic/assets/img/footer.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/header_r.gif b/templates/Classic/assets/img/header_r.gif
deleted file mode 100644
index 4a8e0213..00000000
Binary files a/templates/Classic/assets/img/header_r.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/info.png b/templates/Classic/assets/img/info.png
deleted file mode 100644
index 83323f52..00000000
Binary files a/templates/Classic/assets/img/info.png and /dev/null differ
diff --git a/templates/Classic/assets/img/login.gif b/templates/Classic/assets/img/login.gif
deleted file mode 100644
index ef576850..00000000
Binary files a/templates/Classic/assets/img/login.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/logininternal.gif b/templates/Classic/assets/img/logininternal.gif
deleted file mode 100644
index 7a64fb05..00000000
Binary files a/templates/Classic/assets/img/logininternal.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/logo.png b/templates/Classic/assets/img/logo.png
deleted file mode 100644
index 9d426a2b..00000000
Binary files a/templates/Classic/assets/img/logo.png and /dev/null differ
diff --git a/templates/Classic/assets/img/order_asc.gif b/templates/Classic/assets/img/order_asc.gif
deleted file mode 100644
index 470e9789..00000000
Binary files a/templates/Classic/assets/img/order_asc.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/order_desc.gif b/templates/Classic/assets/img/order_desc.gif
deleted file mode 100644
index a2d17da8..00000000
Binary files a/templates/Classic/assets/img/order_desc.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/section.gif b/templates/Classic/assets/img/section.gif
deleted file mode 100644
index bd67eade..00000000
Binary files a/templates/Classic/assets/img/section.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/shadow.gif b/templates/Classic/assets/img/shadow.gif
deleted file mode 100644
index bc64dc12..00000000
Binary files a/templates/Classic/assets/img/shadow.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/subsection.gif b/templates/Classic/assets/img/subsection.gif
deleted file mode 100644
index d2b5bf8e..00000000
Binary files a/templates/Classic/assets/img/subsection.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/title.gif b/templates/Classic/assets/img/title.gif
deleted file mode 100644
index c686057a..00000000
Binary files a/templates/Classic/assets/img/title.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/traffic_blue.gif b/templates/Classic/assets/img/traffic_blue.gif
deleted file mode 100644
index 8f817faa..00000000
Binary files a/templates/Classic/assets/img/traffic_blue.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/traffic_green.gif b/templates/Classic/assets/img/traffic_green.gif
deleted file mode 100644
index 93e9ebfa..00000000
Binary files a/templates/Classic/assets/img/traffic_green.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/traffic_red.gif b/templates/Classic/assets/img/traffic_red.gif
deleted file mode 100644
index 7a5b5c48..00000000
Binary files a/templates/Classic/assets/img/traffic_red.gif and /dev/null differ
diff --git a/templates/Classic/assets/img/traffic_yellow.gif b/templates/Classic/assets/img/traffic_yellow.gif
deleted file mode 100644
index 2f2b3111..00000000
Binary files a/templates/Classic/assets/img/traffic_yellow.gif and /dev/null differ
diff --git a/templates/Classic/assets/js/main.js b/templates/Classic/assets/js/main.js
deleted file mode 100644
index 24bdf9ef..00000000
--- a/templates/Classic/assets/js/main.js
+++ /dev/null
@@ -1,25 +0,0 @@
-$(document).ready(function() {
-	// make rel="external" links open in a new window
-	$("a[rel='external']").attr('target', '_blank');
-
-	// set focus on username-field if on loginpage
-	if ($(".loginpage").length != 0) {
-		$("#loginname").focus();
-	}
-
-	// Auto-select next field in configfile - wizard
-	$('#config_distribution').change(function (){
-		window.location.href=window.location.href + '&distribution=' + this.options[ this.selectedIndex ].value;
-	});
-	$('#config_service').change(function (){
-		window.location.href=window.location.href + '&service=' + this.options[ this.selectedIndex ].value;
-	});
-	$('#config_daemon').change(function (){
-		window.location.href=window.location.href + '&daemon=' + this.options[ this.selectedIndex ].value;
-	});
-
-	// Back-button
-	$('#yesnobutton').click(function() {
-		history.back();
-	});
-});
\ No newline at end of file
diff --git a/templates/Classic/customer/aps/askyesno.tpl b/templates/Classic/customer/aps/askyesno.tpl
deleted file mode 100644
index e0778dc5..00000000
--- a/templates/Classic/customer/aps/askyesno.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable" style="border: solid 1px #B7B7B7;">
-	<tr>
-		<td width="30" valign="top" style="padding: 15px; background-color: #EBECF5;"><img src="templates/{$theme}/assets/img/info.png" alt="" /></td>
-		<td>
-		$Message
-		<form name="continue" action="$filename" method="post">
-			<input type="submit" name="answer" value="{$lng['panel']['yes']}" />
-			<input type="hidden" name="save" value="1"/>
-			<input type="hidden" name="s" value="$s"/>
-			<input type="hidden" name="action" value="$action"/>
-			$Ids
-		</form>
-		<br/>
-		<form name="back" action="$filename" method="post">
-			<input type="submit" name="submit" value="{$lng['panel']['no']}" />
-			<input type="hidden" name="action" value="<if isset($action_alt)>$action_alt<else>$action</if>"/>
-			<input type="hidden" name="s" value="$s"/>
-		</form>
-		<br/>
-		</td>
-	</tr>
-</table>
-<br/>
diff --git a/templates/Classic/customer/aps/data.tpl b/templates/Classic/customer/aps/data.tpl
deleted file mode 100644
index 06e76872..00000000
--- a/templates/Classic/customer/aps/data.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<if $Groupname != ''>
-<tr>
-	<td class="title" colspan="3"><strong>$Groupname</strong></td>
-</tr>
-</if>
-<tr>
-	<td class="field_name_border_left" valign="top" width="25%">$Fieldname</td>
-	<td class="field_display" colspan="3">$Fieldvalue</td>
-</tr>
diff --git a/templates/Classic/customer/aps/footer.tpl b/templates/Classic/customer/aps/footer.tpl
deleted file mode 100644
index 35ee6c15..00000000
--- a/templates/Classic/customer/aps/footer.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$footer
diff --git a/templates/Classic/customer/aps/header.tpl b/templates/Classic/customer/aps/header.tpl
deleted file mode 100644
index 6af88b30..00000000
--- a/templates/Classic/customer/aps/header.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$header
diff --git a/templates/Classic/customer/aps/infobox.tpl b/templates/Classic/customer/aps/infobox.tpl
deleted file mode 100644
index e8db19bf..00000000
--- a/templates/Classic/customer/aps/infobox.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable" style="border: solid 1px #B7B7B7;">
-	<tr>
-		<td width="30" valign="top" style="padding: 15px; background-color: #EBECF5;"><img src="templates/{$theme}/assets/img/info.png" alt="" /></td>
-		<td>$Message</td>
-	</tr>
-</table>
-<br/>
diff --git a/templates/Classic/customer/aps/installer.tpl b/templates/Classic/customer/aps/installer.tpl
deleted file mode 100644
index 102cf948..00000000
--- a/templates/Classic/customer/aps/installer.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<form method="post" action="$filename">
-	<input type="hidden" name="s" value="$s" />
-	<input type="hidden" name="page" value="$page" />
-	<input type="hidden" name="action" value="install" />
-	<input type="hidden" name="withinput" value="withinput" />
-	<input type="hidden" name="id" value="{$Row['ID']}" />
-
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle" colspan="3"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$Xml->name}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left" colspan="2" valign="top" width="99%"><strong>{$lng['aps']['install_wizard']}</strong>
-			<if $ErrorMessage != 0>
-				<div class="dataerror">{$lng['aps']['wizard_error']}</div>
-			</if>
-			</td>
-			<td class="field_name" style="text-align: center; padding: 10px; background-color:#FFFFFF;" valign="middle"><img src="{$Icon}" alt="{$Xml->name} Icon"/></td>
-		</tr>
-		$Data
-		<tr>
-			<td class="field_name_border_left" colspan="3">
-				<input class="bottom" type="submit" value="{$lng['aps']['install']}" />
-			</td>
-		</tr>
-	</table>
-</form>
diff --git a/templates/Classic/customer/aps/package.tpl b/templates/Classic/customer/aps/package.tpl
deleted file mode 100644
index b4affbdb..00000000
--- a/templates/Classic/customer/aps/package.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-	<tr>
-		<td class="maintitle" colspan="3"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$Xml->name}</b></td>
-	</tr>
-	<tr>
-		<td class="field_name_border_left" colspan="2" valign="top" width="99%"><strong>$Summary</strong></td>
-		<td class="field_name" style="text-align: center; padding: 10px; background-color:#FFFFFF;" valign="middle"><img src="{$Icon}" alt="{$Xml->name} Icon"/></td>
-	</tr>
-	<tr>
-		<td class="title" colspan="3"><strong>{$lng['aps']['data']}</strong></td>
-	</tr>
-	$Data
-	<tr>
-		<td class="field_name_border_left" colspan="3">
-		<if $action == 'overview' || $action == 'search'>
-			<form method="get" action="$filename" style="float:left;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="action" value="details" />
-				<input type="hidden" name="id" value="{$Row['ID']}" />
-				<input class="bottom" type="submit" value="{$lng['aps']['detail']}" />
-			</form>
-		</if>
-		<if $action != 'overview' && $action !='search' && $action != 'customerstatus'>
-			<form method="get" action="$filename" style="float:left;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="action" value="overview" />
-				<input class="bottom" type="submit" value="{$lng['aps']['back']}" />
-			</form>
-		</if>
-		<if $action != 'customerstatus' && ( $userinfo['aps_packages'] != $userinfo['aps_packages_used'] ) && $db_info == ''>
-			<form method="get" action="$filename" style="float:left; padding-left: 5px;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="action" value="install" />
-				<input type="hidden" name="id" value="{$Row['ID']}" />
-				<input class="bottom" type="submit" value="{$lng['aps']['install']}" />
-			</form>
-		</if>
-		<if $db_info != ''>
-			<span style="padding-left: 5px;">{$db_info}</span>
-		</if>
-		<if ($action == 'customerstatus') && ($Row['Status'] == 2 || $Row['Status'] == 3)>
-			<form method="get" action="$filename" style="float:left;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="action" value="remove" />
-				<input type="hidden" name="id" value="{$Row['ID']}" />
-				<input class="bottom" type="submit" value="{$lng['aps']['uninstall']}" />
-			</form>
-		</if>
-		</td>
-	</tr>
-</table>
-<br/>
diff --git a/templates/Classic/customer/aps/package_status.tpl b/templates/Classic/customer/aps/package_status.tpl
deleted file mode 100644
index 1513187e..00000000
--- a/templates/Classic/customer/aps/package_status.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-	<tr>
-		<td class="maintitle" colspan="3"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$Xml->name}</b></td>
-	</tr>
-	<tr>
-		<td class="field_name_border_left" colspan="2" valign="top" width="99%"><strong>$Summary</strong></td>
-		<td class="field_name" style="text-align: center; padding: 10px; background-color:#FFFFFF;" valign="middle"><img src="{$Icon}" alt="{$Xml->name} Icon"/></td>
-	</tr>
-	<tr>
-		<td class="title" colspan="3"><strong>{$lng['aps']['data']}</strong></td>
-	</tr>
-	$Data
-	<tr>
-		<td class="field_name_border_left" colspan="3">
-			<if $Row['Status'] == INSTANCE_INSTALL>
-				<form method="get" action="$filename" >
-					<input type="hidden" name="s" value="$s" />
-					<input type="hidden" name="page" value="$page" />
-					<input type="hidden" name="action" value="stopinstall" />
-					<input type="hidden" name="id" value="{$Row['ID']}" />
-					<input class="bottom" type="submit" value="{$lng['aps']['stopinstall']}" />
-				</form>
-			</if>
-			<if $Row['Status'] == INSTANCE_SUCCESS || $Row['Status'] == INSTANCE_ERROR>
-				<form method="get" action="$filename" style="float:left;">
-					<input type="hidden" name="s" value="$s" />
-					<input type="hidden" name="page" value="$page" />
-					<input type="hidden" name="action" value="remove" />
-					<input type="hidden" name="id" value="{$Row['ID']}" />
-					<input class="bottom" type="submit" value="{$lng['aps']['uninstall']}" />
-				</form>
-			</if>
-			<if $Row['Status'] == INSTANCE_SUCCESS && false == true>
-				<form method="get" action="$filename" style="float:left; padding-left: 5px;">
-					<input type="hidden" name="s" value="$s" />
-					<input type="hidden" name="page" value="$page" />
-					<input type="hidden" name="action" value="reconfigure" />
-					<input type="hidden" name="id" value="{$Row['ID']}" />
-					<input class="bottom" type="submit" value="{$lng['aps']['reconfigure']}" />
-				</form>
-			</if>
-			<if $Row['Status'] == INSTANCE_TASK_ACTIVE || $Row['Status'] == INSTANCE_UNINSTALL>
-				{$lng['aps']['waitfortask']}
-			</if>
-		</td>
-	</tr>
-</table>
-<br/>
diff --git a/templates/Classic/customer/aps/search.tpl b/templates/Classic/customer/aps/search.tpl
deleted file mode 100644
index d81c0d1a..00000000
--- a/templates/Classic/customer/aps/search.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<form method="get" action="$filename">
-	<input type="hidden" name="s" value="$s" />
-	<input type="hidden" name="page" value="$page" />
-	<input type="hidden" name="action" value="$action" />
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['aps']['search']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left" nowrap="nowrap" valign="top">{$lng['aps']['search_description']}</td>
-			<td class="field_display" nowrap="nowrap"><input type="text" size="60" name="keyword" class="text" value="$Keyword"/></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left" style="text-align: right;" colspan="2"><input class="bottom" type="submit" value="{$lng['aps']['search']}" /></td>
-		</tr>
-	</table>
-	<br/>
-</form>
diff --git a/templates/Classic/customer/autoresponder/autoresponder.tpl b/templates/Classic/customer/autoresponder/autoresponder.tpl
deleted file mode 100644
index 4c7ea1e8..00000000
--- a/templates/Classic/customer/autoresponder/autoresponder.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td  class="maintitle" colspan="5"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['email']['autoresponder']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_display_border_left">{$lng['emails']['emailaddress']}</td>
-			<td class="field_display">{$lng['autoresponder']['active']}</td>
-			<td class="field_display">{$lng['autoresponder']['startenddate']}</td>
-			<td class="field_display">&nbsp;</td>
-			<td class="field_display">&nbsp;</td>
-		</tr>
-		$autoresponder
-		<if ($userinfo['email_autoresponder_used'] < $userinfo['email_autoresponder'] || $userinfo['email_autoresponder'] == '-1') >
-		<tr>
-			<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'autoresponder', 'action' => 'add'))}">{$lng['autoresponder']['autoresponder_add']}</a></td>
-		</tr>
-		</if>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/autoresponder/autoresponder_add.tpl b/templates/Classic/customer/autoresponder/autoresponder_add.tpl
deleted file mode 100644
index 1571fe30..00000000
--- a/templates/Classic/customer/autoresponder/autoresponder_add.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'autoresponder'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$autoresponder_add_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/autoresponder/autoresponder_autoresponder.tpl b/templates/Classic/customer/autoresponder/autoresponder_autoresponder.tpl
deleted file mode 100644
index c2378aff..00000000
--- a/templates/Classic/customer/autoresponder/autoresponder_autoresponder.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<tr>
-	<td class="field_name_border_left">{$row['email']}</td>
-	<td class="field_name"><if $row['enabled'] != 0>{$lng['panel']['yes']}</if><if $row['enabled'] == 0>{$lng['panel']['no']}</if></td>
-	<td class="field_name">$activated_date</td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'autoresponder', 'action' => 'edit', 'email' => $row['email']))}">{$lng['panel']['edit']}</a></td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'autoresponder', 'action' => 'delete', 'email' => $row['email']))}">{$lng['panel']['delete']}</a></td>
-</tr>
diff --git a/templates/Classic/customer/autoresponder/autoresponder_edit.tpl b/templates/Classic/customer/autoresponder/autoresponder_edit.tpl
deleted file mode 100644
index f9c37d9e..00000000
--- a/templates/Classic/customer/autoresponder/autoresponder_edit.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'autoresponder'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="account" value="$email" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$autoresponder_edit_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/domains/domainlist.tpl b/templates/Classic/customer/domains/domainlist.tpl
deleted file mode 100644
index d788a8a6..00000000
--- a/templates/Classic/customer/domains/domainlist.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'domains'))}" method="post">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['domains']['domainsettings']}</b>&nbsp;({$domains_count})</td>
-				<td class="maintitle_search_right" colspan="3">{$searchcode}</td>
-			</tr>
-			<if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && 15 < $domains_count && $parentdomains_count != 0 >
-			<tr>
-				<td class="field_display_border_left" colspan="4"><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'add'))}">{$lng['domains']['subdomain_add']}</a></td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left">{$lng['domains']['domainname']}&nbsp;&nbsp;{$arrowcode['d.domain']}</td>
-				<td class="field_display">{$lng['panel']['path']}&nbsp;&nbsp;{$arrowcode['d.documentroot']}</td>
-				<td class="field_display_search" colspan="2">{$sortcode}</td>
-			</tr>
-			$domains
-			<if $pagingcode != ''>
-			<tr>
-				<td class="field_display_border_left" colspan="4" style=" text-align: center; ">{$pagingcode}</td>
-			</tr>
-			</if>
-			<if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && $parentdomains_count != 0 >
-			<tr>
-				<td class="field_display_border_left" colspan="4"><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'add'))}">{$lng['domains']['subdomain_add']}</a></td>
-			</tr>
-			</if>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/domains/domains.tpl b/templates/Classic/customer/domains/domains.tpl
deleted file mode 100644
index b94fef13..00000000
--- a/templates/Classic/customer/domains/domains.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['domains']['domains']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['domains']['description']}</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/domains/domains_add.tpl b/templates/Classic/customer/domains/domains_add.tpl
deleted file mode 100644
index 32f9b13d..00000000
--- a/templates/Classic/customer/domains/domains_add.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'domains'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="$title" />&nbsp;{$title}</b></td>
-			</tr>
-			{$subdomain_add_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/domains/domains_delimiter.tpl b/templates/Classic/customer/domains/domains_delimiter.tpl
deleted file mode 100644
index 80eac269..00000000
--- a/templates/Classic/customer/domains/domains_delimiter.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td class="title" colspan="4">&nbsp;&nbsp;&nbsp;&nbsp;<b>{$row['domain']}</b> [<a href="http://{$row['domain']}/{$statsapp}" target="_blank">{$lng['domains']['statstics']}</a>]</td>
-</tr>
\ No newline at end of file
diff --git a/templates/Classic/customer/domains/domains_domain.tpl b/templates/Classic/customer/domains/domains_domain.tpl
deleted file mode 100644
index d8d54ba3..00000000
--- a/templates/Classic/customer/domains/domains_domain.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left"><a href="http://{$row['domain']}" target="_blank">{$row['domain']}</a></td>
-	<td class="field_name"><if $row['aliasdomain'] == ''>{$row['documentroot']}</if><if isset($row['aliasdomainid']) && $row['aliasdomainid'] != 0>{$lng['domains']['aliasdomain']} {$row['aliasdomain']}</if></td>
-	<td class="field_name"><if $row['caneditdomain'] == '1'><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></if></td>
-	<td class="field_name"><if $row['parentdomainid'] != '0' && !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></if><if $row['parentdomainid'] == '0' && !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)>{$lng['domains']['isassigneddomain']}</if><if isset($row['domainaliasid']) && $row['domainaliasid'] != 0><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'searchfield' => 'd.aliasdomain', 'searchtext' => $row['id']))}">{$lng['domains']['hasaliasdomains']}</a></if></td>
-</tr>
diff --git a/templates/Classic/customer/domains/domains_edit.tpl b/templates/Classic/customer/domains/domains_edit.tpl
deleted file mode 100644
index d7506a1b..00000000
--- a/templates/Classic/customer/domains/domains_edit.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'domains'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="$title" />&nbsp;{$title}</b></td>
-			</tr>
-			{$subdomain_edit_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
-
diff --git a/templates/Classic/customer/email/account_add.tpl b/templates/Classic/customer/email/account_add.tpl
deleted file mode 100644
index ade18920..00000000
--- a/templates/Classic/customer/email/account_add.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'email'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="$title" />&nbsp;{$title}</b></td>
-			</tr>
-			{$account_add_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/email/account_changepw.tpl b/templates/Classic/customer/email/account_changepw.tpl
deleted file mode 100644
index 6ee6ddf0..00000000
--- a/templates/Classic/customer/email/account_changepw.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'email'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$account_changepw_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/email/account_changequota.tpl b/templates/Classic/customer/email/account_changequota.tpl
deleted file mode 100644
index bc143ab4..00000000
--- a/templates/Classic/customer/email/account_changequota.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'email'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$quota_edit}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/email/email.tpl b/templates/Classic/customer/email/email.tpl
deleted file mode 100644
index 48c4cdc9..00000000
--- a/templates/Classic/customer/email/email.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['email']['email']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['emails']['description']}</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/email/emails.tpl b/templates/Classic/customer/email/emails.tpl
deleted file mode 100644
index fd838e52..00000000
--- a/templates/Classic/customer/email/emails.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'email'))}" method="post">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td  class="maintitle_search_left"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['email']['emails']}</b>&nbsp;({$emailscount})</td>
-				<td class="maintitle_search_right" colspan="6">{$searchcode}</td>
-			</tr>
-			<if ($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['emails'] == '-1') && 15 < $emails_count && $emaildomains_count !=0 >
-			<tr>
-				<td class="field_display_border_left" colspan="7"><a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'add'))}">{$lng['emails']['emails_add']}</a></td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left">{$lng['emails']['emailaddress']}&nbsp;&nbsp;{$arrowcode['m.email_full']}</td>
-				<td class="field_display">{$lng['emails']['forwarders']}&nbsp;&nbsp;{$arrowcode['m.destination']}</td>
-				<td class="field_display">{$lng['emails']['account']}</td>
-				<td class="field_display">{$lng['emails']['catchall']}</td>
-				<if $settings['system']['mail_quota_enabled'] == '1'><td class="field_display">{$lng['emails']['quota']}</td></if>
-				<td class="field_display_search" colspan="2">{$sortcode}</td>
-			</tr>
-			$accounts
-			<if $pagingcode != ''>
-			<tr>
-				<td class="field_display_border_left" colspan="7" style=" text-align: center; ">{$pagingcode}</td>
-			</tr>
-			</if>
-			<if ($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['emails'] == '-1') && $emaildomains_count !=0 >
-			<tr>
-				<td class="field_display_border_left" colspan="7"><a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'add'))}">{$lng['emails']['emails_add']}</a></td>
-			</tr>
-			</if>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/email/emails_add.tpl b/templates/Classic/customer/email/emails_add.tpl
deleted file mode 100644
index 2b5389d0..00000000
--- a/templates/Classic/customer/email/emails_add.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'email'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="$title" />&nbsp;{$title}</b></td>
-			</tr>
-			{$email_add_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/email/emails_domain.tpl b/templates/Classic/customer/email/emails_domain.tpl
deleted file mode 100644
index 3c34f6a4..00000000
--- a/templates/Classic/customer/email/emails_domain.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td class="title" colspan="7">&nbsp;&nbsp;&nbsp;&nbsp;<b>{$domainname}</b></td>
-</tr>
\ No newline at end of file
diff --git a/templates/Classic/customer/email/emails_edit.tpl b/templates/Classic/customer/email/emails_edit.tpl
deleted file mode 100644
index f01eb18f..00000000
--- a/templates/Classic/customer/email/emails_edit.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'email'))}">
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="$title" />&nbsp;{$title}</b></td>
-			</tr>
-			{$email_edit_form}
-			<tr>
-				<td class="maintitle" colspan="2"><a href="{$linker->getLink(array('section' => 'email', 'page' => 'emails'))}">{$lng['emails']['back_to_overview']}</a></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/email/emails_edit_forwarder.tpl b/templates/Classic/customer/email/emails_edit_forwarder.tpl
deleted file mode 100644
index 88467962..00000000
--- a/templates/Classic/customer/email/emails_edit_forwarder.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-$destination [<a href="{$linker->getLink(array('section' => 'email', 'page' => 'forwarders', 'action' => 'delete', 'id' => $id, 'forwarderid' => $dest_id))}">{$lng['panel']['delete']}</a>]
-<br />
\ No newline at end of file
diff --git a/templates/Classic/customer/email/emails_email.tpl b/templates/Classic/customer/email/emails_email.tpl
deleted file mode 100644
index 78c10c1d..00000000
--- a/templates/Classic/customer/email/emails_email.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left">{$row['email_full']}</td>
-	<td class="field_name"><if $row['destination'] == ''>&nbsp;<else>{$row['destination']}</if></td>
-	<td class="field_name"><if $row['popaccountid'] != 0>{$lng['panel']['yes']}</if><if $row['popaccountid'] == 0>{$lng['panel']['no']}</if></td>
-	<td class="field_name"><if $row['iscatchall'] != 0>{$lng['panel']['yes']}</if><if $row['iscatchall'] == 0>{$lng['panel']['no']}</if></td>
-	<if $settings['system']['mail_quota_enabled'] == '1'><td class="field_name"><if $row['quota'] == 0>{$lng['emails']['noquota']}<else>{$row['quota']} MB</if></if></td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></td>
-</tr>
diff --git a/templates/Classic/customer/email/forwarder_add.tpl b/templates/Classic/customer/email/forwarder_add.tpl
deleted file mode 100644
index 5f1a501b..00000000
--- a/templates/Classic/customer/email/forwarder_add.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'email'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$forwarder_add_form}
-		</table>
-	</form>
-	<br />
-	<br />
-	<script type="text/javascript">
-		document.forms[0].elements.destination.focus();
-	</script>
-$footer
diff --git a/templates/Classic/customer/extras/backup.tpl b/templates/Classic/customer/extras/backup.tpl
deleted file mode 100644
index 2e4cf1c4..00000000
--- a/templates/Classic/customer/extras/backup.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'extras'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['backup']}</b></td>
-			</tr>
-			{$backup_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/extras/extras.tpl b/templates/Classic/customer/extras/extras.tpl
deleted file mode 100644
index 7f1480ca..00000000
--- a/templates/Classic/customer/extras/extras.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['extras']['extras']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['extras']['description']}</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/extras/htaccess.tpl b/templates/Classic/customer/extras/htaccess.tpl
deleted file mode 100644
index 28f5f730..00000000
--- a/templates/Classic/customer/extras/htaccess.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'extras'))}" method="post">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['extras']['pathoptions']}</b></td>
-				<td class="maintitle_search_right" colspan="<if $cperlenabled == 1 >7<else>6</if>">{$searchcode}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left">{$lng['panel']['path']}&nbsp;&nbsp;{$arrowcode['path']}</td>
-				<td class="field_display">{$lng['extras']['view_directory']}&nbsp;&nbsp;{$arrowcode['options_indexes']}</td>
-				<td class="field_display">{$lng['extras']['error404path']}&nbsp;&nbsp;{$arrowcode['error404path']}</td>
-				<td class="field_display">{$lng['extras']['error403path']}&nbsp;&nbsp;{$arrowcode['error403path']}</td>
-				<td class="field_display">{$lng['extras']['error500path']}&nbsp;&nbsp;{$arrowcode['error500path']}</td>
-				<if $cperlenabled == 1 ><td class="field_display">{$lng['extras']['execute_perl']}&nbsp;&nbsp;{$arrowcode['options_cgi']}</td></if>
-				<td class="field_display_search" colspan="2">{$sortcode}</td>
-			</tr>
-			$htaccess
-			<if $pagingcode != ''>
-			<tr>
-				<td class="field_display_border_left" colspan="<if $cperlenabled == 1 >8<else>7</if>" style=" text-align: center; ">{$pagingcode}</td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left" colspan="<if $cperlenabled == 1 >8<else>7</if>"><a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'add'))}">{$lng['extras']['pathoptions_add']}</a></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/extras/htaccess_add.tpl b/templates/Classic/customer/extras/htaccess_add.tpl
deleted file mode 100644
index c27bf57a..00000000
--- a/templates/Classic/customer/extras/htaccess_add.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'extras'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$htaccess_add_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/extras/htaccess_edit.tpl b/templates/Classic/customer/extras/htaccess_edit.tpl
deleted file mode 100644
index 000315fe..00000000
--- a/templates/Classic/customer/extras/htaccess_edit.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'extras'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$htaccess_edit_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/extras/htaccess_htaccess.tpl b/templates/Classic/customer/extras/htaccess_htaccess.tpl
deleted file mode 100644
index b407265f..00000000
--- a/templates/Classic/customer/extras/htaccess_htaccess.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left">{$row['path']}</td>
-	<td class="field_name">{$row['options_indexes']}</td>
-	<td class="field_name">{$row['error404path']}</td>
-	<td class="field_name">{$row['error403path']}</td>
-	<td class="field_name">{$row['error500path']}</td>
-	<if $cperlenabled == 1 ><td class="field_name">{$row['options_cgi']}</td></if>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></td>
-</tr>
diff --git a/templates/Classic/customer/extras/htpasswds.tpl b/templates/Classic/customer/extras/htpasswds.tpl
deleted file mode 100644
index cf1c7cd1..00000000
--- a/templates/Classic/customer/extras/htpasswds.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'extras'))}" method="post">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['extras']['directoryprotection']}</b></td>
-				<td class="maintitle_search_right" colspan="3">{$searchcode}</td>
-			</tr>
-			<tr>
-				<td class="field_display_border_left">{$lng['login']['username']}&nbsp;&nbsp;{$arrowcode['username']}</td>
-				<td class="field_display">{$lng['panel']['path']}&nbsp;&nbsp;{$arrowcode['path']}</td>
-				<td class="field_display_search" colspan="2">{$sortcode}</td>
-			</tr>
-			$htpasswds
-			<if $pagingcode != ''>
-			<tr>
-				<td class="field_display_border_left" colspan="4" style=" text-align: center; ">{$pagingcode}</td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left" colspan="4"><a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'add'))}">{$lng['extras']['directoryprotection_add']}</a></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/extras/htpasswds_add.tpl b/templates/Classic/customer/extras/htpasswds_add.tpl
deleted file mode 100644
index 5439d198..00000000
--- a/templates/Classic/customer/extras/htpasswds_add.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'extras'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$htpasswd_add_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/extras/htpasswds_edit.tpl b/templates/Classic/customer/extras/htpasswds_edit.tpl
deleted file mode 100644
index eb904a8e..00000000
--- a/templates/Classic/customer/extras/htpasswds_edit.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'extras'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
-			</tr>
-			{$htpasswd_edit_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/extras/htpasswds_htpasswd.tpl b/templates/Classic/customer/extras/htpasswds_htpasswd.tpl
deleted file mode 100644
index f8850f71..00000000
--- a/templates/Classic/customer/extras/htpasswds_htpasswd.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left">{$row['username']}</td>
-	<td class="field_name">{$row['path']}</td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></td>
-</tr>
diff --git a/templates/Classic/customer/ftp/accounts.tpl b/templates/Classic/customer/ftp/accounts.tpl
deleted file mode 100644
index 6040f882..00000000
--- a/templates/Classic/customer/ftp/accounts.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'ftp'))}" method="post">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['ftp']['accounts']}</b>&nbsp;({$ftps_count})</td>
-				<td class="maintitle_search_right" colspan="3">{$searchcode}</td>
-			</tr>
-			<if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') && 15 < $ftps_count >
-			<tr>
-				<td class="field_display_border_left" colspan="4"><a href="{$linker->getLink(array('section' => 'ftp', 'page' => 'accounts', 'action' => 'add'))}">{$lng['ftp']['account_add']}</a></td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left">{$lng['login']['username']}&nbsp;&nbsp;{$arrowcode['username']}</td>
-				<td class="field_display">{$lng['panel']['path']}&nbsp;&nbsp;{$arrowcode['homedir']}</td>
-				<td class="field_display_search" colspan="2">{$sortcode}</td>
-			</tr>
-			$accounts
-			<if $pagingcode != ''>
-			<tr>
-				<td class="field_display_border_left" colspan="4" style=" text-align: center; ">{$pagingcode}</td>
-			</tr>
-			</if>
-			<if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') >
-			<tr>
-				<td class="field_display_border_left" colspan="4"><a href="{$linker->getLink(array('section' => 'ftp', 'page' => 'accounts', 'action' => 'add'))}">{$lng['ftp']['account_add']}</a></td>
-			</tr>
-			</if>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/ftp/accounts_account.tpl b/templates/Classic/customer/ftp/accounts_account.tpl
deleted file mode 100644
index a7bf3d49..00000000
--- a/templates/Classic/customer/ftp/accounts_account.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left">{$row['username']}</td>
-	<td class="field_name">{$row['documentroot']}</td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'ftp', 'page' => 'accounts', 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
-	<td class="field_name"><a href="{$linker->getLink(array('section' => 'ftp', 'page' => 'accounts', 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></td>
-</tr>
diff --git a/templates/Classic/customer/ftp/accounts_add.tpl b/templates/Classic/customer/ftp/accounts_add.tpl
deleted file mode 100644
index 301566aa..00000000
--- a/templates/Classic/customer/ftp/accounts_add.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'ftp'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$title}</b></td>
-			</tr>
-			{$ftp_add_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/ftp/accounts_edit.tpl b/templates/Classic/customer/ftp/accounts_edit.tpl
deleted file mode 100644
index 974f6d88..00000000
--- a/templates/Classic/customer/ftp/accounts_edit.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'ftp'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$title}</b></td>
-			</tr>
-			{$ftp_edit_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/ftp/ftp.tpl b/templates/Classic/customer/ftp/ftp.tpl
deleted file mode 100644
index d1a6ceed..00000000
--- a/templates/Classic/customer/ftp/ftp.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['ftp']['ftp']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['ftp']['description']}</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/index/change_language.tpl b/templates/Classic/customer/index/change_language.tpl
deleted file mode 100644
index dbdcf870..00000000
--- a/templates/Classic/customer/index/change_language.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'index'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="none" rowspan="4"><img src="templates/{$theme}/assets/img/changelanguage.gif" alt="" /></td>
-			</tr>
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['main']['changelanguage']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['login']['language']}</td>
-				<td class="main_field_display" nowrap="nowrap"><select class="dropdown_noborder" name="def_language">$language_options</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottom" type="submit" value="{$lng['menue']['main']['changelanguage']}" /></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/index/change_password.tpl b/templates/Classic/customer/index/change_password.tpl
deleted file mode 100644
index 983e8487..00000000
--- a/templates/Classic/customer/index/change_password.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'index'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="none" rowspan="8"><img src="templates/{$theme}/assets/img/logininternal.gif" alt="" /></td>
-			</tr>
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['main']['changepassword']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['changepassword']['old_password']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="password" name="old_password" maxlength="50" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['changepassword']['new_password']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="password" name="new_password" maxlength="50" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['changepassword']['new_password_confirm']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="password" name="new_password_confirm" maxlength="50" /></td>
-			</tr>
-			<tr>
-				<td class="main_field_name" colspan="2"><input type="checkbox" name="change_main_ftp" value="true" />{$lng['changepassword']['also_change_ftp']}</td>
-			</tr>
-			<tr>
-				<td class="main_field_name" colspan="2"><input type="checkbox" name="change_webalizer" value="true" />{$lng['changepassword']['also_change_webalizer']}</td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['menue']['main']['changepassword']}" /></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/index/change_theme.tpl b/templates/Classic/customer/index/change_theme.tpl
deleted file mode 100644
index 8cbe318b..00000000
--- a/templates/Classic/customer/index/change_theme.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'index'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="none" rowspan="4"><img src="templates/{$theme}/assets/img/changetheme.png" alt="" /></td>
-			</tr>
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['main']['changetheme']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['panel']['theme']}</td>
-				<td class="main_field_display" nowrap="nowrap"><select class="dropdown_noborder" name="theme">$theme_options</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottom" type="submit" value="{$lng['menue']['main']['changetheme']}" /></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
-
diff --git a/templates/Classic/customer/index/index.tpl b/templates/Classic/customer/index/index.tpl
deleted file mode 100644
index 22cf0d55..00000000
--- a/templates/Classic/customer/index/index.tpl
+++ /dev/null
@@ -1,119 +0,0 @@
-$header
-<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable" xmlns="http://www.w3.org/1999/html"
-       xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html">
-		<tr>
-			<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['index']['customerdetails']}</b></td>
-		</tr>
-        <if $userinfo['customernumber'] >
-        <tr>
-            <td class="field_name_nobordersmall">{$lng['customer']['customernumber']}:</td>
-            <td class="field_display_nobordersmall">{$userinfo['customernumber']}</td>
-        </tr>
-        </if>
-        <if $userinfo['company'] >
-        <tr>
-            <td class="field_name_border_left">{$lng['customer']['company']}:</td>
-            <td class="field_display">{$userinfo['company']}</td>
-        </tr>
-        </if>
-        <if $userinfo['name'] >
-        <tr>
-			<td class="field_name_border_left">{$lng['customer']['name']}:</td>
-			<td class="field_display">{$userinfo['firstname']} {$userinfo['name']}</td>
-		</tr>
-        </if>
-        <if $userinfo['street'] >
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['street']}:</td>
-			<td class="field_display">{$userinfo['street']}</td>
-		</tr>
-		</if>
-        <if $userinfo['city'] >
-        <tr>
-			<td class="field_name_border_left">{$lng['customer']['zipcode']}/{$lng['customer']['city']}:</td>
-			<td class="field_display">{$userinfo['zipcode']} {$userinfo['city']}</td>
-		</tr>
-        </if>
-        <if $userinfo['email'] >
-        <tr>
-			<td class="field_name_border_left">{$lng['customer']['email']}:</td>
-			<td class="field_display">{$userinfo['email']}</td>
-		</tr>
-        </if>
-        <tr>
-			<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['index']['accountdetails']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['login']['username']}:</td>
-			<td class="field_display">{$userinfo['loginname']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['domains']}:</td>
-			<td class="field_display">$domains</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['subdomains']} ({$lng['customer']['usedmax']}):</td>
-			<td class="field_display">{$userinfo['subdomains_used']}/{$userinfo['subdomains']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['diskspace']} ({$lng['customer']['usedmax']}):</td>
-			<td class="field_display">{$userinfo['diskspace_used']}/{$userinfo['diskspace']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['traffic']} ($month, {$lng['customer']['usedmax']}):</td>
-			<td class="field_display">{$userinfo['traffic_used']}/{$userinfo['traffic']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['emails']} ({$lng['customer']['usedmax']}):</td>
-			<td class="field_display">{$userinfo['emails_used']}/{$userinfo['emails']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['accounts']} ({$lng['customer']['usedmax']}):</td>
-			<td class="field_display">{$userinfo['email_accounts_used']}/{$userinfo['email_accounts']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['forwarders']} ({$lng['customer']['usedmax']}):</td>
-			<td class="field_display">{$userinfo['email_forwarders_used']}/{$userinfo['email_forwarders']}</td>
-		</tr>
-		<if $settings['system']['mail_quota_enabled'] == 1>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['email_quota']} ({$lng['panel']['megabyte']}, {$lng['customer']['usedmax']}):</td>
-			<td class="field_display">{$userinfo['email_quota_used']}/{$userinfo['email_quota']}</td>
-		</tr>
-		</if>
-		</tr>
-		<if $settings['autoresponder']['autoresponder_active'] == 1>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['autoresponder']} ({$lng['customer']['usedmax']}):</td>
-			<td class="field_display">{$userinfo['email_autoresponder_used']}/{$userinfo['email_autoresponder']}</td>
-		</tr>
-		</if>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['mysqls']} ({$lng['customer']['usedmax']}):</td>
-			<td class="field_display">{$userinfo['mysqls_used']}/{$userinfo['mysqls']}</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['ftps']} ({$lng['customer']['usedmax']}):</td>
-			<td class="field_display">{$userinfo['ftps_used']}/{$userinfo['ftps']}</td>
-		</tr>
-		<if (int)$settings['aps']['aps_active'] == 1>
-		<tr>
-			<td class="field_name_border_left">{$lng['aps']['numberofapspackages']} ({$lng['customer']['usedmax']}):</td>
-			<td class="field_display">{$userinfo['aps_packages_used']}/{$userinfo['aps_packages']}</td>
-		</tr>
-		</if>
-		<if $settings['ticket']['enabled'] == 1 >
-		<tr>
-			<td class="field_name_border_left">{$lng['customer']['tickets']} ({$lng['customer']['usedmax']}):</td>
-			<td class="field_display">{$userinfo['tickets_used']}/{$userinfo['tickets']}</td>
-		</tr>
-		</if>
-		<if 0 < $awaitingtickets && $settings['ticket']['enabled'] == 1 >
-		<tr>
-			<td class="field_name_border_left" colspan="2"><b>{$awaitingtickets_text}</b></td>
-		</tr>
-		</if>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/mysql/mysql.tpl b/templates/Classic/customer/mysql/mysql.tpl
deleted file mode 100644
index 262bbbad..00000000
--- a/templates/Classic/customer/mysql/mysql.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['mysql']['mysql']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['mysql']['description']}</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/mysql/mysqls.tpl b/templates/Classic/customer/mysql/mysqls.tpl
deleted file mode 100644
index 57eef62b..00000000
--- a/templates/Classic/customer/mysql/mysqls.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'mysql'))}" method="post">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle_search_left" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['mysql']['databases']}</b>&nbsp;({$mysqls_count})</td>
-				<td class="maintitle_search_right" colspan="3">{$searchcode}</td>
-			</tr>
-			<if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') && 15 < $mysqls_count >
-			<tr>
-				<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'add'))}">{$lng['mysql']['database_create']}</a></td>
-			</tr>
-			</if>
-			<tr>
-				<td class="field_display_border_left">{$lng['mysql']['databasename']}&nbsp;&nbsp;{$arrowcode['databasename']}</td>
-				<td class="field_display">{$lng['mysql']['databasedescription']}&nbsp;&nbsp;{$arrowcode['description']}</td>
-				<td class="field_display">{$lng['mysql']['size']}</td>
-				<if 1 < count($sql_root)><td class="field_display">{$lng['mysql']['mysql_server']}</td></if>
-				<td class="field_display_search" colspan="2">{$sortcode}</td>
-			</tr>
-			$mysqls
-			<if $pagingcode != ''>
-			<tr>
-				<td class="field_display_border_left" colspan="5" style=" text-align: center; ">{$pagingcode}</td>
-			</tr>
-			</if>
-			<if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') >
-			<tr>
-				<td class="field_display_border_left" colspan="5"><a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'add'))}">{$lng['mysql']['database_create']}</a></td>
-			</tr>
-			</if>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/mysql/mysqls_add.tpl b/templates/Classic/customer/mysql/mysqls_add.tpl
deleted file mode 100644
index 7c73310f..00000000
--- a/templates/Classic/customer/mysql/mysqls_add.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'mysql'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$title}</b></td>
-			</tr>
-			{$mysql_add_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/mysql/mysqls_database.tpl b/templates/Classic/customer/mysql/mysqls_database.tpl
deleted file mode 100644
index 878fce58..00000000
--- a/templates/Classic/customer/mysql/mysqls_database.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left">{$row['databasename']}</td>
-	<td class="field_name">{$row['description']}</td>
-	<td class="field_name">{$row['size']}</td>
-	<if 1 < count($sql_root)><td class="field_name">{$sql_root[$row['dbserver']]['caption']}</td></if>
-	<if $row['apsdb'] != '1'>
-		<td class="field_name"><a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
-		<td class="field_name"><a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></td>
-	<else>
-		<td class="field_name" colspan="2">{$lng['aps']['cannoteditordeleteapsdb']}</td>
-	</if>
-</tr>
diff --git a/templates/Classic/customer/mysql/mysqls_edit.tpl b/templates/Classic/customer/mysql/mysqls_edit.tpl
deleted file mode 100644
index 1c1b63d4..00000000
--- a/templates/Classic/customer/mysql/mysqls_edit.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'mysql'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$title}</b></td>
-			</tr>
-			{$mysql_edit_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/tickets/ticket.tpl b/templates/Classic/customer/tickets/ticket.tpl
deleted file mode 100644
index c60d6a80..00000000
--- a/templates/Classic/customer/tickets/ticket.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['ticket']['ticket']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left">{$lng['ticket']['description']}</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/tickets/tickets.tpl b/templates/Classic/customer/tickets/tickets.tpl
deleted file mode 100644
index ba937b30..00000000
--- a/templates/Classic/customer/tickets/tickets.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-$header
-	<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post">
-	<input type="hidden" name="s" value="$s" />
-	<input type="hidden" name="page" value="$page" />
-	<input type="hidden" name="send" value="send" />
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle_search_left"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['ticket']['supportstatus']}</b></td>
-			<td class="maintitle_search_right">&nbsp;</td>
-		</tr>
-		<tr>
-			<td class="field_name_border_left" colspan="2">
-				<if 0 < $supportavailable >
-				{$lng['ticket']['supportavailable']}
-				</if>
-				<if $supportavailable < 1 >
-				{$lng['ticket']['supportnotavailable']}
-				</if>
-			</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-		<tr>
-			<td class="maintitle_search_left"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['ticket']['ticket']}</b></td>
-			<td class="maintitle_search_right" colspan="7">{$searchcode}</td>
-		</tr>
-		<if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && 15 < $tickets_count && ($ticketsopen < $settings['ticket']['concurrently_open'] || ($settings['ticket']['concurrently_open'] == '-1' || $settings['ticket']['concurrently_open'] == '')) >
-		<tr>
-			<td class="field_display_border_left" colspan="8"><a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a></td>
-		</tr>
-		</if>
-		<tr>
-			<td class="field_display_border_left">{$lng['ticket']['lastchange']}&nbsp;&nbsp;{$arrowcode['lastchange']}</td>
-			<td class="field_display">{$lng['ticket']['ticket_answers']}&nbsp;&nbsp;{$arrowcode['ticket_answers']}</td>
-			<td class="field_display">{$lng['ticket']['subject']}&nbsp;&nbsp;{$arrowcode['subject']}</td>
-			<td class="field_display">{$lng['ticket']['status']}&nbsp;&nbsp;{$arrowcode['status']}</td>
-			<td class="field_display">{$lng['ticket']['lastreplier']}&nbsp;&nbsp;{$arrowcode['lastreplier']}</td>
-			<td class="field_display">{$lng['ticket']['priority']}&nbsp;&nbsp;{$arrowcode['priority']}</td>
-			<td class="field_display_search" colspan="2">{$sortcode}</td>
-		</tr>
-		$tickets
-		<if $pagingcode != ''>
-		<tr>
-			<td class="field_display_border_left" colspan="8" style=" text-align: center; ">{$pagingcode}</td>
-		</tr>
-		</if>
-		<if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && ($ticketsopen < $settings['ticket']['concurrently_open'] || ($settings['ticket']['concurrently_open'] == '-1' || $settings['ticket']['concurrently_open'] == '')) >
-		<tr>
-			<td class="field_display_border_left" colspan="8"><a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a></td>
-		</tr>
-		</if>
-	</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/tickets/tickets_new.tpl b/templates/Classic/customer/tickets/tickets_new.tpl
deleted file mode 100644
index ea9f5e8f..00000000
--- a/templates/Classic/customer/tickets/tickets_new.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'tickets'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$title}</b></td>
-			</tr>
-			{$ticket_add_form}
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/tickets/tickets_reply.tpl b/templates/Classic/customer/tickets/tickets_reply.tpl
deleted file mode 100644
index 0e54dc48..00000000
--- a/templates/Classic/customer/tickets/tickets_reply.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-$header
-	<form method="post" action="{$linker->getLink(array('section' => 'tickets'))}">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
- 		<input type="hidden" name="id" value="$id" />
-		<input type="hidden" name="send" value="send" />
-	<if 0 < $ticket_replies_count >
-	$ticket_replies
-	</if>
-	<if $isclosed < 1 >
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$title}</b></td>
-			</tr>
-			{$ticket_reply_form}
-		</table>
-	</if>
-	<if 0 < $isclosed >
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['ticket']['ticket_reopen']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm"><a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'reopen', 'id' => $id))}">{$lng['ticket']['ticket_reopen']}</a></td>
-			</tr>
-		</table>
-	</if>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/customer/tickets/tickets_tickets.tpl b/templates/Classic/customer/tickets/tickets_tickets.tpl
deleted file mode 100644
index d3033b12..00000000
--- a/templates/Classic/customer/tickets/tickets_tickets.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left">{$row['lastchange']}</td>
-	<td class="field_name">{$row['ticket_answers']}</td>
-	<td class="field_name">{$row['subject']}</td>
-	<td class="field_name">{$row['status']}</td>
-	<td class="field_name">{$row['lastreplier']}</td>
-	<td class="field_name">{$row['priority']}</td>
-	<td class="field_name">
-    <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'answer', 'id' => $row['id']))}">
-    <if $cananswer < 1 >{$lng['ticket']['show']}</if>
-    <if 0 < $cananswer >{$lng['ticket']['answer']}</if>
-    </a>
-  </td>
-	<td class="field_name">    
-    <if $reopen < 1 >
-      <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'close', 'id' => $row['id']))}">{$lng['ticket']['close']}</a>
-    </if>
-    <if 0 < $reopen >
-      <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'reopen', 'id' => $row['id']))}">{$lng['ticket']['reopen']}</a>
-    </if>
-  </td> 
-</tr>
diff --git a/templates/Classic/customer/tickets/tickets_tickets_list.tpl b/templates/Classic/customer/tickets/tickets_tickets_list.tpl
deleted file mode 100644
index ec447c1f..00000000
--- a/templates/Classic/customer/tickets/tickets_tickets_list.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-  <tr>
-    <td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;&nbsp;{$lastchange}&nbsp;von&nbsp;{$by}</b></td>
-	</tr>
-  <tr>
-    <td class="main_field_display">{$subject}</td>
-  </tr>
-  <tr>
-	  <td class="main_field_name">{$message}</td>
-  </tr>
-</table>
diff --git a/templates/Classic/customer/tickets/tickets_tickets_main.tpl b/templates/Classic/customer/tickets/tickets_tickets_main.tpl
deleted file mode 100644
index b070f5ae..00000000
--- a/templates/Classic/customer/tickets/tickets_tickets_main.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-  <tr>
-    <td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;&nbsp;{$dt}&nbsp;von&nbsp;{$by}&nbsp;({$status})</b></td>
-	</tr>
-  <tr>
-    <td class="main_field_display">{$subject}</td>
-  </tr>
-  <tr>
-	  <td class="main_field_name">{$message}</td>
-  </tr>
-</table>
diff --git a/templates/Classic/customer/traffic/traffic.tpl b/templates/Classic/customer/traffic/traffic.tpl
deleted file mode 100644
index 814079ec..00000000
--- a/templates/Classic/customer/traffic/traffic.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-$header
-<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-	<tr>
-		<td class="maintitle" colspan="3"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['traffic']['traffic']}</b></td>
-	</tr>
-	<tr>
-		<td colspan="3" class="field_name_border_left">
-			<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable" width="100%">
-				<tr>
-					<td class="title">{$lng['traffic']['sumftp']} GB</td>
-					<td class="title">{$lng['traffic']['sumhttp']} GB</td>
-					<td class="title">{$lng['traffic']['summail']} GB</td>
-				</tr>
-				<tr>
-					<td class="field_name_border_left"><div style="color:#019522;text-align:center">{$traffic_complete['ftp']}</div></td>
-					<td class="field_name"><div style="color:#0000FF;text-align:center">{$traffic_complete['http']}</div></td>
-					<td class="field_name"><div style="color:#800000;text-align:center">{$traffic_complete['mail']}</div></td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td class="title">{$lng['traffic']['month']}</td>
-		<td class="title">{$lng['traffic']['distribution']}</td>
-		<td class="title" align="right">{$lng['customer']['traffic']}</td>
-	</tr>
-	$traffic
-</table>
-$footer
-
diff --git a/templates/Classic/customer/traffic/traffic_details.tpl b/templates/Classic/customer/traffic/traffic_details.tpl
deleted file mode 100644
index 2da91279..00000000
--- a/templates/Classic/customer/traffic/traffic_details.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-$header
-<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-	<tr>
-		<td class="maintitle" colspan="3"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['traffic']['traffic']} $show</b></td>
-	</tr>
-	<tr>
-		<td colspan="3" class="field_name_border_left">
-			<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable" width="100%">
-				<tr>
-					<td class="title">{$lng['traffic']['sumftp']} MB</td>
-					<td class="title">{$lng['traffic']['sumhttp']} MB</td>
-					<td class="title">{$lng['traffic']['summail']} MB</td>
-				</tr>
-				<tr>
-					<td class="field_name_border_left"><div style="color:#019522;text-align:center">{$traffic_complete['ftp']}</div></td>
-					<td class="field_name"><div style="color:#0000FF;text-align:center">{$traffic_complete['http']}</div></td>
-					<td class="field_name"><div style="color:#800000;text-align:center">{$traffic_complete['mail']}</div></td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td class="title">{$lng['traffic']['day']}</td>
-		<td class="title">{$lng['traffic']['distribution']}</td>
-		<td class="title" align="right">{$lng['traffic']['mb']}</td>
-	</tr>
-	$traffic
-</table>
-$footer
-
diff --git a/templates/Classic/customer/traffic/traffic_month.tpl b/templates/Classic/customer/traffic/traffic_month.tpl
deleted file mode 100644
index ad79d97d..00000000
--- a/templates/Classic/customer/traffic/traffic_month.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left" width="30">{$traf['day']}.&nbsp;&nbsp;</td>
-	<td class="field_name"><img src="templates/{$theme}/assets/img/traffic_green.gif" width="{$traf['ftp']}%" height="9" alt="" border="0" align="" title="{$traf['ftptext']}"><br /><img src="templates/{$theme}/assets/img/traffic_blue.gif" width="{$traf['http']}%" height="9" alt="" border="0" align="" title="{$traf['httptext']}"><br /><img src="templates/{$theme}/assets/img/traffic_red.gif" width="{$traf['mail']}%" height="9" alt="" border="0" align="" title="{$traf['mailtext']}"></td>
-	<td class="field_name" align="right" width="80">{$traf['byte']}</td>
-</tr>
diff --git a/templates/Classic/customer/traffic/traffic_traffic.tpl b/templates/Classic/customer/traffic/traffic_traffic.tpl
deleted file mode 100644
index 9a9ea606..00000000
--- a/templates/Classic/customer/traffic/traffic_traffic.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left" width="80">
-		<a href="{$linker->getLink(array('section' => 'traffic', 'month' => $traf['month'], 'year' => $traf['year']))}">{$traf['monthname']}</a>
-	</td>
-	<td class="field_name"><img src="templates/{$theme}/assets/img/traffic_green.gif" width="{$traf['ftp']}%" height="9" alt="{$traf['ftptext']}" border="0" align="" title="{$traf['ftptext']}"><br /><img src="templates/{$theme}/assets/img/traffic_blue.gif" width="{$traf['http']}%" height="9" alt="{$traf['httptext']}" border="0" align="" title="{$traf['httptext']}"><br /><img src="templates/{$theme}/assets/img/traffic_red.gif" width="{$traf['mail']}%" height="9" alt="{$traf['mailtext']}" border="0" align="" title="{$traf['mailtext']}"></td>
-	<td class="field_name" align="right" width="70">{$traf['byte']}</td>
-</tr>
diff --git a/templates/Classic/footer.tpl b/templates/Classic/footer.tpl
deleted file mode 100644
index c5a9491c..00000000
--- a/templates/Classic/footer.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-				</td>
-			</tr>
-		</table>
-		<table cellspacing="0" cellpadding="0" border="0" width="100%">
-			<tr>
-				<td width="100%" class="footer">
-					<br />Froxlor
-					<if ($settings['admin']['show_version_login'] == '1' && $filename == 'index.php') || ($filename != 'index.php' && $settings['admin']['show_version_footer'] == '1')>
-						 {$version}{$branding}
-					</if>
-					&copy; 2009-{$current_year} by <a href="http://www.froxlor.org/" target="_blank">the Froxlor Team</a>
-					<br />Theme based on work by: Luca Piona and Luca Longinotti
-					<if $lng['translator'] != ''>
-					<br />{$lng['panel']['translator']}: {$lng['translator']}
-					</if>
-					<br />&nbsp;
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/templates/Classic/formfields/bool.tpl b/templates/Classic/formfields/bool.tpl
deleted file mode 100644
index 83ca3de4..00000000
--- a/templates/Classic/formfields/bool.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<tr>
-	<td class="main_field_name">{$label}</td>
-	<td class="main_field_display" nowrap="nowrap"><input type="checkbox" name="{$fieldname}" value="1" <if( $fielddata['value'] == '1' )>checked="checked"</if> /></td>
-</tr>
diff --git a/templates/Classic/formfields/hidden.tpl b/templates/Classic/formfields/hidden.tpl
deleted file mode 100644
index e7807e69..00000000
--- a/templates/Classic/formfields/hidden.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<tr>
-	<td class="main_field_name">{$label}</td>
-	<td class="main_field_display" nowrap="nowrap">{$fielddata['value']}</td>
-</tr>
diff --git a/templates/Classic/formfields/hiddenstring.tpl b/templates/Classic/formfields/hiddenstring.tpl
deleted file mode 100644
index 972265e6..00000000
--- a/templates/Classic/formfields/hiddenstring.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<tr>
-	<td class="main_field_name">{$label}</td>
-	<td class="main_field_display" nowrap="nowrap"><input type="password" class="text" name="{$fieldname}" value="{$value}" /></td>
-</tr>
\ No newline at end of file
diff --git a/templates/Classic/formfields/label.tpl b/templates/Classic/formfields/label.tpl
deleted file mode 100644
index 78f71e38..00000000
--- a/templates/Classic/formfields/label.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td class="maintitle_apply_left" colspan="2">$label</td>
-</tr>
diff --git a/templates/Classic/formfields/option.tpl b/templates/Classic/formfields/option.tpl
deleted file mode 100644
index bd9bd96e..00000000
--- a/templates/Classic/formfields/option.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<tr>
-	<td class="main_field_name"<if $multiple == true> valign="top"</if>>{$label}</td>
-	<td class="main_field_display" nowrap="nowrap"><select class="dropdown_noborder" name="{$fieldname}<if $multiple == true>[]</if>"<if $multiple == true> multiple="multiple"</if>>{$options}</select></td>
-</tr>
diff --git a/templates/Classic/formfields/string.tpl b/templates/Classic/formfields/string.tpl
deleted file mode 100644
index e60f9c90..00000000
--- a/templates/Classic/formfields/string.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<tr>
-	<td class="main_field_name">{$label}</td>
-	<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="{$fieldname}" value="{$value}" /></td>
-</tr>
diff --git a/templates/Classic/formfields/text.tpl b/templates/Classic/formfields/text.tpl
deleted file mode 100644
index 9d69eb84..00000000
--- a/templates/Classic/formfields/text.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<tr>
-	<td class="main_field_name" valign="top">{$label}</td>
-	<td class="main_field_display" nowrap="nowrap"><textarea class="textarea_noborder" rows="12" cols="40" name="{$fieldname}">{$value}</textarea></td>
-</tr>
diff --git a/templates/Classic/header.tpl b/templates/Classic/header.tpl
deleted file mode 100644
index bcae7232..00000000
--- a/templates/Classic/header.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">
-<head>
-	<meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
-	<if $settings['panel']['no_robots'] == '0'>
-	<meta name="robots" content="noindex, nofollow, noarchive" />
-	<meta name="GOOGLEBOT" content="nosnippet" />
-	</if>
-	<link rel="stylesheet" href="templates/{$theme}/assets/css/main.css" type="text/css" />
-	<script type="text/javascript" src="js/jquery.min.js"></script>
-	<script type="text/javascript" src="templates/{$theme}/assets/js/main.js"></script>
-	<link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
-	<title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor</title>
-</head>
-<body style="margin: 0; padding: 0;">
-<!--
-    We request you retain the full copyright notice below including the link to www.froxlor.org.
-    This not only gives respect to the large amount of time given freely by the developers
-    but also helps build interest, traffic and use of Froxlor. If you refuse
-    to include even this then support on our forums may be affected.
-    The Froxlor Team : 2009-2010
-// -->
-<!--
-	Templates based on work by Luca Piona (info@havanastudio.ch) and Luca Longinotti (chtekk@gentoo.org)
-// -->
-<table cellspacing="0" cellpadding="0" border="0" width="100%">
-	<tr>
-		<td width="800"><img src="{$header_logo}" width="800" height="90" alt="" /></td>
-		<td class="header">&nbsp;</td>
-	</tr>
-</table>
-<table cellspacing="0" cellpadding="0" border="0" width="<if isset($userinfo['loginname'])>100%<else>40%</if>" align="center">
-	<tr>
-		<if isset($userinfo['loginname'])>
-			<td width="240" valign="top" bgcolor="#EBECF5">$navigation<br /></td>
-			<td width="15" class="line_shadow">&nbsp;</td>
-			<td valign="top" bgcolor="#FFFFFF">
-		<else>
-			<td valign="top" bgcolor="#FFFFFF">
-		</if>
-		<br />
-		<br />
diff --git a/templates/Classic/login/fpwd.tpl b/templates/Classic/login/fpwd.tpl
deleted file mode 100644
index 7b5b2990..00000000
--- a/templates/Classic/login/fpwd.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-$header
-	<br />
-	<form method="post" action="$filename" name="loginform">
-		<input type="hidden" name="action" value="$action" />
-		<if $message != ''>
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b>&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['error']['error']}/{$lng['error']['info']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_center_noborder" style="padding: 15px;"><img src="templates/{$theme}/assets/img/info.png" alt="" /></td>
-				<td class="field_name" width="80%">$message</td>
-			</tr>
-		</table>
-		<br />
-		<br />
-		</if>
-		<if $settings['panel']['allow_preset'] == '1'>
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="3"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;Froxlor&nbsp;-&nbsp;{$lng['login']['presend']}</b></td>
-			</tr>
-			<tr>
-				<td rowspan="2" class="field_name_center"><img src="templates/{$theme}/assets/img/login.gif" alt="" /></td>
-				<td class="field_name"><font size="-1">{$lng['login']['username']}:</font></td>
-				<td class="field_display"><input type="text" class="text" name="loginname" value="" maxlength="50" /></td>
-			</tr>
-			<tr>
-				<td class="field_name"><font size="-1">{$lng['login']['email']}:</font></td>
-				<td class="field_display"><input type="text" class="text" name="loginemail" /></td>
-			</tr>
-			<tr>
-				<td class="field_name_center" colspan="3"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['login']['remind']}" /></td>
-			</tr>
-			<tr>
-				<td class="field_name_center" colspan="3"><a href="index.php">{$lng['login']['backtologin']}</a></td>
-			</tr>
-		</table>
-		</if>
-	</form>
-	<br />
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/login/login.tpl b/templates/Classic/login/login.tpl
deleted file mode 100644
index 73310f8f..00000000
--- a/templates/Classic/login/login.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-$header
-	<br />
-	<form method="post" action="$filename" name="loginform">
-		<if $message != ''>
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="2"><b>&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['error']['error']}/{$lng['error']['info']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_center_noborder" style="padding: 15px;"><img src="templates/{$theme}/assets/img/info.png" alt="" /></td>
-				<td class="field_name" width="80%">$message</td>
-			</tr>
-		</table>
-		<br />
-		<br />
-		</if>
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
-			<tr>
-				<td class="maintitle" colspan="3"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;Froxlor&nbsp;-&nbsp;Login</b></td>
-			</tr>
-			<tr>
-				<td rowspan="3" class="field_name_center"><img src="templates/{$theme}/assets/img/login.gif" alt="" /></td>
-				<td class="field_name"><font size="-1">{$lng['login']['username']}:</font></td>
-				<td class="field_display"><input type="text" class="text" name="loginname" id="loginname" value="" maxlength="50" /></td>
-			</tr>
-			<tr>
-				<td class="field_name"><font size="-1">{$lng['login']['password']}:</font></td>
-				<td class="field_display"><input type="password" class="text" name="password" maxlength="50" /></td>
-			</tr>
-			<tr>
-				<td class="field_name"><font size="-1">{$lng['login']['language']}:</font></td>
-				<td class="field_display"><select class="dropdown_noborder" name="language">$language_options</select></td>
-			</tr>
-			<tr>
-				<td class="field_name_center" colspan="3"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['login']['login']}" /></td>
-			</tr>
-			<if $settings['panel']['allow_preset'] == '1'>
-			<tr>
-				<td class="field_name_center" colspan="3"><a href="$filename?action=forgotpwd">{$lng['login']['forgotpwd']}</a></td>
-			</tr>
-			</if>
-			<if $update_in_progress !== ''>
-			<tr>
-				<td class="field_name_center" colspan="3">{$update_in_progress}</td>
-			</tr>
-			</if>
-		</table>
-	</form>
-	<br />
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/misc/alreadyinstalledhint.tpl b/templates/Classic/misc/alreadyinstalledhint.tpl
deleted file mode 100644
index 296d2d96..00000000
--- a/templates/Classic/misc/alreadyinstalledhint.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta name="Publisher" content="Froxlor" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <title>Attention: Froxlor has not been configured yet!</title>
-        <style type="text/css">
-        body {
-                font-family: Verdana, Helvetica, sans-serif;
-                font-size: 18px;
-                text-align: center;
-                color: #fff;
-                margin: 0;
-                padding: 0;
-                background-color: #fff;
-        }
-        .default {
-                width: 500px;
-                position: absolute;
-                top: 50%;
-                left: 50%;
-                height: 70px;
-                padding: 1em;
-                margin: -100px 0 0 -258px;
-                background-color: #2d6b85;
-                border: 1px solid #254f76;
-                -moz-border-radius-bottomleft:20px;
-                -moz-border-radius-bottomright:20px;
-                -moz-border-radius-topleft:20px;
-                -moz-border-radius-topright:20px;
-        }
-        .default ul { list-style: none; padding: 0; margin: .75em; }
-        .default ul li { margin-bottom: 1em; margin-top: 1.25em; }
-        .default ul li a { text-decoration: underline; font-weight: bold; color: #fff; }
-        .default ul li a:hover { text-decoration: none; font-weight: bold; color: #cccccc; }
-        .footer {
-                width: 500px;
-                position: absolute;
-                top: 70%;
-                left: 50%;
-                height: 25px;
-                padding: 1em;
-                margin: -100px 0 0 -258px;
-                color: #666666;
-                font-size: 8pt;
-        }
-        .footer ul { list-style: none; padding: 0; margin: 0; }
-        .footer ul li a { text-decoration: none; color: #666666; }
-        .footer ul li a:hover { text-decoration: none; color: #000000; }
-        </style>
-  </head>
-
-<body>
-
-        <div class="default">
-                <ul>
-                        <li>It seems that Froxlor has already been installed..</li>
-                </ul>
-        </div>
-
-        <div class="footer">
-                <ul><li>&copy; 2009-2010 by <a href="http://www.froxlor.org">the Froxlor Team</a></li></ul>
-        </div>
-
-</body>
-
-</html>
diff --git a/templates/Classic/misc/configurehint.tpl b/templates/Classic/misc/configurehint.tpl
deleted file mode 100644
index 7bd6f1b9..00000000
--- a/templates/Classic/misc/configurehint.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta name="Publisher" content="Froxlor" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <title>Attention: Froxlor has not been configured yet!</title>
-        <style type="text/css">
-        body {
-                font-family: Verdana, Helvetica, sans-serif;
-                font-size: 18px;
-                text-align: center;
-                color: #fff;
-                margin: 0;
-                padding: 0;
-                background-color: #fff;
-        }
-        .default {
-                width: 500px;
-                position: absolute;
-                top: 50%;
-                left: 50%;
-                height: 70px;
-                padding: 1em;
-                margin: -100px 0 0 -258px;
-                background-color: #2d6b85;
-                border: 1px solid #254f76;
-                -moz-border-radius-bottomleft:20px;
-                -moz-border-radius-bottomright:20px;
-                -moz-border-radius-topleft:20px;
-                -moz-border-radius-topright:20px;
-        }
-        .default ul { list-style: none; padding: 0; margin: .75em; }
-        .default ul li { margin-bottom: 1em; margin-top: 1.25em; }
-        .default ul li a { text-decoration: underline; font-weight: bold; color: #fff; }
-        .default ul li a:hover { text-decoration: none; font-weight: bold; color: #cccccc; }
-        .footer {
-                width: 500px;
-                position: absolute;
-                top: 70%;
-                left: 50%;
-                height: 25px;
-                padding: 1em;
-                margin: -100px 0 0 -258px;
-                color: #666666;
-                font-size: 8pt;
-        }
-        .footer ul { list-style: none; padding: 0; margin: 0; }
-        .footer ul li a { text-decoration: none; color: #666666; }
-        .footer ul li a:hover { text-decoration: none; color: #000000; }
-        </style>
-  </head>
-
-<body>
-
-        <div class="default">
-                <ul>
-                        <li>You have to <a href="./install/install.php">configure Froxlor</a> first.</li>
-                </ul>
-        </div>
-
-        <div class="footer">
-                <ul><li>&copy; 2009-2012 by <a href="http://www.froxlor.org">the Froxlor Team</a></li></ul>
-        </div>
-
-</body>
-
-</html>
diff --git a/templates/Classic/misc/error.tpl b/templates/Classic/misc/error.tpl
deleted file mode 100644
index 259a438d..00000000
--- a/templates/Classic/misc/error.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable_60">
-		<tr>
-			<td class="maintitle" colspan="2"><b>&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['error']['error']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_center_noborder"><img src="templates/{$theme}/assets/img/error.gif" alt="" /></td>
-			<td class="field_name">$error</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td>$link</td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/misc/form/input_text.tpl b/templates/Classic/misc/form/input_text.tpl
deleted file mode 100644
index ed827ab2..00000000
--- a/templates/Classic/misc/form/input_text.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<input class="<if $ulfield != ''>textul<else>text</if>" type="{$type}" name="{$fieldname}" id="{$fieldname}" value="{$value}"{$extras} />{$ulfield}
diff --git a/templates/Classic/misc/form/input_textarea.tpl b/templates/Classic/misc/form/input_textarea.tpl
deleted file mode 100644
index fbcf9e8f..00000000
--- a/templates/Classic/misc/form/input_textarea.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<textarea class="textarea_noborder" name="{$fieldname}" id="{$fieldname}" {$extras}>{$value}</textarea>
diff --git a/templates/Classic/misc/form/table_end.tpl b/templates/Classic/misc/form/table_end.tpl
deleted file mode 100644
index a79d9bea..00000000
--- a/templates/Classic/misc/form/table_end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<tr>
-	<td colspan="2" class="maintitle_apply_right" nowrap="nowrap">
-		<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
-	</td>
-</tr>
diff --git a/templates/Classic/misc/form/table_row.tpl b/templates/Classic/misc/form/table_row.tpl
deleted file mode 100644
index 6bd4bc52..00000000
--- a/templates/Classic/misc/form/table_row.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<tr>
-	<td class="main_field_name"{$style}>
-		{$label}{$mandatory}:
-		<if $desc != ''>
-			<br /><span style="font-size:85%;">{$desc}</span>
-		</if>
-	</td>
-	<td class="main_field_display" nowrap="nowrap">{$data_field}</td>
-</tr>
diff --git a/templates/Classic/misc/form/table_section.tpl b/templates/Classic/misc/form/table_section.tpl
deleted file mode 100644
index a91444f2..00000000
--- a/templates/Classic/misc/form/table_section.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<tr>
-	<td class="maintitle_apply_left">
-		<b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b>
-	</td>
-	<td class="maintitle_apply_right" nowrap="nowrap">
-		<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
-	</td>
-</tr>
diff --git a/templates/Classic/misc/htmlarrowcode.tpl b/templates/Classic/misc/htmlarrowcode.tpl
deleted file mode 100644
index 2b32c4f6..00000000
--- a/templates/Classic/misc/htmlarrowcode.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<a href="{$baseurl}&amp;sortfield={$fieldname}&amp;sortorder=desc">
-	<img src="templates/{$theme}/assets/img/order_desc.gif" border="0" alt="" />
-</a>
-<a href="{$baseurl}&amp;sortfield={$fieldname}&amp;sortorder=asc">
-	<img src="templates/{$theme}/assets/img/order_asc.gif" border="0" alt="" />
-</a>
diff --git a/templates/Classic/misc/htmlsearchcode.tpl b/templates/Classic/misc/htmlsearchcode.tpl
deleted file mode 100644
index b58952b4..00000000
--- a/templates/Classic/misc/htmlsearchcode.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{$lng['panel']['search']}:&nbsp;
-<select class="dropdown_noborder" name="searchfield">
-{$fieldoptions}
-</select>&nbsp;
-<input type="text" name="searchtext" value="{$searchtext}" />&nbsp;
-<input type="submit" name="Go" value="Go" />
diff --git a/templates/Classic/misc/htmlsortcode.tpl b/templates/Classic/misc/htmlsortcode.tpl
deleted file mode 100644
index e0f16838..00000000
--- a/templates/Classic/misc/htmlsortcode.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<select class="dropdown_noborder" name="sortfield">
-{$fieldoptions}
-</select>
-{$breakorws}
-<select class="dropdown_noborder" name="sortorder">
-{$orderoptions}
-</select>&nbsp;<input type="submit" name="Go" value="Go" />
diff --git a/templates/Classic/misc/question_yesno.tpl b/templates/Classic/misc/question_yesno.tpl
deleted file mode 100644
index 6a5726af..00000000
--- a/templates/Classic/misc/question_yesno.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-$header
-	<form action="$yesfile" method="post">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="send" value="send" />
-		$hiddenparams
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b>&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['question']['question']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left">$text</td>
-				<td class="field_name" nowrap="nowrap"><input type="submit" class="bottom" name="submitbutton" value="{$lng['panel']['yes']}" />&nbsp;<input type="button" class="bottom" value="{$lng['panel']['no']}"  id="yesnobutton" /></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/misc/question_yesno_checkbox.tpl b/templates/Classic/misc/question_yesno_checkbox.tpl
deleted file mode 100644
index d8c6dc3f..00000000
--- a/templates/Classic/misc/question_yesno_checkbox.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-$header
-	<form action="$yesfile" method="post">
-		<input type="hidden" name="s" value="$s" />
-		<input type="hidden" name="send" value="send" />
-		$hiddenparams
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b>&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['question']['question']}</b></td>
-			</tr>
-			<tr>
-				<td class="field_name_center_noborder">$text</td>
-				<td class="field_name">$checkbox</td>
-			</tr>
-			<tr>
-				<td class="field_name_border_left" nowrap="nowrap" style="text-align: center;" colspan="2"><input type="submit" class="bottom" name="submitbutton" value="{$lng['panel']['yes']}" />&nbsp;<input type="button" class="bottom" value="{$lng['panel']['no']}" id="yesnobutton" /></td>
-			</tr>
-		</table>
-	</form>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/misc/success.tpl b/templates/Classic/misc/success.tpl
deleted file mode 100644
index 14948d1b..00000000
--- a/templates/Classic/misc/success.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-$header
-	<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable_60">
-		<tr>
-			<td class="maintitle" colspan="2"><b>&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['success']['success']}</b></td>
-		</tr>
-		<tr>
-			<td class="field_name_center_noborder"><img src="templates/{$theme}/assets/img/info.png" alt="" /></td>
-			<td class="field_name">$success_message<if $redirect_url != ''><br /><a href="{$redirect_url}">{$lng['success']['clickheretocontinue']}</a></if></td>
-		</tr>
-	</table>
-	<br />
-	<br />
-$footer
diff --git a/templates/Classic/navigation_element.tpl b/templates/Classic/navigation_element.tpl
deleted file mode 100644
index 3ae45685..00000000
--- a/templates/Classic/navigation_element.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<br />
-<table cellspacing="0" cellpadding="0" border="0" width="200" align="center">
-	<tr>
-		<td class="section"><b>&nbsp;&nbsp;<img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;$completeLink</b></td>
-	</tr>
-	<tr>
-		<td class="subsection">$navigation_links</td>
-	</tr>
-	<tr>
-		<td class="endsection"></td>
-	</tr>
-</table>
diff --git a/templates/Classic/navigation_link.tpl b/templates/Classic/navigation_link.tpl
deleted file mode 100644
index 822ee88e..00000000
--- a/templates/Classic/navigation_link.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-&nbsp;&nbsp;<img src="templates/{$theme}/assets/img/ball.gif" alt="" />&nbsp;{$completeLink}
-<br />