diff --git a/templates/Maketank/2fa/entercode.tpl b/templates/Maketank/2fa/entercode.tpl
new file mode 100644
index 00000000..2f2d84f6
--- /dev/null
+++ b/templates/Maketank/2fa/entercode.tpl
@@ -0,0 +1,26 @@
+$header
+	<article class="login bradius">
+		<header class="dark">
+			<img src="{$header_logo}" alt="Froxlor Server Management Panel" />
+		</header>
+			<section class="loginsec">
+				<form method="post" action="{$filename}" enctype="application/x-www-form-urlencoded">
+					<fieldset>
+					<legend>Froxlor&nbsp;-&nbsp;{$lng['login']['2fa']}</legend>
+					<p>
+						<label for="2fa_code">{$lng['login']['2facode']}:</label>&nbsp;
+						<input type="text" name="2fa_code" id="2fa_code" value="" autofocus required/>
+					</p>
+					<p class="submit">
+						<input type="hidden" name="action" value="2fa_verify" />
+						<input type="hidden" name="send" value="send" />
+						<input type="submit" value="{$lng['2fa']['2fa_verify']}" />
+					</p>
+					</fieldset>
+				</form>
+				<aside>
+					<a href="index.php">{$lng['login']['backtologin']}</a>
+				</aside>
+			</section>
+	</article>
+$footer
diff --git a/templates/Maketank/2fa/overview.tpl b/templates/Maketank/2fa/overview.tpl
new file mode 100644
index 00000000..fcb2fa25
--- /dev/null
+++ b/templates/Maketank/2fa/overview.tpl
@@ -0,0 +1,43 @@
+$header
+<article>
+	<header>
+		<h2>
+			<img src="templates/{$theme}/assets/img/icons/lock_big.png" alt="" />&nbsp;
+			{$lng['login']['2fa']}
+		</h2>
+	</header>
+
+	<section>
+		<if $userinfo['type_2fa']=='0'>
+		<form method="post"
+			action="{$linker->getLink(array('section' => 'index', 'page' => $page, 'action' => 'add'))}">
+			<p>{$lng['2fa']['2fa_overview_desc']}</p>
+			<br> <select id="type_2fa" name="type_2fa" class="small">{$type_select}
+			</select>&nbsp;<input type="submit" class="submit"
+				value="{$lng['2fa']['2fa_add']}" name="add" />
+		</form>
+		</if>
+
+		<if $userinfo['type_2fa']=='1'>
+		<form method="post"
+			action="{$linker->getLink(array('section' => 'index', 'page' => $page, 'action' => 'delete'))}">
+			<p>{$lng['2fa']['2fa_email_desc']}</p>
+			<br> <input type="submit" class="cancel"
+				value="{$lng['2fa']['2fa_delete']}" name="delete" />
+		</form>
+		</if>
+
+		<if $userinfo['type_2fa']=='2'>
+		<form method="post"
+			action="{$linker->getLink(array('section' => 'index', 'page' => $page, 'action' => 'delete'))}">
+			<p>{$lng['2fa']['2fa_ga_desc']}</p>
+			<br> <img src="{$ga_qrcode}" alt="QRCode" /><br>
+			<br> <input type="submit" class="cancel"
+				value="{$lng['2fa']['2fa_delete']}" name="delete" />
+		</form>
+		</if>
+
+	</section>
+
+</article>
+$footer
diff --git a/templates/Maketank/api_keys/keys_error.tpl b/templates/Maketank/api_keys/keys_error.tpl
new file mode 100644
index 00000000..e573c664
--- /dev/null
+++ b/templates/Maketank/api_keys/keys_error.tpl
@@ -0,0 +1,3 @@
+<tr>
+	<td colspan="6"><span class="red">{$message}</span></td>
+</tr>
diff --git a/templates/Maketank/api_keys/keys_key.tpl b/templates/Maketank/api_keys/keys_key.tpl
new file mode 100644
index 00000000..c2854a69
--- /dev/null
+++ b/templates/Maketank/api_keys/keys_key.tpl
@@ -0,0 +1,44 @@
+<tr <if $isMyKey>class="primary-entry"</if> id="apikey-{$row['id']}" data-id="{$row['id']}" title="{$lng['apikeys']['clicktoview']}">
+	<td>
+		{$adminCustomerLink}
+	</td>
+	<td>
+		<span>{$row['_apikey']}</span>
+	</td>
+	<td>
+		<span>{$row['_secret']}</span>
+	</td>
+	<td>
+		{$row['allowed_from']}
+	</td>
+	<td>
+		<if !$isValid><strong><span class="red"></if>
+		{$row['valid_until']}
+		<if !$isValid></span></strong></if>
+	</td>
+	<td>
+		<a href="{$linker->getLink(array('section' => 'index', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">
+			<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />
+		</a>
+		<div id="dialog-{$row['id']}" title="API-key / Secret" class="hidden api-dialog">
+			<form action="{$linker->getLink(array('section' => 'apikeys'))}" method="post" enctype="application/x-www-form-urlencoded">
+			<input type="hidden" name="id" value="{$row['id']}"/>
+			<input type="hidden" name="area" value="{$area}"/>
+			<table class="full hl">
+				<tr>
+					<th>API-key</th><td><input type="text" value="{$row['apikey']}" readonly/></td>
+				</tr>
+				<tr>
+					<th>Secret</th><td><input type="text" value="{$row['secret']}" readonly/></td>
+				</tr>
+				<tr>
+					<th>{$lng['apikeys']['allowed_from']}<br><small>{$lng['apikeys']['allowed_from_help']}</small></th><td><input type="text" name="allowed_from" value="{$row['allowed_from']}"/></td>
+				</tr>
+				<tr>
+					<th>{$lng['apikeys']['valid_until']}<br><small>{$lng['apikeys']['valid_until_help']}</small></th><td><input type="text" name="valid_until" value="{$row['valid_until']}"/></td>
+				</tr>
+			</table>
+			</form>
+		</div>
+	</td>
+</tr>
diff --git a/templates/Maketank/api_keys/keys_list.tpl b/templates/Maketank/api_keys/keys_list.tpl
new file mode 100644
index 00000000..2c4407d1
--- /dev/null
+++ b/templates/Maketank/api_keys/keys_list.tpl
@@ -0,0 +1,81 @@
+ $header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/lock_big.png" alt="" />&nbsp;
+				{$lng['menue']['main']['apikeys']}
+			</h2>
+		</header>
+		
+		<if !empty($success_message)>
+			<div class="successcontainer bradius">
+				<div class="successtitle">{$lng['success']['success']}</div>
+				<div class="success">
+					$success_message
+				</div>
+			</div>
+		</if>
+
+		<if (int)$userinfo['api_allowed'] != 1>
+		<div class="messagewrapperfull">
+			<div class="warningcontainer bradius">
+				<div class="warningtitle">{$lng['admin']['warning']}</div>
+				<div class="warning">{$lng['usersettings']['api_allowed']['notice']}</div>
+			</div>
+		</div>
+		</if>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'index', 'page' => $page))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+
+				<div class="overviewsearch">
+					{$searchcode}
+				</div>
+
+				<if (int)$userinfo['api_allowed'] == 1>
+				<div class="overviewadd">
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />
+					<a href="{$linker->getLink(array('section' => 'index', 'page' => $page, 'action' => 'add'))}">{$lng['apikeys']['key_add']}</a>
+				</div>
+				</if>
+
+				<table class="full hl">
+					<thead>
+						<tr>
+							<th>{$lng['login']['username']}</th>
+							<th>API-key</th>
+							<th>Secret</th>
+							<th>{$lng['apikeys']['allowed_from']}</th>
+							<th>{$lng['apikeys']['valid_until']}</th>
+							<th>{$lng['panel']['options']}</th>
+						</tr>
+					</thead>
+
+					<if $pagingcode != ''>
+					<tfoot>
+						<tr>
+							<td colspan="6">{$pagingcode}</td>
+						</tr>
+					</tfoot>
+					</if>
+
+					<tbody>
+						{$apikeys}
+					</tbody>
+				</table>
+			</form>
+
+			<if 15 < $count >
+			<if (int)$userinfo['api_allowed'] == 1>
+			<div class="overviewadd">
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />
+				<a href="{$linker->getLink(array('section' => 'index', 'page' => $page, 'action' => 'add'))}">{$lng['apikeys']['key_add']}</a>
+			</div>
+			</if>
+			</if>
+		</section>
+	</article>
+$footer
diff --git a/templates/Maketank/footer.tpl b/templates/Maketank/footer.tpl
index f3e60e78..359c0bb9 100644
--- a/templates/Maketank/footer.tpl
+++ b/templates/Maketank/footer.tpl
@@ -5,7 +5,7 @@
 </if>
 <footer>
 	<span><img src="templates/{$theme}/assets/img/logo_grey.png" alt="Froxlor" /> 
-		<if (Settings::Get('admin.show_version_login') == '1' && $filename == 'index.php') || ($filename != 'index.php' && Settings::Get('admin.show_version_footer') == '1')>
+		<if (\Froxlor\Settings::Get('admin.show_version_login') == '1' && $filename == 'index.php') || ($filename != 'index.php' && \Froxlor\Settings::Get('admin.show_version_footer') == '1')>
 			{$version}{$branding}
 		</if>
 		&copy; 2009-{$current_year} by <a href="http://www.froxlor.org/" rel="external">the Froxlor Team</a><br />
diff --git a/templates/Maketank/header.tpl b/templates/Maketank/header.tpl
index 1187c552..5886ec6e 100644
--- a/templates/Maketank/header.tpl
+++ b/templates/Maketank/header.tpl
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8" />
 	<meta http-equiv="Default-Style" content="text/css" />
-	<if Settings::Get('panel.no_robots') == '0'>
+	<if \Froxlor\Settings::Get('panel.no_robots') == '0'>
 	<meta name="robots" content="noindex, nofollow, noarchive" />
 	<meta name="GOOGLEBOT" content="nosnippet" />
 	</if>
@@ -43,16 +43,9 @@
 	</a>
 	<div class="topheader_navigation">
 		<ul class="topheadernav">
-			<if Settings::Get('ticket.enabled') == 1>
-				<li>
-					<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets'))}">
-						<if 0 < $awaitingtickets>
-							<img src="templates/{$theme}/assets/img/icons/menubar_tickets.png" alt="{$lng['menue']['ticket']['ticket']}" />
-							<span class="countbubble">{$awaitingtickets}</span>
-						<else>
-							<img src="templates/{$theme}/assets/img/icons/menubar_tickets_null.png" alt="{$lng['menue']['ticket']['ticket']}" />
-						</if>
-					</a>
+			<if \Froxlor\Settings::Get('panel.is_configured') == 0 && $userinfo['adminsession'] == 1 && $userinfo['change_serversettings'] == 1>
+				<li class="liwarn">
+					<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'configfiles'))}">{$lng['panel']['not_configured']}</a>
 				</li>
 			</if>
 			<li>{$userinfo['loginname']}</li>
@@ -61,12 +54,19 @@
 				<ul>
 					<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_password'))}">{$lng['login']['password']}</a></li>
 					<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_language'))}">{$lng['login']['language']}</a></li>
-					<if Settings::Get('panel.allow_theme_change_admin') == '1' && $userinfo['adminsession'] == 1>
+					<if \Froxlor\Settings::Get('2fa.enabled') == 1>
+						<li><a href="{$linker->getLink(array('section' => 'index', 'page' => '2fa'))}">{$lng['2fa']['2fa']}</a></li>
+					</if>
+					<if \Froxlor\Settings::Get('panel.allow_theme_change_admin') == '1' && $userinfo['adminsession'] == 1>
 						<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_theme'))}">{$lng['panel']['theme']}</a></li>
 					</if>
-					<if Settings::Get('panel.allow_theme_change_customer') == '1' && $userinfo['adminsession'] == 0>
+					<if \Froxlor\Settings::Get('panel.allow_theme_change_customer') == '1' && $userinfo['adminsession'] == 0>
 						<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_theme'))}">{$lng['panel']['theme']}</a></li>
 					</if>
+					<if \Froxlor\Settings::Get('api.enabled') == 1>
+						<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'apikeys'))}">{$lng['menue']['main']['apikeys']}</a></li>
+						<li><a href="https://api.froxlor.org/doc/?v={$version}" rel="external">{$lng['menue']['main']['apihelp']}</a></li>
+					</if>
 				</ul>
 			</li>
 			<li><a href="{$linker->getLink(array('section' => 'index', 'action' => 'logout'))}" class="logoutlink">{$lng['login']['logout']}</a></li>
diff --git a/templates/Maketank/logfiles_viewer/index.tpl b/templates/Maketank/logfiles_viewer/index.tpl
new file mode 100644
index 00000000..1fb819f7
--- /dev/null
+++ b/templates/Maketank/logfiles_viewer/index.tpl
@@ -0,0 +1,19 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/view.png" alt="" />&nbsp;
+				{$lng['panel']['viewlogs']}&nbsp;(<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'edit', 'id' => $domain_id))}">{$domain['domain']}</a>)&nbsp;[<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains'))}">{$lng['menue']['domains']['domains']}</a>]
+			</h2>
+		</header>
+
+		<section>
+			<h3>Error-Log</h3>
+			<textarea rows="20" class="logcontent" readonly>{$error_log_content}</textarea>
+			<h3>Access-Log</h3>
+			<textarea rows="20" class="logcontent" readonly>{$access_log_content}</textarea>
+		</section>
+
+	</article>
+
+$footer
diff --git a/templates/Maketank/ssl_certificates/certs_cert.tpl b/templates/Maketank/ssl_certificates/certs_cert.tpl
new file mode 100644
index 00000000..f0755efc
--- /dev/null
+++ b/templates/Maketank/ssl_certificates/certs_cert.tpl
@@ -0,0 +1,34 @@
+<tr <if !$isValid>class="domain-expired"</if>>
+	<td>
+		<a href="https://{$row['domain']}" target="_blank">{$row['domain']}</a>
+		{$adminCustomerLink}
+	</td>
+	<td>
+		{$cert_data['subject']['CN']}
+		<if !empty($san_list)><br>SAN: {$san_list}</if>
+	</td>
+	<td>
+		<if isset($cert_data['issuer']['O']) && !empty($cert_data['issuer']['O'])>{$cert_data['issuer']['O']}</if>
+	</td>
+	<td>
+		{$validFrom}
+	</td>
+	<td>
+		<if !$isValid><strong><span class="red"></if>
+		{$validTo}
+		<if !$isValid></span></strong></if>
+	</td>
+	<td>
+		<if $row['letsencrypt'] != 1 && AREA == 'customer'>
+			<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domainssleditor', 'action' => 'view', 'id' => $row['domainid']))}">
+				<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />
+			</a>&nbsp;
+		</if>
+		<if $row['letsencrypt'] == '1'>
+			<img src="templates/{$theme}/assets/img/icons/ssl_letsencrypt.png" alt="{$lng['panel']['letsencrypt']}" title="{$lng['panel']['letsencrypt']}" />
+		</if>
+		<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'sslcertificates', 'action' => 'delete', 'id' => $row['id']))}">
+			<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />
+		</a>
+	</td>
+</tr>
diff --git a/templates/Maketank/ssl_certificates/certs_error.tpl b/templates/Maketank/ssl_certificates/certs_error.tpl
new file mode 100644
index 00000000..e573c664
--- /dev/null
+++ b/templates/Maketank/ssl_certificates/certs_error.tpl
@@ -0,0 +1,3 @@
+<tr>
+	<td colspan="6"><span class="red">{$message}</span></td>
+</tr>
diff --git a/templates/Maketank/ssl_certificates/certs_list.tpl b/templates/Maketank/ssl_certificates/certs_list.tpl
new file mode 100644
index 00000000..b474940e
--- /dev/null
+++ b/templates/Maketank/ssl_certificates/certs_list.tpl
@@ -0,0 +1,57 @@
+ $header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/lock_big.png" alt="" />&nbsp;
+				{$lng['domains']['ssl_certificates']}
+			</h2>
+		</header>
+		
+		<if !empty($success_message)>
+			<div class="successcontainer bradius">
+				<div class="successtitle">{$lng['success']['success']}</div>
+				<div class="success">
+					$success_message
+				</div>
+			</div>
+		</if>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'domains', 'page' => 'sslcertificates'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+
+				<div class="overviewsearch">
+					{$searchcode}
+				</div>
+	
+				<table class="full hl">
+					<thead>
+						<tr>
+							<th>{$lng['domains']['domainname']}&nbsp;{$arrowcode['d.domain']}</th>
+							<th>Certificate for</th>
+							<th>Issuer</th>
+							<th>Valid from</th>
+							<th>Valid until</th>
+							<th>{$lng['panel']['options']}</th>
+						</tr>
+					</thead>
+
+					<if $pagingcode != ''>
+					<tfoot>
+						<tr>
+							<td colspan="6">{$pagingcode}</td>
+						</tr>
+					</tfoot>
+					</if>
+
+					<tbody>
+						{$certificates}
+					</tbody>
+				</table>
+			</form>
+
+		</section>
+	</article>
+$footer