From 68a8caac283f2249479708c5c419bc5b6bc68c2e Mon Sep 17 00:00:00 2001
From: David Goodwin <david@codepoets.co.uk>
Date: Mon, 28 Sep 2020 20:32:57 +0100
Subject: [PATCH] move the bootstrap theme to be the default

---
 templates/bootstrap/backupwarning.tpl         |   6 -
 templates/bootstrap/broadcast-message.tpl     |  43 ----
 templates/bootstrap/editform.tpl              |  80 ------
 templates/bootstrap/flash_error.tpl           |  24 --
 templates/bootstrap/footer.tpl                |  22 --
 templates/bootstrap/header.tpl                |  21 --
 templates/bootstrap/index.tpl                 |  30 ---
 templates/bootstrap/list-virtual.tpl          | 126 ----------
 templates/bootstrap/list-virtual_alias.tpl    |  10 -
 .../bootstrap/list-virtual_alias_domain.tpl   |  11 -
 templates/bootstrap/list-virtual_mailbox.tpl  | 114 ---------
 templates/bootstrap/list.tpl                  | 159 ------------
 templates/bootstrap/login.tpl                 |  61 -----
 templates/bootstrap/main.tpl                  |  36 ---
 templates/bootstrap/menu.tpl                  | 129 ----------
 templates/bootstrap/password-change.tpl       |  29 ---
 templates/bootstrap/password-recover.tpl      |  26 --
 templates/bootstrap/password.tpl              |  40 ---
 templates/bootstrap/sendmail.tpl              |  33 ---
 templates/bootstrap/users_edit-alias.tpl      |  50 ----
 templates/bootstrap/users_main.tpl            |  26 --
 templates/bootstrap/users_menu.tpl            |  30 ---
 templates/bootstrap/vacation.tpl              | 110 ---------
 templates/bootstrap/viewlog.tpl               |  35 ---
 templates/broadcast-message.tpl               |  85 ++++---
 templates/editform.tpl                        | 146 +++++------
 templates/flash_error.tpl                     |  38 +--
 templates/footer.tpl                          |  33 +--
 templates/header.tpl                          |  36 +--
 templates/index.tpl                           |  51 ++--
 templates/list-virtual.tpl                    | 194 +++++++++------
 templates/list-virtual_mailbox.tpl            |  40 +--
 templates/list.tpl                            |  81 ++++---
 templates/login.tpl                           | 104 ++++----
 templates/main.tpl                            |  67 +++---
 templates/menu.tpl                            | 227 ++++++++++--------
 templates/message.tpl                         |   1 -
 templates/password-change.tpl                 |  53 ++--
 templates/password-recover.tpl                |  48 ++--
 templates/password.tpl                        |  77 +++---
 templates/sendmail.tpl                        |  67 +++---
 templates/users_edit-alias.tpl                |  86 ++++---
 templates/users_main.tpl                      |  48 ++--
 templates/users_menu.tpl                      |  43 +++-
 templates/vacation.tpl                        | 184 ++++++++------
 templates/viewlog.tpl                         |  66 ++---
 46 files changed, 971 insertions(+), 2055 deletions(-)
 delete mode 100644 templates/bootstrap/backupwarning.tpl
 delete mode 100644 templates/bootstrap/broadcast-message.tpl
 delete mode 100644 templates/bootstrap/editform.tpl
 delete mode 100644 templates/bootstrap/flash_error.tpl
 delete mode 100644 templates/bootstrap/footer.tpl
 delete mode 100644 templates/bootstrap/header.tpl
 delete mode 100644 templates/bootstrap/index.tpl
 delete mode 100644 templates/bootstrap/list-virtual.tpl
 delete mode 100644 templates/bootstrap/list-virtual_alias.tpl
 delete mode 100644 templates/bootstrap/list-virtual_alias_domain.tpl
 delete mode 100644 templates/bootstrap/list-virtual_mailbox.tpl
 delete mode 100644 templates/bootstrap/list.tpl
 delete mode 100644 templates/bootstrap/login.tpl
 delete mode 100644 templates/bootstrap/main.tpl
 delete mode 100644 templates/bootstrap/menu.tpl
 delete mode 100644 templates/bootstrap/password-change.tpl
 delete mode 100644 templates/bootstrap/password-recover.tpl
 delete mode 100644 templates/bootstrap/password.tpl
 delete mode 100644 templates/bootstrap/sendmail.tpl
 delete mode 100644 templates/bootstrap/users_edit-alias.tpl
 delete mode 100644 templates/bootstrap/users_main.tpl
 delete mode 100644 templates/bootstrap/users_menu.tpl
 delete mode 100644 templates/bootstrap/vacation.tpl
 delete mode 100644 templates/bootstrap/viewlog.tpl
 delete mode 100644 templates/message.tpl

diff --git a/templates/bootstrap/backupwarning.tpl b/templates/bootstrap/backupwarning.tpl
deleted file mode 100644
index 9c711ba3..00000000
--- a/templates/bootstrap/backupwarning.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<ul class="flash-error">
-	<li><span class='error_msg'><b>Warning:</b></span> The backup module of PostfixAdmin is poorly maintained and might contain bugs.
-	<li>Please use <tt>mysqldump</tt> to get a reliable backup of your database.
-	<li>&nbsp;
-	<li>If you still trust this backup module, you can <a href="backup.php?download=1" class="button">download the database dump now</a>
-</div>
diff --git a/templates/bootstrap/broadcast-message.tpl b/templates/bootstrap/broadcast-message.tpl
deleted file mode 100644
index 7f56f5ef..00000000
--- a/templates/bootstrap/broadcast-message.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<form name="broadcast-message" method="post" action="" class="form-horizontal">
-<div id="edit_form" class="panel panel-default">
-	<div class="panel-heading"><h4>{$PALANG.pBroadcast_title}</h4></div>
-	<div class="panel-body">
-		<input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}" />
-		<div class="form-group">
-                        <label class="col-md-4 col-sm-4 control-label">{$PALANG.from}:</label>
-                        <div class="col-md-6 col-sm-8"><p class="form-control-static"><em>{$smtp_from_email}</em></p></div>
-                </div>
-		<div class="form-group">
-                        <label class="col-md-4 col-sm-4 control-label" for="name">{$PALANG.pBroadcast_name}:</label>
-                        <div class="col-md-6 col-sm-8"><input class="form-control" type="text" name="name" id="name" /></div>
-                </div>
-		<div class="form-group">
-                        <label class="col-md-4 col-sm-4 control-label" for="subject">{$PALANG.subject}:</label>
-                        <div class="col-md-6 col-sm-8"><input class="form-control" type="text" name="subject" id="subject" /></div>
-                </div>
-                <div class="form-group">
-                        <label class="col-md-4 col-sm-4 control-label" for="message">{$PALANG.message}:</label>
-                        <div class="col-md-6 col-sm-8"><textarea class="form-control" rows="6" cols="40" name="message" id="message"></textarea></div>
-                </div>
-		<div class="form-group">
-                        <label class="col-md-4 col-sm-4 control-label"></label>
-                        <div class="col-md-6 col-sm-8"><div class="checkbox"><label><input type="checkbox" value="1" name="mailboxes_only"/>{$PALANG.broadcast_mailboxes_only}</label></div></div>
-                </div>
-		<div class="form-group">
-                        <label class="col-md-4 col-sm-4 control-label" for="domains">{$PALANG.broadcast_to_domains}</label>
-                        <div class="col-md-6 col-sm-8">
-				<select multiple="multiple" name="domains[]" id="domains" class="form-control">
-					{html_options output=$allowed_domains values=$allowed_domains selected=$allowed_domains}
-				</select>
-			</div>
-                </div>
-	</div>
-        <div class="panel-footer">
-                <div class="btn-toolbar" role="toolbar">
-                        <div class="btn-group pull-right">
-                        <input class="btn btn-primary" type="submit" name="submit" value="{$PALANG.pSendmail_button}" />
-                        </div>
-                </div>
-        </div>
-</div>
-</form>
diff --git a/templates/bootstrap/editform.tpl b/templates/bootstrap/editform.tpl
deleted file mode 100644
index a5e0fd1a..00000000
--- a/templates/bootstrap/editform.tpl
+++ /dev/null
@@ -1,80 +0,0 @@
-<form name="edit_{$table}" method="post" action="" class="form-horizontal">
-    <div id="edit_form" class="panel panel-default">
-        <div class="panel-heading"><h4>{$formtitle}</h4></div>
-        <div class="panel-body enable-asterisk">
-            <input class="flat" type="hidden" name="table" value="{$table}"/>
-            <input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
-
-            {foreach key=key item=field from=$struct}
-                {if $field.display_in_form == 1}
-
-                    {if $table == 'foo' && $key == 'bar'}
-                        <div class="form-group">Special handling (complete table row) for {$table} / {$key}</div>
-                    {else}
-                        <div class="form-group {if $fielderror.{$key}}has-error{/if}">
-                            <label class="col-md-4 col-sm-4 control-label" for="{$key}">{$field.label}</label>
-                            <div class="col-md-6 col-sm-8">
-                                {if $field.editable == 0}
-                                    {if $field.type == 'enma'}
-                                        {$struct.{$key}.options.{$value_{$key}}}
-                                    {else}
-                                        {$value_{$key}}
-                                    {/if}
-                                {else}
-                                    {if $table == 'foo' && $key == 'bar'}
-                                        Special handling (td content) for {$table} / {$key}
-                                    {elseif $field.type == 'bool'}
-                                        <div class="checkbox"><label>
-                                                <input type="checkbox" value='1'
-                                                       name="value[{$key}]"{if {$value_{$key}} == 1} checked="checked"{/if}/>
-                                            </label></div>
-                                    {elseif $field.type == 'enum'}
-                                        <select class="form-control" name="value[{$key}]" id="{$key}">
-                                            {html_options output=$struct.{$key}.options values=$struct.{$key}.options selected=$value_{$key}}
-                                        </select>
-                                    {elseif $field.type == 'enma'}
-                                        <select class="form-control" name="value[{$key}]" id="{$key}">
-                                            {html_options options=$struct.{$key}.options selected=$value_{$key}}
-                                        </select>
-                                    {elseif $field.type == 'list'}
-                                        <select class="form-control" name="value[{$key}][]" size="10"
-                                                multiple="multiple">
-                                            {html_options output=$struct.{$key}.options values=$struct.{$key}.options selected=$value_{$key}}
-                                        </select>
-                                    {elseif $field.type == 'pass' || $field.type == 'b64p'}
-                                        <input class="form-control" type="password" name="value[{$key}]"/>
-                                    {elseif $field.type == 'txtl'}
-                                        <textarea class="form-control" rows="10" cols="35" name="value[{$key}]">{foreach key=key2 item=field2 from=$value_{$key}}{$field2}{/foreach}</textarea>
-                                    {else}
-                                        <input class="form-control" type="text" name="value[{$key}]"
-                                               value="{$value_{$key}}"/>
-                                    {/if}
-                                {/if}
-
-                                {if $table == 'foo' && $key == 'bar'}
-                                    <span class="help-block">Special handling (td content) for {$table} / {$key}</span>
-                                {else}
-                                    {if $fielderror.{$key}}
-                                        <span class="help-block">{$fielderror.{$key}}</span>
-                                    {else}
-                                        <span class="help-block">{$field.desc}</span>
-                                    {/if}
-                                {/if}
-                            </div>
-                        </div>
-                    {/if}
-
-                {/if}
-            {/foreach}
-
-        </div>
-        <div class="panel-footer">
-            <div class="btn-toolbar" role="toolbar">
-                <div class="btn-group pull-right">
-                    <input class="btn btn-primary" type="submit" name="submit" value="{$submitbutton}"/>
-                </div>
-            </div>
-        </div>
-
-    </div>
-</form>
diff --git a/templates/bootstrap/flash_error.tpl b/templates/bootstrap/flash_error.tpl
deleted file mode 100644
index 627a35f0..00000000
--- a/templates/bootstrap/flash_error.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- {$smarty.template} -->
-<br clear="all"/><br/>
-{strip}
-    {if isset($smarty.session.flash)}
-        {if isset($smarty.session.flash.info)}
-            <div class="alert alert-info" role="alert">
-                <ul class="flash-info">
-                    {foreach from=$smarty.session.flash.info item=msg}
-                        <li>{$msg|escape:html}</li>
-                    {/foreach}
-                </ul>
-            </div>
-        {/if}
-        {if isset($smarty.session.flash.error)}
-            <div class="alert alert-danger" role="alert">
-                <ul class="flash-error">
-                    {foreach from=$smarty.session.flash.error item=msg}
-                        <li>{$msg|escape:html}</li>
-                    {/foreach}
-                </ul>
-            </div>
-        {/if}
-    {/if}
-{/strip}
diff --git a/templates/bootstrap/footer.tpl b/templates/bootstrap/footer.tpl
deleted file mode 100644
index 97562584..00000000
--- a/templates/bootstrap/footer.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- {$smarty.template} -->
-<footer class="footer">
-    <div class="container text-center">
-        <a target="_blank" rel="noopener" href="https://postfixadmin.sf.net/">Postfix Admin {$version}</a>
-        <span id="update-check">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
-	<a target="_blank" rel="noopener"
-       href="https://postfixadmin.sf.net/update-check.php?version={$version|escape:"url"}">{$PALANG.check_update}</a>
-        </span>
-        {if isset($smarty.session.sessid)}
-            {if $smarty.session.sessid.username}
-                &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
-                {$PALANG.pFooter_logged_as|replace:"%s":$smarty.session.sessid.username}
-            {/if}
-        {/if}
-        {if $CONF.show_footer_text == 'YES' && $CONF.footer_link}
-            &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
-            <a href="{$CONF.footer_link}" rel="noopener">{$CONF.footer_text}</a>
-        {/if}
-    </div>
-</footer>
-</body>
-</html>
diff --git a/templates/bootstrap/header.tpl b/templates/bootstrap/header.tpl
deleted file mode 100644
index d68edb78..00000000
--- a/templates/bootstrap/header.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- {$smarty.template} -->
-<!doctype html>
-<html lang="{if isset($smarty.session.lang)}{$smarty.session.lang}{/if}">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-
-    <title>Postfix Admin - {$smarty.server.HTTP_HOST}</title>
-    <link rel="shortcut icon" href="{$CONF.theme_favicon}"/>
-    <link rel="stylesheet" type="text/css" href="{$CONF.theme_css}"/>
-    {if $CONF.theme_custom_css}
-        <link rel="stylesheet" type="text/css" href="{$CONF.theme_custom_css}"/>
-    {/if}
-    <script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
-    <script src="css/bootstrap-3.3.7-dist/js/moment-with-locales.min.js"></script>
-    <script src="css/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
-    <script src="css/bootstrap-3.3.7-dist/js/bootstrap-datetimepicker.min.js"></script>
-</head>
-<body class="lang-{if isset($smarty.session.lang)}{$smarty.session.lang}{/if} page-{$smarty_template} {if isset($table)}page-{$smarty_template}-{$table}{/if}">
diff --git a/templates/bootstrap/index.tpl b/templates/bootstrap/index.tpl
deleted file mode 100644
index 9a272d2b..00000000
--- a/templates/bootstrap/index.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- {$smarty.template} -->
-{strip}
-    {include file="header.tpl"}
-    {if $smarty_template !== 'login' && $smarty_template !== 'password-recover' && $smarty_template !== 'password-change'}
-    {config_load file="menu.conf" section=$smarty_template}
-        {if $authentication_has_role.user}
-            {include file='users_menu.tpl'}
-        {else}
-            {include file='menu.tpl'}
-        {/if}
-    {/if}
-    <div class="container" role="main">
-        {if $authentication_has_role.user && $CONF.motd_user}
-            <div id="motd">{$CONF.motd_user}</div>
-        {elseif $authentication_has_role.global_admin && $CONF.motd_superadmin}
-            <div id="motd">{$CONF.motd_superadmin}</div>
-        {elseif $authentication_has_role.admin && $CONF.motd_admin}
-            <div id="motd">{$CONF.motd_admin}</div>
-        {/if}
-
-        {include file='flash_error.tpl'}
-        {if $smarty_template}
-            {include file="$smarty_template.tpl"}
-        {else}
-            <h3>Template not found</h3>
-            ({$smarty.server.PHP_SELF|escape:"html"})
-        {/if}
-    </div>
-    {include file='footer.tpl'}
-{/strip}
diff --git a/templates/bootstrap/list-virtual.tpl b/templates/bootstrap/list-virtual.tpl
deleted file mode 100644
index 61460654..00000000
--- a/templates/bootstrap/list-virtual.tpl
+++ /dev/null
@@ -1,126 +0,0 @@
-{assign var="file" value=$smarty.config.url_list_virtual}
-<div id="overview" class="panel panel-default">
-    <div class="panel-heading">
-        <div class="row">
-            <div class="col-md-5">
-                <form name="frmOverview" method="get" action="{$smarty.config.url_list_virtual}">
-                    {html_options name='domain' class='form-control' output=$domain_list values=$domain_list selected=$domain_selected onchange="this.form.submit();"}
-                    <input type="hidden" name="limit" value="0"/>
-                    <noscript><input class="button" type="submit" name="go" value="{$PALANG.go}"/></noscript>
-                </form>
-            </div>
-            <div class="col-md-5 col-md-offset-2 text-right">{#form_search#}</div>
-        </div>
-    </div>
-    <div class="panel-body">
-        <div class="text-center">
-            {if isset($search._)}
-                <h4>{$PALANG.pSearch_welcome} {$search._}</h4>
-            {else}
-                <h4>{$PALANG.pOverview_welcome}{$fDomain} :</h4>
-                <ul>
-                    <li>{$PALANG.aliases}: {$limit.alias_count} / {$limit.aliases}</li>
-                    <li>{$PALANG.mailboxes}: {$limit.mailbox_count} / {$limit.mailboxes}</li>
-                </ul>
-            {/if}
-        </div>
-        <hr/>
-        <div class="row">
-            <div class="col-md-12 text-center">{$PALANG.show}
-                {if isset($search._)}
-                    {assign var="searchsuffix" value="&search[_]={$search._}"}
-                {else}
-                    {assign var="searchsuffix" value=""}
-                {/if}
-
-                {if $tab=='all'}<span class='active'>{$PALANG.all}</span>
-                {else}<a href="?domain={$smarty.get.domain}&amp;tab=all{$searchsuffix}">{$PALANG.all}</a>{/if}
-                {if $tab=='mailbox'}<span class='active'>{$PALANG.pOverview_mailbox_title}</span>
-                {else}<a
-                    href="?domain={$smarty.get.domain}&amp;tab=mailbox{$searchsuffix}">{$PALANG.pOverview_mailbox_title}</a>{/if}
-                {if $tab=='alias'}<span class='active'>{$PALANG.pOverview_alias_title}</span>
-                {else}<a
-                    href="?domain={$smarty.get.domain}&amp;tab=alias{$searchsuffix}">{$PALANG.pOverview_alias_title}</a>{/if}
-                {if $boolconf_alias_domain}
-                    {if $tab=='alias_domain'}<span class='active'>{$PALANG.pOverview_alias_domain_title}</span>
-                    {else}<a
-                        href="?domain={$smarty.get.domain}&amp;tab=alias_domain{$searchsuffix}">{$PALANG.pOverview_alias_domain_title}</a>{/if}
-                {/if}
-            </div>
-        </div>
-    </div>
-</div>
-<div class="clearfix"></div><br/>
-{*** Domain Aliases ***}
-{if $boolconf_alias_domain}
-    {if $tab=='alias_domain' || $tab=='all'}
-        {include file="list-virtual_alias_domain.tpl"}
-    {/if}
-{/if}
-{if $tab=='all'}
-    <div class="clearfix"></div>
-    <br/>
-{/if}
-{*** Aliases ***}
-{if $tab=='alias' || $tab=='all'}
-    {$nav_bar_alias.top}
-    {include file="list-virtual_alias.tpl"}
-    {$nav_bar_alias.bottom}
-{/if}
-{if $tab=='all'}
-    <div class="clearfix"></div>
-    <br/>
-{/if}
-{if $tab=='mailbox' || $tab=='all'}
-    <div id="overview" class="panel panel-default">
-        {$nav_bar_mailbox.top}
-        {assign var="colspan" value=9}
-        {if $CONF.vacation_control_admin===YES}{assign var="colspan" value="`$colspan+1`"}{/if}
-        {if $CONF.alias_control_admin===YES}{assign var="colspan" value="`$colspan+1`"}{/if}
-        <table class="table table-hover" id="mailbox_table">
-            <thead>
-            <tr>
-                <th style="text-align:center;" colspan="{$colspan}">{$PALANG.pOverview_mailbox_title}</th>
-            </tr>
-            </thead>
-            {if $tMailbox}
-            {include file="list-virtual_mailbox.tpl"}
-            {else}</table>
-        {/if}
-        <div class="panel-footer">
-            <div class="btn-toolbar" role="toolbar">
-                <div class="btn-group pull-right">
-                    {$nav_bar_mailbox.bottom}
-                    {if $tCanAddMailbox}
-                        <a href="{#url_create_mailbox#}&amp;domain={$fDomain|escape:"url"}" role="button"
-                           class="btn btn-default"><span class="glyphicon glyphicon-plus-sign"
-                                                         aria-hidden="true"></span> {$PALANG.add_mailbox}</a>
-                    {/if}
-                    <a role="button" class="btn btn-default" href="list.php?table=mailbox&amp;output=csv"><span
-                                class="glyphicon glyphicon-export" aria-hidden="true"></span> {$PALANG.download_csv}</a>
-                </div>
-            </div>
-        </div>
-    </div>
-{/if}
-{if $CONF.show_status===YES && $CONF.show_status_key===YES}
-    <br/>
-    <br/>
-    {if $CONF.show_undeliverable===YES}
-        &nbsp;
-        <span style='background-color:{$CONF.show_undeliverable_color};'>{$CONF.show_status_text}</span>
-        ={$PALANG.pStatus_undeliverable}
-    {/if}
-    {if $CONF.show_popimap===YES}
-        &nbsp;
-        <span style='background-color:{$CONF.show_popimap_color};'>{$CONF.show_status_text}</span>
-        ={$PALANG.pStatus_popimap}
-    {/if}
-    {if $CONF.show_custom_domains|@count>0}
-        {foreach from=$CONF.show_custom_domains item=item key=i}
-            &nbsp;
-            <span style='background-color:{$CONF.show_custom_colors[$i]};'>{$CONF.show_status_text}</span>
-            ={$PALANG.pStatus_custom}{$item}
-        {/foreach}
-    {/if}
-{/if}
diff --git a/templates/bootstrap/list-virtual_alias.tpl b/templates/bootstrap/list-virtual_alias.tpl
deleted file mode 100644
index 4587b7c0..00000000
--- a/templates/bootstrap/list-virtual_alias.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{assign var="table" value='alias'}
-{assign var="struct" value=$alias_data.struct}
-{assign var="msg" value=$alias_data.msg}
-{assign var="id_field" value=$msg.id_field}
-{assign var="formconf" value=$alias_data.formconf}
-{assign var="items" value=$tAlias}
-{assign var="RAW_items" value=$RAW_tAlias}
-
-{include 'list.tpl'}
-
diff --git a/templates/bootstrap/list-virtual_alias_domain.tpl b/templates/bootstrap/list-virtual_alias_domain.tpl
deleted file mode 100644
index 83c5dd1b..00000000
--- a/templates/bootstrap/list-virtual_alias_domain.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{*** Domain Aliases ***}
-
-{assign var="table" value='aliasdomain'}
-{assign var="struct" value=$aliasdomain_data.struct}
-{assign var="msg" value=$aliasdomain_data.msg}
-{assign var="id_field" value=$msg.id_field}
-{assign var="formconf" value=$aliasdomain_data.formconf}
-{assign var="items" value=$tAliasDomains}
-{assign var="RAW_items" value=$RAW_tAliasDomains}
-
-{include 'list.tpl'}
diff --git a/templates/bootstrap/list-virtual_mailbox.tpl b/templates/bootstrap/list-virtual_mailbox.tpl
deleted file mode 100644
index 353fa6e6..00000000
--- a/templates/bootstrap/list-virtual_mailbox.tpl
+++ /dev/null
@@ -1,114 +0,0 @@
-{if isset($search._)}
-    {assign var="search" value=$search._}
-{else}
-    {assign var="search" value=''}
-{/if}
-
-	<thead>
-	{#tr_header#}
-		{if $CONF.show_status===YES}<th></th>{/if}
-		<th>{$PALANG.pOverview_mailbox_username}</th>
-		{if $display_mailbox_aliases==true}
-			<th>{$PALANG.to}</th>
-		{/if}
-		<th>{$PALANG.name}</th>
-		{if $CONF.quota===YES}<th>{$PALANG.pOverview_mailbox_quota}</th>{/if}
-		<th>{$PALANG.last_modified}</th>
-		<th>{$PALANG.active}</th>
-		{assign var="colspan" value="`$colspan-6`"}
-		<th colspan="{$colspan}">&nbsp;</th>
-	</tr>
-	</thead>
-	<tbody>
-	{foreach from=$tMailbox item=item key=i}
-		<tr>
-			{if $CONF.show_status===YES}
-				<td>{$gen_show_status_mailbox[$i]}</td>
-			{/if}
-			<td>
-				{if $search eq ""}
-					{$item.username}
-				{else}
-					{$item.username|replace:$search:"<span class='searchresult'>$search</span>"}
-				{/if}
-			</td>
-			{if $display_mailbox_aliases==true}
-				<td>
-				{if $item.goto_mailbox == 1}
-					Mailbox<br/>
-				{else}
-					Forward only<br/>
-				{/if}
-				{foreach from=$item.goto_other item=item2 key=j}
-					{if $search eq ""}
-						{$item2}
-					{else}
-						{$item2|replace:$search:"<span class='searchresult'>$search</span>"}
-					{/if}
-					<br/>
-				{/foreach}
-				</td>
-			{/if}
-			<td>{$item.name}</td>
-			{if $CONF.quota===YES}
-				<td>
-				{if $item.quota==0}
-					{$PALANG.pOverview_unlimited}
-				{elseif $item.quota<0}
-					{$PALANG.pOverview_disabled}
-				{else}
-					{if $boolconf_used_quotas}
-
-
-						{if $divide_quota.percent[$i] > $CONF.quota_level_high_pct}
-							{assign var="quota_level" value="high"}
-						{elseif $divide_quota.percent[$i] > $CONF.quota_level_med_pct}
-							{assign var="quota_level" value="mid"}
-						{else}
-							{assign var="quota_level" value="low"}
-						{/if}
-						<div class="quota quota_{$quota_level}" style="width:{$divide_quota.quota_width[$i]}px;"></div>
-						<div class="quota_bg"></div></div>
-						<div class="quota_text quota_text_{$quota_level}">{$divide_quota.current[$i]} / {$divide_quota.quota[$i]}</div>
-					{else}
-						{$divide_quota.quota[$i]}
-					{/if}
-				{/if}
-				</td>
-			{/if}
-			<td>{$item.modified}</td>
-			<td><a href="{#url_editactive#}mailbox&amp;id={$item.username|escape:"url"}&amp;active={if ($item.active==0)}1{else}0{/if}&amp;token={$smarty.session.PFA_token|escape:"url"}"
-				>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
-			{if $CONF.vacation_control_admin===YES && $CONF.vacation===YES}
-				{if $item.v_active!==-1}
-					{if $item.v_active==1}
-						{assign var="v_active" value=$PALANG.pOverview_vacation_edit}
-					{else}
-						{assign var="v_active" value=$PALANG.pOverview_vacation_option}
-					{/if}
-					<td><a href="vacation.php?username={$item.username|escape:"url"}">{$v_active}</a></td>
-				{/if}
-			{else}
-					<td>&nbsp;</td>
-			{/if}
-			{assign var="edit_aliases" value=0}
-			{if $authentication_has_role.global_admin!==true && $CONF.alias_control_admin===YES}{assign var="edit_aliases" value=1}{/if}
-			{if $authentication_has_role.global_admin==true && $CONF.alias_control===YES}{assign var="edit_aliases" value=1}{/if}
-			{if $edit_aliases==1}
-				<td><a href="edit.php?table=alias&amp;edit={$item.username|escape:"url"}">{$PALANG.alias}</a></td>
-			{/if}
-			<td><a href="edit.php?table=mailbox&amp;edit={$item.username|escape:"url"}">{$PALANG.edit}</a></td>
-			<td>
-				<form method="post" action="delete.php">
-					<input type="hidden" name="table" value="mailbox">
-					<input type="hidden" name="delete" value="{$item.username|escape:"quotes"}">
-					<input type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"quotes"}">
-					<button type="submit" class="btn btn-danger" onclick="return confirm ('{$PALANG.confirm}{$PALANG.mailboxes}: {$item.username}');">
-						{$PALANG.del}
-					</button>
-				</form>
-			</td>
-		</tr>
-	{/foreach}
-	</tbody>
-</table>
diff --git a/templates/bootstrap/list.tpl b/templates/bootstrap/list.tpl
deleted file mode 100644
index 73e451f4..00000000
--- a/templates/bootstrap/list.tpl
+++ /dev/null
@@ -1,159 +0,0 @@
-<div class="panel panel-default">
-
-{if ($admin_list|count > 1)}
-<div class="panel-heading">
-<form name="frmOverview" method="post" action="">
-        {html_options name='username' output=$admin_list values=$admin_list selected=$admin_selected onchange="this.form.submit();"}
-        <noscript><input class="button" type="submit" name="go" value="{$PALANG.go}" /></noscript>
-</form>
-</div>
-{/if}
-
-{if $msg.show_simple_search}
-    {#form_search#}
-{/if}
-
-{if $msg.show_simple_search}
-    {if ($search|count > 0)}
-        <div class='searchparams'>
-            <p>{$PALANG.searchparams}
-            {foreach key=key item=field from=$search}
-                <span>{if $struct.$key.label}{$struct.$key.label}{else}{$key}{/if}
-                    {if isset($searchmode.$key)}{$searchmode.$key}{else}={/if} {$field}
-                </span>
-            {/foreach}
-            <span><a href="list.php?table={$table}&reset_search=1">[x]</a></span>
-        </div>
-    {/if}
-{/if}
-
-<table class="table table-hover" border=0 id='admin_table'><!-- TODO: 'admin_table' needed because of CSS for table header -->
-
-{if $msg.list_header}
-	{assign var="colcount" value=2}
-	{foreach key=key item=field from=$struct}
-		{if $field.display_in_list == 1 && $field.label}{* don't show fields without a label *}
-			{assign var="colcount" value=$colcount+1}
-		{/if}
-	{/foreach}
-	<thead>
-	<tr>
-		<th style="text-align:center;" colspan="{$colcount}">{$PALANG.{$msg.list_header}}</th>
-	</tr>
-	</thead>
-{/if}
-
-<thead>
-<tr class="header">
-    {foreach key=key item=field from=$struct}
-        {if $field.display_in_list == 1 && $field.label}{* don't show fields without a label *}
-            <th>{$field.label}</th>
-        {/if}
-    {/foreach}
-    <th>&nbsp;</th>
-    <th>&nbsp;</th>
-</tr>
-</thead>
-
-{foreach key=itemkey from=$RAW_items item=RAW_item}
-    {assign "item" $items.{htmlentities($itemkey, $smarty.const.ENT_QUOTES, 'UTF-8', false)}} {* array keys in $items are escaped using htmlentities(), see smarty.inc.php *}
-    <tr>
-
-    {foreach key=key item=field from=$struct}
-        {if $field.display_in_list == 1 && $field.label}
-
-            {if $field.linkto != '' && ($item.$id_field != '' || $item.$id_field > 0) }
-                {assign "linkto" "{$field.linkto|replace:'%s':{$item.$id_field|escape:url}}"} {* TODO: use label field instead *}
-                {assign "linktext" "<a href='{$linkto}'>{$item.{$key}}</a>"}
-            {else}
-                {assign "linktext" $item.$key}
-            {/if}
-
-            {if $table == 'foo' && $key == 'bar'}
-                <td>Special handling (complete table row) for {$table} / {$key}</td>
-            {else}
-                <td>
-                    {if $table == 'foo' && $key == 'bar'}
-                        Special handling (td content) for {$table} / {$key}
-                    {elseif $table == 'aliasdomain' && $key == 'target_domain' && $struct.target_domain.linkto == 'target'}
-                        <a href="list-virtual.php?domain={$item.target_domain|escape:"url"}">{$item.target_domain}</a>
-{*                    {elseif $table == 'domain' && $key == 'domain'}
-                        <a href="list.php?table=domain&domain={$item.domain|escape:"url"}">{$item.domain}</a>
-*}
-                    {elseif $key == 'active'}
-                        {if $item._can_edit}
-                            <a class="btn btn-warning" href="{#url_editactive#}{$table}&amp;id={$RAW_item.$id_field|escape:"url"}&amp;active={if ($item.active==0)}1{else}0{/if}&amp;token={$smarty.session.PFA_token|escape:"url"}">{$item._active}</a>
-                        {else}
-                            {$item._active}
-                        {/if}
-                    {elseif $field.type == 'bool'}
-                        {assign "tmpkey" "_{$key}"}{$item.{$tmpkey}}
-                    {elseif $field.type == 'list'}
-                        {foreach key=key2 item=field2 from=$item.$key}{$field2}<br> {/foreach}
-                    {elseif $field.type == 'pass'}
-                        (hidden)
-                    {elseif $field.type == 'quot'}
-                        {assign "tmpkey" "_{$key}_percent"}
-
-                        {if $item[$tmpkey]>90}
-                            {assign var="quota_level" value="high"}
-                        {elseif $item[$tmpkey]>55}
-                            {assign var="quota_level" value="mid"}
-                        {else}
-                            {assign var="quota_level" value="low"}
-                        {/if}
-                        {if $item[$tmpkey] > -1}
-                            <div class="quota quota_{$quota_level}" style="width:{$item[$tmpkey] *1.2}px;"></div>
-                            <div class="quota_bg"></div></div>
-                            <div class="quota_text quota_text_{$quota_level}">{$linktext}</div>
-                        {else}
-                            <div class="quota_bg quota_no_border"></div></div>
-                            <div class="quota_text">{$linktext}</div>
-                        {/if}
-
-                    {elseif $field.type == 'txtl'}
-                        {foreach key=key2 item=field2 from=$item.$key}{$field2}<br> {/foreach}
-                    {elseif $field.type == 'html'}
-                        {$RAW_item.$key}
-                    {else}
-                        {$linktext}
-                    {/if}
-                </td>
-            {/if}
-        {/if}
-    {/foreach}
-
-    <td>{if $item._can_edit}
-            <a class="btn btn-primary" href="edit.php?table={$table|escape:"url"}&amp;edit={$RAW_item.$id_field|escape:"url"}">{$PALANG.edit}</a>
-        {else}&nbsp;
-        {/if}
-    </td>
-    <td>{if $item._can_delete}
-        <form method="post" action="{#url_delete#}">
-            <input type="hidden" name="table" value="{$table}">
-            <input type="hidden" name="delete" value="{$RAW_item.$id_field|escape:"quotes"}">
-            <input type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"quotes"}">
-
-            <button class="btn btn-danger" onclick="return confirm('{$PALANG.{$msg.confirm_delete}|replace:'%s':$item.$id_field}')">
-                {$PALANG.del}
-            </button>
-        </form>
-    {else}&nbsp;{/if}
-</td>
-    </tr>
-{/foreach}
-
-</table>
-
-<div class="panel-footer">
-	<div class="btn-toolbar" role="toolbar">
-		<div class="btn-group pull-right">
-		{if $msg.can_create}
-		<a href="edit.php?table={$table|escape:"url"}" role="button" class="btn btn-default"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> {$PALANG.{$formconf.create_button}}</a>
-		{/if}
-		<a href="list.php?table={$table|escape:"url"}&amp;output=csv" role="button" class="btn btn-default"><span class="glyphicon glyphicon-export" aria-hidden="true"></span> {$PALANG.download_csv}</a>
-		</div>
-	</div>
-</div>
-
-</div>
diff --git a/templates/bootstrap/login.tpl b/templates/bootstrap/login.tpl
deleted file mode 100644
index 090dadf9..00000000
--- a/templates/bootstrap/login.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-<nav class="navbar navbar-default navbar-fixed-top">
-    <div class="container">
-        <div class="navbar-header">
-            <a class="navbar-brand" href='main.php'><img id="login_header_logo" src="{$CONF.theme_logo}"
-                                                         alt="Logo"/></a>
-            {if $CONF.show_header_text==='YES' && $CONF.header_text}
-                <h2>{$CONF.header_text}</h2>
-            {/if}
-        </div>
-    </div>
-</nav>
-
-<div id="login" class="container text-center">
-    <h2>{if $logintype=='admin'}{$PALANG.pLogin_welcome}
-        {else}{$PALANG.pUsersLogin_welcome}
-        {/if}</h2>
-    <div class="well">
-        <form name="frmLogin" method="post" action="" role="form" class="form-signin">
-            <input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
-            <div class="form-group">
-                <label class="control-label" for="fUsername">{$PALANG.pLogin_username}:</label>
-                <input class="flat form-control" type="text" name="fUsername" id="fUsername"/>
-            </div>
-            <div class="form-group">
-                <label class="control-label" for="fPassword">{$PALANG.password}:</label>
-                <input class="flat form-control" type="password" name="fPassword" id="fPassword"/>
-            </div>
-            {if $forgotten_password_reset}
-                <div class="form-group row">
-                    <div class="col-sm-6 col-sm-offset-3 reset-button">
-                        <a class="btn btn-default btn-block" role="button" href="password-recover.php"><span
-                                    class="glyphicon glyphicon-refresh"
-                                    aria-hidden="true"></span> {$PALANG.pUsersLogin_password_recover}</a>
-                    </div>
-                </div>
-            {/if}
-            <div class="form-group">
-                <label class="control-label">{$PALANG.pLogin_language}:</label>
-                {$language_selector}
-            </div>
-            <div class="text-center">
-                <input class="btn btn-primary btn-lg btn-block" type="submit" name="submit"
-                       value="{$PALANG.pLogin_button}"/>
-            </div>
-        </form>
-        {if $logintype == 'admin'}
-            <br/>
-            <div class="text-center">
-                <a href="users/">{$PALANG.pLogin_login_users}</a>
-            </div>
-        {/if}
-    </div>
-    {literal}
-        <script type="text/javascript">
-            <!--
-            document.frmLogin.fUsername.focus();
-            // -->
-        </script>
-    {/literal}
-</div>
-
diff --git a/templates/bootstrap/main.tpl b/templates/bootstrap/main.tpl
deleted file mode 100644
index 4dd00a9d..00000000
--- a/templates/bootstrap/main.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- {$smarty.template} -->
-<div class="panel panel-default" id="main_menu">
-
-    <table class="table">
-        <tr>
-            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_list_domain#}">{$PALANG.pMenu_overview}</a></td>
-            <td>{$PALANG.pMain_overview}</td>
-        </tr>
-        <tr>
-            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_create_alias#}">{$PALANG.add_alias}</a></td>
-            <td>{$PALANG.pMain_create_alias}</td>
-        </tr>
-        <tr>
-            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_create_mailbox#}">{$PALANG.add_mailbox}</a></td>
-            <td>{$PALANG.pMain_create_mailbox}</td>
-        </tr>
-        {if $CONF.sendmail==='YES'}
-            <tr>
-                <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_sendmail#}">{$PALANG.pMenu_sendmail}</a></td>
-                <td>{$PALANG.pMain_sendmail}</td>
-            </tr>
-        {/if}
-        <tr>
-            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_password#}">{$PALANG.pMenu_password}</a></td>
-            <td>{$PALANG.pMain_password}</td>
-        </tr>
-        <tr>
-            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_viewlog#}">{$PALANG.pMenu_viewlog}</a></td>
-            <td>{$PALANG.pMain_viewlog}</td>
-        </tr>
-        <tr>
-            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_logout#}">{$PALANG.pMenu_logout}</a></td>
-            <td>{$PALANG.pMain_logout}</td>
-        </tr>
-    </table>
-</div>
diff --git a/templates/bootstrap/menu.tpl b/templates/bootstrap/menu.tpl
deleted file mode 100644
index 2248359f..00000000
--- a/templates/bootstrap/menu.tpl
+++ /dev/null
@@ -1,129 +0,0 @@
-<!-- {$smarty.template} -->
-{strip}
-    {if !empty($smarty.get) && !empty($smarty.get.domain)}
-        {*** zuweisung muss eleganter gehen ***}
-        {assign var="url_domain" value=$smarty.get.domain}
-        {assign var="url_domain" value="&amp;domain={$url_domain|escape:url}"}
-    {/if}
-{/strip}
-
-{strip}
-    <nav class="navbar navbar-default navbar-fixed-top">
-        <div class="container-fluid">
-            <div class="navbar-header">
-                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar"
-                        aria-expanded="false" aria-controls="navbar">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                {*** <a class="navbar-brand" href='main.php'><img id="login_header_logo" src="{$CONF.theme_logo}" alt="Logo" /></a> ***}
-                <a class="navbar-brand" href='main.php'><img id="login_header_logo" src="images/postbox.png"
-                                                             alt="Logo"/></a>
-            </div>
-            <div id="navbar" class="collapse navbar-collapse">
-                <ul class="nav navbar-nav">
-                    {* list-admin *}
-                    {if $authentication_has_role.global_admin}
-                        {strip}
-                            <li class="dropdown">
-                                <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
-                                   aria-expanded="false" href="{#url_list_admin#}">{$PALANG.pAdminMenu_list_admin} <span
-                                            class="caret"></span></a>
-                                <ul class="dropdown-menu">
-                                    <li><a href="{#url_list_admin#}">{$PALANG.pAdminMenu_list_admin}</a></li>
-                                    <li><a href="{#url_create_admin#}">{$PALANG.pAdminMenu_create_admin}</a></li>
-                                </ul>
-                            </li>
-                        {/strip}
-                    {else}
-                        <li><a href="{#url_main#}">{$PALANG.pMenu_main}</a></li>
-                    {/if}
-                    {* list-domain *}
-                    {strip}
-                        <li>
-                            <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
-                               aria-expanded="false" href="{#url_list_domain#}">{$PALANG.pAdminMenu_list_domain} <span
-                                        class="caret"></span></a>
-                            <ul class="dropdown-menu">
-                                <li><a href="{#url_list_domain#}">{$PALANG.pAdminMenu_list_domain}</a></li>
-                                {if $authentication_has_role.global_admin}
-                                    <li><a href="{#url_edit_domain#}">{$PALANG.pAdminMenu_create_domain}</a></li>
-                                {/if}
-                            </ul>
-                        </li>
-                    {/strip}
-                    {* list-virtual *}
-                    {strip}
-                        <li class="dropdown">
-                            <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
-                               aria-expanded="false" href="{#url_list_virtual#}">{$PALANG.pAdminMenu_list_virtual} <span
-                                        class="caret"></span></a>
-                            <ul class="dropdown-menu">
-                                <li><a href="{#url_list_virtual#}">{$PALANG.pAdminMenu_list_virtual}</a></li>
-                                <li><a href="{#url_create_mailbox#}{$url_domain}">{$PALANG.add_mailbox}</a></li>
-                                <li><a href="{#url_create_alias#}{$url_domain}">{$PALANG.add_alias}</a></li>
-                                {if $boolconf_alias_domain}
-                                    <li>
-                                        <a href="{#url_create_alias_domain#}{$url_domain}">{$PALANG.add_alias_domain}</a>
-                                    </li>
-                                {/if}
-                            </ul>
-                        </li>
-                    {/strip}
-                    {* fetchmail *}
-                    {if $CONF.fetchmail==='YES'}
-                        {strip}
-                            <li class="dropdown">
-                                <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
-                                   aria-expanded="false" href="{#url_fetchmail#}">{$PALANG.pMenu_fetchmail} <span
-                                            class="caret"></span></a>
-                                <ul class="dropdown-menu">
-                                    <li><a href="{#url_fetchmail#}">{$PALANG.pMenu_fetchmail}</a></li>
-                                    <li><a href="{#url_fetchmail_new_entry#}">{$PALANG.pFetchmail_new_entry}</a></li>
-                                </ul>
-                            </li>
-                        {/strip}
-                    {/if}
-                    {* sendmail *}
-                    {if $CONF.sendmail==='YES'}
-                        {strip}
-                            <li class="dropdown">
-                                <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
-                                   aria-expanded="false" href="{#url_sendmail#}">{$PALANG.pMenu_sendmail} <span
-                                            class="caret"></span></a>
-                                <ul class="dropdown-menu">
-                                    <li><a href="{#url_sendmail#}">{$PALANG.pMenu_sendmail}</a></li>
-                                    {if $authentication_has_role.global_admin || (isset($CONF.sendmail_all_admins) && $CONF.sendmail_all_admins === 'YES') }
-                                        <li>
-                                            <a href="{#url_broadcast_message#}">{$PALANG.pAdminMenu_broadcast_message}</a>
-                                        </li>
-                                    {/if}
-                                </ul>
-                            </li>
-                        {/strip}
-                    {/if}
-                </ul>
-                <ul class="nav navbar-nav navbar-right">
-                    {* password *}
-                    <li><a class="btn btn-default navbar-btn btn-sm" type="button"
-                           href="{#url_password#}">{$PALANG.pMenu_password}</a></li>
-                    {* backup *}
-                    {if $authentication_has_role.global_admin && $CONF.database_type!=='pgsql' && $CONF.backup === 'YES'}
-                        <li><a class="btn btn-default navbar-btn btn-sm" type="button"
-                               href="{#url_backup#}">{$PALANG.pAdminMenu_backup}</a></li>
-                    {/if}
-                    {* viewlog *}
-                    {if $CONF.logging==='YES'}
-                        <li><a class="btn btn-default navbar-btn btn-sm" type="button"
-                               href="{#url_viewlog#}">{$PALANG.pMenu_viewlog}</a></li>
-                    {/if}
-                    {* logout *}
-                    <li><a class="btn btn-default navbar-btn btn-sm" type="button"
-                           href="{#url_logout#}">{$PALANG.pMenu_logout}</a></li>
-                </ul>
-            </div><!--/.nav-collapse -->
-        </div>
-    </nav>
-{/strip}
diff --git a/templates/bootstrap/password-change.tpl b/templates/bootstrap/password-change.tpl
deleted file mode 100644
index 10293236..00000000
--- a/templates/bootstrap/password-change.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<div id="edit_form">
-    <form name="mailbox" method="post">
-        <table>
-            <tr>
-                <td colspan="3"><h3>{$PALANG.pPassword_welcome}</h3></td>
-            </tr>
-            <tr>
-                <td>{$PALANG.pLogin_username} :</td>
-                <td><input class="flat" type="text" name="fUsername" value="{$tUsername}"/></td>
-            </tr>
-            <tr>
-                <td>{$PALANG.pPassword_password_code} :</td>
-                <td><input class="flat" type="text" name="fCode" value="{$tCode}"/></td>
-            </tr>
-            <tr>
-                <td>{$PALANG.pPassword_password} :</td>
-                <td><input class="flat" type="password" name="fPassword"/></td>
-            </tr>
-            <tr>
-                <td>{$PALANG.pPassword_password2} :</td>
-                <td><input class="flat" type="password" name="fPassword2"/></td>
-            </tr>
-            <tr>
-                <td colspan="2" class="hlp_center"><input class="button" type="submit" name="submit"
-                                                          value="{$PALANG.change_password}"/></td>
-            </tr>
-        </table>
-    </form>
-</div>
diff --git a/templates/bootstrap/password-recover.tpl b/templates/bootstrap/password-recover.tpl
deleted file mode 100644
index 5ab378b2..00000000
--- a/templates/bootstrap/password-recover.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<div id="edit_form">
-    <form name="frmPassword" method="post" action="">
-        <table>
-            <tr>
-                <th colspan="3">{$PALANG.pPassword_recovery_title}</th>
-            </tr>
-            <tr>
-                <td class="label"><label>{$PALANG.pLogin_username}:</label></td>
-                <td><input class="flat" type="text" name="fUsername"/></td>
-            </tr>
-            <tr>
-                <td class="label">&nbsp;</td>
-                <td colspan="2">
-                    <input class="button" type="submit" name="submit" value="{$PALANG.pPassword_recovery_button}"/>
-                </td>
-            </tr>
-        </table>
-    </form>
-    {literal}
-        <script type="text/javascript">
-            <!--
-            document.frmPassword.fUsername.focus();
-            // -->
-        </script>
-    {/literal}
-</div>
diff --git a/templates/bootstrap/password.tpl b/templates/bootstrap/password.tpl
deleted file mode 100644
index 620f3b97..00000000
--- a/templates/bootstrap/password.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<form name="password" method="post" action="" class="form-horizontal">
-    <div id="edit_form" class="panel panel-default">
-        <div class="panel-heading"><h4>{$PALANG.pPassword_welcome}</h4></div>
-        <div class="panel-body enable-asterisk">
-            <input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label">{$PALANG.pLogin_username}:</label>
-                <div class="col-md-6 col-sm-8"><p class="form-control-static"><em>{$SESSID_USERNAME}</em></p></div>
-            </div>
-            <div class="form-group {if $pPassword_password_current_text}has-error{/if}">
-                <label class="col-md-4 col-sm-4 control-label"
-                       for="fPassword_current">{$PALANG.pPassword_password_current}:</label>
-                <div class="col-md-6 col-sm-8"><input class="form-control" type="password" name="fPassword_current"
-                                                      id="fPassword_current"/></div>
-                <span class="help-block">{$pPassword_password_current_text}</span>
-            </div>
-            <div class="form-group {if $pPassword_password_text}has-error{/if}">
-                <label class="col-md-4 col-sm-4 control-label" for="fPassword">{$PALANG.pPassword_password}:</label>
-                <div class="col-md-6 col-sm-8"><input class="form-control" type="password" name="fPassword"
-                                                      id="fPassword"/></div>
-                <span class="help-block">{$pPassword_password_text}</span>
-            </div>
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label" for="fPassword2">{$PALANG.pPassword_password2}:</label>
-                <div class="col-md-6 col-sm-8"><input class="form-control" type="password" name="fPassword2"
-                                                      id="fPassword2"/></div>
-            </div>
-        </div>
-        <div class="panel-footer">
-            <div class="btn-toolbar" role="toolbar">
-                <div class="btn-group pull-right">
-                    <input class="btn btn-primary" type="submit" name="submit" value="{$PALANG.change_password}"/>
-                    {if $authentication_has_role.user}
-                        <input class="btn btn-primary" type="submit" name="fCancel" value="{$PALANG.exit}"/>
-                    {/if}
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
diff --git a/templates/bootstrap/sendmail.tpl b/templates/bootstrap/sendmail.tpl
deleted file mode 100644
index b97ff029..00000000
--- a/templates/bootstrap/sendmail.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<form name="mailbox" method="post" action="" class="form-horizontal">
-    <div id="edit_form" class="panel panel-default">
-        <div class="panel-heading"><h4>{$PALANG.pSendmail_welcome}</h4></div>
-        <div class="panel-body enable-asterisk">
-            <input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label">{$PALANG.from}:</label>
-                <div class="col-md-6 col-sm-8"><p class="form-control-static"><em>{$smtp_from_email}</em></p></div>
-            </div>
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label" for="fTo">{$PALANG.pSendmail_to}:</label>
-                <div class="col-md-6 col-sm-8"><input class="form-control" type="text" name="fTo" id="fTo"/></div>
-            </div>
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label" for="fSubject">{$PALANG.subject}:</label>
-                <div class="col-md-6 col-sm-8"><input class="form-control" type="text" name="fSubject" id="fSubject"
-                                                      value="{$PALANG.pSendmail_subject_text}"/></div>
-            </div>
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label" for="fBody">{$PALANG.pSendmail_body}:</label>
-                <div class="col-md-6 col-sm-8"><textarea class="form-control" rows="10" cols="60" name="fBody"
-                                                         id="fBody">{$CONF.welcome_text}</textarea></div>
-            </div>
-        </div>
-        <div class="panel-footer">
-            <div class="btn-toolbar" role="toolbar">
-                <div class="btn-group pull-right">
-                    <input class="btn btn-primary" type="submit" name="submit" value="{$PALANG.pSendmail_button}"/>
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
diff --git a/templates/bootstrap/users_edit-alias.tpl b/templates/bootstrap/users_edit-alias.tpl
deleted file mode 100644
index 1d267605..00000000
--- a/templates/bootstrap/users_edit-alias.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-<form name="alias" method="post" action="" class="form-horizontal">
-    <div id="edit_form" class="panel panel-default">
-        <div class="panel-heading"><h4>{$PALANG.pEdit_alias_welcome}</h4></div>
-        <div class="panel-body enable-asterisk">
-            <input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
-            <p class="text-center"><em>{$PALANG.pEdit_alias_help}</em></p>
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label">{$PALANG.alias}:</label>
-                <div class="col-md-6 col-sm-8"><p class="form-control-static"><em>{$USERID_USERNAME}</em></p></div>
-            </div>
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label" for="fGoto">{$PALANG.to}:</label>
-                <div class="col-md-6 col-sm-8">
-			<textarea class="form-control" rows="4" cols="50" name="fGoto" id="fGoto">
-{foreach from=$tGotoArray item=address}
-    {$address}
-{/foreach}
-			</textarea>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label"></label>
-                <div class="col-md-6 col-sm-8">
-                    <div class="radio">
-                        <label>
-                            <input type="radio" name="fForward_and_store" id="fForward_and_store1"
-                                   value="1"{$forward_and_store}/>
-                            {$PALANG.pEdit_alias_forward_and_store}
-                        </label>
-                    </div>
-                    <div class="radio">
-                        <label>
-                            <input type="radio" name="fForward_and_store" id="fForward_and_store0"
-                                   value="0" {$forward_only}/>
-                            {$PALANG.pEdit_alias_forward_only}
-                        </label>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="panel-footer">
-            <div class="btn-toolbar" role="toolbar">
-                <div class="btn-group pull-right">
-                    <input class="btn btn-primary" type="submit" name="submit" value="{$PALANG.save}"/>
-                    <input class="btn btn-primary" type="submit" name="fCancel" value="{$PALANG.exit}"/>
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
diff --git a/templates/bootstrap/users_main.tpl b/templates/bootstrap/users_main.tpl
deleted file mode 100644
index e07a6b16..00000000
--- a/templates/bootstrap/users_main.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="panel panel-default" id="main_menu">
-    <table class="table">
-        {if $CONF.vacation===YES}
-            <tr>
-                <td nowrap="nowrap"><a class="btn btn-primary" href="vacation.php">{$PALANG.pUsersMenu_vacation}</a>
-                </td>
-                <td>{$tummVacationtext}</td>
-            </tr>
-        {/if}
-        {if $CONF.edit_alias===YES}
-            <tr>
-                <td nowrap="nowrap"><a class="btn btn-primary" href="edit-alias.php">{$PALANG.pUsersMenu_edit_alias}</a>
-                </td>
-                <td>{$PALANG.pUsersMain_edit_alias}</td>
-            </tr>
-        {/if}
-        <tr>
-            <td nowrap="nowrap"><a class="btn btn-primary" href="password.php">{$PALANG.change_password}</a></td>
-            <td>{$PALANG.pUsersMain_password}</td>
-        </tr>
-        <tr>
-            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></td>
-            <td>{$PALANG.pMain_logout}</td>
-        </tr>
-    </table>
-</div>
diff --git a/templates/bootstrap/users_menu.tpl b/templates/bootstrap/users_menu.tpl
deleted file mode 100644
index 478765b2..00000000
--- a/templates/bootstrap/users_menu.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<nav class="navbar navbar-default navbar-fixed-top">
-    <div class="container-fluid">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar"
-                    aria-expanded="false" aria-controls="navbar">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            {*** <a class="navbar-brand" href='main.php'><img id="login_header_logo" src="{$CONF.theme_logo}" alt="Logo" /></a> ***}
-            <a class="navbar-brand" href="{#url_user_main#}{#url_user_main#}"><img id="login_header_logo"
-                                                                                   src="../images/postbox.png"
-                                                                                   alt="Logo"/></a>
-        </div>
-        <div id="navbar" class="collapse navbar-collapse">
-            <ul class="nav navbar-nav">
-                <li><a target="_top" href="{#url_user_main#}">{$PALANG.pMenu_main}</a></li>
-                {if $CONF.vacation===YES}
-                    <li><a target="_top" href="{#url_user_vacation#}">{$PALANG.pUsersMenu_vacation}</a></li>
-                {/if}
-                {if $CONF.edit_alias===YES}
-                    <li><a target="_top" href="{#url_user_edit_alias#}">{$PALANG.pUsersMenu_edit_alias}</a></li>
-                {/if}
-                <li><a target="_top" href="{#url_user_password#}">{$PALANG.change_password}</a></li>
-                <li class="logout"><a target="_top" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></li>
-            </ul>
-        </div>
-    </div>
-</nav>
diff --git a/templates/bootstrap/vacation.tpl b/templates/bootstrap/vacation.tpl
deleted file mode 100644
index 76b2dcd4..00000000
--- a/templates/bootstrap/vacation.tpl
+++ /dev/null
@@ -1,110 +0,0 @@
-<form name="edit-vacation" method="post" action="" class="form-horizontal">
-    <div id="edit_form" class="panel panel-default">
-        <div class="panel-heading"><h4>{$PALANG.pUsersVacation_welcome}</h4></div>
-        <div class="panel-body enable-asterisk">
-            <input type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
-            {if !$authentication_has_role.user}
-                <div class="form-group">
-                    <label class="col-md-4 col-sm-4 control-label">{$PALANG.pLogin_username}:</label>
-                    <div class="col-md-6 col-sm-8"><p class="form-control-static"><em>{$tUseremail}</em></p></div>
-                </div>
-            {/if}
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label" for="fActiveFromForm">{$PALANG.pUsersVacation_activefrom}
-                    :</label>
-                <div class="col-md-6 col-sm-8">
-                    <input type='hidden' name="fActiveFrom" id="fActiveFrom" value="{$tActiveFrom}"
-                           class="form-control hidden"/>
-                    <div class="input-group date" id="datetimepicker-fActiveFrom">
-                        <input type='text' name="fActiveFromForm" id="fActiveFromForm" value="{$tActiveFrom}"
-                               class="form-control" readonly="readonly"/>
-                        <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label"
-                       for="fActiveUntilForm">{$PALANG.pUsersVacation_activeuntil}:</label>
-                <div class="col-md-6 col-sm-8">
-                    <input type='hidden' name="fActiveUntil" id="fActiveUntil" value="{$tActiveUntil}"
-                           class="form-control hidden"/>
-                    <div class="input-group date" id="datetimepicker-fActiveUntil">
-                        <input type='text' name="fActiveUntilForm" id="fActiveUntilForm" value="{$tActiveUntil}"
-                               class="form-control" readonly="readonly"/>
-                        <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label" for="fInterval_Time">{$PALANG.pVacation_reply_type}
-                    :</label>
-                <div class="col-md-6 col-sm-8">
-                    <select class="form-control" name="fInterval_Time" id="fInterval_Time">
-                        {html_options options=$select_options selected=$tInterval_Time}
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label" for="fSubject">{$PALANG.subject}:</label>
-                <div class="col-md-6 col-sm-8">
-                    <textarea class="form-control" rows="3" cols="60" name="fSubject"
-                              id="fSubject">{$tSubject}</textarea>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-md-4 col-sm-4 control-label" for="fBody">{$PALANG.message}:</label>
-                <div class="col-md-6 col-sm-8">
-                    <textarea class="form-control" rows="10" cols="60" name="fBody" id="fBody">{$tBody}</textarea>
-                </div>
-            </div>
-        </div>
-        <div class="panel-footer">
-            <div class="btn-toolbar" role="toolbar">
-                <div class="btn-group pull-right">
-                    <input class="btn btn-primary m-3" type="submit" name="fChange"
-                           value="{$PALANG.pEdit_vacation_set}"/>
-                    <input class="btn btn-primary" type="submit" name="fBack"
-                           value="{$PALANG.pEdit_vacation_remove}"/>
-                    <input class="btn btn-primary" type="submit" name="fCancel" value="{$PALANG.exit}"/>
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
-{literal}
-<script type="text/javascript">
-    {/literal}
-    {if isset($smarty.session.lang)}var locale = '{$smarty.session.lang}';{/if}
-    {literal}
-    $(function () {
-        $('#datetimepicker-fActiveFrom').datetimepicker({
-            ignoreReadonly: true,
-            locale: locale,
-            showTodayButton: true,
-            showClear: true,
-            showClose: true,
-            allowInputToggle: true,
-            format: 'L',
-        });
-        $('#datetimepicker-fActiveUntil').datetimepicker({
-            ignoreReadonly: true,
-            locale: locale,
-            showTodayButton: true,
-            showClear: true,
-            showClose: true,
-            allowInputToggle: true,
-            format: 'L',
-            useCurrent: false //Important! See issue #1075
-        });
-        $("#datetimepicker-fActiveFrom").on("dp.change", function (e) {
-            $('#datetimepicker-fActiveUntil').data("DateTimePicker").minDate(e.date);
-            $('#fActiveFrom').val((e.date) ? e.date.format('YYYY-MM-DD') : '').trigger("change");
-        });
-        $("#datetimepicker-fActiveUntil").on("dp.change", function (e) {
-            $('#datetimepicker-fActiveFrom').data("DateTimePicker").maxDate(e.date);
-            $('#fActiveUntil').val((e.date) ? e.date.format('YYYY-MM-DD') : '').trigger("change");
-        });
-
-    });
-</script>
-{/literal}
diff --git a/templates/bootstrap/viewlog.tpl b/templates/bootstrap/viewlog.tpl
deleted file mode 100644
index e2fcb63f..00000000
--- a/templates/bootstrap/viewlog.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <form name="frmOverview" method="post" action="">
-            {html_options name='fDomain' output=$domain_list values=$domain_list selected=$domain_selected onchange="this.form.submit();"}
-            <noscript><input class="button" type="submit" name="go" value="{$PALANG.go}"/></noscript>
-        </form>
-    </div>
-    {if $tLog}
-        <div class="panel-body">
-            <h4>{$PALANG.pViewlog_welcome|replace:"%s":$CONF.page_size} {$fDomain} </h4>
-        </div>
-        <table id="log_table" class="table">
-            {#tr_header#}
-            <th>{$PALANG.pViewlog_timestamp}</th>
-            <th>{$PALANG.admin}</th>
-            <th>{$PALANG.domain}</th>
-            <th>{$PALANG.pViewlog_action}</th>
-            <th>{$PALANG.pViewlog_data}</th>
-            </tr>
-            {assign var="PALANG_pViewlog_data" value=$PALANG.pViewlog_data}
-
-            {foreach from=$tLog item=item}
-                {assign var=log_data value=$item.data|truncate:35:"...":true}
-                {assign var=item_data value=$item.data}
-                {$smarty.config.tr_hilightoff|replace:'>':" style=\"cursor:pointer;\" onclick=\"alert('$PALANG_pViewlog_data = $item_data')\">"}
-                <td nowrap="nowrap">{$item.timestamp}</td>
-                <td nowrap="nowrap">{$item.username}</td>
-                <td nowrap="nowrap">{$item.domain}</td>
-                <td nowrap="nowrap">{$item.action}</td>
-                <td nowrap="nowrap">{$log_data}</td>
-                </tr>
-            {/foreach}
-        </table>
-    {/if}
-</div>
diff --git a/templates/broadcast-message.tpl b/templates/broadcast-message.tpl
index b1a5f442..7f56f5ef 100644
--- a/templates/broadcast-message.tpl
+++ b/templates/broadcast-message.tpl
@@ -1,44 +1,43 @@
-<div id="edit_form">
-<form name="broadcast-message" method="post" action="">
-<input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}" />
-<table>
-	<tr>
-		<th colspan="2">{$PALANG.pBroadcast_title}</th>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.from}:</label></td>
-		<td><em>{$smtp_from_email}</em></td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pBroadcast_name}:</label></td>
-		<td><input class="flat" size="43" type="text" name="name"/></td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.subject}:</label></td>
-		<td><input class="flat" size="43" type="text" name="subject"/></td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.message}:</label></td>
-		<td><textarea class="flat" cols="40" rows="6" name="message"></textarea></td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.broadcast_mailboxes_only}</label></td>
-		<td><input type="checkbox" value="1" name="mailboxes_only"/></td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.broadcast_to_domains}</label></td>
-		<td>
-			<select multiple="multiple" name="domains[]">
-				{html_options output=$allowed_domains values=$allowed_domains selected=$allowed_domains}
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td>
-		<input class="button" type="submit" name="submit" value="{$PALANG.pSendmail_button}" />
-		</td>
-	</tr>
-</table>
-</form>
+<form name="broadcast-message" method="post" action="" class="form-horizontal">
+<div id="edit_form" class="panel panel-default">
+	<div class="panel-heading"><h4>{$PALANG.pBroadcast_title}</h4></div>
+	<div class="panel-body">
+		<input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}" />
+		<div class="form-group">
+                        <label class="col-md-4 col-sm-4 control-label">{$PALANG.from}:</label>
+                        <div class="col-md-6 col-sm-8"><p class="form-control-static"><em>{$smtp_from_email}</em></p></div>
+                </div>
+		<div class="form-group">
+                        <label class="col-md-4 col-sm-4 control-label" for="name">{$PALANG.pBroadcast_name}:</label>
+                        <div class="col-md-6 col-sm-8"><input class="form-control" type="text" name="name" id="name" /></div>
+                </div>
+		<div class="form-group">
+                        <label class="col-md-4 col-sm-4 control-label" for="subject">{$PALANG.subject}:</label>
+                        <div class="col-md-6 col-sm-8"><input class="form-control" type="text" name="subject" id="subject" /></div>
+                </div>
+                <div class="form-group">
+                        <label class="col-md-4 col-sm-4 control-label" for="message">{$PALANG.message}:</label>
+                        <div class="col-md-6 col-sm-8"><textarea class="form-control" rows="6" cols="40" name="message" id="message"></textarea></div>
+                </div>
+		<div class="form-group">
+                        <label class="col-md-4 col-sm-4 control-label"></label>
+                        <div class="col-md-6 col-sm-8"><div class="checkbox"><label><input type="checkbox" value="1" name="mailboxes_only"/>{$PALANG.broadcast_mailboxes_only}</label></div></div>
+                </div>
+		<div class="form-group">
+                        <label class="col-md-4 col-sm-4 control-label" for="domains">{$PALANG.broadcast_to_domains}</label>
+                        <div class="col-md-6 col-sm-8">
+				<select multiple="multiple" name="domains[]" id="domains" class="form-control">
+					{html_options output=$allowed_domains values=$allowed_domains selected=$allowed_domains}
+				</select>
+			</div>
+                </div>
+	</div>
+        <div class="panel-footer">
+                <div class="btn-toolbar" role="toolbar">
+                        <div class="btn-group pull-right">
+                        <input class="btn btn-primary" type="submit" name="submit" value="{$PALANG.pSendmail_button}" />
+                        </div>
+                </div>
+        </div>
 </div>
+</form>
diff --git a/templates/editform.tpl b/templates/editform.tpl
index b9cc84c2..a5e0fd1a 100644
--- a/templates/editform.tpl
+++ b/templates/editform.tpl
@@ -1,80 +1,80 @@
-<div id="edit_form">
-<form name="edit_{$table}" method="post" action="">
-<input class="flat" type="hidden" name="table" value="{$table}" />
-<input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}" />
+<form name="edit_{$table}" method="post" action="" class="form-horizontal">
+    <div id="edit_form" class="panel panel-default">
+        <div class="panel-heading"><h4>{$formtitle}</h4></div>
+        <div class="panel-body enable-asterisk">
+            <input class="flat" type="hidden" name="table" value="{$table}"/>
+            <input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
 
-<table>
-	<tr>
-		<th colspan="4">{$formtitle}</th>
-	</tr>
+            {foreach key=key item=field from=$struct}
+                {if $field.display_in_form == 1}
 
-{foreach key=key item=field from=$struct}
-	{if $field.display_in_form == 1}
+                    {if $table == 'foo' && $key == 'bar'}
+                        <div class="form-group">Special handling (complete table row) for {$table} / {$key}</div>
+                    {else}
+                        <div class="form-group {if $fielderror.{$key}}has-error{/if}">
+                            <label class="col-md-4 col-sm-4 control-label" for="{$key}">{$field.label}</label>
+                            <div class="col-md-6 col-sm-8">
+                                {if $field.editable == 0}
+                                    {if $field.type == 'enma'}
+                                        {$struct.{$key}.options.{$value_{$key}}}
+                                    {else}
+                                        {$value_{$key}}
+                                    {/if}
+                                {else}
+                                    {if $table == 'foo' && $key == 'bar'}
+                                        Special handling (td content) for {$table} / {$key}
+                                    {elseif $field.type == 'bool'}
+                                        <div class="checkbox"><label>
+                                                <input type="checkbox" value='1'
+                                                       name="value[{$key}]"{if {$value_{$key}} == 1} checked="checked"{/if}/>
+                                            </label></div>
+                                    {elseif $field.type == 'enum'}
+                                        <select class="form-control" name="value[{$key}]" id="{$key}">
+                                            {html_options output=$struct.{$key}.options values=$struct.{$key}.options selected=$value_{$key}}
+                                        </select>
+                                    {elseif $field.type == 'enma'}
+                                        <select class="form-control" name="value[{$key}]" id="{$key}">
+                                            {html_options options=$struct.{$key}.options selected=$value_{$key}}
+                                        </select>
+                                    {elseif $field.type == 'list'}
+                                        <select class="form-control" name="value[{$key}][]" size="10"
+                                                multiple="multiple">
+                                            {html_options output=$struct.{$key}.options values=$struct.{$key}.options selected=$value_{$key}}
+                                        </select>
+                                    {elseif $field.type == 'pass' || $field.type == 'b64p'}
+                                        <input class="form-control" type="password" name="value[{$key}]"/>
+                                    {elseif $field.type == 'txtl'}
+                                        <textarea class="form-control" rows="10" cols="35" name="value[{$key}]">{foreach key=key2 item=field2 from=$value_{$key}}{$field2}{/foreach}</textarea>
+                                    {else}
+                                        <input class="form-control" type="text" name="value[{$key}]"
+                                               value="{$value_{$key}}"/>
+                                    {/if}
+                                {/if}
 
-		{if $table == 'foo' && $key == 'bar'}
-			<tr><td>Special handling (complete table row) for {$table} / {$key}</td></tr>
-		{else}
-			<tr>
-				<td class="label">{$field.label}</td>
-				<td>
-				{if $field.editable == 0}
-					{if $field.type == 'enma'}
-						{$struct.{$key}.options.{$value_{$key}}}
-					{else}
-						{$value_{$key}}
-					{/if}
-				{else}
-					{if $table == 'foo' && $key == 'bar'}
-						Special handling (td content) for {$table} / {$key}
-					{elseif $field.type == 'bool'}
-						<input class="flat" type="checkbox" value='1' name="value[{$key}]"{if {$value_{$key}} == 1} checked="checked"{/if}/>
-					{elseif $field.type == 'enum'}
-						<select class="flat" name="value[{$key}]">
-						{html_options output=$struct.{$key}.options values=$struct.{$key}.options selected=$value_{$key}}
-						</select>
-					{elseif $field.type == 'enma'}
-						<select class="flat" name="value[{$key}]">
-						{html_options options=$struct.{$key}.options selected=$value_{$key}}
-						</select>
-					{elseif $field.type == 'list'}
-						<select class="flat" name="value[{$key}][]" size="10" multiple="multiple">
-						{html_options output=$struct.{$key}.options values=$struct.{$key}.options selected=$value_{$key}}
-						</select>
+                                {if $table == 'foo' && $key == 'bar'}
+                                    <span class="help-block">Special handling (td content) for {$table} / {$key}</span>
+                                {else}
+                                    {if $fielderror.{$key}}
+                                        <span class="help-block">{$fielderror.{$key}}</span>
+                                    {else}
+                                        <span class="help-block">{$field.desc}</span>
+                                    {/if}
+                                {/if}
+                            </div>
+                        </div>
+                    {/if}
 
-<!-- alternative: 
-						<div style='max-height:30em; overflow:auto;'>
-							{html_checkboxes name="value[{$key}]" output=$struct.{$key}.options values=$struct.{$key}.options selected=$value_{$key} separator="<br />"}
-						</div>
--->
-					{elseif $field.type == 'pass' || $field.type == 'b64p'}
-						<input class="flat" type="password" name="value[{$key}]" />
-					{elseif $field.type == 'txtl'}
-						<textarea class="flat" rows="10" cols="35" name="value[{$key}]">{foreach key=key2 item=field2 from=$value_{$key}}{$field2}
-{/foreach}</textarea>
-					{else}
-						<input class="flat" type="text" name="value[{$key}]" value="{$value_{$key}}" />
-					{/if}
-				{/if}	
-				</td>
-				<td>
-					{if $table == 'foo' && $key == 'bar'}
-						Special handling (td content) for {$table} / {$key}
-					{else}
-						{$field.desc}
-					{/if}
-				</td>
-				<td class="error_msg">{$fielderror.{$key}}</td>
-			</tr>
-		{/if}
+                {/if}
+            {/foreach}
 
-	{/if}
-{/foreach}
-
-	<tr>
-		<td>&nbsp;</td>
-		<td colspan="3"><input class="button" type="submit" name="submit" value="{$submitbutton}" /></td>
-	</tr>
-</table>
+        </div>
+        <div class="panel-footer">
+            <div class="btn-toolbar" role="toolbar">
+                <div class="btn-group pull-right">
+                    <input class="btn btn-primary" type="submit" name="submit" value="{$submitbutton}"/>
+                </div>
+            </div>
+        </div>
 
+    </div>
 </form>
-</div>
diff --git a/templates/flash_error.tpl b/templates/flash_error.tpl
index 264139cf..627a35f0 100644
--- a/templates/flash_error.tpl
+++ b/templates/flash_error.tpl
@@ -1,20 +1,24 @@
 <!-- {$smarty.template} -->
-<br clear="all"/><br />
+<br clear="all"/><br/>
 {strip}
-		{if isset($smarty.session.flash)}
-			{if isset($smarty.session.flash.info)}
-				<ul class="flash-info">
-					{foreach from=$smarty.session.flash.info item=msg}
-						<li>{$msg|escape:html}</li>
-					{/foreach}
-				</ul>
-			{/if}
-			{if isset($smarty.session.flash.error)}
-				<ul class="flash-error">
-					{foreach from=$smarty.session.flash.error item=msg}
-						<li>{$msg|escape:html}</li>
-					{/foreach}
-				</ul>
-			{/if}
-		{/if}
+    {if isset($smarty.session.flash)}
+        {if isset($smarty.session.flash.info)}
+            <div class="alert alert-info" role="alert">
+                <ul class="flash-info">
+                    {foreach from=$smarty.session.flash.info item=msg}
+                        <li>{$msg|escape:html}</li>
+                    {/foreach}
+                </ul>
+            </div>
+        {/if}
+        {if isset($smarty.session.flash.error)}
+            <div class="alert alert-danger" role="alert">
+                <ul class="flash-error">
+                    {foreach from=$smarty.session.flash.error item=msg}
+                        <li>{$msg|escape:html}</li>
+                    {/foreach}
+                </ul>
+            </div>
+        {/if}
+    {/if}
 {/strip}
diff --git a/templates/footer.tpl b/templates/footer.tpl
index d5fd4a4b..97562584 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -1,19 +1,22 @@
 <!-- {$smarty.template} -->
-<div id="footer">
-	<a target="_blank" rel="noopener" href="http://postfixadmin.sf.net/">Postfix Admin {$version}</a>
-    {if isset($smarty.session.sessid)}
-        {if $smarty.session.sessid.username}
-            <span id="update-check">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
-            <a target="_blank" rel="noopener" href="http://postfixadmin.sf.net/update-check.php?version={$version|escape:"url"}">{$PALANG.check_update}</a></span>
-            &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;	
-            {$PALANG.pFooter_logged_as|replace:"%s":$smarty.session.sessid.username}
+<footer class="footer">
+    <div class="container text-center">
+        <a target="_blank" rel="noopener" href="https://postfixadmin.sf.net/">Postfix Admin {$version}</a>
+        <span id="update-check">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
+	<a target="_blank" rel="noopener"
+       href="https://postfixadmin.sf.net/update-check.php?version={$version|escape:"url"}">{$PALANG.check_update}</a>
+        </span>
+        {if isset($smarty.session.sessid)}
+            {if $smarty.session.sessid.username}
+                &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
+                {$PALANG.pFooter_logged_as|replace:"%s":$smarty.session.sessid.username}
+            {/if}
         {/if}
-    {/if}
-	{if $CONF.show_footer_text == 'YES' && $CONF.footer_link}
-		&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
-		<a href="{$CONF.footer_link}" rel="noopener">{$CONF.footer_text}</a>
-	{/if}
-</div>
-</div>
+        {if $CONF.show_footer_text == 'YES' && $CONF.footer_link}
+            &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
+            <a href="{$CONF.footer_link}" rel="noopener">{$CONF.footer_text}</a>
+        {/if}
+    </div>
+</footer>
 </body>
 </html>
diff --git a/templates/header.tpl b/templates/header.tpl
index 6804c2cf..d68edb78 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -1,21 +1,21 @@
 <!-- {$smarty.template} -->
 <!doctype html>
 <html lang="{if isset($smarty.session.lang)}{$smarty.session.lang}{/if}">
-	<head>
-        <meta charset="utf-8">
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<title>Postfix Admin - {$smarty.server.HTTP_HOST}</title>
-		<link rel="shortcut icon" href="{$CONF.theme_favicon}" />
-		<link rel="stylesheet" type="text/css" href="{$CONF.theme_css}" />
-{if $CONF.theme_custom_css}
-		<link rel="stylesheet" type="text/css" href="{$CONF.theme_custom_css}" />
-{/if}
-	</head>
-	<body class="lang-{if isset($smarty.session.lang)}{$smarty.session.lang}{/if} page-{$smarty_template} {if isset($table)}page-{$smarty_template}-{$table}{/if}">
-		<div id="container">
-		<div id="login_header">
-		<a href='main.php'><img id="login_header_logo" src="{$CONF.theme_logo}" alt="Logo" /></a>
-{if $CONF.show_header_text==='YES' && $CONF.header_text}
-		<h2>{$CONF.header_text}</h2>
-{/if}
-		</div>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+
+    <title>Postfix Admin - {$smarty.server.HTTP_HOST}</title>
+    <link rel="shortcut icon" href="{$CONF.theme_favicon}"/>
+    <link rel="stylesheet" type="text/css" href="{$CONF.theme_css}"/>
+    {if $CONF.theme_custom_css}
+        <link rel="stylesheet" type="text/css" href="{$CONF.theme_custom_css}"/>
+    {/if}
+    <script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
+    <script src="css/bootstrap-3.3.7-dist/js/moment-with-locales.min.js"></script>
+    <script src="css/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
+    <script src="css/bootstrap-3.3.7-dist/js/bootstrap-datetimepicker.min.js"></script>
+</head>
+<body class="lang-{if isset($smarty.session.lang)}{$smarty.session.lang}{/if} page-{$smarty_template} {if isset($table)}page-{$smarty_template}-{$table}{/if}">
diff --git a/templates/index.tpl b/templates/index.tpl
index 8926dd01..9a272d2b 100644
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -1,29 +1,30 @@
 <!-- {$smarty.template} -->
 {strip}
-{include file="header.tpl"}
-{if $smarty_template !== 'login' && $smarty_template !== 'password-recover' && $smarty_template !== 'password-change'}
-	{config_load file="menu.conf" section=$smarty_template}
-	{if $authentication_has_role.user}
-		{include file='users_menu.tpl'}
-	{else}
-		{include file='menu.tpl'}
-	{/if}
-{/if}
-<br clear="all" />
+    {include file="header.tpl"}
+    {if $smarty_template !== 'login' && $smarty_template !== 'password-recover' && $smarty_template !== 'password-change'}
+    {config_load file="menu.conf" section=$smarty_template}
+        {if $authentication_has_role.user}
+            {include file='users_menu.tpl'}
+        {else}
+            {include file='menu.tpl'}
+        {/if}
+    {/if}
+    <div class="container" role="main">
+        {if $authentication_has_role.user && $CONF.motd_user}
+            <div id="motd">{$CONF.motd_user}</div>
+        {elseif $authentication_has_role.global_admin && $CONF.motd_superadmin}
+            <div id="motd">{$CONF.motd_superadmin}</div>
+        {elseif $authentication_has_role.admin && $CONF.motd_admin}
+            <div id="motd">{$CONF.motd_admin}</div>
+        {/if}
 
-{if $authentication_has_role.user && $CONF.motd_user}
-	<div id="motd">{$CONF.motd_user}</div>
-{elseif $authentication_has_role.global_admin && $CONF.motd_superadmin}
-	<div id="motd">{$CONF.motd_superadmin}</div>
-{elseif $authentication_has_role.admin && $CONF.motd_admin}
-	<div id="motd">{$CONF.motd_admin}</div>
-{/if}
-
-{include file='flash_error.tpl'}
-{if $smarty_template}
-	{include file="$smarty_template.tpl"}
-{else}
-	<h3>Template not found</h3>({$smarty.server.PHP_SELF|escape:"html"})
-{/if}
-{include file='footer.tpl'}
+        {include file='flash_error.tpl'}
+        {if $smarty_template}
+            {include file="$smarty_template.tpl"}
+        {else}
+            <h3>Template not found</h3>
+            ({$smarty.server.PHP_SELF|escape:"html"})
+        {/if}
+    </div>
+    {include file='footer.tpl'}
 {/strip}
diff --git a/templates/list-virtual.tpl b/templates/list-virtual.tpl
index e31da865..61460654 100644
--- a/templates/list-virtual.tpl
+++ b/templates/list-virtual.tpl
@@ -1,92 +1,126 @@
 {assign var="file" value=$smarty.config.url_list_virtual}
-<div id="overview">
-<form name="frmOverview" method="get" action="{$smarty.config.url_list_virtual}">
-	{html_options name='domain' output=$domain_list values=$domain_list selected=$domain_selected onchange="this.form.submit();"}
-	<input type="hidden" name="limit" value="0" />
-	<noscript><input class="button" type="submit" name="go" value="{$PALANG.go}" /></noscript>
-</form>
-{if isset($search._)}
-	<h4>{$PALANG.pSearch_welcome} {$search._}</h4>
-{else}
-	<h4>{$PALANG.pOverview_welcome}{$fDomain}</h4>
-	<p>{$PALANG.aliases}: {$limit.alias_count} / {$limit.aliases}</p>
-	<p>{$PALANG.mailboxes}: {$limit.mailbox_count} / {$limit.mailboxes}</p>
-{/if}
-{#form_search#}
-</div>
-<div class='subnav'><p>{$PALANG.show}
-	{if isset($search._)}
-		{assign var="searchsuffix" value="&search[_]={$search._}"}
-	{else}
-		{assign var="searchsuffix" value=""}
-	{/if}
+<div id="overview" class="panel panel-default">
+    <div class="panel-heading">
+        <div class="row">
+            <div class="col-md-5">
+                <form name="frmOverview" method="get" action="{$smarty.config.url_list_virtual}">
+                    {html_options name='domain' class='form-control' output=$domain_list values=$domain_list selected=$domain_selected onchange="this.form.submit();"}
+                    <input type="hidden" name="limit" value="0"/>
+                    <noscript><input class="button" type="submit" name="go" value="{$PALANG.go}"/></noscript>
+                </form>
+            </div>
+            <div class="col-md-5 col-md-offset-2 text-right">{#form_search#}</div>
+        </div>
+    </div>
+    <div class="panel-body">
+        <div class="text-center">
+            {if isset($search._)}
+                <h4>{$PALANG.pSearch_welcome} {$search._}</h4>
+            {else}
+                <h4>{$PALANG.pOverview_welcome}{$fDomain} :</h4>
+                <ul>
+                    <li>{$PALANG.aliases}: {$limit.alias_count} / {$limit.aliases}</li>
+                    <li>{$PALANG.mailboxes}: {$limit.mailbox_count} / {$limit.mailboxes}</li>
+                </ul>
+            {/if}
+        </div>
+        <hr/>
+        <div class="row">
+            <div class="col-md-12 text-center">{$PALANG.show}
+                {if isset($search._)}
+                    {assign var="searchsuffix" value="&search[_]={$search._}"}
+                {else}
+                    {assign var="searchsuffix" value=""}
+                {/if}
 
-	{if $tab=='all'}<span class='active'>{$PALANG.all}</span>
-	{else}<a href="?domain={$smarty.get.domain}&amp;tab=all{$searchsuffix}">{$PALANG.all}</a>{/if}
-	{if $tab=='mailbox'}<span class='active'>{$PALANG.pOverview_mailbox_title}</span>
-	{else}<a href="?domain={$smarty.get.domain}&amp;tab=mailbox{$searchsuffix}">{$PALANG.pOverview_mailbox_title}</a>{/if}
-	{if $tab=='alias'}<span class='active'>{$PALANG.pOverview_alias_title}</span>
-	{else}<a href="?domain={$smarty.get.domain}&amp;tab=alias{$searchsuffix}">{$PALANG.pOverview_alias_title}</a>{/if}
-	{if $boolconf_alias_domain}
-		{if $tab=='alias_domain'}<span class='active'>{$PALANG.pOverview_alias_domain_title}</span>
-		{else}<a href="?domain={$smarty.get.domain}&amp;tab=alias_domain{$searchsuffix}">{$PALANG.pOverview_alias_domain_title}</a>{/if}
-	{/if}
-</p></div>
-<br clear="all"/><br/>
+                {if $tab=='all'}<span class='active'>{$PALANG.all}</span>
+                {else}<a href="?domain={$smarty.get.domain}&amp;tab=all{$searchsuffix}">{$PALANG.all}</a>{/if}
+                {if $tab=='mailbox'}<span class='active'>{$PALANG.pOverview_mailbox_title}</span>
+                {else}<a
+                    href="?domain={$smarty.get.domain}&amp;tab=mailbox{$searchsuffix}">{$PALANG.pOverview_mailbox_title}</a>{/if}
+                {if $tab=='alias'}<span class='active'>{$PALANG.pOverview_alias_title}</span>
+                {else}<a
+                    href="?domain={$smarty.get.domain}&amp;tab=alias{$searchsuffix}">{$PALANG.pOverview_alias_title}</a>{/if}
+                {if $boolconf_alias_domain}
+                    {if $tab=='alias_domain'}<span class='active'>{$PALANG.pOverview_alias_domain_title}</span>
+                    {else}<a
+                        href="?domain={$smarty.get.domain}&amp;tab=alias_domain{$searchsuffix}">{$PALANG.pOverview_alias_domain_title}</a>{/if}
+                {/if}
+            </div>
+        </div>
+    </div>
+</div>
+<div class="clearfix"></div><br/>
 {*** Domain Aliases ***}
 {if $boolconf_alias_domain}
-	{if $tab=='alias_domain' || $tab=='all'}
-		{include file="list-virtual_alias_domain.tpl"}
-	{/if}
+    {if $tab=='alias_domain' || $tab=='all'}
+        {include file="list-virtual_alias_domain.tpl"}
+    {/if}
+{/if}
+{if $tab=='all'}
+    <div class="clearfix"></div>
+    <br/>
 {/if}
-{if $tab=='all'}<br />{/if}
 {*** Aliases ***}
 {if $tab=='alias' || $tab=='all'}
-	{$nav_bar_alias.top}
-	{include file="list-virtual_alias.tpl"}
-	{$nav_bar_alias.bottom}
+    {$nav_bar_alias.top}
+    {include file="list-virtual_alias.tpl"}
+    {$nav_bar_alias.bottom}
+{/if}
+{if $tab=='all'}
+    <div class="clearfix"></div>
+    <br/>
 {/if}
-{if $tab=='all'}<br />{/if}
 {if $tab=='mailbox' || $tab=='all'}
-	{$nav_bar_mailbox.top}
-	{assign var="colspan" value=9}
-	{if $CONF.vacation_control_admin===YES}{assign var="colspan" value="`$colspan+1`"}{/if}
-	{if $CONF.alias_control_admin===YES}{assign var="colspan" value="`$colspan+1`"}{/if}
-	<table id="mailbox_table">
-		<tr>
-			<th colspan="{$colspan}">{$PALANG.pOverview_mailbox_title}</th>
-		</tr>
-	{if $tMailbox}
-		{include file="list-virtual_mailbox.tpl"}
-	{else}</table>
-	{/if}
-	{$nav_bar_mailbox.bottom}
-	{if $tCanAddMailbox}
-		<br /><a href="{#url_create_mailbox#}&amp;domain={$fDomain|escape:"url"}" class="button">{$PALANG.add_mailbox}</a><br />
-	{/if}
-	<br /><br /><a href="list.php?table=mailbox&amp;output=csv">{$PALANG.download_csv}</a>
+    <div id="overview" class="panel panel-default">
+        {$nav_bar_mailbox.top}
+        {assign var="colspan" value=9}
+        {if $CONF.vacation_control_admin===YES}{assign var="colspan" value="`$colspan+1`"}{/if}
+        {if $CONF.alias_control_admin===YES}{assign var="colspan" value="`$colspan+1`"}{/if}
+        <table class="table table-hover" id="mailbox_table">
+            <thead>
+            <tr>
+                <th style="text-align:center;" colspan="{$colspan}">{$PALANG.pOverview_mailbox_title}</th>
+            </tr>
+            </thead>
+            {if $tMailbox}
+            {include file="list-virtual_mailbox.tpl"}
+            {else}</table>
+        {/if}
+        <div class="panel-footer">
+            <div class="btn-toolbar" role="toolbar">
+                <div class="btn-group pull-right">
+                    {$nav_bar_mailbox.bottom}
+                    {if $tCanAddMailbox}
+                        <a href="{#url_create_mailbox#}&amp;domain={$fDomain|escape:"url"}" role="button"
+                           class="btn btn-default"><span class="glyphicon glyphicon-plus-sign"
+                                                         aria-hidden="true"></span> {$PALANG.add_mailbox}</a>
+                    {/if}
+                    <a role="button" class="btn btn-default" href="list.php?table=mailbox&amp;output=csv"><span
+                                class="glyphicon glyphicon-export" aria-hidden="true"></span> {$PALANG.download_csv}</a>
+                </div>
+            </div>
+        </div>
+    </div>
 {/if}
 {if $CONF.show_status===YES && $CONF.show_status_key===YES}
-	<br/><br/>
-	{if $CONF.show_undeliverable===YES}
-		&nbsp;<span style='background-color:{$CONF.show_undeliverable_color};'>{$CONF.show_status_text}</span>={$PALANG.pStatus_undeliverable}
-	{/if}
-	{if $CONF.show_vacation===YES}
-                &nbsp;<span style='background-color:{$CONF.show_vacation_color};'>{$CONF.show_status_text}</span>={$PALANG.pStatus_vacation}
-        {/if}
-        {if $CONF.show_disabled===YES}
-                &nbsp;<span style='background-color:{$CONF.show_disabled_color};'>{$CONF.show_status_text}</span>={$PALANG.pStatus_disabled}
-        {/if}
-        {if $CONF.show_expired===YES}
-                &nbsp;<span style='background-color:{$CONF.show_expired_color};'>{$CONF.show_status_text}</span>={$PALANG.pStatus_expired}
-        {/if}
-
-	{if $CONF.show_popimap===YES}
-		&nbsp;<span style='background-color:{$CONF.show_popimap_color};'>{$CONF.show_status_text}</span>={$PALANG.pStatus_popimap}
-	{/if}
-	{if $CONF.show_custom_domains|@count>0}
-		{foreach from=$CONF.show_custom_domains item=item key=i}
-			&nbsp;<span style='background-color:{$CONF.show_custom_colors[$i]};'>{$CONF.show_status_text}</span>={$PALANG.pStatus_custom}{$item}
-		{/foreach}
-	{/if}
+    <br/>
+    <br/>
+    {if $CONF.show_undeliverable===YES}
+        &nbsp;
+        <span style='background-color:{$CONF.show_undeliverable_color};'>{$CONF.show_status_text}</span>
+        ={$PALANG.pStatus_undeliverable}
+    {/if}
+    {if $CONF.show_popimap===YES}
+        &nbsp;
+        <span style='background-color:{$CONF.show_popimap_color};'>{$CONF.show_status_text}</span>
+        ={$PALANG.pStatus_popimap}
+    {/if}
+    {if $CONF.show_custom_domains|@count>0}
+        {foreach from=$CONF.show_custom_domains item=item key=i}
+            &nbsp;
+            <span style='background-color:{$CONF.show_custom_colors[$i]};'>{$CONF.show_status_text}</span>
+            ={$PALANG.pStatus_custom}{$item}
+        {/foreach}
+    {/if}
 {/if}
diff --git a/templates/list-virtual_mailbox.tpl b/templates/list-virtual_mailbox.tpl
index 409591ab..353fa6e6 100644
--- a/templates/list-virtual_mailbox.tpl
+++ b/templates/list-virtual_mailbox.tpl
@@ -4,24 +4,24 @@
     {assign var="search" value=''}
 {/if}
 
+	<thead>
 	{#tr_header#}
-		{if $CONF.show_status===YES}<td></td>{/if}
-		<td>{$PALANG.pOverview_mailbox_username}</td>
+		{if $CONF.show_status===YES}<th></th>{/if}
+		<th>{$PALANG.pOverview_mailbox_username}</th>
 		{if $display_mailbox_aliases==true}
-			<td>{$PALANG.to}</td>
+			<th>{$PALANG.to}</th>
 		{/if}
-		<td>{$PALANG.name}</td>
-		{if $CONF.quota===YES}<td>{$PALANG.pOverview_mailbox_quota}</td>{/if}
-		<td>{$PALANG.last_modified}</td>
-		{if $CONF.password_expiration===YES}
-			<td>{$PALANG.password_expiration}</td>
-		{/if}
-		<td>{$PALANG.active}</td>
+		<th>{$PALANG.name}</th>
+		{if $CONF.quota===YES}<th>{$PALANG.pOverview_mailbox_quota}</th>{/if}
+		<th>{$PALANG.last_modified}</th>
+		<th>{$PALANG.active}</th>
 		{assign var="colspan" value="`$colspan-6`"}
-		<td colspan="{$colspan}">&nbsp;</td>
+		<th colspan="{$colspan}">&nbsp;</th>
 	</tr>
+	</thead>
+	<tbody>
 	{foreach from=$tMailbox item=item key=i}
-		{#tr_hilightoff#}
+		<tr>
 			{if $CONF.show_status===YES}
 				<td>{$gen_show_status_mailbox[$i]}</td>
 			{/if}
@@ -77,9 +77,6 @@
 				</td>
 			{/if}
 			<td>{$item.modified}</td>
-			{if $CONF.password_expiration===YES}
-				<td>{$item.password_expiration}</td>
-			{/if}
 			<td><a href="{#url_editactive#}mailbox&amp;id={$item.username|escape:"url"}&amp;active={if ($item.active==0)}1{else}0{/if}&amp;token={$smarty.session.PFA_token|escape:"url"}"
 				>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
 			{if $CONF.vacation_control_admin===YES && $CONF.vacation===YES}
@@ -101,8 +98,17 @@
 				<td><a href="edit.php?table=alias&amp;edit={$item.username|escape:"url"}">{$PALANG.alias}</a></td>
 			{/if}
 			<td><a href="edit.php?table=mailbox&amp;edit={$item.username|escape:"url"}">{$PALANG.edit}</a></td>
-			<td><a href="delete.php?table=mailbox&amp;delete={$item.username|escape:"url"}&amp;token={$smarty.session.PFA_token|escape:"url"}"
-				onclick="return confirm ('{$PALANG.confirm}{$PALANG.mailboxes}: {$item.username}');">{$PALANG.del}</a></td>
+			<td>
+				<form method="post" action="delete.php">
+					<input type="hidden" name="table" value="mailbox">
+					<input type="hidden" name="delete" value="{$item.username|escape:"quotes"}">
+					<input type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"quotes"}">
+					<button type="submit" class="btn btn-danger" onclick="return confirm ('{$PALANG.confirm}{$PALANG.mailboxes}: {$item.username}');">
+						{$PALANG.del}
+					</button>
+				</form>
+			</td>
 		</tr>
 	{/foreach}
+	</tbody>
 </table>
diff --git a/templates/list.tpl b/templates/list.tpl
index 992efc28..73e451f4 100644
--- a/templates/list.tpl
+++ b/templates/list.tpl
@@ -1,14 +1,17 @@
-<div id="overview">
+<div class="panel panel-default">
+
+{if ($admin_list|count > 1)}
+<div class="panel-heading">
 <form name="frmOverview" method="post" action="">
-    {if ($admin_list|count > 1)}
         {html_options name='username' output=$admin_list values=$admin_list selected=$admin_selected onchange="this.form.submit();"}
         <noscript><input class="button" type="submit" name="go" value="{$PALANG.go}" /></noscript>
-    {/if}
 </form>
+</div>
+{/if}
+
 {if $msg.show_simple_search}
     {#form_search#}
 {/if}
-</div>
 
 {if $msg.show_simple_search}
     {if ($search|count > 0)}
@@ -24,36 +27,37 @@
     {/if}
 {/if}
 
-
-
-<div id="list">
-<table border=0 id='admin_table'><!-- TODO: 'admin_table' needed because of CSS for table header -->
+<table class="table table-hover" border=0 id='admin_table'><!-- TODO: 'admin_table' needed because of CSS for table header -->
 
 {if $msg.list_header}
 	{assign var="colcount" value=2}
-    {foreach key=key item=field from=$struct}
-        {if $field.display_in_list == 1 && $field.label}{* don't show fields without a label *}
+	{foreach key=key item=field from=$struct}
+		{if $field.display_in_list == 1 && $field.label}{* don't show fields without a label *}
 			{assign var="colcount" value=$colcount+1}
-        {/if}
-    {/foreach}
+		{/if}
+	{/foreach}
+	<thead>
 	<tr>
-		<th colspan="{$colcount}">{$PALANG.{$msg.list_header}}</th>
+		<th style="text-align:center;" colspan="{$colcount}">{$PALANG.{$msg.list_header}}</th>
 	</tr>
+	</thead>
 {/if}
 
+<thead>
 <tr class="header">
     {foreach key=key item=field from=$struct}
         {if $field.display_in_list == 1 && $field.label}{* don't show fields without a label *}
-            <td>{$field.label}</td>
+            <th>{$field.label}</th>
         {/if}
     {/foreach}
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
+    <th>&nbsp;</th>
+    <th>&nbsp;</th>
 </tr>
+</thead>
 
 {foreach key=itemkey from=$RAW_items item=RAW_item}
     {assign "item" $items.{htmlentities($itemkey, $smarty.const.ENT_QUOTES, 'UTF-8', false)}} {* array keys in $items are escaped using htmlentities(), see smarty.inc.php *}
-    {#tr_hilightoff#}
+    <tr>
 
     {foreach key=key item=field from=$struct}
         {if $field.display_in_list == 1 && $field.label}
@@ -78,7 +82,7 @@
 *}
                     {elseif $key == 'active'}
                         {if $item._can_edit}
-                            <a href="{#url_editactive#}{$table}&amp;id={$RAW_item.$id_field|escape:"url"}&amp;active={if ($item.active==0)}1{else}0{/if}&amp;token={$smarty.session.PFA_token|escape:"url"}">{$item._active}</a>
+                            <a class="btn btn-warning" href="{#url_editactive#}{$table}&amp;id={$RAW_item.$id_field|escape:"url"}&amp;active={if ($item.active==0)}1{else}0{/if}&amp;token={$smarty.session.PFA_token|escape:"url"}">{$item._active}</a>
                         {else}
                             {$item._active}
                         {/if}
@@ -91,11 +95,11 @@
                     {elseif $field.type == 'quot'}
                         {assign "tmpkey" "_{$key}_percent"}
 
-                        {if $item[$tmpkey] > $CONF.quota_level_high_pct}
+                        {if $item[$tmpkey]>90}
                             {assign var="quota_level" value="high"}
-                        {elseif $item[$tmpkey] > $CONF.quota_level_med_pct}
+                        {elseif $item[$tmpkey]>55}
                             {assign var="quota_level" value="mid"}
-                        {else} 
+                        {else}
                             {assign var="quota_level" value="low"}
                         {/if}
                         {if $item[$tmpkey] > -1}
@@ -119,18 +123,37 @@
         {/if}
     {/foreach}
 
-    <td>{if $item._can_edit}<a href="edit.php?table={$table|escape:"url"}&amp;edit={$RAW_item.$id_field|escape:"url"}">{$PALANG.edit}</a>{else}&nbsp;{/if}</td>
-    <td>{if $item._can_delete}<a href="{#url_delete#}?table={$table}&amp;delete={$RAW_item.$id_field|escape:"url"}&amp;token={$smarty.session.PFA_token|escape:"url"}"
-        onclick="return confirm ('{$PALANG.{$msg.confirm_delete}|replace:'%s':$item.$id_field}')">{$PALANG.del}</a>{else}&nbsp;{/if}</td>
+    <td>{if $item._can_edit}
+            <a class="btn btn-primary" href="edit.php?table={$table|escape:"url"}&amp;edit={$RAW_item.$id_field|escape:"url"}">{$PALANG.edit}</a>
+        {else}&nbsp;
+        {/if}
+    </td>
+    <td>{if $item._can_delete}
+        <form method="post" action="{#url_delete#}">
+            <input type="hidden" name="table" value="{$table}">
+            <input type="hidden" name="delete" value="{$RAW_item.$id_field|escape:"quotes"}">
+            <input type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"quotes"}">
+
+            <button class="btn btn-danger" onclick="return confirm('{$PALANG.{$msg.confirm_delete}|replace:'%s':$item.$id_field}')">
+                {$PALANG.del}
+            </button>
+        </form>
+    {else}&nbsp;{/if}
+</td>
     </tr>
 {/foreach}
 
 </table>
 
-{if $msg.can_create}
-<br /><a href="edit.php?table={$table|escape:"url"}" class="button">{$PALANG.{$formconf.create_button}}</a><br />
-<br />
-{/if}
-<br /><a href="list.php?table={$table|escape:"url"}&amp;output=csv">{$PALANG.download_csv}</a>
+<div class="panel-footer">
+	<div class="btn-toolbar" role="toolbar">
+		<div class="btn-group pull-right">
+		{if $msg.can_create}
+		<a href="edit.php?table={$table|escape:"url"}" role="button" class="btn btn-default"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> {$PALANG.{$formconf.create_button}}</a>
+		{/if}
+		<a href="list.php?table={$table|escape:"url"}&amp;output=csv" role="button" class="btn btn-default"><span class="glyphicon glyphicon-export" aria-hidden="true"></span> {$PALANG.download_csv}</a>
+		</div>
+	</div>
+</div>
 
 </div>
diff --git a/templates/login.tpl b/templates/login.tpl
index 01bddfd0..090dadf9 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -1,47 +1,61 @@
-<div id="login">
-<form name="frmLogin" method="post" action="">
-<input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}" />
-<table id="login_table" cellspacing="10">
-	<tr>
-		<th colspan="2">
-{if $logintype=='admin'}{$PALANG.pLogin_welcome}
-{else}{$PALANG.pUsersLogin_welcome}
-{/if}
-	</th>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pLogin_username}:</label></td>
-		<td><input class="flat" type="text" name="fUsername" /></td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.password}:</label></td>
-		<td><input class="flat" type="password" name="fPassword" />
-{if $forgotten_password_reset}
-	<br/><a href="password-recover.php">{$PALANG.pUsersLogin_password_recover}</a>
-{/if}
-		</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pLogin_language}:</label></td>
-		<td>{$language_selector}</td>
-	</tr>
-	<tr>
-		<td class="label">&nbsp;</td>
-		<td><input class="button" type="submit" name="submit" value="{$PALANG.pLogin_button}" /></td>
-	</tr>
-{if $logintype == 'admin'}
-	<tr>
-		<td colspan="2"><a href="users/">{$PALANG.pLogin_login_users}</a></td>
-	</tr>
-{/if}
-</table>
-</form>
-{literal}
-<script type="text/javascript">
-<!--
-	document.frmLogin.fUsername.focus();
-// -->
-</script>
-{/literal}
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <div class="navbar-header">
+            <a class="navbar-brand" href='main.php'><img id="login_header_logo" src="{$CONF.theme_logo}"
+                                                         alt="Logo"/></a>
+            {if $CONF.show_header_text==='YES' && $CONF.header_text}
+                <h2>{$CONF.header_text}</h2>
+            {/if}
+        </div>
+    </div>
+</nav>
+
+<div id="login" class="container text-center">
+    <h2>{if $logintype=='admin'}{$PALANG.pLogin_welcome}
+        {else}{$PALANG.pUsersLogin_welcome}
+        {/if}</h2>
+    <div class="well">
+        <form name="frmLogin" method="post" action="" role="form" class="form-signin">
+            <input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
+            <div class="form-group">
+                <label class="control-label" for="fUsername">{$PALANG.pLogin_username}:</label>
+                <input class="flat form-control" type="text" name="fUsername" id="fUsername"/>
+            </div>
+            <div class="form-group">
+                <label class="control-label" for="fPassword">{$PALANG.password}:</label>
+                <input class="flat form-control" type="password" name="fPassword" id="fPassword"/>
+            </div>
+            {if $forgotten_password_reset}
+                <div class="form-group row">
+                    <div class="col-sm-6 col-sm-offset-3 reset-button">
+                        <a class="btn btn-default btn-block" role="button" href="password-recover.php"><span
+                                    class="glyphicon glyphicon-refresh"
+                                    aria-hidden="true"></span> {$PALANG.pUsersLogin_password_recover}</a>
+                    </div>
+                </div>
+            {/if}
+            <div class="form-group">
+                <label class="control-label">{$PALANG.pLogin_language}:</label>
+                {$language_selector}
+            </div>
+            <div class="text-center">
+                <input class="btn btn-primary btn-lg btn-block" type="submit" name="submit"
+                       value="{$PALANG.pLogin_button}"/>
+            </div>
+        </form>
+        {if $logintype == 'admin'}
+            <br/>
+            <div class="text-center">
+                <a href="users/">{$PALANG.pLogin_login_users}</a>
+            </div>
+        {/if}
+    </div>
+    {literal}
+        <script type="text/javascript">
+            <!--
+            document.frmLogin.fUsername.focus();
+            // -->
+        </script>
+    {/literal}
 </div>
 
diff --git a/templates/main.tpl b/templates/main.tpl
index 6f5dbfb5..4dd00a9d 100644
--- a/templates/main.tpl
+++ b/templates/main.tpl
@@ -1,35 +1,36 @@
 <!-- {$smarty.template} -->
-<div id="main_menu">
-<table>
-	<tr>
-		<td nowrap="nowrap"><a target="_top" href="{#url_list_domain#}">{$PALANG.pMenu_overview}</a></td>
-		<td>{$PALANG.pMain_overview}</td>
-	</tr>
-	<tr>
-		<td nowrap="nowrap"><a target="_top" href="{#url_create_alias#}">{$PALANG.add_alias}</a></td>
-		<td>{$PALANG.pMain_create_alias}</td>
-	</tr>
-	<tr>
-		<td nowrap="nowrap"><a target="_top" href="{#url_create_mailbox#}">{$PALANG.add_mailbox}</a></td>
-		<td>{$PALANG.pMain_create_mailbox}</td>
-	</tr>
-{if $CONF.sendmail==='YES'}
-	<tr>
-		<td nowrap="nowrap"><a target="_top" href="{#url_sendmail#}">{$PALANG.pMenu_sendmail}</a></td>
-		<td>{$PALANG.pMain_sendmail}</td>
-	</tr>
-{/if}
-	<tr>
-		<td nowrap="nowrap"><a target="_top" href="{#url_password#}">{$PALANG.pMenu_password}</a></td>
-		<td>{$PALANG.pMain_password}</td>
-	</tr>
-	<tr>
-		<td nowrap="nowrap"><a target="_top" href="{#url_viewlog#}">{$PALANG.pMenu_viewlog}</a></td>
-		<td>{$PALANG.pMain_viewlog}</td>
-	</tr>
-	<tr>
-		<td nowrap="nowrap"><a target="_top" href="{#url_logout#}">{$PALANG.pMenu_logout}</a></td>
-		<td>{$PALANG.pMain_logout}</td>
-	</tr>
-</table>
+<div class="panel panel-default" id="main_menu">
+
+    <table class="table">
+        <tr>
+            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_list_domain#}">{$PALANG.pMenu_overview}</a></td>
+            <td>{$PALANG.pMain_overview}</td>
+        </tr>
+        <tr>
+            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_create_alias#}">{$PALANG.add_alias}</a></td>
+            <td>{$PALANG.pMain_create_alias}</td>
+        </tr>
+        <tr>
+            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_create_mailbox#}">{$PALANG.add_mailbox}</a></td>
+            <td>{$PALANG.pMain_create_mailbox}</td>
+        </tr>
+        {if $CONF.sendmail==='YES'}
+            <tr>
+                <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_sendmail#}">{$PALANG.pMenu_sendmail}</a></td>
+                <td>{$PALANG.pMain_sendmail}</td>
+            </tr>
+        {/if}
+        <tr>
+            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_password#}">{$PALANG.pMenu_password}</a></td>
+            <td>{$PALANG.pMain_password}</td>
+        </tr>
+        <tr>
+            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_viewlog#}">{$PALANG.pMenu_viewlog}</a></td>
+            <td>{$PALANG.pMain_viewlog}</td>
+        </tr>
+        <tr>
+            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_logout#}">{$PALANG.pMenu_logout}</a></td>
+            <td>{$PALANG.pMain_logout}</td>
+        </tr>
+    </table>
 </div>
diff --git a/templates/menu.tpl b/templates/menu.tpl
index c4facd17..2248359f 100644
--- a/templates/menu.tpl
+++ b/templates/menu.tpl
@@ -1,108 +1,129 @@
 <!-- {$smarty.template} -->
 {strip}
-{if !empty($smarty.get) && !empty($smarty.get.domain)}
-{*** zuweisung muss eleganter gehen ***}
-	{assign var="url_domain" value=$smarty.get.domain}
-	{assign var="url_domain" value="&amp;domain={$url_domain|escape:url}"}
-{/if}
+    {if !empty($smarty.get) && !empty($smarty.get.domain)}
+        {*** zuweisung muss eleganter gehen ***}
+        {assign var="url_domain" value=$smarty.get.domain}
+        {assign var="url_domain" value="&amp;domain={$url_domain|escape:url}"}
+    {/if}
 {/strip}
-<div id="menu">
-<ul>
-{* list-admin *}
-{if $authentication_has_role.global_admin}
+
 {strip}
-	<li><a target="_top" href="{#url_list_admin#}">{$PALANG.pAdminMenu_list_admin}</a>
-		<ul>
-			<li><a target="_top" href="{#url_list_admin#}">{$PALANG.pAdminMenu_list_admin}</a></li>
-			<li><a target="_top" href="{#url_create_admin#}">{$PALANG.pAdminMenu_create_admin}</a></li>
-		</ul>
-	</li>
+    <nav class="navbar navbar-default navbar-fixed-top">
+        <div class="container-fluid">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar"
+                        aria-expanded="false" aria-controls="navbar">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                {*** <a class="navbar-brand" href='main.php'><img id="login_header_logo" src="{$CONF.theme_logo}" alt="Logo" /></a> ***}
+                <a class="navbar-brand" href='main.php'><img id="login_header_logo" src="images/postbox.png"
+                                                             alt="Logo"/></a>
+            </div>
+            <div id="navbar" class="collapse navbar-collapse">
+                <ul class="nav navbar-nav">
+                    {* list-admin *}
+                    {if $authentication_has_role.global_admin}
+                        {strip}
+                            <li class="dropdown">
+                                <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
+                                   aria-expanded="false" href="{#url_list_admin#}">{$PALANG.pAdminMenu_list_admin} <span
+                                            class="caret"></span></a>
+                                <ul class="dropdown-menu">
+                                    <li><a href="{#url_list_admin#}">{$PALANG.pAdminMenu_list_admin}</a></li>
+                                    <li><a href="{#url_create_admin#}">{$PALANG.pAdminMenu_create_admin}</a></li>
+                                </ul>
+                            </li>
+                        {/strip}
+                    {else}
+                        <li><a href="{#url_main#}">{$PALANG.pMenu_main}</a></li>
+                    {/if}
+                    {* list-domain *}
+                    {strip}
+                        <li>
+                            <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
+                               aria-expanded="false" href="{#url_list_domain#}">{$PALANG.pAdminMenu_list_domain} <span
+                                        class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="{#url_list_domain#}">{$PALANG.pAdminMenu_list_domain}</a></li>
+                                {if $authentication_has_role.global_admin}
+                                    <li><a href="{#url_edit_domain#}">{$PALANG.pAdminMenu_create_domain}</a></li>
+                                {/if}
+                            </ul>
+                        </li>
+                    {/strip}
+                    {* list-virtual *}
+                    {strip}
+                        <li class="dropdown">
+                            <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
+                               aria-expanded="false" href="{#url_list_virtual#}">{$PALANG.pAdminMenu_list_virtual} <span
+                                        class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="{#url_list_virtual#}">{$PALANG.pAdminMenu_list_virtual}</a></li>
+                                <li><a href="{#url_create_mailbox#}{$url_domain}">{$PALANG.add_mailbox}</a></li>
+                                <li><a href="{#url_create_alias#}{$url_domain}">{$PALANG.add_alias}</a></li>
+                                {if $boolconf_alias_domain}
+                                    <li>
+                                        <a href="{#url_create_alias_domain#}{$url_domain}">{$PALANG.add_alias_domain}</a>
+                                    </li>
+                                {/if}
+                            </ul>
+                        </li>
+                    {/strip}
+                    {* fetchmail *}
+                    {if $CONF.fetchmail==='YES'}
+                        {strip}
+                            <li class="dropdown">
+                                <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
+                                   aria-expanded="false" href="{#url_fetchmail#}">{$PALANG.pMenu_fetchmail} <span
+                                            class="caret"></span></a>
+                                <ul class="dropdown-menu">
+                                    <li><a href="{#url_fetchmail#}">{$PALANG.pMenu_fetchmail}</a></li>
+                                    <li><a href="{#url_fetchmail_new_entry#}">{$PALANG.pFetchmail_new_entry}</a></li>
+                                </ul>
+                            </li>
+                        {/strip}
+                    {/if}
+                    {* sendmail *}
+                    {if $CONF.sendmail==='YES'}
+                        {strip}
+                            <li class="dropdown">
+                                <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
+                                   aria-expanded="false" href="{#url_sendmail#}">{$PALANG.pMenu_sendmail} <span
+                                            class="caret"></span></a>
+                                <ul class="dropdown-menu">
+                                    <li><a href="{#url_sendmail#}">{$PALANG.pMenu_sendmail}</a></li>
+                                    {if $authentication_has_role.global_admin || (isset($CONF.sendmail_all_admins) && $CONF.sendmail_all_admins === 'YES') }
+                                        <li>
+                                            <a href="{#url_broadcast_message#}">{$PALANG.pAdminMenu_broadcast_message}</a>
+                                        </li>
+                                    {/if}
+                                </ul>
+                            </li>
+                        {/strip}
+                    {/if}
+                </ul>
+                <ul class="nav navbar-nav navbar-right">
+                    {* password *}
+                    <li><a class="btn btn-default navbar-btn btn-sm" type="button"
+                           href="{#url_password#}">{$PALANG.pMenu_password}</a></li>
+                    {* backup *}
+                    {if $authentication_has_role.global_admin && $CONF.database_type!=='pgsql' && $CONF.backup === 'YES'}
+                        <li><a class="btn btn-default navbar-btn btn-sm" type="button"
+                               href="{#url_backup#}">{$PALANG.pAdminMenu_backup}</a></li>
+                    {/if}
+                    {* viewlog *}
+                    {if $CONF.logging==='YES'}
+                        <li><a class="btn btn-default navbar-btn btn-sm" type="button"
+                               href="{#url_viewlog#}">{$PALANG.pMenu_viewlog}</a></li>
+                    {/if}
+                    {* logout *}
+                    <li><a class="btn btn-default navbar-btn btn-sm" type="button"
+                           href="{#url_logout#}">{$PALANG.pMenu_logout}</a></li>
+                </ul>
+            </div><!--/.nav-collapse -->
+        </div>
+    </nav>
 {/strip}
-{else}
-	<li><a target="_top" href="{#url_main#}">{$PALANG.pMenu_main}</a></li>
-{/if}
-{* list-domain *}
-{strip}
-	<li><a target="_top" href="{#url_list_domain#}">{$PALANG.pAdminMenu_list_domain}</a>
-		<ul>
-			<li><a target="_top" href="{#url_list_domain#}">{$PALANG.pAdminMenu_list_domain}</a></li>
-{if $authentication_has_role.global_admin}
-			<li><a target="_top" href="{#url_edit_domain#}">{$PALANG.pAdminMenu_create_domain}</a></li>
-{/if}
-		</ul>
-	</li>
-{/strip}
-{* list-virtual *}
-{strip}
-	<li><a target="_top" href="{#url_list_virtual#}">{$PALANG.pAdminMenu_list_virtual}</a>
-		<ul>
-			<li><a target="_top" href="{#url_list_virtual#}">{$PALANG.pAdminMenu_list_virtual}</a></li>
-			<li><a target="_top" href="{#url_create_mailbox#}{$url_domain}">{$PALANG.add_mailbox}</a></li>
-			<li><a target="_top" href="{#url_create_alias#}{$url_domain}">{$PALANG.add_alias}</a></li>
-{if $boolconf_alias_domain}
-			<li><a target="_top" href="{#url_create_alias_domain#}{$url_domain}">{$PALANG.add_alias_domain}</a></li>
-{/if}
-		</ul>
-	</li>
-{/strip}
-{* fetchmail *}
-{if $CONF.fetchmail==='YES'}
-{strip}
-	<li><a target="_top" href="{#url_fetchmail#}">{$PALANG.pMenu_fetchmail}</a>
-		<ul>
-			<li><a target="_top" href="{#url_fetchmail#}">{$PALANG.pMenu_fetchmail}</a></li>
-			<li><a target="_top" href="{#url_fetchmail_new_entry#}">{$PALANG.pFetchmail_new_entry}</a></li>
-		</ul>
-	</li>
-{/strip}
-{/if}
-{* sendmail *}
-{if $CONF.sendmail==='YES'}
-{strip}
-	<li><a target="_top" href="{#url_sendmail#}">{$PALANG.pMenu_sendmail}</a>
-		<ul>
-			<li><a target="_top" href="{#url_sendmail#}">{$PALANG.pMenu_sendmail}</a></li>
-{if $authentication_has_role.global_admin || (isset($CONF.sendmail_all_admins) && $CONF.sendmail_all_admins === 'YES') }
-			<li><a target="_top" href="{#url_broadcast_message#}">{$PALANG.pAdminMenu_broadcast_message}</a></li>
-{/if}
-		</ul>
-	</li>
-{/strip}
-{/if}
-{* password *}
-	<li><a target="_top" href="{#url_password#}">{$PALANG.pMenu_password}</a></li>
-{* backup *}
-{if $authentication_has_role.global_admin && $CONF.database_type!=='pgsql' && $CONF.backup === 'YES'}
-	<li><a target="_top" href="{#url_backup#}">{$PALANG.pAdminMenu_backup}</a></li>
-{/if}
-{* viewlog *}
-{if $CONF.logging==='YES'}
-	<li><a target="_top" href="{#url_viewlog#}">{$PALANG.pMenu_viewlog}</a></li>
-{/if}
-{* logout *}
-	<li class="logout"><a target="_top" href="{#url_logout#}">{$PALANG.pMenu_logout}</a></li>
-</ul>
-</div>
-{literal}
-<script type='text/javascript'>
-// <![CDATA[
-sfHover = function()
-{
-	var sfEls = document.getElementById("menu").getElementsByTagName("LI");
-	for (var i=0; i<sfEls.length; i++)
-	{
-		sfEls[i].onmouseover=function()
-		{
-			this.className+=" sfhover";
-		}
-		sfEls[i].onmouseout=function()
-		{
-			this.className=this.className.replace(new RegExp(" sfhover\\b"), "");
-		}
-	}
-}
-if (window.attachEvent)
-	window.attachEvent("onload", sfHover);
-// ]]>
-</script>
-{/literal}
diff --git a/templates/message.tpl b/templates/message.tpl
deleted file mode 100644
index b9c45cc1..00000000
--- a/templates/message.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- TODO: remove usage of message.tpl, then remove this file -->
diff --git a/templates/password-change.tpl b/templates/password-change.tpl
index 1c7e99f9..10293236 100644
--- a/templates/password-change.tpl
+++ b/templates/password-change.tpl
@@ -1,28 +1,29 @@
 <div id="edit_form">
-<form name="mailbox" method="post">
-<table>
-	<tr>
-		<td colspan="3"><h3>{$PALANG.pPassword_welcome}</h3></td>
-	</tr>
-	<tr>
-		<td>{$PALANG.pLogin_username} :</td>
-		<td><input class="flat" type="text" name="fUsername" value="{$tUsername}" /></td>
-	</tr>
-	<tr>
-		<td>{$PALANG.pPassword_password_code} :</td>
-		<td><input class="flat" type="text" name="fCode" value="{$tCode}" /></td>
-	</tr>
-	<tr>
-		<td>{$PALANG.pPassword_password} :</td>
-		<td><input class="flat" type="password" name="fPassword" /></td>
-	</tr>
-	<tr>
-		<td>{$PALANG.pPassword_password2} :</td>
-		<td><input class="flat" type="password" name="fPassword2" /></td>
-	</tr>
-	<tr>
-		<td colspan="2" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.change_password}" /></td>
-	</tr>
-</table>
-</form>
+    <form name="mailbox" method="post">
+        <table>
+            <tr>
+                <td colspan="3"><h3>{$PALANG.pPassword_welcome}</h3></td>
+            </tr>
+            <tr>
+                <td>{$PALANG.pLogin_username} :</td>
+                <td><input class="flat" type="text" name="fUsername" value="{$tUsername}"/></td>
+            </tr>
+            <tr>
+                <td>{$PALANG.pPassword_password_code} :</td>
+                <td><input class="flat" type="text" name="fCode" value="{$tCode}"/></td>
+            </tr>
+            <tr>
+                <td>{$PALANG.pPassword_password} :</td>
+                <td><input class="flat" type="password" name="fPassword"/></td>
+            </tr>
+            <tr>
+                <td>{$PALANG.pPassword_password2} :</td>
+                <td><input class="flat" type="password" name="fPassword2"/></td>
+            </tr>
+            <tr>
+                <td colspan="2" class="hlp_center"><input class="button" type="submit" name="submit"
+                                                          value="{$PALANG.change_password}"/></td>
+            </tr>
+        </table>
+    </form>
 </div>
diff --git a/templates/password-recover.tpl b/templates/password-recover.tpl
index ebe0b017..5ab378b2 100644
--- a/templates/password-recover.tpl
+++ b/templates/password-recover.tpl
@@ -1,26 +1,26 @@
 <div id="edit_form">
-<form name="frmPassword" method="post" action="">
-<table>
-	<tr>
-		<th colspan="3">{$PALANG.pPassword_recovery_title}</th>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pLogin_username}:</label></td>
-		<td><input class="flat" type="text" name="fUsername" /></td>
-	</tr>
-	<tr>
-		<td class="label">&nbsp;</td>
-		<td colspan="2">
-			<input class="button" type="submit" name="submit" value="{$PALANG.pPassword_recovery_button}" />
-		</td>
-	</tr>
-</table>
-</form>
-{literal}
-<script type="text/javascript">
-<!--
-	document.frmPassword.fUsername.focus();
-// -->
-</script>
-{/literal}
+    <form name="frmPassword" method="post" action="">
+        <table>
+            <tr>
+                <th colspan="3">{$PALANG.pPassword_recovery_title}</th>
+            </tr>
+            <tr>
+                <td class="label"><label>{$PALANG.pLogin_username}:</label></td>
+                <td><input class="flat" type="text" name="fUsername"/></td>
+            </tr>
+            <tr>
+                <td class="label">&nbsp;</td>
+                <td colspan="2">
+                    <input class="button" type="submit" name="submit" value="{$PALANG.pPassword_recovery_button}"/>
+                </td>
+            </tr>
+        </table>
+    </form>
+    {literal}
+        <script type="text/javascript">
+            <!--
+            document.frmPassword.fUsername.focus();
+            // -->
+        </script>
+    {/literal}
 </div>
diff --git a/templates/password.tpl b/templates/password.tpl
index 8c815c95..620f3b97 100644
--- a/templates/password.tpl
+++ b/templates/password.tpl
@@ -1,39 +1,40 @@
-<div id="edit_form">
-<form name="password" method="post" action="">
-<input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}" />
-<table>
-	<tr>
-		<th colspan="3">{$PALANG.pPassword_welcome}</th>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pPassword_admin}:</label></td>
-		<td><em>{$SESSID_USERNAME}</em></td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pPassword_password_current}:</label></td>
-		<td><input class="flat" type="password" name="fPassword_current" /></td>
-		<td class="error_msg">{$pPassword_password_current_text}</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pPassword_password}:</label></td>
-		<td><input class="flat" type="password" name="fPassword" /></td>
-		<td class="error_msg">{$pPassword_password_text}</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pPassword_password2}:</label></td>
-		<td><input class="flat" type="password" name="fPassword2" /></td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label">&nbsp;</td>
-		<td>
-			<input class="button" type="submit" name="submit" value="{$PALANG.change_password}" />
-			{if $authentication_has_role.user}
-				<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
-			{/if}
-		<td>&nbsp;</td>
-	</tr>
-</table>
+<form name="password" method="post" action="" class="form-horizontal">
+    <div id="edit_form" class="panel panel-default">
+        <div class="panel-heading"><h4>{$PALANG.pPassword_welcome}</h4></div>
+        <div class="panel-body enable-asterisk">
+            <input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label">{$PALANG.pLogin_username}:</label>
+                <div class="col-md-6 col-sm-8"><p class="form-control-static"><em>{$SESSID_USERNAME}</em></p></div>
+            </div>
+            <div class="form-group {if $pPassword_password_current_text}has-error{/if}">
+                <label class="col-md-4 col-sm-4 control-label"
+                       for="fPassword_current">{$PALANG.pPassword_password_current}:</label>
+                <div class="col-md-6 col-sm-8"><input class="form-control" type="password" name="fPassword_current"
+                                                      id="fPassword_current"/></div>
+                <span class="help-block">{$pPassword_password_current_text}</span>
+            </div>
+            <div class="form-group {if $pPassword_password_text}has-error{/if}">
+                <label class="col-md-4 col-sm-4 control-label" for="fPassword">{$PALANG.pPassword_password}:</label>
+                <div class="col-md-6 col-sm-8"><input class="form-control" type="password" name="fPassword"
+                                                      id="fPassword"/></div>
+                <span class="help-block">{$pPassword_password_text}</span>
+            </div>
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label" for="fPassword2">{$PALANG.pPassword_password2}:</label>
+                <div class="col-md-6 col-sm-8"><input class="form-control" type="password" name="fPassword2"
+                                                      id="fPassword2"/></div>
+            </div>
+        </div>
+        <div class="panel-footer">
+            <div class="btn-toolbar" role="toolbar">
+                <div class="btn-group pull-right">
+                    <input class="btn btn-primary" type="submit" name="submit" value="{$PALANG.change_password}"/>
+                    {if $authentication_has_role.user}
+                        <input class="btn btn-primary" type="submit" name="fCancel" value="{$PALANG.exit}"/>
+                    {/if}
+                </div>
+            </div>
+        </div>
+    </div>
 </form>
-</div>
diff --git a/templates/sendmail.tpl b/templates/sendmail.tpl
index 2c2e9d2c..b97ff029 100644
--- a/templates/sendmail.tpl
+++ b/templates/sendmail.tpl
@@ -1,36 +1,33 @@
-<div id="edit_form">
-<form name="mailbox" method="post" action="">
-<input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}" />
-<table>
-	<tr>
-		<th colspan="3">{$PALANG.pSendmail_welcome}</th>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.from}:</label></td>
-		<td><em>{$smtp_from_email}</em></td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pSendmail_to}:</label></td>
-		<td><input class="flat" type="text" name="fTo" /></td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.subject}:</label></td>
-		<td><input class="flat" type="text" name="fSubject" value="{$PALANG.pSendmail_subject_text}" /></td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pSendmail_body}:</label></td>
-		<td>
-		<textarea class="flat" rows="10" cols="60" name="fBody">{$CONF.welcome_text}</textarea>
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label">&nbsp;</td>
-		<td colspan="2"><input class="button" type="submit" name="submit" value="{$PALANG.pSendmail_button}" /></td>
-	</tr>
-</table>
+<form name="mailbox" method="post" action="" class="form-horizontal">
+    <div id="edit_form" class="panel panel-default">
+        <div class="panel-heading"><h4>{$PALANG.pSendmail_welcome}</h4></div>
+        <div class="panel-body enable-asterisk">
+            <input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label">{$PALANG.from}:</label>
+                <div class="col-md-6 col-sm-8"><p class="form-control-static"><em>{$smtp_from_email}</em></p></div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label" for="fTo">{$PALANG.pSendmail_to}:</label>
+                <div class="col-md-6 col-sm-8"><input class="form-control" type="text" name="fTo" id="fTo"/></div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label" for="fSubject">{$PALANG.subject}:</label>
+                <div class="col-md-6 col-sm-8"><input class="form-control" type="text" name="fSubject" id="fSubject"
+                                                      value="{$PALANG.pSendmail_subject_text}"/></div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label" for="fBody">{$PALANG.pSendmail_body}:</label>
+                <div class="col-md-6 col-sm-8"><textarea class="form-control" rows="10" cols="60" name="fBody"
+                                                         id="fBody">{$CONF.welcome_text}</textarea></div>
+            </div>
+        </div>
+        <div class="panel-footer">
+            <div class="btn-toolbar" role="toolbar">
+                <div class="btn-group pull-right">
+                    <input class="btn btn-primary" type="submit" name="submit" value="{$PALANG.pSendmail_button}"/>
+                </div>
+            </div>
+        </div>
+    </div>
 </form>
-</div>
diff --git a/templates/users_edit-alias.tpl b/templates/users_edit-alias.tpl
index c6b5b1fb..1d267605 100644
--- a/templates/users_edit-alias.tpl
+++ b/templates/users_edit-alias.tpl
@@ -1,42 +1,50 @@
-<div id="edit_form">
-<form name="alias" method="post" action="">
-<input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}" />
-<table>
-	<tr>
-		<th colspan="3">{$PALANG.pEdit_alias_welcome}<br /><em>{$PALANG.pEdit_alias_help}</em></th>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.alias}:</label></td>
-		<td><em>{$USERID_USERNAME}</em></td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.to}:</label></td>
-		<td><textarea class="flat" rows="4" cols="50" name="fGoto">
+<form name="alias" method="post" action="" class="form-horizontal">
+    <div id="edit_form" class="panel panel-default">
+        <div class="panel-heading"><h4>{$PALANG.pEdit_alias_welcome}</h4></div>
+        <div class="panel-body enable-asterisk">
+            <input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
+            <p class="text-center"><em>{$PALANG.pEdit_alias_help}</em></p>
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label">{$PALANG.alias}:</label>
+                <div class="col-md-6 col-sm-8"><p class="form-control-static"><em>{$USERID_USERNAME}</em></p></div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label" for="fGoto">{$PALANG.to}:</label>
+                <div class="col-md-6 col-sm-8">
+			<textarea class="form-control" rows="4" cols="50" name="fGoto" id="fGoto">
 {foreach from=$tGotoArray item=address}
-{$address}
+    {$address}
 {/foreach}
-</textarea>
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td colspan="2">
-		<input class="flat" type="radio" name="fForward_and_store" value="1"{$forward_and_store}/>
-		{$PALANG.pEdit_alias_forward_and_store}<br />
-		<input class="flat" type="radio" name="fForward_and_store" value="0" {$forward_only}/>
-		{$PALANG.pEdit_alias_forward_only}
-		</td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td>
-			<input class="button" type="submit" name="submit" value="{$PALANG.save}" />
-			<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
+			</textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label"></label>
+                <div class="col-md-6 col-sm-8">
+                    <div class="radio">
+                        <label>
+                            <input type="radio" name="fForward_and_store" id="fForward_and_store1"
+                                   value="1"{$forward_and_store}/>
+                            {$PALANG.pEdit_alias_forward_and_store}
+                        </label>
+                    </div>
+                    <div class="radio">
+                        <label>
+                            <input type="radio" name="fForward_and_store" id="fForward_and_store0"
+                                   value="0" {$forward_only}/>
+                            {$PALANG.pEdit_alias_forward_only}
+                        </label>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="panel-footer">
+            <div class="btn-toolbar" role="toolbar">
+                <div class="btn-group pull-right">
+                    <input class="btn btn-primary" type="submit" name="submit" value="{$PALANG.save}"/>
+                    <input class="btn btn-primary" type="submit" name="fCancel" value="{$PALANG.exit}"/>
+                </div>
+            </div>
+        </div>
+    </div>
 </form>
-</div>
diff --git a/templates/users_main.tpl b/templates/users_main.tpl
index 339dbdbd..e07a6b16 100644
--- a/templates/users_main.tpl
+++ b/templates/users_main.tpl
@@ -1,24 +1,26 @@
-<div id="main_menu">
-<table>
-{if $CONF.vacation===YES}
-	<tr>
-		<td nowrap="nowrap"><a target="_top" href="vacation.php">{$PALANG.pUsersMenu_vacation}</a></td>
-		<td>{$tummVacationtext}</td>
-	</tr>
-{/if}
-{if $CONF.edit_alias===YES}
-	<tr>
-		<td nowrap="nowrap"><a target="_top" href="edit-alias.php">{$PALANG.pUsersMenu_edit_alias}</a></td>
-		<td>{$PALANG.pUsersMain_edit_alias}</td>
-	</tr>
-{/if}
-	<tr>
-		<td nowrap="nowrap"><a target="_top" href="password.php">{$PALANG.change_password}</a></td>
-		<td>{$PALANG.pUsersMain_password}</td>
-	</tr>
-	<tr>
-		<td nowrap="nowrap"><a target="_top" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></td>
-		<td>{$PALANG.pMain_logout}</td>
-	</tr>
-</table>
+<div class="panel panel-default" id="main_menu">
+    <table class="table">
+        {if $CONF.vacation===YES}
+            <tr>
+                <td nowrap="nowrap"><a class="btn btn-primary" href="vacation.php">{$PALANG.pUsersMenu_vacation}</a>
+                </td>
+                <td>{$tummVacationtext}</td>
+            </tr>
+        {/if}
+        {if $CONF.edit_alias===YES}
+            <tr>
+                <td nowrap="nowrap"><a class="btn btn-primary" href="edit-alias.php">{$PALANG.pUsersMenu_edit_alias}</a>
+                </td>
+                <td>{$PALANG.pUsersMain_edit_alias}</td>
+            </tr>
+        {/if}
+        <tr>
+            <td nowrap="nowrap"><a class="btn btn-primary" href="password.php">{$PALANG.change_password}</a></td>
+            <td>{$PALANG.pUsersMain_password}</td>
+        </tr>
+        <tr>
+            <td nowrap="nowrap"><a class="btn btn-primary" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></td>
+            <td>{$PALANG.pMain_logout}</td>
+        </tr>
+    </table>
 </div>
diff --git a/templates/users_menu.tpl b/templates/users_menu.tpl
index ff14391d..478765b2 100644
--- a/templates/users_menu.tpl
+++ b/templates/users_menu.tpl
@@ -1,13 +1,30 @@
-<div id="menu">
-<ul>
-	<li><a target="_top" href="{#url_user_main#}">{$PALANG.pMenu_main}</a></li>
-{if $CONF.vacation===YES}
-	<li><a target="_top" href="{#url_user_vacation#}">{$PALANG.pUsersMenu_vacation}</a></li>
-{/if}
-{if $CONF.edit_alias===YES}
-	<li><a target="_top" href="{#url_user_edit_alias#}">{$PALANG.pUsersMenu_edit_alias}</a></li>
-{/if}
-	<li><a target="_top" href="{#url_user_password#}">{$PALANG.change_password}</a></li>
-	<li class="logout"><a target="_top" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></li>
-</ul>
-</div>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container-fluid">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar"
+                    aria-expanded="false" aria-controls="navbar">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            {*** <a class="navbar-brand" href='main.php'><img id="login_header_logo" src="{$CONF.theme_logo}" alt="Logo" /></a> ***}
+            <a class="navbar-brand" href="{#url_user_main#}{#url_user_main#}"><img id="login_header_logo"
+                                                                                   src="../images/postbox.png"
+                                                                                   alt="Logo"/></a>
+        </div>
+        <div id="navbar" class="collapse navbar-collapse">
+            <ul class="nav navbar-nav">
+                <li><a target="_top" href="{#url_user_main#}">{$PALANG.pMenu_main}</a></li>
+                {if $CONF.vacation===YES}
+                    <li><a target="_top" href="{#url_user_vacation#}">{$PALANG.pUsersMenu_vacation}</a></li>
+                {/if}
+                {if $CONF.edit_alias===YES}
+                    <li><a target="_top" href="{#url_user_edit_alias#}">{$PALANG.pUsersMenu_edit_alias}</a></li>
+                {/if}
+                <li><a target="_top" href="{#url_user_password#}">{$PALANG.change_password}</a></li>
+                <li class="logout"><a target="_top" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></li>
+            </ul>
+        </div>
+    </div>
+</nav>
diff --git a/templates/vacation.tpl b/templates/vacation.tpl
index 6e1a51a4..76b2dcd4 100644
--- a/templates/vacation.tpl
+++ b/templates/vacation.tpl
@@ -1,76 +1,110 @@
-{literal}
-	<script language="JavaScript" src="calendar.js" type="text/javascript"></script>
-{/literal}
-<div id="edit_form">
-<form name="edit-vacation" method="post" action=''>
-<input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}" />
-<table>
-	<tr>
-		<th colspan="3">{$PALANG.pUsersVacation_welcome}</th>
-	</tr>
-	{if !$authentication_has_role.user}
-	<tr>
-		<td class="label"><label>{$PALANG.pLogin_username}:</label></td>
-		<td><em>{$tUseremail}</em></td>
-		<td>&nbsp;</td>
-	</tr>
-	{/if}
-	<tr>
-		<td class="label"><label>{$PALANG.pUsersVacation_activefrom}:</label></td>
-		<td><input class="flat readonly" name="fActiveFrom" value="{$tActiveFrom}" readonly="readonly" />
-{literal}
-<script language="JavaScript" type="text/javascript">
-	new tcal ({
-		'formname': 'edit-vacation',
-		'controlname': 'fActiveFrom'
-	});
-</script>
-{/literal}
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pUsersVacation_activeuntil}:</label></td>
-		<td><input class="flat readonly" name="fActiveUntil" value="{$tActiveUntil}" readonly="readonly" />
-{literal}
-<script language="JavaScript" type="text/javascript">
-	new tcal ({
-		'formname': 'edit-vacation',
-		'controlname': 'fActiveUntil'
-	});
-</script>
-{/literal}
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-
-    <tr>
-        <td class="label"><label>{$PALANG.pVacation_reply_type}:</label></td>
-        <td>
-			<select class="flat" name="fInterval_Time">
-				{html_options options=$select_options selected=$tInterval_Time}
-			</select>
-		</td>
-        <td>&nbsp;</td>
-    </tr>
-	<tr>
-		<td class="label"><label>{$PALANG.subject}:</label></td>
-		<td><textarea class="flat" rows="3" cols="60" name="fSubject" >{$tSubject}</textarea></td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.message}:</label></td>
-		<td><textarea class="flat" rows="10" cols="60" name="fBody" >{$tBody}</textarea></td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td colspan="2">
-			<input class="button" type="submit" name="fChange" value="{$PALANG.pEdit_vacation_set}" />
-			<input class="button" type="submit" name="fBack" value="{$PALANG.pEdit_vacation_remove}" />
-			<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
-		</td>
-	</tr>
-</table>
+<form name="edit-vacation" method="post" action="" class="form-horizontal">
+    <div id="edit_form" class="panel panel-default">
+        <div class="panel-heading"><h4>{$PALANG.pUsersVacation_welcome}</h4></div>
+        <div class="panel-body enable-asterisk">
+            <input type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
+            {if !$authentication_has_role.user}
+                <div class="form-group">
+                    <label class="col-md-4 col-sm-4 control-label">{$PALANG.pLogin_username}:</label>
+                    <div class="col-md-6 col-sm-8"><p class="form-control-static"><em>{$tUseremail}</em></p></div>
+                </div>
+            {/if}
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label" for="fActiveFromForm">{$PALANG.pUsersVacation_activefrom}
+                    :</label>
+                <div class="col-md-6 col-sm-8">
+                    <input type='hidden' name="fActiveFrom" id="fActiveFrom" value="{$tActiveFrom}"
+                           class="form-control hidden"/>
+                    <div class="input-group date" id="datetimepicker-fActiveFrom">
+                        <input type='text' name="fActiveFromForm" id="fActiveFromForm" value="{$tActiveFrom}"
+                               class="form-control" readonly="readonly"/>
+                        <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label"
+                       for="fActiveUntilForm">{$PALANG.pUsersVacation_activeuntil}:</label>
+                <div class="col-md-6 col-sm-8">
+                    <input type='hidden' name="fActiveUntil" id="fActiveUntil" value="{$tActiveUntil}"
+                           class="form-control hidden"/>
+                    <div class="input-group date" id="datetimepicker-fActiveUntil">
+                        <input type='text' name="fActiveUntilForm" id="fActiveUntilForm" value="{$tActiveUntil}"
+                               class="form-control" readonly="readonly"/>
+                        <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label" for="fInterval_Time">{$PALANG.pVacation_reply_type}
+                    :</label>
+                <div class="col-md-6 col-sm-8">
+                    <select class="form-control" name="fInterval_Time" id="fInterval_Time">
+                        {html_options options=$select_options selected=$tInterval_Time}
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label" for="fSubject">{$PALANG.subject}:</label>
+                <div class="col-md-6 col-sm-8">
+                    <textarea class="form-control" rows="3" cols="60" name="fSubject"
+                              id="fSubject">{$tSubject}</textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label" for="fBody">{$PALANG.message}:</label>
+                <div class="col-md-6 col-sm-8">
+                    <textarea class="form-control" rows="10" cols="60" name="fBody" id="fBody">{$tBody}</textarea>
+                </div>
+            </div>
+        </div>
+        <div class="panel-footer">
+            <div class="btn-toolbar" role="toolbar">
+                <div class="btn-group pull-right">
+                    <input class="btn btn-primary m-3" type="submit" name="fChange"
+                           value="{$PALANG.pEdit_vacation_set}"/>
+                    <input class="btn btn-primary" type="submit" name="fBack"
+                           value="{$PALANG.pEdit_vacation_remove}"/>
+                    <input class="btn btn-primary" type="submit" name="fCancel" value="{$PALANG.exit}"/>
+                </div>
+            </div>
+        </div>
+    </div>
 </form>
-</div>
+{literal}
+<script type="text/javascript">
+    {/literal}
+    {if isset($smarty.session.lang)}var locale = '{$smarty.session.lang}';{/if}
+    {literal}
+    $(function () {
+        $('#datetimepicker-fActiveFrom').datetimepicker({
+            ignoreReadonly: true,
+            locale: locale,
+            showTodayButton: true,
+            showClear: true,
+            showClose: true,
+            allowInputToggle: true,
+            format: 'L',
+        });
+        $('#datetimepicker-fActiveUntil').datetimepicker({
+            ignoreReadonly: true,
+            locale: locale,
+            showTodayButton: true,
+            showClear: true,
+            showClose: true,
+            allowInputToggle: true,
+            format: 'L',
+            useCurrent: false //Important! See issue #1075
+        });
+        $("#datetimepicker-fActiveFrom").on("dp.change", function (e) {
+            $('#datetimepicker-fActiveUntil').data("DateTimePicker").minDate(e.date);
+            $('#fActiveFrom').val((e.date) ? e.date.format('YYYY-MM-DD') : '').trigger("change");
+        });
+        $("#datetimepicker-fActiveUntil").on("dp.change", function (e) {
+            $('#datetimepicker-fActiveFrom').data("DateTimePicker").maxDate(e.date);
+            $('#fActiveUntil').val((e.date) ? e.date.format('YYYY-MM-DD') : '').trigger("change");
+        });
+
+    });
+</script>
+{/literal}
diff --git a/templates/viewlog.tpl b/templates/viewlog.tpl
index d5324d6b..e2fcb63f 100644
--- a/templates/viewlog.tpl
+++ b/templates/viewlog.tpl
@@ -1,33 +1,35 @@
-<div id="overview">
-<form name="frmOverview" method="post" action="">
-	{html_options name='fDomain' output=$domain_list values=$domain_list selected=$domain_selected onchange="this.form.submit();"}
-	<noscript><input class="button" type="submit" name="go" value="{$PALANG.go}" /></noscript>
-</form>
-</div>
-{if $tLog}
-<table id="log_table">
-	<tr>
-	    <th colspan="5">{$PALANG.pViewlog_welcome|replace:"%s":$CONF.page_size} {$fDomain} </th>
-	</tr>
-	{#tr_header#}
-		<td>{$PALANG.pViewlog_timestamp}</td>
-		<td>{$PALANG.admin}</td>
-		<td>{$PALANG.domain}</td>
-		<td>{$PALANG.pViewlog_action}</td>
-		<td>{$PALANG.pViewlog_data}</td>
-	</tr>
-	{assign var="PALANG_pViewlog_data" value=$PALANG.pViewlog_data}
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <form name="frmOverview" method="post" action="">
+            {html_options name='fDomain' output=$domain_list values=$domain_list selected=$domain_selected onchange="this.form.submit();"}
+            <noscript><input class="button" type="submit" name="go" value="{$PALANG.go}"/></noscript>
+        </form>
+    </div>
+    {if $tLog}
+        <div class="panel-body">
+            <h4>{$PALANG.pViewlog_welcome|replace:"%s":$CONF.page_size} {$fDomain} </h4>
+        </div>
+        <table id="log_table" class="table">
+            {#tr_header#}
+            <th>{$PALANG.pViewlog_timestamp}</th>
+            <th>{$PALANG.admin}</th>
+            <th>{$PALANG.domain}</th>
+            <th>{$PALANG.pViewlog_action}</th>
+            <th>{$PALANG.pViewlog_data}</th>
+            </tr>
+            {assign var="PALANG_pViewlog_data" value=$PALANG.pViewlog_data}
 
-	{foreach from=$tLog item=item}
-		{assign var=log_data value=$item.data|truncate:35:"...":true}
-		{assign var=item_data value=$item.data}
-		{$smarty.config.tr_hilightoff|replace:'>':" style=\"cursor:pointer;\" onclick=\"alert('$PALANG_pViewlog_data = $item_data')\">"}
-		<td nowrap="nowrap">{$item.timestamp}</td>
-		<td nowrap="nowrap">{$item.username}</td>
-		<td nowrap="nowrap">{$item.domain}</td>
-		<td nowrap="nowrap">{$item.action}</td>
-		<td nowrap="nowrap">{$log_data}</td>
-		</tr>
-{/foreach}
-</table>
-{/if}
+            {foreach from=$tLog item=item}
+                {assign var=log_data value=$item.data|truncate:35:"...":true}
+                {assign var=item_data value=$item.data}
+                {$smarty.config.tr_hilightoff|replace:'>':" style=\"cursor:pointer;\" onclick=\"alert('$PALANG_pViewlog_data = $item_data')\">"}
+                <td nowrap="nowrap">{$item.timestamp}</td>
+                <td nowrap="nowrap">{$item.username}</td>
+                <td nowrap="nowrap">{$item.domain}</td>
+                <td nowrap="nowrap">{$item.action}</td>
+                <td nowrap="nowrap">{$log_data}</td>
+                </tr>
+            {/foreach}
+        </table>
+    {/if}
+</div>