diff --git a/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php b/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php
index d6a4291..edb8301 100644
--- a/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php
+++ b/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php
@@ -36,7 +36,7 @@
             <input type="hidden" id="<?= $this->printHtml($this->getId()); ?>-idlist"<?= $this->isRequired() ? ' required' : ''; ?>>
         </span>
     </div>
-    <div class="ipt-second"><button><?= $this->getHtml('Add', 0, 0); ?></button></div>
+    <div class="ipt-second"><button><?= $this->getHtml('Add', '0', '0'); ?></button></div>
 </div>
 <div class="box taglist" id="<?= $this->printHtml($this->getId()); ?>-taglist" data-action='[
     {
diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php
index 03c92c5..a0f1a5d 100644
--- a/Theme/Backend/accounts-create.tpl.php
+++ b/Theme/Backend/accounts-create.tpl.php
@@ -48,7 +48,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com">
                         <tr><td><label for="iPassword"><?= $this->getHtml('Name3'); ?></label>
                         <tr><td><input id="iPassword" name="password" type="password" placeholder="&#xf023; Pa55ssw0rd?">
-                        <tr><td><input id="account-create-submit" name="createSubmit" type="submit" value="<?= $this->getHtml('Create', 0, 0); ?>">
+                        <tr><td><input id="account-create-submit" name="createSubmit" type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                     </table>
                 </form>
             </div>
diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index aadb9da..c1ee262 100644
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-list.tpl.php
@@ -25,7 +25,7 @@ echo $this->getData('nav')->render(); ?>
                 <caption><?= $this->getHtml('Groups') ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
-                    <td><?= $this->getHtml('ID', 0, 0); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                     <td><?= $this->getHtml('Status') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                     <td class="wf-100"><?= $this->getHtml('Name') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                     <td><?= $this->getHtml('Activity') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
@@ -41,14 +41,14 @@ echo $this->getData('nav')->render(); ?>
                         elseif ($value->getStatus() === AccountStatus::TIMEOUT) { $color = 'purple'; }
                         elseif ($value->getStatus() === AccountStatus::BANNED) { $color = 'red'; } ?>
                 <tr data-href="<?= $url; ?>">
-                    <td data-label="<?= $this->getHtml('ID', 0, 0) ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
+                    <td data-label="<?= $this->getHtml('ID', '0', '0') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td data-label="<?= $this->getHtml('Status') ?>"><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->getHtml('Status'. $value->getStatus()); ?></span></a>
                     <td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName1()); ?></a>
                     <td data-label="<?= $this->getHtml('Activity') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getLastActive()->format('Y-m-d H:i:s')); ?></a>
                     <td data-label="<?= $this->getHtml('Created') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?></a>
                         <?php endforeach; ?>
                         <?php if ($c === 0) : ?>
-                        <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
+                        <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                         <?php endif; ?>
             </table>
         </div>
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php
index a9577f7..a2d0b04 100644
--- a/Theme/Backend/accounts-single.tpl.php
+++ b/Theme/Backend/accounts-single.tpl.php
@@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
                 <form id="account-edit" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/account'); ?>" method="post">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td><label for="iId"><?= $this->getHtml('ID', 0, 0); ?></label>
+                        <tr><td><label for="iId"><?= $this->getHtml('ID', '0', '0'); ?></label>
                         <tr><td><input id="iId" name="iaccount-idlist" type="text" value="<?= $this->printHtml($account->getId()); ?>" disabled>
                         <tr><td><label for="iType"><?= $this->getHtml('Type'); ?></label>
                         <tr><td><select id="iType" name="type">
@@ -87,7 +87,7 @@ echo $this->getData('nav')->render(); ?>
                                 <div class="ipt-second"> or <button><?= $this->getHtml('Reset'); ?></button></div>
                         </div>
                         <tr><td>
-                            <input id="account-edit-submit" name="editSubmit" type="submit" value="<?= $this->getHtml('Save', 0, 0); ?>">
+                            <input id="account-edit-submit" name="editSubmit" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
                             <button id="account-profile-create" data-action='[
                                 {
                                     "key": 1, "listener": "click", "action": [
@@ -110,7 +110,7 @@ echo $this->getData('nav')->render(); ?>
             <thead>
                 <tr>
                     <td>
-                    <td><?= $this->getHtml('ID', 0, 0); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                     <td class="wf-100"><?= $this->getHtml('Name') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
             <tbody>
                 <?php $c = 0; $groups = $account->getGroups(); foreach ($groups as $key => $value) : $c++;
@@ -121,7 +121,7 @@ echo $this->getData('nav')->render(); ?>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
                 <?php endforeach; ?>
                 <?php if ($c === 0) : ?>
-                <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
+                <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                 <?php endif; ?>
         </table>
 
@@ -135,7 +135,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td><?= $this->getData('grpSelector')->render('iGroup', true); ?>
                         <tr><td>
                             <input name="account" type="hidden" value="<?= $this->printHtml($account->getId()); ?>">
-                            <input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                            <input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                     </table>
                 </form>
             </div>
@@ -149,7 +149,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr>
                     <td>
                     <td>
-                    <td><?= $this->getHtml('ID', 0, 0); ?>
+                    <td><?= $this->getHtml('ID', '0', '0'); ?>
                     <td><?= $this->getHtml('Unit'); ?>
                     <td><?= $this->getHtml('App'); ?>
                     <td><?= $this->getHtml('Module'); ?>
@@ -177,7 +177,7 @@ echo $this->getData('nav')->render(); ?>
                         <?= (PermissionType::PERMISSION | $permission) === $permission ? 'P' : ''; ?>
                 <?php endforeach; ?>
                 <?php if ($c === 0) : ?>
-                <tr><td colspan="10" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
+                <tr><td colspan="10" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                 <?php endif; ?>
         </table>
 
@@ -224,7 +224,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td>
                             <input type="hidden" name="permissionref" value="<?= $this->printHtml($account->getId()); ?>">
                             <input type="hidden" name="permissionowner" value="<?= \phpOMS\Account\PermissionOwner::ACCOUNT ?>">
-                            <input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                            <input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                     </table>
                 </form>
             </div>
diff --git a/Theme/Backend/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php
index a353a91..c5560c5 100644
--- a/Theme/Backend/groups-create.tpl.php
+++ b/Theme/Backend/groups-create.tpl.php
@@ -34,7 +34,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td><input id="iGname" name="name" type="text" placeholder="&#xf0c0; Guest" required>
                         <tr><td><?= $this->getData('editor')->render('group-editor'); ?>
                         <tr><td><?= $this->getData('editor')->getData('text')->render('group-editor', 'description', 'fGroupCreate'); ?>
-                        <tr><td><input type="submit" id="iCreate" name="create" value="<?= $this->getHtml('Create', 0, 0); ?>">
+                        <tr><td><input type="submit" id="iCreate" name="create" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                     </table>
                 </form>
             </div>
diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php
index f768a91..b0727ad 100644
--- a/Theme/Backend/groups-list.tpl.php
+++ b/Theme/Backend/groups-list.tpl.php
@@ -22,7 +22,7 @@ echo $this->getData('nav')->render(); ?>
             <caption><?= $this->getHtml('Groups') ?><i class="fa fa-download floatRight download btn"></i></caption>
             <thead>
                 <tr>
-                    <td><?= $this->getHtml('ID', 0, 0); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                     <td><?= $this->getHtml('Status') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                     <td class="wf-100"><?= $this->getHtml('Name') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                     <td><?= $this->getHtml('Members') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
@@ -36,13 +36,13 @@ echo $this->getData('nav')->render(); ?>
                         elseif ($value->getStatus() === \phpOMS\Account\GroupStatus::INACTIVE) { $color = 'darkblue'; }
                         elseif ($value->getStatus() === \phpOMS\Account\GroupStatus::HIDDEN) { $color = 'purple'; } ?>
                 <tr data-href="<?= $url; ?>">
-                    <td data-label="<?= $this->getHtml('ID', 0, 0) ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
+                    <td data-label="<?= $this->getHtml('ID', '0', '0') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td data-label="<?= $this->getHtml('Status') ?>"><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->getHtml('Status'. $value->getStatus()); ?></span></a>
                     <td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
                     <td data-label="<?= $this->getHtml('Members') ?>">
                 <?php endforeach; ?>
                 <?php if ($c === 0) : ?>
-                <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
+                <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                 <?php endif; ?>
         </table>
     </div>
diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php
index 7823428..26d1e38 100644
--- a/Theme/Backend/groups-single.tpl.php
+++ b/Theme/Backend/groups-single.tpl.php
@@ -36,7 +36,7 @@ echo $this->getData('nav')->render(); ?>
                         <header><h1><?= $this->getHtml('Group'); ?></h1></header>
                         <div class="inner">
                             <form id="fGroupEdit" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/group'); ?>" method="post">
-                                <label for="iGid"><?= $this->getHtml('ID', 0, 0); ?></label>
+                                <label for="iGid"><?= $this->getHtml('ID', '0', '0'); ?></label>
                                 <input id="iGid" name="id" type="text" value="<?= $this->printHtml($group->getId()); ?>" disabled>
                                 <label for="iGname"><?= $this->getHtml('Name'); ?></label>
                                 <input id="iGname" name="name" type="text" placeholder="&#xf0c0; Guest" value="<?= $this->printHtml($group->getName()); ?>">
@@ -54,7 +54,7 @@ echo $this->getData('nav')->render(); ?>
                                     $group->getDescriptionRaw(),
                                     $group->getDescription()
                                 ); ?>
-                                <input id="groupSubmit" name="groupsubmit" type="submit" value="<?= $this->getHtml('Save', 0, 0); ?>">
+                                <input id="groupSubmit" name="groupsubmit" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
                             </form>
                         </div>
                     </section>
@@ -65,7 +65,7 @@ echo $this->getData('nav')->render(); ?>
                         <caption><?= $this->getHtml('Accounts') ?><i class="fa fa-download floatRight download btn"></i></caption>
                         <thead>
                             <tr>
-                                <td><?= $this->getHtml('ID', 0, 0); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                                 <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                         <tbody>
                             <?php $c = 0; foreach ($accounts as $key => $value) : $c++; ?>
@@ -74,7 +74,7 @@ echo $this->getData('nav')->render(); ?>
                                 <td><a href="<?= \phpOMS\Uri\UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId()) ?>"><?= $value->getName1(); ?></a>
                             <?php endforeach; ?>
                             <?php if ($c === 0) : ?>
-                            <tr><td colspan="2" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
+                            <tr><td colspan="2" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                             <?php endif; ?>
                     </table>
 
@@ -84,7 +84,7 @@ echo $this->getData('nav')->render(); ?>
                             <form id="iAddAccountToGroup" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/group/account'); ?>" method="put">
                                 <label for="iAccount"><?= $this->getHtml('Name'); ?></label>
                                 <?= $this->getData('accGrpSelector')->render('iAccount', 'group', true); ?>
-                                <input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                <input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                             </form>
                         </div>
                     </section>
@@ -97,7 +97,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr>
                                 <td>
                                 <td>
-                                <td><?= $this->getHtml('ID', 0, 0); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                                 <td><?= $this->getHtml('Unit'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                                 <td><?= $this->getHtml('App'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                                 <td><?= $this->getHtml('Module'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
@@ -145,7 +145,7 @@ echo $this->getData('nav')->render(); ?>
                                     <?= (\phpOMS\Account\PermissionType::PERMISSION | $permission) === $permission ? 'P' : ''; ?>
                             <?php endforeach; ?>
                             <?php if ($c === 0) : ?>
-                            <tr><td colspan="10" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
+                            <tr><td colspan="10" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                             <?php endif; ?>
                     </table>
 
@@ -192,7 +192,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tr><td>
                                         <input type="hidden" name="permissionref" value="<?= $this->printHtml($group->getId()); ?>">
                                         <input type="hidden" name="permissionowner" value="<?= \phpOMS\Account\PermissionOwner::GROUP ?>">
-                                        <input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                        <input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -209,7 +209,7 @@ echo $this->getData('nav')->render(); ?>
                         <caption><?= $this->getHtml('AuditLog') ?><i class="fa fa-download floatRight download btn"></i></caption>
                         <thead>
                             <tr>
-                                <td><?= $this->getHtml('ID', 0, 0); ?>
+                                <td><?= $this->getHtml('ID', '0', '0'); ?>
                                 <td class="wf-100">Name
                         <tbody>
                             <?php $c = 0; foreach ([] as $key => $value) : $c++; ?>
@@ -219,7 +219,7 @@ echo $this->getData('nav')->render(); ?>
                                 <td>
                             <?php endforeach; ?>
                             <?php if ($c === 0) : ?>
-                            <tr><td colspan="2" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
+                            <tr><td colspan="2" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                             <?php endif; ?>
                     </table>
                 </div>
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php
index 29c1555..0f98afe 100644
--- a/Theme/Backend/modules-list.tpl.php
+++ b/Theme/Backend/modules-list.tpl.php
@@ -28,7 +28,7 @@ $installed = $this->app->moduleManager->getInstalledModules();
                 <caption><?= $this->getHtml('Modules') ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
-                    <td><?= $this->getHtml('ID', 0, 0); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                     <td class="wf-100"><?= $this->getHtml('Name') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                     <td><?= $this->getHtml('Version') ?>
                     <td><?= $this->getHtml('Status') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
@@ -43,7 +43,7 @@ $installed = $this->app->moduleManager->getInstalledModules();
                             else { $status = ModuleStatus::AVAILABLE; }
                         ?>
                 <tr data-href="<?= $url; ?>">
-                    <td data-label="<?= $this->getHtml('ID', 0, 0) ?>"><a href="<?= $url; ?>"><?= $this->printHtml($module['name']['id']); ?></a>
+                    <td data-label="<?= $this->getHtml('ID', '0', '0') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($module['name']['id']); ?></a>
                     <td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($module['name']['external']); ?></a>
                     <td data-label="<?= $this->getHtml('Version') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($module['version']); ?></a>
                     <td data-label="<?= $this->getHtml('Status') ?>">
@@ -66,7 +66,7 @@ $installed = $this->app->moduleManager->getInstalledModules();
                             <?php endforeach; ?>
                         </span>
                 <?php if ($count === 0) : ?>
-                    <tr><td colspan="4" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
+                    <tr><td colspan="4" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                 <?php endif; ?>
             </table>
         </div>