diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php
index b9e23ea..369e497 100644
--- a/Theme/Backend/accounts-create.tpl.php
+++ b/Theme/Backend/accounts-create.tpl.php
@@ -45,7 +45,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->getText('Name3') ?></label>
                 <tr><td><input id="iPassword" name="password" type="text" placeholder="&#xf023; Pa55ssw0rd?">
-                <tr><td><input type="submit" value="<?= $this->getText('Create') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
             </table>
         </form>
     </div>
@@ -59,7 +59,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGroup"><?= $this->getText('Name') ?></label>
                 <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iGroup" name="group" type="text" placeholder="&#xf0c0; Guest" required></span>
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
@@ -73,7 +73,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGroup"><?= $this->getText('Name') ?></label>
                 <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iGroup" name="group" type="text" placeholder="&#xf084; news_create" required></span>
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index e94c38b..d9cf6f3 100644
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-list.tpl.php
@@ -33,7 +33,7 @@ echo $this->getData('nav')->render();
         <caption><?= $this->getText('Groups'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->getText('ID'); ?>
+            <td><?= $this->getText('ID', 0, 0); ?>
             <td><?= $this->getText('Status'); ?>
             <td class="wf-100"><?= $this->getText('Name'); ?>
             <td><?= $this->getText('Activity'); ?>
@@ -51,7 +51,7 @@ echo $this->getData('nav')->render();
             <td><a href="<?= $url; ?>"><?= $value->getCreatedAt()->format('Y-m-d H:i:s'); ?></a>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
-                <tr><td colspan="5" class="empty"><?= $this->getText('Empty'); ?>
+                <tr><td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
                         <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php
index 70b94b5..4aa7661 100644
--- a/Theme/Backend/accounts-single.tpl.php
+++ b/Theme/Backend/accounts-single.tpl.php
@@ -52,7 +52,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com" value="<?= $account->getEmail(); ?>">
                 <tr><td><label for="iPassword"><?= $this->getText('Name3') ?></label>
                 <tr><td><input id="iPassword" name="password" type="text" placeholder="&#xf023; Pa55ssw0rd?">
-                <tr><td><input type="submit" value="<?= $this->getText('Create') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
             </table>
         </form>
     </div>
@@ -66,7 +66,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGroup"><?= $this->getText('Name') ?></label>
                 <tr><td><input id="iGroup" name="group" type="text" placeholder="&#xf0c0; Guest">
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
@@ -80,7 +80,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGroup"><?= $this->getText('Name') ?></label>
                 <tr><td><input id="iGroup" name="group" type="text" placeholder="&#xf084; news_create">
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php
index 8d92ecf..d1374e1 100644
--- a/Theme/Backend/groups-create.tpl.php
+++ b/Theme/Backend/groups-create.tpl.php
@@ -29,7 +29,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><input id="iGname" name="gname" type="text" placeholder="&#xf0c0; Guest" required>
                 <tr><td><label for="iGroupDescription"><?= $this->getText('Description') ?></label>
                 <tr><td><textarea id="iGroupDescription" name="description" placeholder="&#xf040;"></textarea>
-                <tr><td><input type="submit" value="<?= $this->getText('Create') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
             </table>
         </form>
     </div>
@@ -43,7 +43,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGParentName"><?= $this->getText('Name') ?></label>
                 <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iGParentName" name="parentname" type="text" placeholder="&#xf0c0; Guest" required></span>
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
@@ -57,7 +57,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iPermissionName"><?= $this->getText('Name') ?></label>
                 <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iPermissionName" name="permissionname" type="text" placeholder="&#xf084; Admin" required></span>
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php
index 30d09d4..9b7c170 100644
--- a/Theme/Backend/groups-list.tpl.php
+++ b/Theme/Backend/groups-list.tpl.php
@@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
         <caption><?= $this->getText('Groups'); ?></caption>
         <thead>
             <tr>
-                <td><?= $this->getText('ID'); ?>
+                <td><?= $this->getText('ID', 0, 0); ?>
                 <td class="wf-100"><?= $this->getText('Name'); ?>
                 <td><?= $this->getText('Parents'); ?>
                 <td><?= $this->getText('Children'); ?>
@@ -49,7 +49,7 @@ echo $this->getData('nav')->render(); ?>
                 <td>
             <?php endforeach; ?>
             <?php if($c === 0) : ?>
-            <tr><td colspan="5" class="empty"><?= $this->getText('Empty'); ?>
+            <tr><td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
             <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php
index bc10fae..03ccbc9 100644
--- a/Theme/Backend/groups-single.tpl.php
+++ b/Theme/Backend/groups-single.tpl.php
@@ -33,7 +33,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><input id="iGname" name="gname" type="text" placeholder="&#xf0c0; Guest" value="<?= $group->getName(); ?>">
                 <tr><td><label for="iGroupDescription"><?= $this->getText('Description') ?></label>
                 <tr><td><textarea id="iGroupDescription" name="description" placeholder="&#xf040;"><?= $group->getDescription(); ?></textarea>
-                <tr><td><input type="submit" value="<?= $this->getText('Create') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
             </table>
         </form>
     </div>
@@ -47,7 +47,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGParentName"><?= $this->getText('Name') ?></label>
                 <tr><td><input id="iGParentName" name="parentname" type="text" placeholder="&#xf0c0; Guest">
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
@@ -61,7 +61,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iPermissionName"><?= $this->getText('Name') ?></label>
                 <tr><td><input id="iPermissionName" name="permissionname" type="text" placeholder="&#xf084; Admin">
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
@@ -75,7 +75,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGParentName"><?= $this->getText('Name') ?></label>
                 <tr><td><input id="iGParentName" name="parentname" type="text" placeholder="&#xf234; Donald Duck">
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php
index 33695af..33af2e5 100644
--- a/Theme/Backend/modules-list.tpl.php
+++ b/Theme/Backend/modules-list.tpl.php
@@ -34,7 +34,7 @@ $footerView->setResults(count($modules));
         <caption><?= $this->getText('Modules'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->getText('ID'); ?>
+            <td><?= $this->getText('ID', 0, 0); ?>
             <td class="wf-100"><?= $this->getText('Name'); ?>
             <td><?= $this->getText('Version'); ?>
             <td><?= $this->getText('Status'); ?>
@@ -56,7 +56,7 @@ $footerView->setResults(count($modules));
                     echo strtolower($this->getText('Available')); ?></a>
                 <?php endforeach; ?>
         <?php if($count === 0) : ?>
-            <tr><td colspan="4" class="empty"><?= $this->getText('Empty'); ?>
+            <tr><td colspan="4" class="empty"><?= $this->getText('Empty', 0, 0); ?>
         <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/accounts-create.tpl.php b/Theme/backend/accounts-create.tpl.php
index b9e23ea..369e497 100644
--- a/Theme/backend/accounts-create.tpl.php
+++ b/Theme/backend/accounts-create.tpl.php
@@ -45,7 +45,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->getText('Name3') ?></label>
                 <tr><td><input id="iPassword" name="password" type="text" placeholder="&#xf023; Pa55ssw0rd?">
-                <tr><td><input type="submit" value="<?= $this->getText('Create') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
             </table>
         </form>
     </div>
@@ -59,7 +59,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGroup"><?= $this->getText('Name') ?></label>
                 <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iGroup" name="group" type="text" placeholder="&#xf0c0; Guest" required></span>
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
@@ -73,7 +73,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGroup"><?= $this->getText('Name') ?></label>
                 <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iGroup" name="group" type="text" placeholder="&#xf084; news_create" required></span>
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/accounts-list.tpl.php b/Theme/backend/accounts-list.tpl.php
index e94c38b..d9cf6f3 100644
--- a/Theme/backend/accounts-list.tpl.php
+++ b/Theme/backend/accounts-list.tpl.php
@@ -33,7 +33,7 @@ echo $this->getData('nav')->render();
         <caption><?= $this->getText('Groups'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->getText('ID'); ?>
+            <td><?= $this->getText('ID', 0, 0); ?>
             <td><?= $this->getText('Status'); ?>
             <td class="wf-100"><?= $this->getText('Name'); ?>
             <td><?= $this->getText('Activity'); ?>
@@ -51,7 +51,7 @@ echo $this->getData('nav')->render();
             <td><a href="<?= $url; ?>"><?= $value->getCreatedAt()->format('Y-m-d H:i:s'); ?></a>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
-                <tr><td colspan="5" class="empty"><?= $this->getText('Empty'); ?>
+                <tr><td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
                         <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/accounts-single.tpl.php b/Theme/backend/accounts-single.tpl.php
index 70b94b5..4aa7661 100644
--- a/Theme/backend/accounts-single.tpl.php
+++ b/Theme/backend/accounts-single.tpl.php
@@ -52,7 +52,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com" value="<?= $account->getEmail(); ?>">
                 <tr><td><label for="iPassword"><?= $this->getText('Name3') ?></label>
                 <tr><td><input id="iPassword" name="password" type="text" placeholder="&#xf023; Pa55ssw0rd?">
-                <tr><td><input type="submit" value="<?= $this->getText('Create') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
             </table>
         </form>
     </div>
@@ -66,7 +66,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGroup"><?= $this->getText('Name') ?></label>
                 <tr><td><input id="iGroup" name="group" type="text" placeholder="&#xf0c0; Guest">
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
@@ -80,7 +80,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGroup"><?= $this->getText('Name') ?></label>
                 <tr><td><input id="iGroup" name="group" type="text" placeholder="&#xf084; news_create">
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/groups-create.tpl.php b/Theme/backend/groups-create.tpl.php
index 8d92ecf..d1374e1 100644
--- a/Theme/backend/groups-create.tpl.php
+++ b/Theme/backend/groups-create.tpl.php
@@ -29,7 +29,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><input id="iGname" name="gname" type="text" placeholder="&#xf0c0; Guest" required>
                 <tr><td><label for="iGroupDescription"><?= $this->getText('Description') ?></label>
                 <tr><td><textarea id="iGroupDescription" name="description" placeholder="&#xf040;"></textarea>
-                <tr><td><input type="submit" value="<?= $this->getText('Create') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
             </table>
         </form>
     </div>
@@ -43,7 +43,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGParentName"><?= $this->getText('Name') ?></label>
                 <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iGParentName" name="parentname" type="text" placeholder="&#xf0c0; Guest" required></span>
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
@@ -57,7 +57,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iPermissionName"><?= $this->getText('Name') ?></label>
                 <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iPermissionName" name="permissionname" type="text" placeholder="&#xf084; Admin" required></span>
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/groups-list.tpl.php b/Theme/backend/groups-list.tpl.php
index 30d09d4..9b7c170 100644
--- a/Theme/backend/groups-list.tpl.php
+++ b/Theme/backend/groups-list.tpl.php
@@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
         <caption><?= $this->getText('Groups'); ?></caption>
         <thead>
             <tr>
-                <td><?= $this->getText('ID'); ?>
+                <td><?= $this->getText('ID', 0, 0); ?>
                 <td class="wf-100"><?= $this->getText('Name'); ?>
                 <td><?= $this->getText('Parents'); ?>
                 <td><?= $this->getText('Children'); ?>
@@ -49,7 +49,7 @@ echo $this->getData('nav')->render(); ?>
                 <td>
             <?php endforeach; ?>
             <?php if($c === 0) : ?>
-            <tr><td colspan="5" class="empty"><?= $this->getText('Empty'); ?>
+            <tr><td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
             <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/groups-single.tpl.php b/Theme/backend/groups-single.tpl.php
index bc10fae..03ccbc9 100644
--- a/Theme/backend/groups-single.tpl.php
+++ b/Theme/backend/groups-single.tpl.php
@@ -33,7 +33,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><input id="iGname" name="gname" type="text" placeholder="&#xf0c0; Guest" value="<?= $group->getName(); ?>">
                 <tr><td><label for="iGroupDescription"><?= $this->getText('Description') ?></label>
                 <tr><td><textarea id="iGroupDescription" name="description" placeholder="&#xf040;"><?= $group->getDescription(); ?></textarea>
-                <tr><td><input type="submit" value="<?= $this->getText('Create') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
             </table>
         </form>
     </div>
@@ -47,7 +47,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGParentName"><?= $this->getText('Name') ?></label>
                 <tr><td><input id="iGParentName" name="parentname" type="text" placeholder="&#xf0c0; Guest">
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
@@ -61,7 +61,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iPermissionName"><?= $this->getText('Name') ?></label>
                 <tr><td><input id="iPermissionName" name="permissionname" type="text" placeholder="&#xf084; Admin">
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
@@ -75,7 +75,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <tr><td><label for="iGParentName"><?= $this->getText('Name') ?></label>
                 <tr><td><input id="iGParentName" name="parentname" type="text" placeholder="&#xf234; Donald Duck">
-                <tr><td><input type="submit" value="<?= $this->getText('Add') ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/modules-list.tpl.php b/Theme/backend/modules-list.tpl.php
index 33695af..33af2e5 100644
--- a/Theme/backend/modules-list.tpl.php
+++ b/Theme/backend/modules-list.tpl.php
@@ -34,7 +34,7 @@ $footerView->setResults(count($modules));
         <caption><?= $this->getText('Modules'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->getText('ID'); ?>
+            <td><?= $this->getText('ID', 0, 0); ?>
             <td class="wf-100"><?= $this->getText('Name'); ?>
             <td><?= $this->getText('Version'); ?>
             <td><?= $this->getText('Status'); ?>
@@ -56,7 +56,7 @@ $footerView->setResults(count($modules));
                     echo strtolower($this->getText('Available')); ?></a>
                 <?php endforeach; ?>
         <?php if($count === 0) : ?>
-            <tr><td colspan="4" class="empty"><?= $this->getText('Empty'); ?>
+            <tr><td colspan="4" class="empty"><?= $this->getText('Empty', 0, 0); ?>
         <?php endif; ?>
     </table>
 </div>