diff --git a/Theme/Backend/task-analysis.tpl.php b/Theme/Backend/task-analysis.tpl.php
index 167f318..6d8e67a 100644
--- a/Theme/Backend/task-analysis.tpl.php
+++ b/Theme/Backend/task-analysis.tpl.php
@@ -29,7 +29,7 @@ echo $this->getData('nav')->render(); ?>
                 <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->getText('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->getText('Submit'); ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Submit', 0, 0); ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/task-create.tpl.php b/Theme/Backend/task-create.tpl.php
index 1ec24a2..a5e92de 100644
--- a/Theme/Backend/task-create.tpl.php
+++ b/Theme/Backend/task-create.tpl.php
@@ -26,16 +26,16 @@ echo $this->getData('nav')->render(); ?>
             <table class="layout wf-100">
                 <tbody>
                 <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><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', 0, 0); ?></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><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', 0, 0); ?></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->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->getText('Create'); ?>"><input type="hidden" name="type" value="<?= \Modules\Tasks\Models\TaskType::SINGLE; ?>">
+                <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>"><input type="hidden" name="type" value="<?= \Modules\Tasks\Models\TaskType::SINGLE; ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php
index 0af9921..703d7ef 100644
--- a/Theme/Backend/task-dashboard.tpl.php
+++ b/Theme/Backend/task-dashboard.tpl.php
@@ -46,7 +46,7 @@ echo $this->getData('nav')->render(); ?>
                 <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->getText('Empty'); ?>
+        <tr><td colspan="6" class="empty"><?= $this->getText('Empty', 0, 0); ?>
         <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index a7d5ffe..806e750 100644
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -83,7 +83,7 @@ foreach ($elements as $key => $element) : $c++;
                         </select>
                 <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->getText('Create'); ?>"><input type="hidden" name="type" value="1">
+                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>"><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 167f318..6d8e67a 100644
--- a/Theme/backend/task-analysis.tpl.php
+++ b/Theme/backend/task-analysis.tpl.php
@@ -29,7 +29,7 @@ echo $this->getData('nav')->render(); ?>
                 <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->getText('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->getText('Submit'); ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Submit', 0, 0); ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/task-create.tpl.php b/Theme/backend/task-create.tpl.php
index 1ec24a2..a5e92de 100644
--- a/Theme/backend/task-create.tpl.php
+++ b/Theme/backend/task-create.tpl.php
@@ -26,16 +26,16 @@ echo $this->getData('nav')->render(); ?>
             <table class="layout wf-100">
                 <tbody>
                 <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><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', 0, 0); ?></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><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', 0, 0); ?></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->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->getText('Create'); ?>"><input type="hidden" name="type" value="<?= \Modules\Tasks\Models\TaskType::SINGLE; ?>">
+                <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>"><input type="hidden" name="type" value="<?= \Modules\Tasks\Models\TaskType::SINGLE; ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/task-dashboard.tpl.php b/Theme/backend/task-dashboard.tpl.php
index 0af9921..703d7ef 100644
--- a/Theme/backend/task-dashboard.tpl.php
+++ b/Theme/backend/task-dashboard.tpl.php
@@ -46,7 +46,7 @@ echo $this->getData('nav')->render(); ?>
                 <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->getText('Empty'); ?>
+        <tr><td colspan="6" class="empty"><?= $this->getText('Empty', 0, 0); ?>
         <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/task-single.tpl.php b/Theme/backend/task-single.tpl.php
index a7d5ffe..806e750 100644
--- a/Theme/backend/task-single.tpl.php
+++ b/Theme/backend/task-single.tpl.php
@@ -83,7 +83,7 @@ foreach ($elements as $key => $element) : $c++;
                         </select>
                 <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->getText('Create'); ?>"><input type="hidden" name="type" value="1">
+                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>"><input type="hidden" name="type" value="1">
             </table>
         </form>
     </div>