diff --git a/Theme/Backend/workflow-create.tpl.php b/Theme/Backend/workflow-create.tpl.php
index 38be15f..1ec24a2 100644
--- a/Theme/Backend/workflow-create.tpl.php
+++ b/Theme/Backend/workflow-create.tpl.php
@@ -19,38 +19,38 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->getText('Tasks', 'Backend', 'Task'); ?></h1></header>
+    <header><h1><?= $this->getText('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->getText('Tasks', 'Backend', '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, 'Backend', 'Add'); ?></button>
-                <tr><td colspan="2"><label for="iObserver"><?= $this->l11n->getText('Tasks', 'Backend', '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, 'Backend', 'Add'); ?></button>
-                <tr><td colspan="2"><label for="iDue"><?= $this->l11n->getText('Tasks', 'Backend', 'Due'); ?></label>
+                <tr><td colspan="2"><label for="iReceiver"><?= $this->getText('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->getText('Add'); ?></button>
+                <tr><td colspan="2"><label for="iObserver"><?= $this->getText('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->getText('Add'); ?></button>
+                <tr><td colspan="2"><label for="iDue"><?= $this->getText('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->getText('Tasks', 'Backend', 'Title'); ?></label>
-                <tr><td><input type="text" id="iTitle" name="title" placeholder="&#xf040; <?= $this->l11n->getText('Tasks', 'Backend', 'Title'); ?>"><td>
-                <tr><td colspan="2"><label for="iMessage"><?= $this->l11n->getText('Tasks', 'Backend', 'Message'); ?></label>
+                <tr><td colspan="2"><label for="iTitle"><?= $this->getText('Title'); ?></label>
+                <tr><td><input type="text" id="iTitle" name="title" placeholder="&#xf040; <?= $this->getText('Title'); ?>"><td>
+                <tr><td colspan="2"><label for="iMessage"><?= $this->getText('Message'); ?></label>
                 <tr><td><textarea id="iMessage" name="description" placeholder="&#xf040;"></textarea><td>
-                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->getText(0, 'Backend', 'Create'); ?>"><input type="hidden" name="type" value="<?= \Modules\Tasks\Models\TaskType::SINGLE; ?>">
+                <tr><td colspan="2"><input type="submit" value="<?= $this->getText('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->getText('Tasks', 'Backend', 'Media'); ?></h1></header>
+    <header><h1><?= $this->getText('Media'); ?></h1></header>
 
     <div class="inner">
         <form>
             <table class="layout wf-100">
                 <tbody>
-                <tr><td colspan="2"><label for="iMedia"><?= $this->l11n->getText('Tasks', 'Backend', 'Media'); ?></label>
-                <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->l11n->getText(0, 'Backend', 'Select'); ?></button>
-                <tr><td colspan="2"><label for="iUpload"><?= $this->l11n->getText('Tasks', 'Backend', 'Upload'); ?></label>
+                <tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
+                <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
+                <tr><td colspan="2"><label for="iUpload"><?= $this->getText('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/workflow-dashboard.tpl.php b/Theme/Backend/workflow-dashboard.tpl.php
index 2e55ab9..8d37d59 100644
--- a/Theme/Backend/workflow-dashboard.tpl.php
+++ b/Theme/Backend/workflow-dashboard.tpl.php
@@ -22,13 +22,13 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100 floatLeft">
     <table class="table">
-        <caption><?= $this->l11n->getText('Workflow', 'Backend', 'Workflow'); ?></caption>
+        <caption><?= $this->getText('Workflow'); ?></caption>
         <thead>
-        <td><?= $this->l11n->getText('Workflow', 'Backend', 'Status'); ?>
-        <td><?= $this->l11n->getText('Workflow', 'Backend', 'Next'); ?>
-        <td class="full"><?= $this->l11n->getText('Workflow', 'Backend', 'Title'); ?>
-        <td><?= $this->l11n->getText('Workflow', 'Backend', 'Creator'); ?>
-        <td><?= $this->l11n->getText('Workflow', 'Backend', 'Created'); ?>
+        <td><?= $this->getText('Status'); ?>
+        <td><?= $this->getText('Next'); ?>
+        <td class="full"><?= $this->getText('Title'); ?>
+        <td><?= $this->getText('Creator'); ?>
+        <td><?= $this->getText('Created'); ?>
         <tfoot>
         <tbody>
         <?php $c = 0; foreach($workflows as $key => $workflow) : $c++;
@@ -40,13 +40,13 @@ echo $this->getData('nav')->render(); ?>
         elseif($workflow->getStatus() === \Modules\Workflow\Models\WorkflowStatus::CANCELED) { $color = 'red'; }
         elseif($workflow->getStatus() === \Modules\Workflow\Models\WorkflowStatus::SUSPENDED) { $color = 'yellow'; } ;?>
         <tr>
-            <td><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->l11n->getText('Workflow', 'Backend', 'S' . $workflow->getStatus()); ?></span></a>
+            <td><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->getText('S' . $workflow->getStatus()); ?></span></a>
             <td><a href="<?= $url; ?>"><?= $workflow->getDue()->format('Y-m-d H:i'); ?></a>
             <td><a href="<?= $url; ?>"><?= $workflow->getTitle(); ?></a>
             <td><a href="<?= $url; ?>"><?= $workflow->getCreatedBy(); ?></a>
             <td><a href="<?= $url; ?>"><?= $workflow->getCreatedAt()->format('Y-m-d H:i'); ?></a>
                 <?php endforeach; if($c == 0) : ?>
-        <tr><td colspan="6" class="empty"><?= $this->l11n->getText(0, 'Backend', 'Empty'); ?>
+        <tr><td colspan="6" class="empty"><?= $this->getText('Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
\ No newline at end of file
diff --git a/Theme/Backend/workflow-single.tpl.php b/Theme/Backend/workflow-single.tpl.php
index 6d33369..a7d5ffe 100644
--- a/Theme/Backend/workflow-single.tpl.php
+++ b/Theme/Backend/workflow-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->getText('Tasks', 'Backend', 'S' . $element->getStatus()); ?></span></div>
+        <div class="floatRight"><span class="tag <?= $color; ?>"><?= $this->getText('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->getText('Tasks', 'Backend', 'Message'); ?></label>
+                <tr><td><label for="iMessage"><?= $this->getText('Message'); ?></label>
                 <tr><td><textarea></textarea>
-                <tr><td><label for="iDue"><?= $this->l11n->getText('Tasks', 'Backend', 'Due'); ?></label>
+                <tr><td><label for="iDue"><?= $this->getText('Due'); ?></label>
                 <tr><td><input type="datetime-local">
-                <tr><td><label for="iReceiver"><?= $this->l11n->getText('Tasks', 'Backend', 'Status'); ?></label>
+                <tr><td><label for="iReceiver"><?= $this->getText('Status'); ?></label>
                 <tr><td><select>
                             <option>
                         </select>
-                <tr><td><label for="iReceiver"><?= $this->l11n->getText('Tasks', 'Backend', 'To'); ?></label>
+                <tr><td><label for="iReceiver"><?= $this->getText('To'); ?></label>
                 <tr><td><input type="text" id="iReceiver" placeholder="&#xf007; Guest">
-                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Backend', 'Create'); ?>"><input type="hidden" name="type" value="1">
+                <tr><td><input type="submit" value="<?= $this->getText('Create'); ?>"><input type="hidden" name="type" value="1">
             </table>
         </form>
     </div>