diff --git a/Theme/backend/clients-create.tpl.php b/Theme/backend/clients-create.tpl.php
index f893b64..2460911 100644
--- a/Theme/backend/clients-create.tpl.php
+++ b/Theme/backend/clients-create.tpl.php
@@ -21,33 +21,33 @@ echo $this->getData('nav')->render(); ?>
 <div class="tabular-2">
     <div class="box">
         <ul class="tab-links">
-            <li><label for="c-tab-1"><?= $this->l11n->lang['ClientManagement']['Master'] ?></label></li>
-            <li><label for="c-tab-2"><?= $this->l11n->lang['ClientManagement']['Contact'] ?></label></li>
-            <li><label for="c-tab-3"><?= $this->l11n->lang['ClientManagement']['Addresses'] ?></label></li>
-            <li><label for="c-tab-4"><?= $this->l11n->lang['ClientManagement']['PaymentTerm'] ?></label></li>
-            <li><label for="c-tab-5"><?= $this->l11n->lang['ClientManagement']['Payment'] ?></label></li>
-            <li><label for="c-tab-6"><?= $this->l11n->lang['ClientManagement']['Prices'] ?></label></li>
-            <li><label for="c-tab-7"><?= $this->l11n->lang['ClientManagement']['AreaManager'] ?></label></li>
-            <li><label for="c-tab-8"><?= $this->l11n->lang['ClientManagement']['Files'] ?></label></li>
+            <li><label for="c-tab-1"><?= $this->l11n->getText('ClientManagement', 'Master') ?></label></li>
+            <li><label for="c-tab-2"><?= $this->l11n->getText('ClientManagement', 'Contact') ?></label></li>
+            <li><label for="c-tab-3"><?= $this->l11n->getText('ClientManagement', 'Addresses') ?></label></li>
+            <li><label for="c-tab-4"><?= $this->l11n->getText('ClientManagement', 'PaymentTerm') ?></label></li>
+            <li><label for="c-tab-5"><?= $this->l11n->getText('ClientManagement', 'Payment') ?></label></li>
+            <li><label for="c-tab-6"><?= $this->l11n->getText('ClientManagement', 'Prices') ?></label></li>
+            <li><label for="c-tab-7"><?= $this->l11n->getText('ClientManagement', 'AreaManager') ?></label></li>
+            <li><label for="c-tab-8"><?= $this->l11n->getText('ClientManagement', 'Files') ?></label></li>
         </ul>
     </div>
     <div class="tab-content">
         <input type="radio" id="c-tab-1" name="tabular-2" checked>
         <div class="tab">
             <section class="box w-33 floatLeft">
-                <header><h1><?= $this->l11n->lang['ClientManagement']['Client'] ?></h1></header>
+                <header><h1><?= $this->l11n->getText('ClientManagement', 'Client') ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout w-100">
-                            <tr><td><label for="iId"><?= $this->l11n->lang[0]['ID']; ?></label>
+                            <tr><td><label for="iId"><?= $this->l11n->getText(0, 'ID'); ?></label>
                             <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" id="iId" min="1" name="id" required></span>
-                            <tr><td><label for="iName1"><?= $this->l11n->lang['ClientManagement']['Name1']; ?></label>
+                            <tr><td><label for="iName1"><?= $this->l11n->getText('ClientManagement', 'Name1'); ?></label>
                             <tr><td><input type="text" id="iName1" name="name1" placeholder="&#xf040;" required>
-                            <tr><td><label for="iName2"><?= $this->l11n->lang['ClientManagement']['Name2']; ?></label>
+                            <tr><td><label for="iName2"><?= $this->l11n->getText('ClientManagement', 'Name2'); ?></label>
                             <tr><td><input type="text" id="iName2" name="name2" placeholder="&#xf040;">
-                            <tr><td><label for="iName3"><?= $this->l11n->lang['ClientManagement']['Name3']; ?></label>
+                            <tr><td><label for="iName3"><?= $this->l11n->getText('ClientManagement', 'Name3'); ?></label>
                             <tr><td><input type="text" id="iName3" name="name3" placeholder="&#xf040;">
-                            <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->lang[0]['Create'] ?>">
+                            <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->getText(0, 'Create') ?>">
                         </table>
                     </form>
                 </div>
@@ -56,29 +56,29 @@ echo $this->getData('nav')->render(); ?>
         <input type="radio" id="c-tab-2" name="tabular-2">
         <div class="tab">
             <section class="box w-33 floatLeft">
-                <header><h1><?= $this->l11n->lang['ClientManagement']['Contact'] ?></h1></header>
+                <header><h1><?= $this->l11n->getText('ClientManagement', 'Contact') ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout w-100">
-                            <tr><td><label for="iCType"><?= $this->l11n->lang['ClientManagement']['Type']; ?></label>
+                            <tr><td><label for="iCType"><?= $this->l11n->getText('ClientManagement', 'Type'); ?></label>
                             <tr><td><select id="iCType" name="actype">
-                                        <option><?= $this->l11n->lang['ClientManagement']['Email']; ?>
-                                        <option><?= $this->l11n->lang['ClientManagement']['Fax']; ?>
-                                        <option><?= $this->l11n->lang['ClientManagement']['Phone']; ?>
+                                        <option><?= $this->l11n->getText('ClientManagement', 'Email'); ?>
+                                        <option><?= $this->l11n->getText('ClientManagement', 'Fax'); ?>
+                                        <option><?= $this->l11n->getText('ClientManagement', 'Phone'); ?>
                                     </select>
-                            <tr><td><label for="iCStype"><?= $this->l11n->lang['ClientManagement']['Subtype']; ?></label>
+                            <tr><td><label for="iCStype"><?= $this->l11n->getText('ClientManagement', 'Subtype'); ?></label>
                             <tr><td><select id="iCStype" name="acstype">
-                                        <option><?= $this->l11n->lang['ClientManagement']['Office']; ?>
-                                        <option><?= $this->l11n->lang['ClientManagement']['Sales']; ?>
-                                        <option><?= $this->l11n->lang['ClientManagement']['Purchase']; ?>
-                                        <option><?= $this->l11n->lang['ClientManagement']['Accounting']; ?>
-                                        <option><?= $this->l11n->lang['ClientManagement']['Support']; ?>
+                                        <option><?= $this->l11n->getText('ClientManagement', 'Office'); ?>
+                                        <option><?= $this->l11n->getText('ClientManagement', 'Sales'); ?>
+                                        <option><?= $this->l11n->getText('ClientManagement', 'Purchase'); ?>
+                                        <option><?= $this->l11n->getText('ClientManagement', 'Accounting'); ?>
+                                        <option><?= $this->l11n->getText('ClientManagement', 'Support'); ?>
                                     </select>
-                            <tr><td><label for="iCInfo"><?= $this->l11n->lang['ClientManagement']['Info']; ?></label>
+                            <tr><td><label for="iCInfo"><?= $this->l11n->getText('ClientManagement', 'Info'); ?></label>
                             <tr><td><input type="text" id="iCInfo" name="cinfo">
-                            <tr><td><label for="iCData"><?= $this->l11n->lang['ClientManagement']['Contact']; ?></label>
+                            <tr><td><label for="iCData"><?= $this->l11n->getText('ClientManagement', 'Contact'); ?></label>
                             <tr><td><input type="text" id="iCData" name="cdata">
-                            <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>
@@ -87,26 +87,26 @@ echo $this->getData('nav')->render(); ?>
         <input type="radio" id="c-tab-3" name="tabular-2">
         <div class="tab">
             <section class="box w-33 floatLeft">
-                <header><h1><?= $this->l11n->lang['ClientManagement']['Address'] ?></h1></header>
+                <header><h1><?= $this->l11n->getText('ClientManagement', 'Address') ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout w-100">
-                            <tr><td><label for="iAType"><?= $this->l11n->lang['ClientManagement']['Type']; ?></label>
+                            <tr><td><label for="iAType"><?= $this->l11n->getText('ClientManagement', 'Type'); ?></label>
                             <tr><td><select id="iAType" name="atype">
-                                        <option><?= $this->l11n->lang['ClientManagement']['Default']; ?>
-                                        <option><?= $this->l11n->lang['ClientManagement']['Delivery']; ?>
-                                        <option><?= $this->l11n->lang['ClientManagement']['Invoice']; ?>
+                                        <option><?= $this->l11n->getText('ClientManagement', 'Default'); ?>
+                                        <option><?= $this->l11n->getText('ClientManagement', 'Delivery'); ?>
+                                        <option><?= $this->l11n->getText('ClientManagement', 'Invoice'); ?>
                                     </select>
-                            <tr><td><label for="iAddress"><?= $this->l11n->lang['ClientManagement']['Address']; ?></label>
+                            <tr><td><label for="iAddress"><?= $this->l11n->getText('ClientManagement', 'Address'); ?></label>
                             <tr><td><input type="text" id="iAddress" name="address">
-                            <tr><td><label for="iZip"><?= $this->l11n->lang['ClientManagement']['Zip']; ?></label>
+                            <tr><td><label for="iZip"><?= $this->l11n->getText('ClientManagement', 'Zip'); ?></label>
                             <tr><td><input type="text" id="iZip" name="zip">
-                            <tr><td><label for="iCountry"><?= $this->l11n->lang['ClientManagement']['Country']; ?></label>
+                            <tr><td><label for="iCountry"><?= $this->l11n->getText('ClientManagement', 'Country'); ?></label>
                             <tr><td><input type="text" id="iCountry" name="country">
-                            <tr><td><label for="iAInfo"><?= $this->l11n->lang['ClientManagement']['Info']; ?></label>
+                            <tr><td><label for="iAInfo"><?= $this->l11n->getText('ClientManagement', 'Info'); ?></label>
                             <tr><td><input type="text" id="iAInfo" name="ainfo">
-                            <tr><td><span class="check"><input type="checkbox" id="iDefault" name="default" checked><label for="iDefault"><?= $this->l11n->lang['ClientManagement']['IsDefault']; ?></label></span>
-                            <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                            <tr><td><span class="check"><input type="checkbox" id="iDefault" name="default" checked><label for="iDefault"><?= $this->l11n->getText('ClientManagement', 'IsDefault'); ?></label></span>
+                            <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
                         </table>
                     </form>
                 </div>
@@ -115,26 +115,26 @@ echo $this->getData('nav')->render(); ?>
         <input type="radio" id="c-tab-4" name="tabular-2">
         <div class="tab">
             <section class="box w-33 floatLeft">
-                <header><h1><?= $this->l11n->lang['ClientManagement']['PaymentTerm'] ?></h1></header>
+                <header><h1><?= $this->l11n->getText('ClientManagement', 'PaymentTerm') ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout w-100">
-                            <tr><td><label for="iSource"><?= $this->l11n->lang[0]['ID'] ?></label>
+                            <tr><td><label for="iSource"><?= $this->l11n->getText(0, 'ID') ?></label>
                             <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
-                            <tr><td><label for="iSegment"><?= $this->l11n->lang['ClientManagement']['Segment'] ?></label>
+                            <tr><td><label for="iSegment"><?= $this->l11n->getText('ClientManagement', 'Segment') ?></label>
                             <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
-                            <tr><td><label for="iProductgroup"><?= $this->l11n->lang['ClientManagement']['Productgroup'] ?></label>
+                            <tr><td><label for="iProductgroup"><?= $this->l11n->getText('ClientManagement', 'Productgroup') ?></label>
                             <tr><td><input id="iProductgroup" name="productgroup" type="text" placeholder="">
-                            <tr><td><label for="iGroup"><?= $this->l11n->lang['ClientManagement']['Group'] ?></label>
+                            <tr><td><label for="iGroup"><?= $this->l11n->getText('ClientManagement', 'Group') ?></label>
                             <tr><td><input id="iGroup" name="group" type="text" placeholder="">
-                            <tr><td><label for="iArticlegroup"><?= $this->l11n->lang['ClientManagement']['Articlegroup'] ?></label>
+                            <tr><td><label for="iArticlegroup"><?= $this->l11n->getText('ClientManagement', 'Articlegroup') ?></label>
                             <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
-                            <tr><td><label for="iTerm"><?= $this->l11n->lang['ClientManagement']['Type'] ?></label>
+                            <tr><td><label for="iTerm"><?= $this->l11n->getText('ClientManagement', 'Type') ?></label>
                             <tr><td><select id="iTerm" name="term" required>
                                         <option>
                                     </select>
-                            <tr><td><span class="check"><input type="checkbox" id="iFreightage" name="freightage"><label for="iFreightage"><?= $this->l11n->lang['ClientManagement']['Freightage'] ?></label></span>
-                            <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                            <tr><td><span class="check"><input type="checkbox" id="iFreightage" name="freightage"><label for="iFreightage"><?= $this->l11n->getText('ClientManagement', 'Freightage') ?></label></span>
+                            <tr><td colspan="2"><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
                         </table>
                     </form>
                 </div>
@@ -143,16 +143,16 @@ echo $this->getData('nav')->render(); ?>
         <input type="radio" id="c-tab-5" name="tabular-2">
         <div class="tab">
             <section class="box w-33 floatLeft">
-                <header><h1><?= $this->l11n->lang['ClientManagement']['Payment'] ?></h1></header>
+                <header><h1><?= $this->l11n->getText('ClientManagement', 'Payment') ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout w-100">
-                            <tr><td><label for="iACType"><?= $this->l11n->lang['ClientManagement']['Type']; ?></label>
+                            <tr><td><label for="iACType"><?= $this->l11n->getText('ClientManagement', 'Type'); ?></label>
                             <tr><td><select id="iACType" name="actype">
-                                        <option><?= $this->l11n->lang['ClientManagement']['Wire']; ?>
-                                        <option><?= $this->l11n->lang['ClientManagement']['Creditcard']; ?>
+                                        <option><?= $this->l11n->getText('ClientManagement', 'Wire'); ?>
+                                        <option><?= $this->l11n->getText('ClientManagement', 'Creditcard'); ?>
                                     </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>
@@ -161,36 +161,36 @@ echo $this->getData('nav')->render(); ?>
         <input type="radio" id="c-tab-6" name="tabular-2">
         <div class="tab">
             <section class="box w-33 floatLeft">
-                <header><h1><?= $this->l11n->lang['ClientManagement']['Price'] ?></h1></header>
+                <header><h1><?= $this->l11n->getText('ClientManagement', 'Price') ?></h1></header>
                 <div class="inner">
                     <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
-                            <tr><td colspan="2"><label for="iPType"><?= $this->l11n->lang['ClientManagement']['Type'] ?></label>
+                            <tr><td colspan="2"><label for="iPType"><?= $this->l11n->getText('ClientManagement', 'Type') ?></label>
                             <tr><td><select id="iPType" name="ptye">
                                         <option>
                                     </select><td>
-                            <tr><td><label for="iSource"><?= $this->l11n->lang[0]['ID'] ?></label>
+                            <tr><td><label for="iSource"><?= $this->l11n->getText(0, 'ID') ?></label>
                             <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
-                            <tr><td><label for="iSegment"><?= $this->l11n->lang['ClientManagement']['Segment'] ?></label>
+                            <tr><td><label for="iSegment"><?= $this->l11n->getText('ClientManagement', 'Segment') ?></label>
                             <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
-                            <tr><td><label for="iProductgroup"><?= $this->l11n->lang['ClientManagement']['Productgroup'] ?></label>
+                            <tr><td><label for="iProductgroup"><?= $this->l11n->getText('ClientManagement', 'Productgroup') ?></label>
                             <tr><td><input id="iProductgroup" name="productgroup" type="text" placeholder="">
-                            <tr><td><label for="iGroup"><?= $this->l11n->lang['ClientManagement']['Group'] ?></label>
+                            <tr><td><label for="iGroup"><?= $this->l11n->getText('ClientManagement', 'Group') ?></label>
                             <tr><td><input id="iGroup" name="group" type="text" placeholder="">
-                            <tr><td><label for="iArticlegroup"><?= $this->l11n->lang['ClientManagement']['Articlegroup'] ?></label>
+                            <tr><td><label for="iArticlegroup"><?= $this->l11n->getText('ClientManagement', 'Articlegroup') ?></label>
                             <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
-                            <tr><td><label for="iPQuantity"><?= $this->l11n->lang['ClientManagement']['Quantity'] ?></label>
+                            <tr><td><label for="iPQuantity"><?= $this->l11n->getText('ClientManagement', 'Quantity') ?></label>
                             <tr><td><input id="iPQuantity" name="quantity" type="text" placeholder=""><td>
-                            <tr><td><label for="iPrice"><?= $this->l11n->lang['ClientManagement']['Price'] ?></label>
+                            <tr><td><label for="iPrice"><?= $this->l11n->getText('ClientManagement', 'Price') ?></label>
                             <tr><td><input id="iPrice" name="price" type="number" step="any" min="0" placeholder=""><td>
-                            <tr><td><label for="iDiscount"><?= $this->l11n->lang['ClientManagement']['Discount'] ?></label>
+                            <tr><td><label for="iDiscount"><?= $this->l11n->getText('ClientManagement', 'Discount') ?></label>
                             <tr><td><input id="iDiscount" name="discount" type="number" step="any" min="0" placeholder=""><td>
-                            <tr><td><label for="iDiscount"><?= $this->l11n->lang['ClientManagement']['DiscountP'] ?></label>
+                            <tr><td><label for="iDiscount"><?= $this->l11n->getText('ClientManagement', 'DiscountP') ?></label>
                             <tr><td><input id="iDiscountP" name="discountp" type="number" step="any" min="0" placeholder=""><td>
-                            <tr><td><label for="iBonus"><?= $this->l11n->lang['ClientManagement']['Bonus'] ?></label>
+                            <tr><td><label for="iBonus"><?= $this->l11n->getText('ClientManagement', 'Bonus') ?></label>
                             <tr><td><input id="iBonus" name="bonus" type="number" step="any" min="0" placeholder=""><td>
-                            <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                            <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
                         </table>
                     </form>
                 </div>
@@ -199,24 +199,24 @@ echo $this->getData('nav')->render(); ?>
         <input type="radio" id="c-tab-7" name="tabular-2">
         <div class="tab">
             <section class="box w-33 floatLeft">
-                <header><h1><?= $this->l11n->lang['ClientManagement']['AreaManager'] ?></h1></header>
+                <header><h1><?= $this->l11n->getText('ClientManagement', 'AreaManager') ?></h1></header>
                 <div class="inner">
                     <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
-                            <tr><td><label for="iManager"><?= $this->l11n->lang['ClientManagement']['AreaManager'] ?></label>
+                            <tr><td><label for="iManager"><?= $this->l11n->getText('ClientManagement', 'AreaManager') ?></label>
                             <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iManager" name="source" type="text" placeholder=""></span>
-                            <tr><td><label for="iSource"><?= $this->l11n->lang[0]['ID'] ?></label>
+                            <tr><td><label for="iSource"><?= $this->l11n->getText(0, 'ID') ?></label>
                             <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
-                            <tr><td><label for="iSegment"><?= $this->l11n->lang['ClientManagement']['Segment'] ?></label>
+                            <tr><td><label for="iSegment"><?= $this->l11n->getText('ClientManagement', 'Segment') ?></label>
                             <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
-                            <tr><td><label for="iProductgroup"><?= $this->l11n->lang['ClientManagement']['Productgroup'] ?></label>
+                            <tr><td><label for="iProductgroup"><?= $this->l11n->getText('ClientManagement', 'Productgroup') ?></label>
                             <tr><td><input id="iProductgroup" name="productgroup" type="text" placeholder="">
-                            <tr><td><label for="iGroup"><?= $this->l11n->lang['ClientManagement']['Group'] ?></label>
+                            <tr><td><label for="iGroup"><?= $this->l11n->getText('ClientManagement', 'Group') ?></label>
                             <tr><td><input id="iGroup" name="group" type="text" placeholder="">
-                            <tr><td><label for="iArticlegroup"><?= $this->l11n->lang['ClientManagement']['Articlegroup'] ?></label>
+                            <tr><td><label for="iArticlegroup"><?= $this->l11n->getText('ClientManagement', 'Articlegroup') ?></label>
                             <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
-                            <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Add'] ?>">
+                            <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Add') ?>">
                         </table>
                     </form>
                 </div>
diff --git a/Theme/backend/clients-list.tpl.php b/Theme/backend/clients-list.tpl.php
index 9961a9f..75752b6 100644
--- a/Theme/backend/clients-list.tpl.php
+++ b/Theme/backend/clients-list.tpl.php
@@ -23,35 +23,35 @@ echo $this->getData('nav')->render(); ?>
 
 <!-- Hover may be better here?!?!?!
 <section class="box w-100">
-    <header><h1><?= $this->l11n->lang['ClientManagement']['Client'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('ClientManagement', 'Client') ?></h1></header>
     <div class="inner floatLeft wf-100">
         <form class="wf-33 floatLeft">
             <table class="layout w-100">
-                <tr><td><label for="iName1"><?= $this->l11n->lang['ClientManagement']['Name1']; ?></label>
+                <tr><td><label for="iName1"><?= $this->l11n->getText('ClientManagement', 'Name1'); ?></label>
                 <tr><td><input type="text" id="iName1" disabled>
-                <tr><td><label for="iName2"><?= $this->l11n->lang['ClientManagement']['Name2']; ?></label>
+                <tr><td><label for="iName2"><?= $this->l11n->getText('ClientManagement', 'Name2'); ?></label>
                 <tr><td><input type="text" id="iName2" disabled>
-                <tr><td><label for="iName3"><?= $this->l11n->lang['ClientManagement']['Name3']; ?></label>
+                <tr><td><label for="iName3"><?= $this->l11n->getText('ClientManagement', 'Name3'); ?></label>
                 <tr><td><input type="text" id="iName3" disabled>
             </table>
         </form>
         <form class="wf-33 floatLeft">
             <table class="layout w-100">
-                <tr><td><label for="iAddress"><?= $this->l11n->lang['ClientManagement']['Address']; ?></label>
+                <tr><td><label for="iAddress"><?= $this->l11n->getText('ClientManagement', 'Address'); ?></label>
                 <tr><td><input type="text" id="iAddress" disabled>
-                <tr><td><label for="iZip"><?= $this->l11n->lang['ClientManagement']['Zip']; ?></label>
+                <tr><td><label for="iZip"><?= $this->l11n->getText('ClientManagement', 'Zip'); ?></label>
                 <tr><td><input type="text" id="iZip" disabled>
-                <tr><td><label for="iCountry"><?= $this->l11n->lang['ClientManagement']['Country']; ?></label>
+                <tr><td><label for="iCountry"><?= $this->l11n->getText('ClientManagement', 'Country'); ?></label>
                 <tr><td><input type="text" id="iCountry" disabled>
             </table>
         </form>
         <form class="wf-33 floatLeft">
             <table class="layout w-100">
-                <tr><td><label for="iPhone"><?= $this->l11n->lang['ClientManagement']['Phone']; ?></label>
+                <tr><td><label for="iPhone"><?= $this->l11n->getText('ClientManagement', 'Phone'); ?></label>
                 <tr><td><input type="text" id="iPhone" disabled>
-                <tr><td><label for="iFax"><?= $this->l11n->lang['ClientManagement']['Fax']; ?></label>
+                <tr><td><label for="iFax"><?= $this->l11n->getText('ClientManagement', 'Fax'); ?></label>
                 <tr><td><input type="text" id="iFax" disabled>
-                <tr><td><label for="iEmail"><?= $this->l11n->lang['ClientManagement']['Email']; ?></label>
+                <tr><td><label for="iEmail"><?= $this->l11n->getText('ClientManagement', 'Email'); ?></label>
                 <tr><td><input type="text" id="iEmail" disabled>
             </table>
         </form>
@@ -61,17 +61,17 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['ClientManagement']['Clients'] ?></caption>
+        <caption><?= $this->l11n->getText('ClientManagement', 'Clients') ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td><?= $this->l11n->lang['ClientManagement']['Name1']; ?>
-            <td><?= $this->l11n->lang['ClientManagement']['Name2']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['ClientManagement']['Name3']; ?>
-            <td><?= $this->l11n->lang['ClientManagement']['City']; ?>
-            <td><?= $this->l11n->lang['ClientManagement']['Zip']; ?>
-            <td><?= $this->l11n->lang['ClientManagement']['Address']; ?>
-            <td><?= $this->l11n->lang['ClientManagement']['Country']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td><?= $this->l11n->getText('ClientManagement', 'Name1'); ?>
+            <td><?= $this->l11n->getText('ClientManagement', 'Name2'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('ClientManagement', 'Name3'); ?>
+            <td><?= $this->l11n->getText('ClientManagement', 'City'); ?>
+            <td><?= $this->l11n->getText('ClientManagement', 'Zip'); ?>
+            <td><?= $this->l11n->getText('ClientManagement', 'Address'); ?>
+            <td><?= $this->l11n->getText('ClientManagement', 'Country'); ?>
         <tfoot>
         <tr>
             <td colspan="8"><?= $footerView->render(); ?>
@@ -79,7 +79,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>