diff --git a/Theme/Backend/surveys-create.tpl.php b/Theme/Backend/surveys-create.tpl.php
index 1fae1be..341e829 100644
--- a/Theme/Backend/surveys-create.tpl.php
+++ b/Theme/Backend/surveys-create.tpl.php
@@ -16,42 +16,42 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Surveys']['Survey'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Surveys', 'Survey') ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td colspan="3"><label for="iName"><?= $this->l11n->lang['Surveys']['Name'] ?><label>
+                <tr><td colspan="3"><label for="iName"><?= $this->l11n->getText('Surveys', 'Name') ?><label>
                 <tr><td colspan="2"><input type="text" id="iName" name="name" required><td>
-                <tr><td><label for="iStart"><?= $this->l11n->lang['Surveys']['Start'] ?><label><td><label for="iEnd"><?= $this->l11n->lang['Surveys']['End'] ?><label><td>
+                <tr><td><label for="iStart"><?= $this->l11n->getText('Surveys']['Start'] ?><label><td><label for="iEnd"><?= $this->l11n->lang['Surveys', 'End') ?><label><td>
                 <tr><td><input type="datetime-local" id="iStart" name="start" required><td><input type="datetime-local" id="iEnd" name="end" required><td>
-                <tr><td colspan="3"><label for="iDesc"><?= $this->l11n->lang['Surveys']['Description'] ?><label>
+                <tr><td colspan="3"><label for="iDesc"><?= $this->l11n->getText('Surveys', 'Description') ?><label>
                 <tr><td colspan="2"><textarea id="iDesc" name="desc"></textarea><td>
-                <tr><td colspan="3"><span class="check"><input type="checkbox" id="iResult" name="result"><label for="iResult"><?= $this->l11n->lang['Surveys']['ResultPublic'] ?><label></span>
-                <tr><td><label for="iResponsibility"><?= $this->l11n->lang['Surveys']['Responsibility'] ?><label><td colspan="2"><label for="iPerm"><?= $this->l11n->lang['Surveys']['UserGroup'] ?><label>
+                <tr><td colspan="3"><span class="check"><input type="checkbox" id="iResult" name="result"><label for="iResult"><?= $this->l11n->getText('Surveys', 'ResultPublic') ?><label></span>
+                <tr><td><label for="iResponsibility"><?= $this->l11n->getText('Surveys']['Responsibility'] ?><label><td colspan="2"><label for="iPerm"><?= $this->l11n->lang['Surveys', 'UserGroup') ?><label>
                 <tr><td><select id="iResponsibility" name="responsibility">
-                        <option value=""><?= $this->l11n->lang['Surveys']['Questionee'] ?>
-                        <option value=""><?= $this->l11n->lang['Surveys']['Manager'] ?>
-                    </select><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iPerm" name="permission"></span><td><button><?= $this->l11n->lang[0]['Add'] ?></button>
-                <tr><td colspan="3"><input type="submit" value="<?= $this->l11n->lang[0]['Create'] ?>">
+                        <option value=""><?= $this->l11n->getText('Surveys', 'Questionee') ?>
+                        <option value=""><?= $this->l11n->getText('Surveys', 'Manager') ?>
+                    </select><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iPerm" name="permission"></span><td><button><?= $this->l11n->getText(0, 'Add') ?></button>
+                <tr><td colspan="3"><input type="submit" value="<?= $this->l11n->getText(0, 'Create') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Surveys']['Section'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Surveys', 'Section') ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td colspan="2"><label for="iSection"><?= $this->l11n->lang['Surveys']['Section'] ?><label>
+                <tr><td colspan="2"><label for="iSection"><?= $this->l11n->getText('Surveys', 'Section') ?><label>
                 <tr><td colspan="2"><input type="text" id="iSection" name="section">
-                <tr><td colspan="2"><label for="iSDesc"><?= $this->l11n->lang['Surveys']['Description'] ?><label>
+                <tr><td colspan="2"><label for="iSDesc"><?= $this->l11n->getText('Surveys', 'Description') ?><label>
                 <tr><td colspan="2"><textarea id="iSDesc" name="sdesc"></textarea>
-                <tr><td colspan="2"><label for="iSType"><?= $this->l11n->lang['Surveys']['Type'] ?><label>
+                <tr><td colspan="2"><label for="iSType"><?= $this->l11n->getText('Surveys', 'Type') ?><label>
                 <tr><td colspan="2"><select id="iSType" name="stype">
                             <option>
                         </select>
-                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
@@ -59,19 +59,19 @@ echo $this->getData('nav')->render(); ?>
 
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Surveys']['Question'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Surveys', 'Question') ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td colspan="2"><label for="iQuestion"><?= $this->l11n->lang['Surveys']['Question'] ?><label>
+                <tr><td colspan="2"><label for="iQuestion"><?= $this->l11n->getText('Surveys', 'Question') ?><label>
                 <tr><td colspan="2"><input type="text" id="iQuestion" name="question">
-                <tr><td colspan="2"><label for="iQDesc"><?= $this->l11n->lang['Surveys']['Description'] ?><label>
+                <tr><td colspan="2"><label for="iQDesc"><?= $this->l11n->getText('Surveys', 'Description') ?><label>
                 <tr><td colspan="2"><textarea id="iQDesc" name="qdesc"></textarea>
-                <tr><td colspan="2"><label for="iQSection"><?= $this->l11n->lang['Surveys']['Section'] ?><label>
+                <tr><td colspan="2"><label for="iQSection"><?= $this->l11n->getText('Surveys', 'Section') ?><label>
                 <tr><td colspan="2"><select id="iQSection" name="iqsection">
                                             <option>
                                     </select>
-                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/surveys-list.tpl.php b/Theme/Backend/surveys-list.tpl.php
index d2687b3..65255b1 100644
--- a/Theme/Backend/surveys-list.tpl.php
+++ b/Theme/Backend/surveys-list.tpl.php
@@ -23,13 +23,13 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Surveys']['Surveys'] ?></caption>
+        <caption><?= $this->l11n->getText('Surveys', 'Surveys') ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang['Surveys']['Status']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Surveys']['Title']; ?>
-            <td><?= $this->l11n->lang['Surveys']['Created']; ?>
-            <td><?= $this->l11n->lang['Surveys']['Creator']; ?>
+            <td><?= $this->l11n->getText('Surveys', 'Status'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Surveys', 'Title'); ?>
+            <td><?= $this->l11n->getText('Surveys', 'Created'); ?>
+            <td><?= $this->l11n->getText('Surveys', 'Creator'); ?>
         <tfoot>
         <tr>
             <td colspan="4"><?= $footerView->render(); ?>
@@ -37,7 +37,7 @@ echo $this->getData('nav')->render(); ?>
         <?php $count = 0; foreach([] as $key => $value) : $count++; ?>
         <?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/surveys-create.tpl.php b/Theme/backend/surveys-create.tpl.php
index 1fae1be..341e829 100644
--- a/Theme/backend/surveys-create.tpl.php
+++ b/Theme/backend/surveys-create.tpl.php
@@ -16,42 +16,42 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Surveys']['Survey'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Surveys', 'Survey') ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td colspan="3"><label for="iName"><?= $this->l11n->lang['Surveys']['Name'] ?><label>
+                <tr><td colspan="3"><label for="iName"><?= $this->l11n->getText('Surveys', 'Name') ?><label>
                 <tr><td colspan="2"><input type="text" id="iName" name="name" required><td>
-                <tr><td><label for="iStart"><?= $this->l11n->lang['Surveys']['Start'] ?><label><td><label for="iEnd"><?= $this->l11n->lang['Surveys']['End'] ?><label><td>
+                <tr><td><label for="iStart"><?= $this->l11n->getText('Surveys']['Start'] ?><label><td><label for="iEnd"><?= $this->l11n->lang['Surveys', 'End') ?><label><td>
                 <tr><td><input type="datetime-local" id="iStart" name="start" required><td><input type="datetime-local" id="iEnd" name="end" required><td>
-                <tr><td colspan="3"><label for="iDesc"><?= $this->l11n->lang['Surveys']['Description'] ?><label>
+                <tr><td colspan="3"><label for="iDesc"><?= $this->l11n->getText('Surveys', 'Description') ?><label>
                 <tr><td colspan="2"><textarea id="iDesc" name="desc"></textarea><td>
-                <tr><td colspan="3"><span class="check"><input type="checkbox" id="iResult" name="result"><label for="iResult"><?= $this->l11n->lang['Surveys']['ResultPublic'] ?><label></span>
-                <tr><td><label for="iResponsibility"><?= $this->l11n->lang['Surveys']['Responsibility'] ?><label><td colspan="2"><label for="iPerm"><?= $this->l11n->lang['Surveys']['UserGroup'] ?><label>
+                <tr><td colspan="3"><span class="check"><input type="checkbox" id="iResult" name="result"><label for="iResult"><?= $this->l11n->getText('Surveys', 'ResultPublic') ?><label></span>
+                <tr><td><label for="iResponsibility"><?= $this->l11n->getText('Surveys']['Responsibility'] ?><label><td colspan="2"><label for="iPerm"><?= $this->l11n->lang['Surveys', 'UserGroup') ?><label>
                 <tr><td><select id="iResponsibility" name="responsibility">
-                        <option value=""><?= $this->l11n->lang['Surveys']['Questionee'] ?>
-                        <option value=""><?= $this->l11n->lang['Surveys']['Manager'] ?>
-                    </select><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iPerm" name="permission"></span><td><button><?= $this->l11n->lang[0]['Add'] ?></button>
-                <tr><td colspan="3"><input type="submit" value="<?= $this->l11n->lang[0]['Create'] ?>">
+                        <option value=""><?= $this->l11n->getText('Surveys', 'Questionee') ?>
+                        <option value=""><?= $this->l11n->getText('Surveys', 'Manager') ?>
+                    </select><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iPerm" name="permission"></span><td><button><?= $this->l11n->getText(0, 'Add') ?></button>
+                <tr><td colspan="3"><input type="submit" value="<?= $this->l11n->getText(0, 'Create') ?>">
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Surveys']['Section'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Surveys', 'Section') ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td colspan="2"><label for="iSection"><?= $this->l11n->lang['Surveys']['Section'] ?><label>
+                <tr><td colspan="2"><label for="iSection"><?= $this->l11n->getText('Surveys', 'Section') ?><label>
                 <tr><td colspan="2"><input type="text" id="iSection" name="section">
-                <tr><td colspan="2"><label for="iSDesc"><?= $this->l11n->lang['Surveys']['Description'] ?><label>
+                <tr><td colspan="2"><label for="iSDesc"><?= $this->l11n->getText('Surveys', 'Description') ?><label>
                 <tr><td colspan="2"><textarea id="iSDesc" name="sdesc"></textarea>
-                <tr><td colspan="2"><label for="iSType"><?= $this->l11n->lang['Surveys']['Type'] ?><label>
+                <tr><td colspan="2"><label for="iSType"><?= $this->l11n->getText('Surveys', 'Type') ?><label>
                 <tr><td colspan="2"><select id="iSType" name="stype">
                             <option>
                         </select>
-                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
@@ -59,19 +59,19 @@ echo $this->getData('nav')->render(); ?>
 
 
 <section class="box w-50 floatLeft">
-    <header><h1><?= $this->l11n->lang['Surveys']['Question'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Surveys', 'Question') ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td colspan="2"><label for="iQuestion"><?= $this->l11n->lang['Surveys']['Question'] ?><label>
+                <tr><td colspan="2"><label for="iQuestion"><?= $this->l11n->getText('Surveys', 'Question') ?><label>
                 <tr><td colspan="2"><input type="text" id="iQuestion" name="question">
-                <tr><td colspan="2"><label for="iQDesc"><?= $this->l11n->lang['Surveys']['Description'] ?><label>
+                <tr><td colspan="2"><label for="iQDesc"><?= $this->l11n->getText('Surveys', 'Description') ?><label>
                 <tr><td colspan="2"><textarea id="iQDesc" name="qdesc"></textarea>
-                <tr><td colspan="2"><label for="iQSection"><?= $this->l11n->lang['Surveys']['Section'] ?><label>
+                <tr><td colspan="2"><label for="iQSection"><?= $this->l11n->getText('Surveys', 'Section') ?><label>
                 <tr><td colspan="2"><select id="iQSection" name="iqsection">
                                             <option>
                                     </select>
-                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/surveys-list.tpl.php b/Theme/backend/surveys-list.tpl.php
index d2687b3..65255b1 100644
--- a/Theme/backend/surveys-list.tpl.php
+++ b/Theme/backend/surveys-list.tpl.php
@@ -23,13 +23,13 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Surveys']['Surveys'] ?></caption>
+        <caption><?= $this->l11n->getText('Surveys', 'Surveys') ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang['Surveys']['Status']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Surveys']['Title']; ?>
-            <td><?= $this->l11n->lang['Surveys']['Created']; ?>
-            <td><?= $this->l11n->lang['Surveys']['Creator']; ?>
+            <td><?= $this->l11n->getText('Surveys', 'Status'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Surveys', 'Title'); ?>
+            <td><?= $this->l11n->getText('Surveys', 'Created'); ?>
+            <td><?= $this->l11n->getText('Surveys', 'Creator'); ?>
         <tfoot>
         <tr>
             <td colspan="4"><?= $footerView->render(); ?>
@@ -37,7 +37,7 @@ echo $this->getData('nav')->render(); ?>
         <?php $count = 0; foreach([] as $key => $value) : $count++; ?>
         <?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>