diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index 5fa0005..7a46bfc 100644
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-list.tpl.php
@@ -30,14 +30,14 @@ echo $this->getData('nav')->render();
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Admin']['Groups']; ?></caption>
+        <caption><?= $this->l11n->getText('Admin', 'Groups'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td><?= $this->l11n->lang['Admin']['Status']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Admin']['Name']; ?>
-            <td><?= $this->l11n->lang['Admin']['Activity']; ?>
-            <td><?= $this->l11n->lang['Admin']['Created']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td><?= $this->l11n->getText('Admin', 'Status'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Admin', 'Name'); ?>
+            <td><?= $this->l11n->getText('Admin', 'Activity'); ?>
+            <td><?= $this->l11n->getText('Admin', 'Created'); ?>
                 <tfoot>
         <tr><td colspan="5"><?= $footerView->render(); ?>
                 <tbody>
@@ -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->l11n->lang[0]['Empty']; ?>
+                <tr><td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                         <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php
index 864286a..7b7bb1f 100644
--- a/Theme/Backend/accounts-single.tpl.php
+++ b/Theme/Backend/accounts-single.tpl.php
@@ -21,66 +21,66 @@ $account = $this->getData('account');
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Account'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Account') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/account'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iId"><?= $this->l11n->lang[0]['ID'] ?></label>
+                <tr><td><label for="iId"><?= $this->l11n->getText(0, 'ID') ?></label>
                 <tr><td><input id="iId" name="id" type="text" value="<?= $account->getId(); ?>" disabled>
-                <tr><td><label for="iType"><?= $this->l11n->lang['Admin']['Type'] ?></label>
+                <tr><td><label for="iType"><?= $this->l11n->getText('Admin', 'Type') ?></label>
                 <tr><td><select id="iType" name="type">
-                            <option value="<?= \phpOMS\Account\AccountType::USER; ?>"<?= $account->getType() === \phpOMS\Account\AccountType::USER ? ' selected' : ''; ?>><?= $this->l11n->lang['Admin']['Person'] ?>
-                            <option value="<?= \phpOMS\Account\AccountType::GROUP; ?>"<?= $account->getType() === \phpOMS\Account\AccountType::GROUP ? ' selected' : ''; ?>><?= $this->l11n->lang['Admin']['Organization'] ?>
+                            <option value="<?= \phpOMS\Account\AccountType::USER; ?>"<?= $account->getType() === \phpOMS\Account\AccountType::USER ? ' selected' : ''; ?>><?= $this->l11n->getText('Admin', 'Person') ?>
+                            <option value="<?= \phpOMS\Account\AccountType::GROUP; ?>"<?= $account->getType() === \phpOMS\Account\AccountType::GROUP ? ' selected' : ''; ?>><?= $this->l11n->getText('Admin', 'Organization') ?>
                         </select>
-                <tr><td><label for="iStatus"><?= $this->l11n->lang['Admin']['Status'] ?></label>
+                <tr><td><label for="iStatus"><?= $this->l11n->getText('Admin', 'Status') ?></label>
                 <tr><td><select id="iStatus" name="status">
-                            <option value="<?= \phpOMS\Account\AccountStatus::ACTIVE; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::ACTIVE ? ' selected' : ''; ?>><?= $this->l11n->lang['Admin']['Active'] ?>
-                            <option value="<?= \phpOMS\Account\AccountStatus::INACTIVE; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::INACTIVE ? ' selected' : ''; ?>><?= $this->l11n->lang['Admin']['Inactive'] ?>
-                            <option value="<?= \phpOMS\Account\AccountStatus::TIMEOUT; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::TIMEOUT ? ' selected' : ''; ?>><?= $this->l11n->lang['Admin']['Timeout'] ?>
-                            <option value="<?= \phpOMS\Account\AccountStatus::BANNED; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::BANNED ? ' selected' : ''; ?>><?= $this->l11n->lang['Admin']['Banned'] ?>
+                            <option value="<?= \phpOMS\Account\AccountStatus::ACTIVE; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::ACTIVE ? ' selected' : ''; ?>><?= $this->l11n->getText('Admin', 'Active') ?>
+                            <option value="<?= \phpOMS\Account\AccountStatus::INACTIVE; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::INACTIVE ? ' selected' : ''; ?>><?= $this->l11n->getText('Admin', 'Inactive') ?>
+                            <option value="<?= \phpOMS\Account\AccountStatus::TIMEOUT; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::TIMEOUT ? ' selected' : ''; ?>><?= $this->l11n->getText('Admin', 'Timeout') ?>
+                            <option value="<?= \phpOMS\Account\AccountStatus::BANNED; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::BANNED ? ' selected' : ''; ?>><?= $this->l11n->getText('Admin', 'Banned') ?>
                         </select>
-                <tr><td><label for="iUsername"><?= $this->l11n->lang['Admin']['Username'] ?></label>
+                <tr><td><label for="iUsername"><?= $this->l11n->getText('Admin', 'Username') ?></label>
                 <tr><td><input id="iUsername" name="name" type="text" placeholder="&#xf007; Fred" value="<?= $account->getEmail(); ?>" disabled>
-                <tr><td><label for="iName1"><?= $this->l11n->lang['Admin']['Name1'] ?></label>
+                <tr><td><label for="iName1"><?= $this->l11n->getText('Admin', 'Name1') ?></label>
                 <tr><td><input id="iName1" name="name1" type="text" placeholder="&#xf007; Donald" value="<?= $account->getName1(); ?>" required>
-                <tr><td><label for="iName2"><?= $this->l11n->lang['Admin']['Name2'] ?></label>
+                <tr><td><label for="iName2"><?= $this->l11n->getText('Admin', 'Name2') ?></label>
                 <tr><td><input id="iName2" name="name2" type="text" placeholder="&#xf007; Fauntleroy" value="<?= $account->getName2(); ?>">
-                <tr><td><label for="iName3"><?= $this->l11n->lang['Admin']['Name3'] ?></label>
+                <tr><td><label for="iName3"><?= $this->l11n->getText('Admin', 'Name3') ?></label>
                 <tr><td><input id="iName3" name="name3" type="text" placeholder="&#xf007; Duck" value="<?= $account->getName3(); ?>">
-                <tr><td><label for="iEmail"><?= $this->l11n->lang['Admin']['Email'] ?></label>
+                <tr><td><label for="iEmail"><?= $this->l11n->getText('Admin', 'Email') ?></label>
                 <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com" value="<?= $account->getEmail(); ?>">
-                <tr><td><label for="iPassword"><?= $this->l11n->lang['Admin']['Name3'] ?></label>
+                <tr><td><label for="iPassword"><?= $this->l11n->getText('Admin', 'Name3') ?></label>
                 <tr><td><input id="iPassword" name="password" type="text" placeholder="&#xf023; Pa55ssw0rd?">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Create'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Create') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-66 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Groups'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Groups') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iGroup"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iGroup"><?= $this->l11n->getText('Admin', 'Name') ?></label>
                 <tr><td><input id="iGroup" name="group" type="text" placeholder="&#xf0c0; Guest">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-66 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Permissions'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Permissions') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iGroup"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iGroup"><?= $this->l11n->getText('Admin', 'Name') ?></label>
                 <tr><td><input id="iGroup" name="group" type="text" placeholder="&#xf084; news_create">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php
index 43504d0..9da8b07 100644
--- a/Theme/Backend/groups-create.tpl.php
+++ b/Theme/Backend/groups-create.tpl.php
@@ -20,44 +20,44 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Group'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Group') ?></h1></header>
     <div class="inner">
         <form id="group-create" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="<?= \phpOMS\Message\Http\RequestMethod::PUT; ?>">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iGname"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iGname"><?= $this->l11n->getText('Admin', 'Name') ?></label>
                 <tr><td><input id="iGname" name="gname" type="text" placeholder="&#xf0c0; Guest" required>
-                <tr><td><label for="iGroupDescription"><?= $this->l11n->lang['Admin']['Description'] ?></label>
+                <tr><td><label for="iGroupDescription"><?= $this->l11n->getText('Admin', 'Description') ?></label>
                 <tr><td><textarea id="iGroupDescription" name="description" placeholder="&#xf040;"></textarea>
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Create'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Create') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-66 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Parent'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Parent') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iGParentName"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iGParentName"><?= $this->l11n->getText('Admin', '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->l11n->lang[0]['Add'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-66 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Permissions'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Permissions') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iPermissionName"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iPermissionName"><?= $this->l11n->getText('Admin', '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->l11n->lang[0]['Add'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php
index 908177b..2b82832 100644
--- a/Theme/Backend/groups-single.tpl.php
+++ b/Theme/Backend/groups-single.tpl.php
@@ -22,60 +22,60 @@ $group = $this->getData('group');
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Group'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Group') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iGid"><?= $this->l11n->lang[0]['ID'] ?></label>
+                <tr><td><label for="iGid"><?= $this->l11n->getText(0, 'ID') ?></label>
                 <tr><td><input id="iGid" name="gid" type="text" value="<?= $group->getId(); ?>" disabled>
-                <tr><td><label for="iGname"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iGname"><?= $this->l11n->getText('Admin', 'Name') ?></label>
                 <tr><td><input id="iGname" name="gname" type="text" placeholder="&#xf0c0; Guest" value="<?= $group->getName(); ?>">
-                <tr><td><label for="iGroupDescription"><?= $this->l11n->lang['Admin']['Description'] ?></label>
+                <tr><td><label for="iGroupDescription"><?= $this->l11n->getText('Admin', 'Description') ?></label>
                 <tr><td><textarea id="iGroupDescription" name="description" placeholder="&#xf040;"><?= $group->getDescription(); ?></textarea>
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Create'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Create') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Parent'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Parent') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iGParentName"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iGParentName"><?= $this->l11n->getText('Admin', 'Name') ?></label>
                 <tr><td><input id="iGParentName" name="parentname" type="text" placeholder="&#xf0c0; Guest">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Permissions'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Permissions') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iPermissionName"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iPermissionName"><?= $this->l11n->getText('Admin', 'Name') ?></label>
                 <tr><td><input id="iPermissionName" name="permissionname" type="text" placeholder="&#xf084; Admin">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Accounts'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Accounts') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iGParentName"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iGParentName"><?= $this->l11n->getText('Admin', 'Name') ?></label>
                 <tr><td><input id="iGParentName" name="parentname" type="text" placeholder="&#xf234; Donald Duck">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php
index c98d873..948b9cd 100644
--- a/Theme/Backend/modules-list.tpl.php
+++ b/Theme/Backend/modules-list.tpl.php
@@ -31,13 +31,13 @@ $footerView->setResults(count($modules));
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Admin']['Modules']; ?></caption>
+        <caption><?= $this->l11n->getText('Admin', 'Modules'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Admin']['Name']; ?>
-            <td><?= $this->l11n->lang['Admin']['Version']; ?>
-            <td><?= $this->l11n->lang['Admin']['Status']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Admin', 'Name'); ?>
+            <td><?= $this->l11n->getText('Admin', 'Version'); ?>
+            <td><?= $this->l11n->getText('Admin', 'Status'); ?>
                 <tfoot>
         <tr>
             <td colspan="4"><?= $footerView->render(); ?>
@@ -49,14 +49,14 @@ $footerView->setResults(count($modules));
             <td><a href="<?= $url; ?>"><?= $module['name']['external']; ?></a>
             <td><a href="<?= $url; ?>"><?= $module['version']; ?></a>
             <td><a href="<?= $url; ?>"><?php if (in_array($module['name']['internal'], $active))
-                    echo strtolower($this->l11n->lang['Admin']['Active']);
+                    echo strtolower($this->l11n->getText('Admin', 'Active'));
                 elseif (in_array($module['name']['internal'], $installed))
-                    echo strtolower($this->l11n->lang['Admin']['Inactive']);
+                    echo strtolower($this->l11n->getText('Admin', 'Inactive'));
                 else
-                    echo strtolower($this->l11n->lang['Admin']['Available']); ?></a>
+                    echo strtolower($this->l11n->getText('Admin', 'Available')); ?></a>
                 <?php endforeach; ?>
         <?php if($count === 0) : ?>
-            <tr><td colspan="4" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+            <tr><td colspan="4" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
         <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/Backend/modules-single.tpl.php b/Theme/Backend/modules-single.tpl.php
index f0d370b..d18e724 100644
--- a/Theme/Backend/modules-single.tpl.php
+++ b/Theme/Backend/modules-single.tpl.php
@@ -31,38 +31,38 @@ $id = $this->request->getData('id') ?? 1;
         <table class="list wf-100">
             <tbody>
             <tr>
-                <td><?= $this->l11n->lang['Admin']['Name'] ?>
+                <td><?= $this->l11n->getText('Admin', 'Name') ?>
                 <td><?= $modules[$id]['name']['external']; ?>
             <tr>
-                <td><?= $this->l11n->lang['Admin']['Version'] ?>
+                <td><?= $this->l11n->getText('Admin', 'Version') ?>
                 <td><?= $modules[$id]['version'] ?>
             <tr>
-                <td><?= $this->l11n->lang['Admin']['CreatedBy'] ?>
+                <td><?= $this->l11n->getText('Admin', 'CreatedBy') ?>
                 <td><?= $modules[$id]['creator']['name'] ?>
             <tr>
-                <td><?= $this->l11n->lang['Admin']['Website'] ?>
+                <td><?= $this->l11n->getText('Admin', 'Website') ?>
                 <td><?= $modules[$id]['creator']['website'] ?>
             <tr>
-                <td><?= $this->l11n->lang['Admin']['Description'] ?>
+                <td><?= $this->l11n->getText('Admin', 'Description') ?>
                 <td><?= $modules[$id]['description'] ?>
             <tr>
                 <td colspan="2">
                     <?php if (in_array($id, $active)) : ?>
                         <button
-                            data-reload="<?= \phpOMS\Uri\UriFactory::build('POST:/{/lang}/backend/admin/module/status?status=deactivate&module=' . $id); ?>"><?= $this->l11n->lang['Admin']['Deactivate'] ?></button>
+                            data-reload="<?= \phpOMS\Uri\UriFactory::build('POST:/{/lang}/backend/admin/module/status?status=deactivate&module=' . $id); ?>"><?= $this->l11n->getText('Admin', 'Deactivate') ?></button>
                     <?php elseif (in_array($id, $installed)) : ?>
-                        <button data-reload="<?= \phpOMS\Uri\UriFactory::build('POST:/{/lang}/backend/admin/module/deactivate?id=' . $id); ?>"><?= $this->l11n->lang['Admin']['Uninstall'] ?></button>
-                        <button data-reload="<?= \phpOMS\Uri\UriFactory::build('POST:/{/lang}/backend/admin/module/deactivate?id=' . $id); ?>"><?= $this->l11n->lang['Admin']['Activate'] ?></button>
+                        <button data-reload="<?= \phpOMS\Uri\UriFactory::build('POST:/{/lang}/backend/admin/module/deactivate?id=' . $id); ?>"><?= $this->l11n->getText('Admin', 'Uninstall') ?></button>
+                        <button data-reload="<?= \phpOMS\Uri\UriFactory::build('POST:/{/lang}/backend/admin/module/deactivate?id=' . $id); ?>"><?= $this->l11n->getText('Admin', 'Activate') ?></button>
                     <?php elseif (isset($modules[$id])) : ?>
-                        <button data-reload="<?= \phpOMS\Uri\UriFactory::build('PUT:/{/lang}/backend/admin/module/install?id=' . $id); ?>"><?= $this->l11n->lang['Admin']['Install'] ?></button>
-                        <button data-reload="<?= \phpOMS\Uri\UriFactory::build('DELETE:/{/lang}/backend/admin/module/delete?id=' . $id); ?>"><?= $this->l11n->lang['Admin']['Delete'] ?></button>
+                        <button data-reload="<?= \phpOMS\Uri\UriFactory::build('PUT:/{/lang}/backend/admin/module/install?id=' . $id); ?>"><?= $this->l11n->getText('Admin', 'Install') ?></button>
+                        <button data-reload="<?= \phpOMS\Uri\UriFactory::build('DELETE:/{/lang}/backend/admin/module/delete?id=' . $id); ?>"><?= $this->l11n->getText('Admin', 'Delete') ?></button>
                     <?php endif; ?>
         </table>
     </div>
 </section>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Settings'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Settings') ?></h1></header>
 
     <div class="inner">
 
@@ -70,7 +70,7 @@ $id = $this->request->getData('id') ?? 1;
 </section>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Groups'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Groups') ?></h1></header>
 
     <div class="inner">
 
@@ -78,7 +78,7 @@ $id = $this->request->getData('id') ?? 1;
 </section>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Permissions'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Permissions') ?></h1></header>
 
     <div class="inner">
 
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php
index c9ed41d..888ada2 100644
--- a/Theme/Backend/settings-general.tpl.php
+++ b/Theme/Backend/settings-general.tpl.php
@@ -35,63 +35,63 @@ $currencies    = \phpOMS\Localization\ISO4217EnumArray::getConstants();
 
 ?>
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Settings'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Settings') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/settings/general'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                    <tr><td><label for="iOname"><?= $this->l11n->lang['Admin']['OrganizationName'] ?></label>
+                    <tr><td><label for="iOname"><?= $this->l11n->getText('Admin', 'OrganizationName') ?></label>
                     <tr><td><input id="iOname" name="oname" type="text" value="<?= $_oname; ?>" placeholder="&#xf12e; Money Bin" required>
-                    <tr><td><label for="iPassword"><?= $this->l11n->lang['Admin']['PasswordRegex'] ?></label>
+                    <tr><td><label for="iPassword"><?= $this->l11n->getText('Admin', 'PasswordRegex') ?></label>
                     <tr><td><input id="iPassword" name="passpattern" type="text" value="<?= $_password; ?>" placeholder="&#xf023; ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
-                    <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Save'] ?>">
+                    <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Save') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Localization'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Localization') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/settings/localization'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td colspan="2"><label for="iCountries"><?= $this->l11n->lang['Admin']['Country'] ?></label>
+                <tr><td colspan="2"><label for="iCountries"><?= $this->l11n->getText('Admin', 'Country') ?></label>
                 <tr><td colspan="2"><select id="iCountries" name="country">
                             <?php foreach($countries as $code => $country) : ?>
                             <option value="<?= $code; ?>"<?= strtolower($code) == strtolower($_country) ? ' selected' : ''; ?>><?= $country; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td colspan="2"><label for="iTimezones"><?= $this->l11n->lang['Admin']['Timezone'] ?></label>
+                <tr><td colspan="2"><label for="iTimezones"><?= $this->l11n->getText('Admin', 'Timezone') ?></label>
                 <tr><td colspan="2"><select id="iTimezones" name="timezone">
                             <?php foreach($timezones as $code => $timezone) : ?>
                             <option value="<?= $code; ?>"<?= $timezone == $_timezone ? ' selected' : ''; ?>><?= $timezone; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td colspan="2"><label for="iTimeformats"><?= $this->l11n->lang['Admin']['Timeformat'] ?></label>
+                <tr><td colspan="2"><label for="iTimeformats"><?= $this->l11n->getText('Admin', 'Timeformat') ?></label>
                 <tr><td colspan="2"><select id="iTimeformats" name="timeformat">
                             <?php foreach($timeformats as $code => $timeformat) : ?>
                             <option value="<?= $code; ?>"<?= strtolower($timeformat) == strtolower($_timeformat) ? ' selected' : ''; ?>><?= $timeformat; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td colspan="2"><label for="iLanguages"><?= $this->l11n->lang['Admin']['Language'] ?></label>
+                <tr><td colspan="2"><label for="iLanguages"><?= $this->l11n->getText('Admin', 'Language') ?></label>
                 <tr><td colspan="2"><select id="iLanguages" name="language">
                             <?php foreach($languages as $code => $language) : ?>
                             <option value="<?= $code; ?>"<?= strtolower($code) == strtolower($_language) ? ' selected' : ''; ?>><?= $language; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td colspan="2"><label for="iCurrencies"><?= $this->l11n->lang['Admin']['Currency'] ?></label>
+                <tr><td colspan="2"><label for="iCurrencies"><?= $this->l11n->getText('Admin', 'Currency') ?></label>
                 <tr><td colspan="2"><select id="iCurrencies" name="currency">
                             <?php foreach($currencies as $code => $currency) : ?>
                             <option value="<?= $code; ?>"<?= strtolower($code) == strtolower($_currency) ? ' selected' : ''; ?>><?= $currency[0]; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td colspan="2"><h2><?= $this->l11n->lang['Admin']['Numberformat'] ?></h2>
-                <tr><td><label for="iDecimalPoint"><?= $this->l11n->lang['Admin']['DecimalPoint'] ?></label>
-                    <td><label for="iThousandSep"><?= $this->l11n->lang['Admin']['ThousandsSeparator'] ?></label>
+                <tr><td colspan="2"><h2><?= $this->l11n->getText('Admin', 'Numberformat') ?></h2>
+                <tr><td><label for="iDecimalPoint"><?= $this->l11n->getText('Admin', 'DecimalPoint') ?></label>
+                    <td><label for="iThousandSep"><?= $this->l11n->getText('Admin', 'ThousandsSeparator') ?></label>
                 <tr><td><input id="iDecimalPoint" name="decimalpoint" type="text" value="<?= $_decimal_point; ?>" placeholder="." required>
                     <td><input id="iThousandSep" name="thousandsep" type="text" value="<?= $_thousands_sep; ?>" placeholder="," required>
-                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->lang[0]['Save'] ?>">
+                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->getText(0, 'Save') ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/accounts-create.tpl.php b/Theme/backend/accounts-create.tpl.php
index 8b38f6b..c806419 100644
--- a/Theme/backend/accounts-create.tpl.php
+++ b/Theme/backend/accounts-create.tpl.php
@@ -16,64 +16,64 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-66 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Account'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Account') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/account'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iType"><?= $this->l11n->lang['Admin']['Type'] ?></label>
+                <tr><td><label for="iType"><?= $this->l11n->getText('Admin', 'Type') ?></label>
                 <tr><td><select id="iType" name="type">
-                            <option><?= $this->l11n->lang['Admin']['Person'] ?>
-                            <option><?= $this->l11n->lang['Admin']['Organization'] ?>
+                            <option><?= $this->l11n->getText('Admin', 'Person') ?>
+                            <option><?= $this->l11n->getText('Admin', 'Organization') ?>
                         </select>
-                <tr><td><label for="iStatus"><?= $this->l11n->lang['Admin']['Status'] ?></label>
+                <tr><td><label for="iStatus"><?= $this->l11n->getText('Admin', 'Status') ?></label>
                 <tr><td><select id="iStatus" name="status">
-                            <option><?= $this->l11n->lang['Admin']['Active'] ?>
-                            <option><?= $this->l11n->lang['Admin']['Inactive'] ?>
-                            <option><?= $this->l11n->lang['Admin']['Timeout'] ?>
-                            <option><?= $this->l11n->lang['Admin']['Banned'] ?>
+                            <option><?= $this->l11n->getText('Admin', 'Active') ?>
+                            <option><?= $this->l11n->getText('Admin', 'Inactive') ?>
+                            <option><?= $this->l11n->getText('Admin', 'Timeout') ?>
+                            <option><?= $this->l11n->getText('Admin', 'Banned') ?>
                         </select>
-                <tr><td><label for="iUsername"><?= $this->l11n->lang['Admin']['Username'] ?></label>
+                <tr><td><label for="iUsername"><?= $this->l11n->getText('Admin', 'Username') ?></label>
                 <tr><td><input id="iUsername" name="name" type="text" placeholder="&#xf007; Fred">
-                <tr><td><label for="iName1"><?= $this->l11n->lang['Admin']['Name1'] ?></label>
+                <tr><td><label for="iName1"><?= $this->l11n->getText('Admin', 'Name1') ?></label>
                 <tr><td><input id="iName1" name="name1" type="text" placeholder="&#xf007; Donald" required>
-                <tr><td><label for="iName2"><?= $this->l11n->lang['Admin']['Name2'] ?></label>
+                <tr><td><label for="iName2"><?= $this->l11n->getText('Admin', 'Name2') ?></label>
                 <tr><td><input id="iName2" name="name2" type="text" placeholder="&#xf007; Fauntleroy">
-                <tr><td><label for="iName3"><?= $this->l11n->lang['Admin']['Name3'] ?></label>
+                <tr><td><label for="iName3"><?= $this->l11n->getText('Admin', 'Name3') ?></label>
                 <tr><td><input id="iName3" name="name3" type="text" placeholder="&#xf007; Duck">
-                <tr><td><label for="iEmail"><?= $this->l11n->lang['Admin']['Email'] ?></label>
+                <tr><td><label for="iEmail"><?= $this->l11n->getText('Admin', 'Email') ?></label>
                 <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com">
-                <tr><td><label for="iPassword"><?= $this->l11n->lang['Admin']['Name3'] ?></label>
+                <tr><td><label for="iPassword"><?= $this->l11n->getText('Admin', 'Name3') ?></label>
                 <tr><td><input id="iPassword" name="password" type="text" placeholder="&#xf023; Pa55ssw0rd?">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Create'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Create') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Groups'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Groups') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iGroup"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iGroup"><?= $this->l11n->getText('Admin', '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->l11n->lang[0]['Add'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Permissions'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Permissions') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iGroup"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iGroup"><?= $this->l11n->getText('Admin', '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->l11n->lang[0]['Add'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/accounts-list.tpl.php b/Theme/backend/accounts-list.tpl.php
index 5fa0005..7a46bfc 100644
--- a/Theme/backend/accounts-list.tpl.php
+++ b/Theme/backend/accounts-list.tpl.php
@@ -30,14 +30,14 @@ echo $this->getData('nav')->render();
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Admin']['Groups']; ?></caption>
+        <caption><?= $this->l11n->getText('Admin', 'Groups'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td><?= $this->l11n->lang['Admin']['Status']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Admin']['Name']; ?>
-            <td><?= $this->l11n->lang['Admin']['Activity']; ?>
-            <td><?= $this->l11n->lang['Admin']['Created']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td><?= $this->l11n->getText('Admin', 'Status'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Admin', 'Name'); ?>
+            <td><?= $this->l11n->getText('Admin', 'Activity'); ?>
+            <td><?= $this->l11n->getText('Admin', 'Created'); ?>
                 <tfoot>
         <tr><td colspan="5"><?= $footerView->render(); ?>
                 <tbody>
@@ -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->l11n->lang[0]['Empty']; ?>
+                <tr><td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                         <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/accounts-single.tpl.php b/Theme/backend/accounts-single.tpl.php
index 864286a..7b7bb1f 100644
--- a/Theme/backend/accounts-single.tpl.php
+++ b/Theme/backend/accounts-single.tpl.php
@@ -21,66 +21,66 @@ $account = $this->getData('account');
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Account'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Account') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/account'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iId"><?= $this->l11n->lang[0]['ID'] ?></label>
+                <tr><td><label for="iId"><?= $this->l11n->getText(0, 'ID') ?></label>
                 <tr><td><input id="iId" name="id" type="text" value="<?= $account->getId(); ?>" disabled>
-                <tr><td><label for="iType"><?= $this->l11n->lang['Admin']['Type'] ?></label>
+                <tr><td><label for="iType"><?= $this->l11n->getText('Admin', 'Type') ?></label>
                 <tr><td><select id="iType" name="type">
-                            <option value="<?= \phpOMS\Account\AccountType::USER; ?>"<?= $account->getType() === \phpOMS\Account\AccountType::USER ? ' selected' : ''; ?>><?= $this->l11n->lang['Admin']['Person'] ?>
-                            <option value="<?= \phpOMS\Account\AccountType::GROUP; ?>"<?= $account->getType() === \phpOMS\Account\AccountType::GROUP ? ' selected' : ''; ?>><?= $this->l11n->lang['Admin']['Organization'] ?>
+                            <option value="<?= \phpOMS\Account\AccountType::USER; ?>"<?= $account->getType() === \phpOMS\Account\AccountType::USER ? ' selected' : ''; ?>><?= $this->l11n->getText('Admin', 'Person') ?>
+                            <option value="<?= \phpOMS\Account\AccountType::GROUP; ?>"<?= $account->getType() === \phpOMS\Account\AccountType::GROUP ? ' selected' : ''; ?>><?= $this->l11n->getText('Admin', 'Organization') ?>
                         </select>
-                <tr><td><label for="iStatus"><?= $this->l11n->lang['Admin']['Status'] ?></label>
+                <tr><td><label for="iStatus"><?= $this->l11n->getText('Admin', 'Status') ?></label>
                 <tr><td><select id="iStatus" name="status">
-                            <option value="<?= \phpOMS\Account\AccountStatus::ACTIVE; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::ACTIVE ? ' selected' : ''; ?>><?= $this->l11n->lang['Admin']['Active'] ?>
-                            <option value="<?= \phpOMS\Account\AccountStatus::INACTIVE; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::INACTIVE ? ' selected' : ''; ?>><?= $this->l11n->lang['Admin']['Inactive'] ?>
-                            <option value="<?= \phpOMS\Account\AccountStatus::TIMEOUT; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::TIMEOUT ? ' selected' : ''; ?>><?= $this->l11n->lang['Admin']['Timeout'] ?>
-                            <option value="<?= \phpOMS\Account\AccountStatus::BANNED; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::BANNED ? ' selected' : ''; ?>><?= $this->l11n->lang['Admin']['Banned'] ?>
+                            <option value="<?= \phpOMS\Account\AccountStatus::ACTIVE; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::ACTIVE ? ' selected' : ''; ?>><?= $this->l11n->getText('Admin', 'Active') ?>
+                            <option value="<?= \phpOMS\Account\AccountStatus::INACTIVE; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::INACTIVE ? ' selected' : ''; ?>><?= $this->l11n->getText('Admin', 'Inactive') ?>
+                            <option value="<?= \phpOMS\Account\AccountStatus::TIMEOUT; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::TIMEOUT ? ' selected' : ''; ?>><?= $this->l11n->getText('Admin', 'Timeout') ?>
+                            <option value="<?= \phpOMS\Account\AccountStatus::BANNED; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::BANNED ? ' selected' : ''; ?>><?= $this->l11n->getText('Admin', 'Banned') ?>
                         </select>
-                <tr><td><label for="iUsername"><?= $this->l11n->lang['Admin']['Username'] ?></label>
+                <tr><td><label for="iUsername"><?= $this->l11n->getText('Admin', 'Username') ?></label>
                 <tr><td><input id="iUsername" name="name" type="text" placeholder="&#xf007; Fred" value="<?= $account->getEmail(); ?>" disabled>
-                <tr><td><label for="iName1"><?= $this->l11n->lang['Admin']['Name1'] ?></label>
+                <tr><td><label for="iName1"><?= $this->l11n->getText('Admin', 'Name1') ?></label>
                 <tr><td><input id="iName1" name="name1" type="text" placeholder="&#xf007; Donald" value="<?= $account->getName1(); ?>" required>
-                <tr><td><label for="iName2"><?= $this->l11n->lang['Admin']['Name2'] ?></label>
+                <tr><td><label for="iName2"><?= $this->l11n->getText('Admin', 'Name2') ?></label>
                 <tr><td><input id="iName2" name="name2" type="text" placeholder="&#xf007; Fauntleroy" value="<?= $account->getName2(); ?>">
-                <tr><td><label for="iName3"><?= $this->l11n->lang['Admin']['Name3'] ?></label>
+                <tr><td><label for="iName3"><?= $this->l11n->getText('Admin', 'Name3') ?></label>
                 <tr><td><input id="iName3" name="name3" type="text" placeholder="&#xf007; Duck" value="<?= $account->getName3(); ?>">
-                <tr><td><label for="iEmail"><?= $this->l11n->lang['Admin']['Email'] ?></label>
+                <tr><td><label for="iEmail"><?= $this->l11n->getText('Admin', 'Email') ?></label>
                 <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com" value="<?= $account->getEmail(); ?>">
-                <tr><td><label for="iPassword"><?= $this->l11n->lang['Admin']['Name3'] ?></label>
+                <tr><td><label for="iPassword"><?= $this->l11n->getText('Admin', 'Name3') ?></label>
                 <tr><td><input id="iPassword" name="password" type="text" placeholder="&#xf023; Pa55ssw0rd?">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Create'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Create') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-66 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Groups'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Groups') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iGroup"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iGroup"><?= $this->l11n->getText('Admin', 'Name') ?></label>
                 <tr><td><input id="iGroup" name="group" type="text" placeholder="&#xf0c0; Guest">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-66 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Permissions'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Permissions') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iGroup"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iGroup"><?= $this->l11n->getText('Admin', 'Name') ?></label>
                 <tr><td><input id="iGroup" name="group" type="text" placeholder="&#xf084; news_create">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/groups-create.tpl.php b/Theme/backend/groups-create.tpl.php
index 43504d0..9da8b07 100644
--- a/Theme/backend/groups-create.tpl.php
+++ b/Theme/backend/groups-create.tpl.php
@@ -20,44 +20,44 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Group'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Group') ?></h1></header>
     <div class="inner">
         <form id="group-create" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="<?= \phpOMS\Message\Http\RequestMethod::PUT; ?>">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iGname"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iGname"><?= $this->l11n->getText('Admin', 'Name') ?></label>
                 <tr><td><input id="iGname" name="gname" type="text" placeholder="&#xf0c0; Guest" required>
-                <tr><td><label for="iGroupDescription"><?= $this->l11n->lang['Admin']['Description'] ?></label>
+                <tr><td><label for="iGroupDescription"><?= $this->l11n->getText('Admin', 'Description') ?></label>
                 <tr><td><textarea id="iGroupDescription" name="description" placeholder="&#xf040;"></textarea>
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Create'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Create') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-66 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Parent'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Parent') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iGParentName"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iGParentName"><?= $this->l11n->getText('Admin', '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->l11n->lang[0]['Add'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-66 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Permissions'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Permissions') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/group'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iPermissionName"><?= $this->l11n->lang['Admin']['Name'] ?></label>
+                <tr><td><label for="iPermissionName"><?= $this->l11n->getText('Admin', '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->l11n->lang[0]['Add'] ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/groups-list.tpl.php b/Theme/backend/groups-list.tpl.php
index c55786a..787512d 100644
--- a/Theme/backend/groups-list.tpl.php
+++ b/Theme/backend/groups-list.tpl.php
@@ -28,14 +28,14 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Admin']['Groups']; ?></caption>
+        <caption><?= $this->l11n->getText('Admin', 'Groups'); ?></caption>
         <thead>
             <tr>
-                <td><?= $this->l11n->lang[0]['ID']; ?>
-                <td class="wf-100"><?= $this->l11n->lang['Admin']['Name']; ?>
-                <td><?= $this->l11n->lang['Admin']['Parents']; ?>
-                <td><?= $this->l11n->lang['Admin']['Children']; ?>
-                <td><?= $this->l11n->lang['Admin']['Members']; ?>
+                <td><?= $this->l11n->getText(0, 'ID'); ?>
+                <td class="wf-100"><?= $this->l11n->getText('Admin', 'Name'); ?>
+                <td><?= $this->l11n->getText('Admin', 'Parents'); ?>
+                <td><?= $this->l11n->getText('Admin', 'Children'); ?>
+                <td><?= $this->l11n->getText('Admin', 'Members'); ?>
         <tfoot>
             <tr><td colspan="5"><?= $footerView->render(); ?>
         <tbody>
@@ -49,7 +49,7 @@ echo $this->getData('nav')->render(); ?>
                 <td>
             <?php endforeach; ?>
             <?php if($c === 0) : ?>
-            <tr><td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+            <tr><td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
             <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/settings-general.tpl.php b/Theme/backend/settings-general.tpl.php
index c9ed41d..888ada2 100644
--- a/Theme/backend/settings-general.tpl.php
+++ b/Theme/backend/settings-general.tpl.php
@@ -35,63 +35,63 @@ $currencies    = \phpOMS\Localization\ISO4217EnumArray::getConstants();
 
 ?>
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Settings'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Settings') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/settings/general'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                    <tr><td><label for="iOname"><?= $this->l11n->lang['Admin']['OrganizationName'] ?></label>
+                    <tr><td><label for="iOname"><?= $this->l11n->getText('Admin', 'OrganizationName') ?></label>
                     <tr><td><input id="iOname" name="oname" type="text" value="<?= $_oname; ?>" placeholder="&#xf12e; Money Bin" required>
-                    <tr><td><label for="iPassword"><?= $this->l11n->lang['Admin']['PasswordRegex'] ?></label>
+                    <tr><td><label for="iPassword"><?= $this->l11n->getText('Admin', 'PasswordRegex') ?></label>
                     <tr><td><input id="iPassword" name="passpattern" type="text" value="<?= $_password; ?>" placeholder="&#xf023; ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
-                    <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Save'] ?>">
+                    <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Save') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Admin']['Localization'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Admin', 'Localization') ?></h1></header>
     <div class="inner">
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/settings/localization'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td colspan="2"><label for="iCountries"><?= $this->l11n->lang['Admin']['Country'] ?></label>
+                <tr><td colspan="2"><label for="iCountries"><?= $this->l11n->getText('Admin', 'Country') ?></label>
                 <tr><td colspan="2"><select id="iCountries" name="country">
                             <?php foreach($countries as $code => $country) : ?>
                             <option value="<?= $code; ?>"<?= strtolower($code) == strtolower($_country) ? ' selected' : ''; ?>><?= $country; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td colspan="2"><label for="iTimezones"><?= $this->l11n->lang['Admin']['Timezone'] ?></label>
+                <tr><td colspan="2"><label for="iTimezones"><?= $this->l11n->getText('Admin', 'Timezone') ?></label>
                 <tr><td colspan="2"><select id="iTimezones" name="timezone">
                             <?php foreach($timezones as $code => $timezone) : ?>
                             <option value="<?= $code; ?>"<?= $timezone == $_timezone ? ' selected' : ''; ?>><?= $timezone; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td colspan="2"><label for="iTimeformats"><?= $this->l11n->lang['Admin']['Timeformat'] ?></label>
+                <tr><td colspan="2"><label for="iTimeformats"><?= $this->l11n->getText('Admin', 'Timeformat') ?></label>
                 <tr><td colspan="2"><select id="iTimeformats" name="timeformat">
                             <?php foreach($timeformats as $code => $timeformat) : ?>
                             <option value="<?= $code; ?>"<?= strtolower($timeformat) == strtolower($_timeformat) ? ' selected' : ''; ?>><?= $timeformat; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td colspan="2"><label for="iLanguages"><?= $this->l11n->lang['Admin']['Language'] ?></label>
+                <tr><td colspan="2"><label for="iLanguages"><?= $this->l11n->getText('Admin', 'Language') ?></label>
                 <tr><td colspan="2"><select id="iLanguages" name="language">
                             <?php foreach($languages as $code => $language) : ?>
                             <option value="<?= $code; ?>"<?= strtolower($code) == strtolower($_language) ? ' selected' : ''; ?>><?= $language; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td colspan="2"><label for="iCurrencies"><?= $this->l11n->lang['Admin']['Currency'] ?></label>
+                <tr><td colspan="2"><label for="iCurrencies"><?= $this->l11n->getText('Admin', 'Currency') ?></label>
                 <tr><td colspan="2"><select id="iCurrencies" name="currency">
                             <?php foreach($currencies as $code => $currency) : ?>
                             <option value="<?= $code; ?>"<?= strtolower($code) == strtolower($_currency) ? ' selected' : ''; ?>><?= $currency[0]; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td colspan="2"><h2><?= $this->l11n->lang['Admin']['Numberformat'] ?></h2>
-                <tr><td><label for="iDecimalPoint"><?= $this->l11n->lang['Admin']['DecimalPoint'] ?></label>
-                    <td><label for="iThousandSep"><?= $this->l11n->lang['Admin']['ThousandsSeparator'] ?></label>
+                <tr><td colspan="2"><h2><?= $this->l11n->getText('Admin', 'Numberformat') ?></h2>
+                <tr><td><label for="iDecimalPoint"><?= $this->l11n->getText('Admin', 'DecimalPoint') ?></label>
+                    <td><label for="iThousandSep"><?= $this->l11n->getText('Admin', 'ThousandsSeparator') ?></label>
                 <tr><td><input id="iDecimalPoint" name="decimalpoint" type="text" value="<?= $_decimal_point; ?>" placeholder="." required>
                     <td><input id="iThousandSep" name="thousandsep" type="text" value="<?= $_thousands_sep; ?>" placeholder="," required>
-                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->lang[0]['Save'] ?>">
+                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->getText(0, 'Save') ?>">
             </table>
         </form>
     </div>