diff --git a/Theme/Backend/task-analysis.tpl.php b/Theme/Backend/task-analysis.tpl.php
index 37c57bf..afadfb1 100644
--- a/Theme/Backend/task-analysis.tpl.php
+++ b/Theme/Backend/task-analysis.tpl.php
@@ -19,32 +19,32 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Tasks']['Account']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Tasks', 'Account'); ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td><label for="iAccount"><?= $this->l11n->lang['Tasks']['Account']; ?></label>
+                <tr><td><label for="iAccount"><?= $this->l11n->getText('Tasks', 'Account'); ?></label>
                 <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iAccount" name="account" placeholder="&#xf007; Guest" required></span>
-                <tr><td><label for="iFrom"><?= $this->l11n->lang['Tasks']['From']; ?></label>
+                <tr><td><label for="iFrom"><?= $this->l11n->getText('Tasks', 'From'); ?></label>
                 <tr><td><input type="datetime-local" id="iFrom" name="from" value="<?= (new \DateTime('NOW'))->format('Y-m-d\TH:i:s') ?>">
-                <tr><td><label for="iTo"><?= $this->l11n->lang['Tasks']['To']; ?></label>
+                <tr><td><label for="iTo"><?= $this->l11n->getText('Tasks', 'To'); ?></label>
                 <tr><td><input type="datetime-local" id="iTo" name="to" value="<?= (new \DateTime('NOW'))->format('Y-m-d\TH:i:s') ?>">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Submit']; ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Submit'); ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Tasks']['Statistics']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Tasks', 'Statistics'); ?></h1></header>
     <div class="inner">
         <table class="list wf-100">
-            <tr><td><?= $this->l11n->lang['Tasks']['Received']; ?><td>0
-            <tr><td><?= $this->l11n->lang['Tasks']['Created']; ?><td>0
-            <tr><td><?= $this->l11n->lang['Tasks']['Forwarded']; ?><td>0
-            <tr><td><?= $this->l11n->lang['Tasks']['AverageAmount']; ?><td>0
-            <tr><td><?= $this->l11n->lang['Tasks']['AverageProcessTime']; ?><td>0
-            <tr><td><?= $this->l11n->lang['Tasks']['InTime']; ?><td>0
+            <tr><td><?= $this->l11n->getText('Tasks', 'Received'); ?><td>0
+            <tr><td><?= $this->l11n->getText('Tasks', 'Created'); ?><td>0
+            <tr><td><?= $this->l11n->getText('Tasks', 'Forwarded'); ?><td>0
+            <tr><td><?= $this->l11n->getText('Tasks', 'AverageAmount'); ?><td>0
+            <tr><td><?= $this->l11n->getText('Tasks', 'AverageProcessTime'); ?><td>0
+            <tr><td><?= $this->l11n->getText('Tasks', 'InTime'); ?><td>0
         </table>
     </div>
 </section>
diff --git a/Theme/Backend/task-create.tpl.php b/Theme/Backend/task-create.tpl.php
index 2d09000..5683e59 100644
--- a/Theme/Backend/task-create.tpl.php
+++ b/Theme/Backend/task-create.tpl.php
@@ -19,38 +19,38 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Tasks']['Task']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Tasks', 'Task'); ?></h1></header>
 
     <div class="inner">
         <form id="fTask"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/task/create'); ?>">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td colspan="2"><label for="iReceiver"><?= $this->l11n->lang['Tasks']['To']; ?></label>
-                <tr><td><span class="input"><button type="button" data-action='[{"type": "popup", "tpl": "acc-grp-tpl", "aniIn": "fadeIn", "aniOut": "fadeOut", "stay": 5000}]' formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iReceiver" name="receiver" placeholder="&#xf007; Guest" required></span><td><button><?= $this->l11n->lang[0]['Add']; ?></button>
-                <tr><td colspan="2"><label for="iObserver"><?= $this->l11n->lang['Tasks']['CC']; ?></label>
-                <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iObserver" name="observer" placeholder="&#xf007; Guest" required></span><td><button><?= $this->l11n->lang[0]['Add']; ?></button>
-                <tr><td colspan="2"><label for="iDue"><?= $this->l11n->lang['Tasks']['Due']; ?></label>
+                <tr><td colspan="2"><label for="iReceiver"><?= $this->l11n->getText('Tasks', 'To'); ?></label>
+                <tr><td><span class="input"><button type="button" data-action='[{"type": "popup", "tpl": "acc-grp-tpl", "aniIn": "fadeIn", "aniOut": "fadeOut", "stay": 5000}]' formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iReceiver" name="receiver" placeholder="&#xf007; Guest" required></span><td><button><?= $this->l11n->getText(0, 'Add'); ?></button>
+                <tr><td colspan="2"><label for="iObserver"><?= $this->l11n->getText('Tasks', 'CC'); ?></label>
+                <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iObserver" name="observer" placeholder="&#xf007; Guest" required></span><td><button><?= $this->l11n->getText(0, 'Add'); ?></button>
+                <tr><td colspan="2"><label for="iDue"><?= $this->l11n->getText('Tasks', 'Due'); ?></label>
                 <tr><td><input type="datetime-local" id="iDue" name="due" value="<?= (new \DateTime('NOW'))->format('Y-m-d\TH:i:s') ?>"><td>
-                <tr><td colspan="2"><label for="iTitle"><?= $this->l11n->lang['Tasks']['Title']; ?></label>
-                <tr><td><input type="text" id="iTitle" name="title" placeholder="&#xf040; <?= $this->l11n->lang['Tasks']['Title']; ?>"><td>
-                <tr><td colspan="2"><label for="iMessage"><?= $this->l11n->lang['Tasks']['Message']; ?></label>
+                <tr><td colspan="2"><label for="iTitle"><?= $this->l11n->getText('Tasks', 'Title'); ?></label>
+                <tr><td><input type="text" id="iTitle" name="title" placeholder="&#xf040; <?= $this->l11n->getText('Tasks', 'Title'); ?>"><td>
+                <tr><td colspan="2"><label for="iMessage"><?= $this->l11n->getText('Tasks', 'Message'); ?></label>
                 <tr><td><textarea id="iMessage" name="description" placeholder="&#xf040;"></textarea><td>
-                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->lang[0]['Create']; ?>"><input type="hidden" name="type" value="<?= \Modules\Tasks\Models\TaskType::SINGLE; ?>">
+                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->getText(0, 'Create'); ?>"><input type="hidden" name="type" value="<?= \Modules\Tasks\Models\TaskType::SINGLE; ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Tasks']['Media']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Tasks', 'Media'); ?></h1></header>
 
     <div class="inner">
         <form>
             <table class="layout wf-100">
                 <tbody>
-                <tr><td colspan="2"><label for="iMedia"><?= $this->l11n->lang['Tasks']['Media']; ?></label>
-                <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->l11n->lang[0]['Select']; ?></button>
-                <tr><td colspan="2"><label for="iUpload"><?= $this->l11n->lang['Tasks']['Upload']; ?></label>
+                <tr><td colspan="2"><label for="iMedia"><?= $this->l11n->getText('Tasks', 'Media'); ?></label>
+                <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->l11n->getText(0, 'Select'); ?></button>
+                <tr><td colspan="2"><label for="iUpload"><?= $this->l11n->getText('Tasks', 'Upload'); ?></label>
                 <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
             </table>
         </form>
diff --git a/Theme/Backend/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php
index e9ff03a..8270403 100644
--- a/Theme/Backend/task-dashboard.tpl.php
+++ b/Theme/Backend/task-dashboard.tpl.php
@@ -22,13 +22,13 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-75 floatLeft">
     <table class="table">
-        <caption><?= $this->l11n->lang['Tasks']['Tasks']; ?></caption>
+        <caption><?= $this->l11n->getText('Tasks', 'Tasks'); ?></caption>
         <thead>
-            <td><?= $this->l11n->lang['Tasks']['Status']; ?>
-            <td><?= $this->l11n->lang['Tasks']['Due']; ?>
-            <td class="full"><?= $this->l11n->lang['Tasks']['Title']; ?>
-            <td><?= $this->l11n->lang['Tasks']['Creator']; ?>
-            <td><?= $this->l11n->lang['Tasks']['Created']; ?>
+            <td><?= $this->l11n->getText('Tasks', 'Status'); ?>
+            <td><?= $this->l11n->getText('Tasks', 'Due'); ?>
+            <td class="full"><?= $this->l11n->getText('Tasks', 'Title'); ?>
+            <td><?= $this->l11n->getText('Tasks', 'Creator'); ?>
+            <td><?= $this->l11n->getText('Tasks', 'Created'); ?>
         <tfoot>
         <tbody>
         <?php $c = 0; foreach($tasks as $key => $task) : $c++;
@@ -40,30 +40,30 @@ echo $this->getData('nav')->render(); ?>
         elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
         elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ;?>
             <tr>
-                <td><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->l11n->lang['Tasks']['S' . $task->getStatus()]; ?></span></a>
+                <td><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->l11n->getText('Tasks', 'S' . $task->getStatus()); ?></span></a>
                 <td><a href="<?= $url; ?>"><?= $task->getDue()->format('Y-m-d H:i'); ?></a>
                 <td><a href="<?= $url; ?>"><?= $task->getTitle(); ?></a>
                 <td><a href="<?= $url; ?>"><?= $task->getCreatedBy(); ?></a>
                 <td><a href="<?= $url; ?>"><?= $task->getCreatedAt()->format('Y-m-d H:i'); ?></a>
         <?php endforeach; if($c == 0) : ?>
-        <tr><td colspan="6" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+        <tr><td colspan="6" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
         <?php endif; ?>
     </table>
 </div>
 
 <section class="w-25 floatLeft">
     <section class="box w-100">
-        <header><h1><?= $this->l11n->lang['Tasks']['Settings']; ?></h1></header>
+        <header><h1><?= $this->l11n->getText('Tasks', 'Settings'); ?></h1></header>
         <div class="inner">
             <form>
                 <table class="layout wf-100">
-                    <tr><td><label for="iIntervarl"><?= $this->l11n->lang['Tasks']['Interval']; ?></label>
+                    <tr><td><label for="iIntervarl"><?= $this->l11n->getText('Tasks', 'Interval'); ?></label>
                     <tr><td><select id="iIntervarl" name="interval">
-                                <option><?= $this->l11n->lang['Tasks']['All']; ?>
-                                <option><?= $this->l11n->lang['Tasks']['Day']; ?>
-                                <option><?= $this->l11n->lang['Tasks']['Week']; ?>
-                                <option selected><?= $this->l11n->lang['Tasks']['Month']; ?>
-                                <option><?= $this->l11n->lang['Tasks']['Year']; ?>
+                                <option><?= $this->l11n->getText('Tasks', 'All'); ?>
+                                <option><?= $this->l11n->getText('Tasks', 'Day'); ?>
+                                <option><?= $this->l11n->getText('Tasks', 'Week'); ?>
+                                <option selected><?= $this->l11n->getText('Tasks', 'Month'); ?>
+                                <option><?= $this->l11n->getText('Tasks', 'Year'); ?>
                             </select>
                 </table>
             </form>
@@ -71,15 +71,15 @@ echo $this->getData('nav')->render(); ?>
     </section>
 
     <section class="box w-100">
-        <header><h1><?= $this->l11n->lang['Tasks']['Settings']; ?></h1></header>
+        <header><h1><?= $this->l11n->getText('Tasks', 'Settings'); ?></h1></header>
         <div class="inner">
             <table class="list">
-                <tr><th><?= $this->l11n->lang['Tasks']['Received']; ?><td>0
-                <tr><th><?= $this->l11n->lang['Tasks']['Created']; ?><td>0
-                <tr><th><?= $this->l11n->lang['Tasks']['Forwarded']; ?><td>0
-                <tr><th><?= $this->l11n->lang['Tasks']['AverageAmount']; ?><td>0
-                <tr><th><?= $this->l11n->lang['Tasks']['AverageProcessTime']; ?><td>0
-                <tr><th><?= $this->l11n->lang['Tasks']['InTime']; ?><td>0
+                <tr><th><?= $this->l11n->getText('Tasks', 'Received'); ?><td>0
+                <tr><th><?= $this->l11n->getText('Tasks', 'Created'); ?><td>0
+                <tr><th><?= $this->l11n->getText('Tasks', 'Forwarded'); ?><td>0
+                <tr><th><?= $this->l11n->getText('Tasks', 'AverageAmount'); ?><td>0
+                <tr><th><?= $this->l11n->getText('Tasks', 'AverageProcessTime'); ?><td>0
+                <tr><th><?= $this->l11n->getText('Tasks', 'InTime'); ?><td>0
             </table>
         </div>
     </section>
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index 4ca4c5b..dcc726a 100644
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -44,7 +44,7 @@ foreach ($elements as $key => $element) : $c++;
     elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
     elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?>
     <section class="box w-50">
-        <div class="floatRight"><span class="tag <?= $color; ?>"><?= $this->l11n->lang['Tasks']['S' . $element->getStatus()]; ?></span></div>
+        <div class="floatRight"><span class="tag <?= $color; ?>"><?= $this->l11n->getText('Tasks', 'S' . $element->getStatus()); ?></span></div>
         <div><?= $element->getCreatedBy(); ?> - <?= $element->getCreatedAt()->format('Y-m-d H:i'); ?></div>
     </section>
     <?php if ($element->getDescription() !== '') : ?>
@@ -73,17 +73,17 @@ foreach ($elements as $key => $element) : $c++;
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td><label for="iMessage"><?= $this->l11n->lang['Tasks']['Message']; ?></label>
+                <tr><td><label for="iMessage"><?= $this->l11n->getText('Tasks', 'Message'); ?></label>
                 <tr><td><textarea></textarea>
-                <tr><td><label for="iDue"><?= $this->l11n->lang['Tasks']['Due']; ?></label>
+                <tr><td><label for="iDue"><?= $this->l11n->getText('Tasks', 'Due'); ?></label>
                 <tr><td><input type="datetime-local">
-                <tr><td><label for="iReceiver"><?= $this->l11n->lang['Tasks']['Status']; ?></label>
+                <tr><td><label for="iReceiver"><?= $this->l11n->getText('Tasks', 'Status'); ?></label>
                 <tr><td><select>
                             <option>
                         </select>
-                <tr><td><label for="iReceiver"><?= $this->l11n->lang['Tasks']['To']; ?></label>
+                <tr><td><label for="iReceiver"><?= $this->l11n->getText('Tasks', 'To'); ?></label>
                 <tr><td><input type="text" id="iReceiver" placeholder="&#xf007; Guest">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Create']; ?>"><input type="hidden" name="type" value="1">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Create'); ?>"><input type="hidden" name="type" value="1">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/task-analysis.tpl.php b/Theme/backend/task-analysis.tpl.php
index 37c57bf..afadfb1 100644
--- a/Theme/backend/task-analysis.tpl.php
+++ b/Theme/backend/task-analysis.tpl.php
@@ -19,32 +19,32 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Tasks']['Account']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Tasks', 'Account'); ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td><label for="iAccount"><?= $this->l11n->lang['Tasks']['Account']; ?></label>
+                <tr><td><label for="iAccount"><?= $this->l11n->getText('Tasks', 'Account'); ?></label>
                 <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iAccount" name="account" placeholder="&#xf007; Guest" required></span>
-                <tr><td><label for="iFrom"><?= $this->l11n->lang['Tasks']['From']; ?></label>
+                <tr><td><label for="iFrom"><?= $this->l11n->getText('Tasks', 'From'); ?></label>
                 <tr><td><input type="datetime-local" id="iFrom" name="from" value="<?= (new \DateTime('NOW'))->format('Y-m-d\TH:i:s') ?>">
-                <tr><td><label for="iTo"><?= $this->l11n->lang['Tasks']['To']; ?></label>
+                <tr><td><label for="iTo"><?= $this->l11n->getText('Tasks', 'To'); ?></label>
                 <tr><td><input type="datetime-local" id="iTo" name="to" value="<?= (new \DateTime('NOW'))->format('Y-m-d\TH:i:s') ?>">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Submit']; ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Submit'); ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Tasks']['Statistics']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Tasks', 'Statistics'); ?></h1></header>
     <div class="inner">
         <table class="list wf-100">
-            <tr><td><?= $this->l11n->lang['Tasks']['Received']; ?><td>0
-            <tr><td><?= $this->l11n->lang['Tasks']['Created']; ?><td>0
-            <tr><td><?= $this->l11n->lang['Tasks']['Forwarded']; ?><td>0
-            <tr><td><?= $this->l11n->lang['Tasks']['AverageAmount']; ?><td>0
-            <tr><td><?= $this->l11n->lang['Tasks']['AverageProcessTime']; ?><td>0
-            <tr><td><?= $this->l11n->lang['Tasks']['InTime']; ?><td>0
+            <tr><td><?= $this->l11n->getText('Tasks', 'Received'); ?><td>0
+            <tr><td><?= $this->l11n->getText('Tasks', 'Created'); ?><td>0
+            <tr><td><?= $this->l11n->getText('Tasks', 'Forwarded'); ?><td>0
+            <tr><td><?= $this->l11n->getText('Tasks', 'AverageAmount'); ?><td>0
+            <tr><td><?= $this->l11n->getText('Tasks', 'AverageProcessTime'); ?><td>0
+            <tr><td><?= $this->l11n->getText('Tasks', 'InTime'); ?><td>0
         </table>
     </div>
 </section>