diff --git a/Theme/Backend/supplier-create.tpl.php b/Theme/Backend/supplier-create.tpl.php
index 8261c4c..2f6835c 100644
--- a/Theme/Backend/supplier-create.tpl.php
+++ b/Theme/Backend/supplier-create.tpl.php
@@ -20,32 +20,32 @@ echo $this->getData('nav')->render(); ?>
 <div class="tabular-2">
     <div class="box">
         <ul class="tab-links">
-            <li><label for="c-tab-1"><?= $this->getText('Master') ?></label></li>
-            <li><label for="c-tab-2"><?= $this->getText('Contact') ?></label></li>
-            <li><label for="c-tab-3"><?= $this->getText('Addresses') ?></label></li>
-            <li><label for="c-tab-4"><?= $this->getText('PaymentTerm') ?></label></li>
-            <li><label for="c-tab-5"><?= $this->getText('Payment') ?></label></li>
-            <li><label for="c-tab-6"><?= $this->getText('Files') ?></label></li>
-            <li><label for="c-tab-7"><?= $this->getText('Logs') ?></label>
+            <li><label for="c-tab-1"><?= $this->getHtml('Master'); ?></label></li>
+            <li><label for="c-tab-2"><?= $this->getHtml('Contact'); ?></label></li>
+            <li><label for="c-tab-3"><?= $this->getHtml('Addresses'); ?></label></li>
+            <li><label for="c-tab-4"><?= $this->getHtml('PaymentTerm'); ?></label></li>
+            <li><label for="c-tab-5"><?= $this->getHtml('Payment'); ?></label></li>
+            <li><label for="c-tab-6"><?= $this->getHtml('Files'); ?></label></li>
+            <li><label for="c-tab-7"><?= $this->getHtml('Logs'); ?></label>
         </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->getText('Supplier') ?></h1></header>
+                <header><h1><?= $this->getHtml('Supplier'); ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout w-100">
-                            <tr><td><label for="iId"><?= $this->getText('ID', 0, 0); ?></label>
+                            <tr><td><label for="iId"><?= $this->getHtml('ID', 0, 0); ?></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->getText('Name1'); ?></label>
+                            <tr><td><label for="iName1"><?= $this->getHtml('Name1') ?></label>
                             <tr><td><input type="text" id="iName1" name="name1" placeholder="&#xf040;" required>
-                            <tr><td><label for="iName2"><?= $this->getText('Name2'); ?></label>
+                            <tr><td><label for="iName2"><?= $this->getHtml('Name2') ?></label>
                             <tr><td><input type="text" id="iName2" name="name2" placeholder="&#xf040;">
-                            <tr><td><label for="iName3"><?= $this->getText('Name3'); ?></label>
+                            <tr><td><label for="iName3"><?= $this->getHtml('Name3') ?></label>
                             <tr><td><input type="text" id="iName3" name="name3" placeholder="&#xf040;">
-                            <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                            <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Create', 0, 0); ?>">
                         </table>
                     </form>
                 </div>
@@ -54,29 +54,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->getText('Contact') ?></h1></header>
+                <header><h1><?= $this->getHtml('Contact'); ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout w-100">
-                            <tr><td><label for="iCType"><?= $this->getText('Type'); ?></label>
+                            <tr><td><label for="iCType"><?= $this->getHtml('Type') ?></label>
                             <tr><td><select id="iCType" name="actype">
-                                        <option><?= $this->getText('Email'); ?>
-                                        <option><?= $this->getText('Fax'); ?>
-                                        <option><?= $this->getText('Phone'); ?>
+                                        <option><?= $this->getHtml('Email') ?>
+                                        <option><?= $this->getHtml('Fax') ?>
+                                        <option><?= $this->getHtml('Phone') ?>
                                     </select>
-                            <tr><td><label for="iCStype"><?= $this->getText('Subtype'); ?></label>
+                            <tr><td><label for="iCStype"><?= $this->getHtml('Subtype') ?></label>
                             <tr><td><select id="iCStype" name="acstype">
-                                        <option><?= $this->getText('Office'); ?>
-                                        <option><?= $this->getText('Sales'); ?>
-                                        <option><?= $this->getText('Purchase'); ?>
-                                        <option><?= $this->getText('Accounting'); ?>
-                                        <option><?= $this->getText('Support'); ?>
+                                        <option><?= $this->getHtml('Office') ?>
+                                        <option><?= $this->getHtml('Sales') ?>
+                                        <option><?= $this->getHtml('Purchase') ?>
+                                        <option><?= $this->getHtml('Accounting') ?>
+                                        <option><?= $this->getHtml('Support') ?>
                                     </select>
-                            <tr><td><label for="iCInfo"><?= $this->getText('Info'); ?></label>
+                            <tr><td><label for="iCInfo"><?= $this->getHtml('Info') ?></label>
                             <tr><td><input type="text" id="iCInfo" name="cinfo">
-                            <tr><td><label for="iCData"><?= $this->getText('Contact'); ?></label>
+                            <tr><td><label for="iCData"><?= $this->getHtml('Contact') ?></label>
                             <tr><td><input type="text" id="iCData" name="cdata">
-                            <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                            <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
                         </table>
                     </form>
                 </div>
@@ -85,26 +85,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->getText('Address') ?></h1></header>
+                <header><h1><?= $this->getHtml('Address'); ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout w-100">
-                            <tr><td><label for="iAType"><?= $this->getText('Type'); ?></label>
+                            <tr><td><label for="iAType"><?= $this->getHtml('Type') ?></label>
                             <tr><td><select id="iAType" name="atype">
-                                        <option><?= $this->getText('Default'); ?>
-                                        <option><?= $this->getText('Delivery'); ?>
-                                        <option><?= $this->getText('Invoice'); ?>
+                                        <option><?= $this->getHtml('Default') ?>
+                                        <option><?= $this->getHtml('Delivery') ?>
+                                        <option><?= $this->getHtml('Invoice') ?>
                                     </select>
-                            <tr><td><label for="iAddress"><?= $this->getText('Address'); ?></label>
+                            <tr><td><label for="iAddress"><?= $this->getHtml('Address') ?></label>
                             <tr><td><input type="text" id="iAddress" name="address">
-                            <tr><td><label for="iZip"><?= $this->getText('Zip'); ?></label>
+                            <tr><td><label for="iZip"><?= $this->getHtml('Zip') ?></label>
                             <tr><td><input type="text" id="iZip" name="zip">
-                            <tr><td><label for="iCountry"><?= $this->getText('Country'); ?></label>
+                            <tr><td><label for="iCountry"><?= $this->getHtml('Country') ?></label>
                             <tr><td><input type="text" id="iCountry" name="country">
-                            <tr><td><label for="iAInfo"><?= $this->getText('Info'); ?></label>
+                            <tr><td><label for="iAInfo"><?= $this->getHtml('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->getText('IsDefault'); ?></label></span>
-                            <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                            <tr><td><span class="check"><input type="checkbox" id="iDefault" name="default" checked><label for="iDefault"><?= $this->getHtml('IsDefault') ?></label></span>
+                            <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
                         </table>
                     </form>
                 </div>
@@ -113,26 +113,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->getText('PaymentTerm') ?></h1></header>
+                <header><h1><?= $this->getHtml('PaymentTerm'); ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout w-100">
-                            <tr><td><label for="iSource"><?= $this->getText('ID') ?></label>
+                            <tr><td><label for="iSource"><?= $this->getHtml('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->getText('Segment') ?></label>
+                            <tr><td><label for="iSegment"><?= $this->getHtml('Segment'); ?></label>
                             <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
-                            <tr><td><label for="iProductgroup"><?= $this->getText('Productgroup') ?></label>
+                            <tr><td><label for="iProductgroup"><?= $this->getHtml('Productgroup'); ?></label>
                             <tr><td><input id="iProductgroup" name="productgroup" type="text" placeholder="">
-                            <tr><td><label for="iGroup"><?= $this->getText('Group') ?></label>
+                            <tr><td><label for="iGroup"><?= $this->getHtml('Group'); ?></label>
                             <tr><td><input id="iGroup" name="group" type="text" placeholder="">
-                            <tr><td><label for="iArticlegroup"><?= $this->getText('Articlegroup') ?></label>
+                            <tr><td><label for="iArticlegroup"><?= $this->getHtml('Articlegroup'); ?></label>
                             <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
-                            <tr><td><label for="iTerm"><?= $this->getText('Type') ?></label>
+                            <tr><td><label for="iTerm"><?= $this->getHtml('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->getText('Freightage') ?></label></span>
-                            <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                            <tr><td><span class="check"><input type="checkbox" id="iFreightage" name="freightage"><label for="iFreightage"><?= $this->getHtml('Freightage'); ?></label></span>
+                            <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
                         </table>
                     </form>
                 </div>
@@ -141,16 +141,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->getText('Payment') ?></h1></header>
+                <header><h1><?= $this->getHtml('Payment'); ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout w-100">
-                            <tr><td><label for="iACType"><?= $this->getText('Type'); ?></label>
+                            <tr><td><label for="iACType"><?= $this->getHtml('Type') ?></label>
                             <tr><td><select id="iACType" name="actype">
-                                        <option><?= $this->getText('Wire'); ?>
-                                        <option><?= $this->getText('Creditcard'); ?>
+                                        <option><?= $this->getHtml('Wire') ?>
+                                        <option><?= $this->getHtml('Creditcard') ?>
                                     </select>
-                            <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                            <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
                         </table>
                     </form>
                 </div>
@@ -169,24 +169,24 @@ echo $this->getData('nav')->render(); ?>
             ?>
             <div class="box w-100">
                 <table class="table red">
-                    <caption><?= $this->getText('Logs') ?></caption>
+                    <caption><?= $this->getHtml('Logs'); ?></caption>
                     <thead>
                     <tr>
                         <td>IP
-                        <td><?= $this->getText('ID', 0, 0); ?>
-                        <td><?= $this->getText('Name'); ?>
-                        <td class="wf-100"><?= $this->getText('Log'); ?>
-                        <td><?= $this->getText('Date'); ?>
+                        <td><?= $this->getHtml('ID', 0, 0); ?>
+                        <td><?= $this->getHtml('Name') ?>
+                        <td class="wf-100"><?= $this->getHtml('Log') ?>
+                        <td><?= $this->getHtml('Date') ?>
                     <tfoot>
                     <tr>
-                        <td colspan="6"><?= $footerView->render(); ?>
+                        <td colspan="6"><?= htmlspecialchars($footerView->render(), ENT_COMPAT, 'utf-8'); ?>
                     <tbody>
                     <tr>
-                        <td><?= $this->request->getOrigin(); ?>
-                        <td><?= $this->request->getAccount(); ?>
-                        <td><?= $this->request->getAccount(); ?>
+                        <td><?= htmlspecialchars($this->request->getOrigin(), ENT_COMPAT, 'utf-8'); ?>
+                        <td><?= htmlspecialchars($this->request->getAccount(), ENT_COMPAT, 'utf-8'); ?>
+                        <td><?= htmlspecialchars($this->request->getAccount(), ENT_COMPAT, 'utf-8'); ?>
                         <td>Creating suppier
-                        <td><?= (new \DateTime('now'))->format('Y-m-d H:i:s') ?>
+                        <td><?= htmlspecialchars((new \DateTime('now'))->format('Y-m-d H:i:s') , ENT_COMPAT, 'utf-8'); ?>
                 </table>
             </div>
         </div>
diff --git a/Theme/Backend/supplier-list.tpl.php b/Theme/Backend/supplier-list.tpl.php
index 0bd8051..a6b2a21 100644
--- a/Theme/Backend/supplier-list.tpl.php
+++ b/Theme/Backend/supplier-list.tpl.php
@@ -24,25 +24,25 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
             <table class="table red">
-                <caption><?= $this->getText('Suppliers') ?></caption>
+                <caption><?= $this->getHtml('Suppliers'); ?></caption>
                 <thead>
                 <tr>
-                    <td><?= $this->getText('ID', 0, 0); ?>
-                    <td><?= $this->getText('Name1'); ?>
-                    <td><?= $this->getText('Name2'); ?>
-                    <td class="wf-100"><?= $this->getText('Name3'); ?>
-                    <td><?= $this->getText('City'); ?>
-                    <td><?= $this->getText('Zip'); ?>
-                    <td><?= $this->getText('Address'); ?>
-                    <td><?= $this->getText('Country'); ?>
+                    <td><?= $this->getHtml('ID', 0, 0); ?>
+                    <td><?= $this->getHtml('Name1') ?>
+                    <td><?= $this->getHtml('Name2') ?>
+                    <td class="wf-100"><?= $this->getHtml('Name3') ?>
+                    <td><?= $this->getHtml('City') ?>
+                    <td><?= $this->getHtml('Zip') ?>
+                    <td><?= $this->getHtml('Address') ?>
+                    <td><?= $this->getHtml('Country') ?>
                 <tfoot>
                 <tr>
-                    <td colspan="8"><?= $footerView->render(); ?>
+                    <td colspan="8"><?= htmlspecialchars($footerView->render(), ENT_COMPAT, 'utf-8'); ?>
                 <tbody>
                 <?php $count = 0; foreach([] as $key => $value) : $count++; ?>
                 <?php endforeach; ?>
                 <?php if($count === 0) : ?>
-                <tr><td colspan="8" class="empty"><?= $this->getText('Empty', 0, 0); ?>
+                <tr><td colspan="8" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
                         <?php endif; ?>
             </table>
         </div>