diff --git a/Theme/backend/checklist-template-create.tpl.php b/Theme/backend/checklist-template-create.tpl.php
index d39c043..3272e6a 100644
--- a/Theme/backend/checklist-template-create.tpl.php
+++ b/Theme/backend/checklist-template-create.tpl.php
@@ -20,44 +20,44 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-33">
-    <header><h1><?= $this->l11n->lang['Checklist']['General']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Checklist', 'General'); ?></h1></header>
     <div class="inner">
         <form id="fChecklist">
             <table class="layout wf-100">
-                <tr><td><label for="iName"><?= $this->l11n->lang['Checklist']['Name']; ?></label><td>
+                <tr><td><label for="iName"><?= $this->l11n->getText('Checklist', 'Name'); ?></label><td>
                 <tr><td><input type="text" id="iName" name="name" required><td>
-                <tr><td><label for="iDescription"><?= $this->l11n->lang['Checklist']['Description']; ?></label><td>
+                <tr><td><label for="iDescription"><?= $this->l11n->getText('Checklist', 'Description'); ?></label><td>
                 <tr><td><textarea id="iDescription" name="description"></textarea><td>
-                <tr><td><label for="iPermission"><?= $this->l11n->lang['Checklist']['Permissions']; ?></label><td>
+                <tr><td><label for="iPermission"><?= $this->l11n->getText('Checklist', 'Permissions'); ?></label><td>
                 <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button>
                             <input type="text" id="iPermission" name="permission"></span>
-                    <td><button><?= $this->l11n->lang[0]['Add']; ?></button>
-                <tr><td><label for="iFiles"><?= $this->l11n->lang['Checklist']['Files']; ?></label><td>
+                    <td><button><?= $this->l11n->getText(0, 'Add'); ?></button>
+                <tr><td><label for="iFiles"><?= $this->l11n->getText('Checklist', 'Files'); ?></label><td>
                 <tr><td><input id="iFiles" name="files" type="file" multiple><td>
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Create']; ?>"><td>
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Create'); ?>"><td>
             </table>
         </form>
     </div>
 </section>
 
 <section class="box w-33">
-    <header><h1><?= $this->l11n->lang['Checklist']['Tasks']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Checklist', 'Tasks'); ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td><label for="iETitle"><?= $this->l11n->lang['Checklist']['Title']; ?></label><td>
+                <tr><td><label for="iETitle"><?= $this->l11n->getText('Checklist', 'Title'); ?></label><td>
                 <tr><td><input type="text" id="iETitle" name="eTitle" required><td>
-                <tr><td><label for="iEDescription"><?= $this->l11n->lang['Checklist']['Description']; ?></label><td>
+                <tr><td><label for="iEDescription"><?= $this->l11n->getText('Checklist', 'Description'); ?></label><td>
                 <tr><td><textarea id="iEDescription" name="eDescription"></textarea><td>
-                <tr><td><label for="iETime"><?= $this->l11n->lang['Checklist']['TimeInMinutes']; ?></label><td>
+                <tr><td><label for="iETime"><?= $this->l11n->getText('Checklist', 'TimeInMinutes'); ?></label><td>
                 <tr><td><input type="number" min="0" step="1" id="iETime" name="eTime" value="0"><td>
-                <tr><td><label for="iEPermission"><?= $this->l11n->lang['Checklist']['Permissions']; ?></label><td>
+                <tr><td><label for="iEPermission"><?= $this->l11n->getText('Checklist', 'Permissions'); ?></label><td>
                 <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button>
                             <input type="text" id="iEPermission" name="ePermission"></span>
-                    <td><button data-action=""><?= $this->l11n->lang[0]['Add']; ?></button>
-                <tr><td><label for="iEFiles"><?= $this->l11n->lang['Checklist']['Files']; ?></label><td>
+                    <td><button data-action=""><?= $this->l11n->getText(0, 'Add'); ?></button>
+                <tr><td><label for="iEFiles"><?= $this->l11n->getText('Checklist', 'Files'); ?></label><td>
                 <tr><td><input id="iEFiles" name="eFiles" type="file" multiple><td>
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Add']; ?>" data-action=""><td>
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add'); ?>" data-action=""><td>
             </table>
         </form>
     </div>
diff --git a/Theme/backend/checklist-template-list.tpl.php b/Theme/backend/checklist-template-list.tpl.php
index 851fe81..a65a0fa 100644
--- a/Theme/backend/checklist-template-list.tpl.php
+++ b/Theme/backend/checklist-template-list.tpl.php
@@ -28,14 +28,14 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Checklist']['Templates']; ?></caption>
+        <caption><?= $this->l11n->getText('Checklist', 'Templates'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td><?= $this->l11n->lang['Checklist']['Status']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Checklist']['Name']; ?>
-            <td><?= $this->l11n->lang['Checklist']['Creator']; ?>
-            <td><?= $this->l11n->lang['Checklist']['Created']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td><?= $this->l11n->getText('Checklist', 'Status'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Checklist', 'Name'); ?>
+            <td><?= $this->l11n->getText('Checklist', 'Creator'); ?>
+            <td><?= $this->l11n->getText('Checklist', 'Created'); ?>
         <tfoot>
         <tr><td colspan="5"><?= $footerView->render(); ?>
         <tbody>
@@ -49,7 +49,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
         <tr>
-            <td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+            <td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>