diff --git a/Theme/backend/invoice-list.tpl.php b/Theme/backend/invoice-list.tpl.php
index c3385f5..427a48a 100644
--- a/Theme/backend/invoice-list.tpl.php
+++ b/Theme/backend/invoice-list.tpl.php
@@ -23,17 +23,17 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Billing']['Invoices'] ?></caption>
+        <caption><?= $this->l11n->getText('Billing', 'Invoices') ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td><?= $this->l11n->lang['Billing']['Type']; ?>
-            <td><?= $this->l11n->lang['Billing']['ClientID']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Billing']['Client']; ?>
-            <td><?= $this->l11n->lang['Billing']['Net']; ?>
-            <td><?= $this->l11n->lang['Billing']['Gross']; ?>
-            <td><?= $this->l11n->lang['Billing']['Created']; ?>
-            <td><?= $this->l11n->lang['Billing']['Due']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td><?= $this->l11n->getText('Billing', 'Type'); ?>
+            <td><?= $this->l11n->getText('Billing', 'ClientID'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Billing', 'Client'); ?>
+            <td><?= $this->l11n->getText('Billing', 'Net'); ?>
+            <td><?= $this->l11n->getText('Billing', 'Gross'); ?>
+            <td><?= $this->l11n->getText('Billing', 'Created'); ?>
+            <td><?= $this->l11n->getText('Billing', 'Due'); ?>
         <tfoot>
         <tr>
             <td colspan="8"><?= $footerView->render(); ?>
@@ -41,7 +41,7 @@ echo $this->getData('nav')->render(); ?>
         <?php $count = 0; foreach([] as $key => $value) : $count++; ?>
         <?php endforeach; ?>
         <?php if($count === 0) : ?>
-        <tr><td colspan="8" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+        <tr><td colspan="8" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/purchase-invoice-list.tpl.php b/Theme/backend/purchase-invoice-list.tpl.php
index 9921d66..7dcbed4 100644
--- a/Theme/backend/purchase-invoice-list.tpl.php
+++ b/Theme/backend/purchase-invoice-list.tpl.php
@@ -23,17 +23,17 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Billing']['Invoices'] ?></caption>
+        <caption><?= $this->l11n->getText('Billing', 'Invoices') ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td><?= $this->l11n->lang['Billing']['Type']; ?>
-            <td><?= $this->l11n->lang['Billing']['SupplierID']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Billing']['Supplier']; ?>
-            <td><?= $this->l11n->lang['Billing']['Net']; ?>
-            <td><?= $this->l11n->lang['Billing']['Gross']; ?>
-            <td><?= $this->l11n->lang['Billing']['Created']; ?>
-            <td><?= $this->l11n->lang['Billing']['Due']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td><?= $this->l11n->getText('Billing', 'Type'); ?>
+            <td><?= $this->l11n->getText('Billing', 'SupplierID'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Billing', 'Supplier'); ?>
+            <td><?= $this->l11n->getText('Billing', 'Net'); ?>
+            <td><?= $this->l11n->getText('Billing', 'Gross'); ?>
+            <td><?= $this->l11n->getText('Billing', 'Created'); ?>
+            <td><?= $this->l11n->getText('Billing', 'Due'); ?>
         <tfoot>
         <tr>
             <td colspan="8"><?= $footerView->render(); ?>
@@ -41,7 +41,7 @@ echo $this->getData('nav')->render(); ?>
         <?php $count = 0; foreach([] as $key => $value) : $count++; ?>
         <?php endforeach; ?>
         <?php if($count === 0) : ?>
-        <tr><td colspan="8" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+        <tr><td colspan="8" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>