diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php
index 057640d..c3f1fb3 100755
--- a/Theme/Backend/accounts-create.tpl.php
+++ b/Theme/Backend/accounts-create.tpl.php
@@ -13,6 +13,8 @@
 declare(strict_types=1);
 
 use phpOMS\Uri\UriFactory;
+use phpOMS\Account\AccountType;
+use phpOMS\Account\AccountStatus;
 
 /** @var \phpOMS\Views\View $this */
 echo $this->getData('nav')->render(); ?>
@@ -27,15 +29,15 @@ echo $this->getData('nav')->render(); ?>
                         <tbody>
                         <tr><td><label for="iType"><?= $this->getHtml('Type'); ?></label>
                         <tr><td><select id="Type" name="type">
-                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountType::USER); ?>"><?= $this->getHtml('Person'); ?>
-                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountType::GROUP); ?>"><?= $this->getHtml('Organization'); ?>
+                                    <option value="<?= $this->printHtml((string) AccountType::USER); ?>"><?= $this->getHtml('Person'); ?>
+                                    <option value="<?= $this->printHtml((string) AccountType::GROUP); ?>"><?= $this->getHtml('Organization'); ?>
                                 </select>
                         <tr><td><label for="iStatus"><?= $this->getHtml('Status'); ?></label>
                         <tr><td><select id="iStatus" name="status">
-                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountStatus::ACTIVE); ?>"><?= $this->getHtml('Active'); ?>
-                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountStatus::INACTIVE); ?>"><?= $this->getHtml('Inactive'); ?>
-                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountStatus::TIMEOUT); ?>"><?= $this->getHtml('Timeout'); ?>
-                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountStatus::BANNED); ?>"><?= $this->getHtml('Banned'); ?>
+                                    <option value="<?= $this->printHtml((string) AccountStatus::ACTIVE); ?>"><?= $this->getHtml('Active'); ?>
+                                    <option value="<?= $this->printHtml((string) AccountStatus::INACTIVE); ?>"><?= $this->getHtml('Inactive'); ?>
+                                    <option value="<?= $this->printHtml((string) AccountStatus::TIMEOUT); ?>"><?= $this->getHtml('Timeout'); ?>
+                                    <option value="<?= $this->printHtml((string) AccountStatus::BANNED); ?>"><?= $this->getHtml('Banned'); ?>
                                 </select>
                         <tr><td><label for="iUsername"><?= $this->getHtml('Username'); ?></label>
                         <tr><td><input id="iUsername" name="login" type="text" autocomplete="off" spellcheck="false" placeholder="&#xf007; Fred">
diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index 301f89a..a272a01 100755
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-list.tpl.php
@@ -50,7 +50,7 @@ echo $this->getData('nav')->render(); ?>
                         <input id="accountList-r5-desc" name="accountList-sort" type="radio"><label for="accountList-r5-desc"><i class="sort-desc fa fa-chevron-down"></i></label>
                     <tbody>
                         <?php $c                                                          = 0; foreach ($accounts as $key => $value) : ++$c;
-                        $url                                                              = \phpOMS\Uri\UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId());
+                        $url                                                              = UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId());
                         $color                                                            = 'darkred';
                         if ($value->getStatus() === AccountStatus::ACTIVE) { $color       = 'green'; }
                         elseif ($value->getStatus() === AccountStatus::INACTIVE) { $color = 'darkblue'; }
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php
index 4690d5a..4a27888 100755
--- a/Theme/Backend/accounts-single.tpl.php
+++ b/Theme/Backend/accounts-single.tpl.php
@@ -298,7 +298,7 @@ echo $this->getData('nav')->render(); ?>
                                     <td><?= $audit->getId(); ?>
                                     <td><?= $this->printHtml($audit->getModule()); ?>
                                     <td><?= $audit->getType(); ?>
-                                    <td><?= $audit->getSubtype(); ?>
+                                    <td><?= $this->printHtml($audit->getTrigger()); ?>
                                     <td><?= $this->printHtml($audit->getOld()); ?>
                                     <td><?= $this->printHtml($audit->getNew()); ?>
                                     <td><?= $this->printHtml($audit->getContent()); ?>
diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php
index 34d8040..51e69aa 100755
--- a/Theme/Backend/groups-single.tpl.php
+++ b/Theme/Backend/groups-single.tpl.php
@@ -236,8 +236,6 @@ echo $this->getData('nav')->render(); ?>
                                 <col style="width: 75px">
                                 <col style="width: 150px">
                                 <col style="width: 100px">
-                                <col style="width: 75px">
-                                <col>
                                 <col>
                                 <col>
                                 <col style="width: 125px">
@@ -247,15 +245,13 @@ echo $this->getData('nav')->render(); ?>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td ><?= $this->getHtml('Module', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('Type', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('Subtype', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('Old', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('New', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('Content', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('By', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('Ref', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('Date', 'Auditor'); ?>
+                                <td><?= $this->getHtml('Module', 'Auditor'); ?>
+                                <td><?= $this->getHtml('Type', 'Auditor'); ?>
+                                <td><?= $this->getHtml('Trigger', 'Auditor'); ?>
+                                <td><?= $this->getHtml('Content', 'Auditor'); ?>
+                                <td><?= $this->getHtml('By', 'Auditor'); ?>
+                                <td><?= $this->getHtml('Ref', 'Auditor'); ?>
+                                <td><?= $this->getHtml('Date', 'Auditor'); ?>
                             <tbody>
                             <?php $count = 0; foreach ($audits as $key => $audit) : ++$count;
                             $url         = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?>
@@ -263,16 +259,14 @@ echo $this->getData('nav')->render(); ?>
                                     <td><?= $audit->getId(); ?>
                                     <td><?= $this->printHtml($audit->getModule()); ?>
                                     <td><?= $audit->getType(); ?>
-                                    <td><?= $audit->getSubtype(); ?>
-                                    <td><?= $this->printHtml($audit->getOld()); ?>
-                                    <td><?= $this->printHtml($audit->getNew()); ?>
+                                    <td><?= $this->printHtml($audit->getTrigger()); ?>
                                     <td><?= $this->printHtml($audit->getContent()); ?>
                                     <td><?= $this->printHtml($audit->createdBy->login); ?>
                                     <td><?= $this->printHtml($audit->getRef()); ?>
                                     <td><?= $audit->createdAt->format('Y-m-d H:i'); ?>
                             <?php endforeach; ?>
                             <?php if ($count === 0) : ?>
-                                <tr><td colspan="9" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
+                                <tr><td colspan="8" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                             <?php endif; ?>
                         </table>
                         <div class="portlet-foot">
diff --git a/Theme/Backend/modules-single.tpl.php b/Theme/Backend/modules-single.tpl.php
index 9f91cca..b7f7cd0 100755
--- a/Theme/Backend/modules-single.tpl.php
+++ b/Theme/Backend/modules-single.tpl.php
@@ -153,8 +153,6 @@ if ($nav !== null) {
                                 <col style="width: 75px">
                                 <col style="width: 150px">
                                 <col style="width: 100px">
-                                <col style="width: 75px">
-                                <col>
                                 <col>
                                 <col>
                                 <col style="width: 125px">
@@ -164,15 +162,13 @@ if ($nav !== null) {
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td ><?= $this->getHtml('Module', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('Type', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('Subtype', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('Old', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('New', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('Content', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('By', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('Ref', 'Auditor'); ?>
-                                <td ><?= $this->getHtml('Date', 'Auditor'); ?>
+                                <td><?= $this->getHtml('Module', 'Auditor'); ?>
+                                <td><?= $this->getHtml('Type', 'Auditor'); ?>
+                                <td><?= $this->getHtml('Trigger', 'Auditor'); ?>
+                                <td><?= $this->getHtml('Content', 'Auditor'); ?>
+                                <td><?= $this->getHtml('By', 'Auditor'); ?>
+                                <td><?= $this->getHtml('Ref', 'Auditor'); ?>
+                                <td><?= $this->getHtml('Date', 'Auditor'); ?>
                             <tbody>
                             <?php $count = 0; foreach ($audits as $key => $audit) : ++$count;
                             $url         = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?>
@@ -180,16 +176,14 @@ if ($nav !== null) {
                                     <td><?= $audit->getId(); ?>
                                     <td><?= $this->printHtml($audit->getModule()); ?>
                                     <td><?= $audit->getType(); ?>
-                                    <td><?= $audit->getSubtype(); ?>
-                                    <td><?= $this->printHtml($audit->getOld()); ?>
-                                    <td><?= $this->printHtml($audit->getNew()); ?>
+                                    <td><?= $this->printHtml($audit->getTrigger()); ?>
                                     <td><?= $this->printHtml($audit->getContent()); ?>
                                     <td><?= $this->printHtml($audit->createdBy->login); ?>
                                     <td><?= $this->printHtml($audit->getRef()); ?>
                                     <td><?= $audit->createdAt->format('Y-m-d H:i'); ?>
                             <?php endforeach; ?>
                             <?php if ($count === 0) : ?>
-                                <tr><td colspan="9" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
+                                <tr><td colspan="8" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                             <?php endif; ?>
                         </table>
                         <div class="portlet-foot">