diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php
index 9a4c1b3..a9bec9a 100644
--- a/Theme/Backend/accounts-create.tpl.php
+++ b/Theme/Backend/accounts-create.tpl.php
@@ -17,36 +17,36 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Account') ?></h1></header>
+            <header><h1><?= $this->getHtml('Account'); ?></h1></header>
             <div class="inner">
                 <form id="fAccount" action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/account'); ?>" method="put">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td><label for="iType"><?= $this->getText('Type') ?></label>
+                        <tr><td><label for="iType"><?= $this->getHtml('Type'); ?></label>
                         <tr><td><select id="iType" name="type">
-                                    <option value="<?= \phpOMS\Account\AccountType::USER; ?>"><?= $this->getText('Person') ?>
-                                    <option value="<?= \phpOMS\Account\AccountType::GROUP; ?>"><?= $this->getText('Organization') ?>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountType::USER, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Person'); ?>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountType::GROUP, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Organization'); ?>
                                 </select>
-                        <tr><td><label for="iStatus"><?= $this->getText('Status') ?></label>
+                        <tr><td><label for="iStatus"><?= $this->getHtml('Status'); ?></label>
                         <tr><td><select id="iStatus" name="status">
-                                    <option value="<?= \phpOMS\Account\AccountStatus::ACTIVE; ?>"><?= $this->getText('Active') ?>
-                                    <option value="<?= \phpOMS\Account\AccountStatus::INACTIVE; ?>"><?= $this->getText('Inactive') ?>
-                                    <option value="<?= \phpOMS\Account\AccountStatus::TIMEOUT; ?>"><?= $this->getText('Timeout') ?>
-                                    <option value="<?= \phpOMS\Account\AccountStatus::BANNED; ?>"><?= $this->getText('Banned') ?>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::ACTIVE, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Active'); ?>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::INACTIVE, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Inactive'); ?>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::TIMEOUT, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Timeout'); ?>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::BANNED, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Banned'); ?>
                                 </select>
-                        <tr><td><label for="iUsername"><?= $this->getText('Username') ?></label>
+                        <tr><td><label for="iUsername"><?= $this->getHtml('Username'); ?></label>
                         <tr><td><input id="iUsername" name="name" type="text" placeholder="&#xf007; Fred">
-                        <tr><td><label for="iName1"><?= $this->getText('Name1') ?></label>
+                        <tr><td><label for="iName1"><?= $this->getHtml('Name1'); ?></label>
                         <tr><td><input id="iName1" name="name1" type="text" placeholder="&#xf007; Donald" required>
-                        <tr><td><label for="iName2"><?= $this->getText('Name2') ?></label>
+                        <tr><td><label for="iName2"><?= $this->getHtml('Name2'); ?></label>
                         <tr><td><input id="iName2" name="name2" type="text" placeholder="&#xf007; Fauntleroy">
-                        <tr><td><label for="iName3"><?= $this->getText('Name3') ?></label>
+                        <tr><td><label for="iName3"><?= $this->getHtml('Name3'); ?></label>
                         <tr><td><input id="iName3" name="name3" type="text" placeholder="&#xf007; Duck">
-                        <tr><td><label for="iEmail"><?= $this->getText('Email') ?></label>
+                        <tr><td><label for="iEmail"><?= $this->getHtml('Email'); ?></label>
                         <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com">
-                        <tr><td><label for="iPassword"><?= $this->getText('Name3') ?></label>
+                        <tr><td><label for="iPassword"><?= $this->getHtml('Name3'); ?></label>
                         <tr><td><input id="iPassword" name="password" type="password" placeholder="&#xf023; Pa55ssw0rd?">
-                        <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Create', 0, 0); ?>">
                     </table>
                 </form>
             </div>
@@ -55,14 +55,14 @@ echo $this->getData('nav')->render(); ?>
 
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Groups') ?></h1></header>
+            <header><h1><?= $this->getHtml('Groups'); ?></h1></header>
             <div class="inner">
                 <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="post">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td><label for="iGroup"><?= $this->getText('Name') ?></label>
+                        <tr><td><label for="iGroup"><?= $this->getHtml('Name'); ?></label>
                         <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iGroup" name="group" type="text" placeholder="&#xf0c0; Guest" required></span>
-                        <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
                     </table>
                 </form>
             </div>
@@ -71,14 +71,14 @@ echo $this->getData('nav')->render(); ?>
 
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Permissions') ?></h1></header>
+            <header><h1><?= $this->getHtml('Permissions'); ?></h1></header>
             <div class="inner">
                 <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="post">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td><label for="iGroup"><?= $this->getText('Name') ?></label>
+                        <tr><td><label for="iGroup"><?= $this->getHtml('Name'); ?></label>
                         <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iGroup" name="group" type="text" placeholder="&#xf084; news_create" required></span>
-                        <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
                     </table>
                 </form>
             </div>
diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index 3c21d93..a8fa672 100644
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-list.tpl.php
@@ -31,28 +31,28 @@ echo $this->getData('nav')->render();
     <div class="col-xs-12">
         <div class="box wf-100">
             <table class="table red">
-                <caption><?= $this->getText('Groups'); ?></caption>
+                <caption><?= $this->getHtml('Groups') ?></caption>
                 <thead>
                 <tr>
-                    <td><?= $this->getText('ID', 0, 0); ?>
-                    <td><?= $this->getText('Status'); ?>
-                    <td class="wf-100"><?= $this->getText('Name'); ?>
-                    <td><?= $this->getText('Activity'); ?>
-                    <td><?= $this->getText('Created'); ?>
+                    <td><?= $this->getHtml('ID', 0, 0); ?>
+                    <td><?= $this->getHtml('Status') ?>
+                    <td class="wf-100"><?= $this->getHtml('Name') ?>
+                    <td><?= $this->getHtml('Activity') ?>
+                    <td><?= $this->getHtml('Created') ?>
                         <tfoot>
-                <tr><td colspan="5"><?= $footerView->render(); ?>
+                <tr><td colspan="5"><?= htmlspecialchars($footerView->render(), ENT_COMPAT, 'utf-8'); ?>
                         <tbody>
                         <?php $c = 0; foreach ($this->getData('list:elements') as $key => $value) : $c++;
                         $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/admin/account/settings?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
-                    <td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
-                    <td><a href="<?= $url; ?>"><?= $value->getStatus(); ?></a>
-                    <td><a href="<?= $url; ?>"><?= $value->getName1(); ?></a>
-                    <td><a href="<?= $url; ?>"><?= $value->getLastActive()->format('Y-m-d H:i:s'); ?></a>
-                    <td><a href="<?= $url; ?>"><?= $value->getCreatedAt()->format('Y-m-d H:i:s'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getId(), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getStatus(), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getName1(), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getLastActive()->format('Y-m-d H:i:s'), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getCreatedAt()->format('Y-m-d H:i:s'), ENT_COMPAT, 'utf-8'); ?></a>
                         <?php endforeach; ?>
                         <?php if($c === 0) : ?>
-                        <tr><td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
+                        <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
                                 <?php endif; ?>
             </table>
         </div>
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php
index 1b2d32d..9453f51 100644
--- a/Theme/Backend/accounts-single.tpl.php
+++ b/Theme/Backend/accounts-single.tpl.php
@@ -22,38 +22,38 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Account') ?></h1></header>
+            <header><h1><?= $this->getHtml('Account'); ?></h1></header>
             <div class="inner">
                 <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/account'); ?>" method="post">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td><label for="iId"><?= $this->getText('ID', 0, 0) ?></label>
-                        <tr><td><input id="iId" name="id" type="text" value="<?= $account->getId(); ?>" disabled>
-                        <tr><td><label for="iType"><?= $this->getText('Type') ?></label>
+                        <tr><td><label for="iId"><?= $this->getHtml('ID', 0, 0); ?></label>
+                        <tr><td><input id="iId" name="id" type="text" value="<?= htmlspecialchars($account->getId(), ENT_COMPAT, 'utf-8'); ?>" disabled>
+                        <tr><td><label for="iType"><?= $this->getHtml('Type'); ?></label>
                         <tr><td><select id="iType" name="type">
-                                    <option value="<?= \phpOMS\Account\AccountType::USER; ?>"<?= $account->getType() === \phpOMS\Account\AccountType::USER ? ' selected' : ''; ?>><?= $this->getText('Person') ?>
-                                    <option value="<?= \phpOMS\Account\AccountType::GROUP; ?>"<?= $account->getType() === \phpOMS\Account\AccountType::GROUP ? ' selected' : ''; ?>><?= $this->getText('Organization') ?>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountType::USER, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($account->getType() === \phpOMS\Account\AccountType::USER ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= $this->getHtml('Person'); ?>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountType::GROUP, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($account->getType() === \phpOMS\Account\AccountType::GROUP ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= $this->getHtml('Organization'); ?>
                                 </select>
-                        <tr><td><label for="iStatus"><?= $this->getText('Status') ?></label>
+                        <tr><td><label for="iStatus"><?= $this->getHtml('Status'); ?></label>
                         <tr><td><select id="iStatus" name="status">
-                                    <option value="<?= \phpOMS\Account\AccountStatus::ACTIVE; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::ACTIVE ? ' selected' : ''; ?>><?= $this->getText('Active') ?>
-                                    <option value="<?= \phpOMS\Account\AccountStatus::INACTIVE; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::INACTIVE ? ' selected' : ''; ?>><?= $this->getText('Inactive') ?>
-                                    <option value="<?= \phpOMS\Account\AccountStatus::TIMEOUT; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::TIMEOUT ? ' selected' : ''; ?>><?= $this->getText('Timeout') ?>
-                                    <option value="<?= \phpOMS\Account\AccountStatus::BANNED; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::BANNED ? ' selected' : ''; ?>><?= $this->getText('Banned') ?>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::ACTIVE, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($account->getStatus() === \phpOMS\Account\AccountStatus::ACTIVE ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= $this->getHtml('Active'); ?>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::INACTIVE, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($account->getStatus() === \phpOMS\Account\AccountStatus::INACTIVE ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= $this->getHtml('Inactive'); ?>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::TIMEOUT, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($account->getStatus() === \phpOMS\Account\AccountStatus::TIMEOUT ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= $this->getHtml('Timeout'); ?>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::BANNED, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($account->getStatus() === \phpOMS\Account\AccountStatus::BANNED ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= $this->getHtml('Banned'); ?>
                                 </select>
-                        <tr><td><label for="iUsername"><?= $this->getText('Username') ?></label>
-                        <tr><td><input id="iUsername" name="name" type="text" placeholder="&#xf007; Fred" value="<?= $account->getName(); ?>" disabled>
-                        <tr><td><label for="iName1"><?= $this->getText('Name1') ?></label>
-                        <tr><td><input id="iName1" name="name1" type="text" placeholder="&#xf007; Donald" value="<?= $account->getName1(); ?>" required>
-                        <tr><td><label for="iName2"><?= $this->getText('Name2') ?></label>
-                        <tr><td><input id="iName2" name="name2" type="text" placeholder="&#xf007; Fauntleroy" value="<?= $account->getName2(); ?>">
-                        <tr><td><label for="iName3"><?= $this->getText('Name3') ?></label>
-                        <tr><td><input id="iName3" name="name3" type="text" placeholder="&#xf007; Duck" value="<?= $account->getName3(); ?>">
-                        <tr><td><label for="iEmail"><?= $this->getText('Email') ?></label>
-                        <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com" value="<?= $account->getEmail(); ?>">
-                        <tr><td><label for="iPassword"><?= $this->getText('Name3') ?></label>
+                        <tr><td><label for="iUsername"><?= $this->getHtml('Username'); ?></label>
+                        <tr><td><input id="iUsername" name="name" type="text" placeholder="&#xf007; Fred" value="<?= htmlspecialchars($account->getName(), ENT_COMPAT, 'utf-8'); ?>" disabled>
+                        <tr><td><label for="iName1"><?= $this->getHtml('Name1'); ?></label>
+                        <tr><td><input id="iName1" name="name1" type="text" placeholder="&#xf007; Donald" value="<?= htmlspecialchars($account->getName1(), ENT_COMPAT, 'utf-8'); ?>" required>
+                        <tr><td><label for="iName2"><?= $this->getHtml('Name2'); ?></label>
+                        <tr><td><input id="iName2" name="name2" type="text" placeholder="&#xf007; Fauntleroy" value="<?= htmlspecialchars($account->getName2(), ENT_COMPAT, 'utf-8'); ?>">
+                        <tr><td><label for="iName3"><?= $this->getHtml('Name3'); ?></label>
+                        <tr><td><input id="iName3" name="name3" type="text" placeholder="&#xf007; Duck" value="<?= htmlspecialchars($account->getName3(), ENT_COMPAT, 'utf-8'); ?>">
+                        <tr><td><label for="iEmail"><?= $this->getHtml('Email'); ?></label>
+                        <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com" value="<?= htmlspecialchars($account->getEmail(), ENT_COMPAT, 'utf-8'); ?>">
+                        <tr><td><label for="iPassword"><?= $this->getHtml('Name3'); ?></label>
                         <tr><td><input id="iPassword" name="password" type="text" placeholder="&#xf023; Pa55ssw0rd?">
-                        <tr><td><input type="submit" value="<?= $this->getText('Save', 0, 0); ?>">
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Save', 0, 0); ?>">
                     </table>
                 </form>
             </div>
@@ -62,14 +62,14 @@ echo $this->getData('nav')->render(); ?>
 
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Groups') ?></h1></header>
+            <header><h1><?= $this->getHtml('Groups'); ?></h1></header>
             <div class="inner">
                 <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="post">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td><label for="iGroup"><?= $this->getText('Name') ?></label>
+                        <tr><td><label for="iGroup"><?= $this->getHtml('Name'); ?></label>
                         <tr><td><input id="iGroup" name="group" type="text" placeholder="&#xf0c0; Guest">
-                        <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
                     </table>
                 </form>
             </div>
@@ -78,14 +78,14 @@ echo $this->getData('nav')->render(); ?>
 
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Permissions') ?></h1></header>
+            <header><h1><?= $this->getHtml('Permissions'); ?></h1></header>
             <div class="inner">
                 <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="post">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td><label for="iGroup"><?= $this->getText('Name') ?></label>
+                        <tr><td><label for="iGroup"><?= $this->getHtml('Name'); ?></label>
                         <tr><td><input id="iGroup" name="group" type="text" placeholder="&#xf084; news_create">
-                        <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
                     </table>
                 </form>
             </div>
diff --git a/Theme/Backend/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php
index 7a700b7..e21763b 100644
--- a/Theme/Backend/groups-create.tpl.php
+++ b/Theme/Backend/groups-create.tpl.php
@@ -21,20 +21,20 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12 col-md-6">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Group') ?></h1></header>
+            <header><h1><?= $this->getHtml('Group'); ?></h1></header>
             <div class="inner">
-                <form id="group-create" action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="<?= \phpOMS\Message\Http\RequestMethod::PUT; ?>">
+                <form id="group-create" action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="<?= htmlspecialchars(\phpOMS\Message\Http\RequestMethod::PUT, ENT_COMPAT, 'utf-8'); ?>">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td colspan="2"><label for="iStatus"><?= $this->getText('Status') ?></label>
+                        <tr><td colspan="2"><label for="iStatus"><?= $this->getHtml('Status'); ?></label>
                         <tr><td colspan="2"><select id="iStatus" name="status">
-                                    <option value="<?= \phpOMS\Account\GroupStatus::ACTIVE; ?>" selected><?= $this->getText('Active') ?>
-                                    <option value="<?= \phpOMS\Account\GroupStatus::INACTIVE; ?>"><?= $this->getText('Inactive') ?>
-                        <tr><td><label for="iGname"><?= $this->getText('Name') ?></label>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\GroupStatus::ACTIVE, ENT_COMPAT, 'utf-8'); ?>" selected><?= $this->getHtml('Active'); ?>
+                                    <option value="<?= htmlspecialchars(\phpOMS\Account\GroupStatus::INACTIVE, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Inactive'); ?>
+                        <tr><td><label for="iGname"><?= $this->getHtml('Name'); ?></label>
                         <tr><td><input id="iGname" name="name" type="text" placeholder="&#xf0c0; Guest" required>
-                        <tr><td><label for="iGroupDescription"><?= $this->getText('Description') ?></label>
+                        <tr><td><label for="iGroupDescription"><?= $this->getHtml('Description'); ?></label>
                         <tr><td><textarea id="iGroupDescription" name="description" placeholder="&#xf040;"></textarea>
-                        <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Create', 0, 0); ?>">
                     </table>
                 </form>
             </div>
@@ -43,14 +43,14 @@ echo $this->getData('nav')->render(); ?>
 
     <div class="col-xs-12 col-md-6">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Parent') ?></h1></header>
+            <header><h1><?= $this->getHtml('Parent'); ?></h1></header>
             <div class="inner">
                 <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="post">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td><label for="iGParentName"><?= $this->getText('Name') ?></label>
+                        <tr><td><label for="iGParentName"><?= $this->getHtml('Name'); ?></label>
                         <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iGParentName" name="parentname" type="text" placeholder="&#xf0c0; Guest" required></span>
-                        <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
                     </table>
                 </form>
             </div>
@@ -59,14 +59,14 @@ echo $this->getData('nav')->render(); ?>
 
     <div class="col-xs-12 col-md-6">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Permissions') ?></h1></header>
+            <header><h1><?= $this->getHtml('Permissions'); ?></h1></header>
             <div class="inner">
                 <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="post">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td><label for="iPermissionName"><?= $this->getText('Name') ?></label>
+                        <tr><td><label for="iPermissionName"><?= $this->getHtml('Name'); ?></label>
                         <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iPermissionName" name="permissionname" type="text" placeholder="&#xf084; Admin" required></span>
-                        <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
                     </table>
                 </form>
             </div>
diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php
index a2cf598..2c848a0 100644
--- a/Theme/Backend/groups-list.tpl.php
+++ b/Theme/Backend/groups-list.tpl.php
@@ -28,28 +28,28 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <table class="box table red">
-            <caption><?= $this->getText('Groups'); ?></caption>
+            <caption><?= $this->getHtml('Groups') ?></caption>
             <thead>
                 <tr>
-                    <td><?= $this->getText('ID', 0, 0); ?>
-                    <td class="wf-100"><?= $this->getText('Name'); ?>
-                    <td><?= $this->getText('Parents'); ?>
-                    <td><?= $this->getText('Children'); ?>
-                    <td><?= $this->getText('Members'); ?>
+                    <td><?= $this->getHtml('ID', 0, 0); ?>
+                    <td class="wf-100"><?= $this->getHtml('Name') ?>
+                    <td><?= $this->getHtml('Parents') ?>
+                    <td><?= $this->getHtml('Children') ?>
+                    <td><?= $this->getHtml('Members') ?>
             <tfoot>
-                <tr><td colspan="5"><?= $footerView->render(); ?>
+                <tr><td colspan="5"><?= htmlspecialchars($footerView->render(), ENT_COMPAT, 'utf-8'); ?>
             <tbody>
                 <?php $c = 0; foreach ($this->getData('list:elements') as $key => $value) : $c++;
                     $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
-                    <td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
-                    <td><a href="<?= $url; ?>"><?= $value->getName(); ?></a>
+                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getId(), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getName(), ENT_COMPAT, 'utf-8'); ?></a>
                     <td>
                     <td>
                     <td>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
-                <tr><td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
+                <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
                 <?php endif; ?>
         </table>
     </div>
diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php
index a3f4ff2..41b9fb2 100644
--- a/Theme/Backend/groups-single.tpl.php
+++ b/Theme/Backend/groups-single.tpl.php
@@ -23,18 +23,18 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Group') ?></h1></header>
+            <header><h1><?= $this->getHtml('Group'); ?></h1></header>
             <div class="inner">
                 <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="post">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td><label for="iGid"><?= $this->getText('ID', 0, 0) ?></label>
-                        <tr><td><input id="iGid" name="gid" type="text" value="<?= $group->getId(); ?>" disabled>
-                        <tr><td><label for="iGname"><?= $this->getText('Name') ?></label>
-                        <tr><td><input id="iGname" name="gname" type="text" placeholder="&#xf0c0; Guest" value="<?= $group->getName(); ?>">
-                        <tr><td><label for="iGroupDescription"><?= $this->getText('Description') ?></label>
-                        <tr><td><textarea id="iGroupDescription" name="description" placeholder="&#xf040;"><?= $group->getDescription(); ?></textarea>
-                        <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                        <tr><td><label for="iGid"><?= $this->getHtml('ID', 0, 0); ?></label>
+                        <tr><td><input id="iGid" name="gid" type="text" value="<?= htmlspecialchars($group->getId(), ENT_COMPAT, 'utf-8'); ?>" disabled>
+                        <tr><td><label for="iGname"><?= $this->getHtml('Name'); ?></label>
+                        <tr><td><input id="iGname" name="gname" type="text" placeholder="&#xf0c0; Guest" value="<?= htmlspecialchars($group->getName(), ENT_COMPAT, 'utf-8'); ?>">
+                        <tr><td><label for="iGroupDescription"><?= $this->getHtml('Description'); ?></label>
+                        <tr><td><textarea id="iGroupDescription" name="description" placeholder="&#xf040;"><?= htmlspecialchars($group->getDescription(), ENT_COMPAT, 'utf-8'); ?></textarea>
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Create', 0, 0); ?>">
                     </table>
                 </form>
             </div>
@@ -43,14 +43,14 @@ echo $this->getData('nav')->render(); ?>
 
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Parent') ?></h1></header>
+            <header><h1><?= $this->getHtml('Parent'); ?></h1></header>
             <div class="inner">
                 <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="post">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td><label for="iGParentName"><?= $this->getText('Name') ?></label>
+                        <tr><td><label for="iGParentName"><?= $this->getHtml('Name'); ?></label>
                         <tr><td><input id="iGParentName" name="parentname" type="text" placeholder="&#xf0c0; Guest">
-                        <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
                     </table>
                 </form>
             </div>
@@ -59,14 +59,14 @@ echo $this->getData('nav')->render(); ?>
 
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Permissions') ?></h1></header>
+            <header><h1><?= $this->getHtml('Permissions'); ?></h1></header>
             <div class="inner">
                 <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="post">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td><label for="iPermissionName"><?= $this->getText('Name') ?></label>
+                        <tr><td><label for="iPermissionName"><?= $this->getHtml('Name'); ?></label>
                         <tr><td><input id="iPermissionName" name="permissionname" type="text" placeholder="&#xf084; Admin">
-                        <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
                     </table>
                 </form>
             </div>
@@ -75,14 +75,14 @@ echo $this->getData('nav')->render(); ?>
 
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Accounts') ?></h1></header>
+            <header><h1><?= $this->getHtml('Accounts'); ?></h1></header>
             <div class="inner">
                 <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="post">
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td><label for="iGParentName"><?= $this->getText('Name') ?></label>
+                        <tr><td><label for="iGParentName"><?= $this->getHtml('Name'); ?></label>
                         <tr><td><input id="iGParentName" name="parentname" type="text" placeholder="&#xf234; Donald Duck">
-                        <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
                     </table>
                 </form>
             </div>
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php
index a017199..f769b7d 100644
--- a/Theme/Backend/modules-list.tpl.php
+++ b/Theme/Backend/modules-list.tpl.php
@@ -32,32 +32,32 @@ $footerView->setResults(count($modules));
     <div class="col-xs-12">
         <div class="box w-100">
             <table class="table red">
-                <caption><?= $this->getText('Modules'); ?></caption>
+                <caption><?= $this->getHtml('Modules') ?></caption>
                 <thead>
                 <tr>
-                    <td><?= $this->getText('ID', 0, 0); ?>
-                    <td class="wf-100"><?= $this->getText('Name'); ?>
-                    <td><?= $this->getText('Version'); ?>
-                    <td><?= $this->getText('Status'); ?>
+                    <td><?= $this->getHtml('ID', 0, 0); ?>
+                    <td class="wf-100"><?= $this->getHtml('Name') ?>
+                    <td><?= $this->getHtml('Version') ?>
+                    <td><?= $this->getHtml('Status') ?>
                         <tfoot>
                 <tr>
-                    <td colspan="4"><?= $footerView->render(); ?>
+                    <td colspan="4"><?= htmlspecialchars($footerView->render(), ENT_COMPAT, 'utf-8'); ?>
                         <tbody>
                         <?php $count = 0; foreach ($modules as $key => $module) : $count++;
                         $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/admin/module/settings?{?}&id=' . $module['name']['internal']); ?>
                 <tr data-href="<?= $url; ?>">
-                    <td><a href="<?= $url; ?>"><?= $module['name']['internal']; ?></a>
-                    <td><a href="<?= $url; ?>"><?= $module['name']['external']; ?></a>
-                    <td><a href="<?= $url; ?>"><?= $module['version']; ?></a>
+                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($module['name']['internal'], ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($module['name']['external'], ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($module['version'], ENT_COMPAT, 'utf-8'); ?></a>
                     <td><a href="<?= $url; ?>"><?php if (in_array($module['name']['internal'], $active))
-                            echo strtolower($this->getText('Active'));
+                            echo strtolower($this->getHtml('Active'));
                         elseif (in_array($module['name']['internal'], $installed))
-                            echo strtolower($this->getText('Inactive'));
+                            echo strtolower($this->getHtml('Inactive'));
                         else
-                            echo strtolower($this->getText('Available')); ?></a>
+                            echo strtolower($this->getHtml('Available')); ?></a>
                         <?php endforeach; ?>
                 <?php if($count === 0) : ?>
-                    <tr><td colspan="4" class="empty"><?= $this->getText('Empty', 0, 0); ?>
+                    <tr><td colspan="4" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
                 <?php endif; ?>
             </table>
         </div>
diff --git a/Theme/Backend/modules-single.tpl.php b/Theme/Backend/modules-single.tpl.php
index 7ce02c0..6138515 100644
--- a/Theme/Backend/modules-single.tpl.php
+++ b/Theme/Backend/modules-single.tpl.php
@@ -26,37 +26,37 @@ $id = $this->request->getData('id') ?? 1;
 <div class="row">
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $modules[$id]['name']['external'] ?></h1></header>
+            <header><h1><?= htmlspecialchars($modules[$id]['name']['external'] , ENT_COMPAT, 'utf-8'); ?></h1></header>
 
             <div class="inner">
                 <table class="list wf-100">
                     <tbody>
                     <tr>
-                        <td><?= $this->getText('Name') ?>
-                        <td><?= $modules[$id]['name']['external']; ?>
+                        <td><?= $this->getHtml('Name'); ?>
+                        <td><?= htmlspecialchars($modules[$id]['name']['external'], ENT_COMPAT, 'utf-8'); ?>
                     <tr>
-                        <td><?= $this->getText('Version') ?>
-                        <td><?= $modules[$id]['version'] ?>
+                        <td><?= $this->getHtml('Version'); ?>
+                        <td><?= htmlspecialchars($modules[$id]['version'] , ENT_COMPAT, 'utf-8'); ?>
                     <tr>
-                        <td><?= $this->getText('CreatedBy') ?>
-                        <td><?= $modules[$id]['creator']['name'] ?>
+                        <td><?= $this->getHtml('CreatedBy'); ?>
+                        <td><?= htmlspecialchars($modules[$id]['creator']['name'] , ENT_COMPAT, 'utf-8'); ?>
                     <tr>
-                        <td><?= $this->getText('Website') ?>
-                        <td><?= $modules[$id]['creator']['website'] ?>
+                        <td><?= $this->getHtml('Website'); ?>
+                        <td><?= htmlspecialchars($modules[$id]['creator']['website'] , ENT_COMPAT, 'utf-8'); ?>
                     <tr>
-                        <td><?= $this->getText('Description') ?>
-                        <td><?= $modules[$id]['description'] ?>
+                        <td><?= $this->getHtml('Description'); ?>
+                        <td><?= htmlspecialchars($modules[$id]['description'] , ENT_COMPAT, 'utf-8'); ?>
                     <tr>
                         <td colspan="2">
                             <?php if (in_array($id, $active)) : ?>
                                 <button
-                                    data-reload="<?= \phpOMS\Uri\UriFactory::build('POST:/{/lang}/backend/admin/module/status?{?}&status=deactivate&module=' . $id); ?>"><?= $this->getText('Deactivate') ?></button>
+                                    data-reload="<?= \phpOMS\Uri\UriFactory::build('POST:/{/lang}/backend/admin/module/status?{?}&status=deactivate&module=' . $id); ?>"><?= $this->getHtml('Deactivate'); ?></button>
                             <?php elseif (in_array($id, $installed)) : ?>
-                                <button data-reload="<?= \phpOMS\Uri\UriFactory::build('POST:/{/lang}/backend/admin/module/deactivate?{?}&id=' . $id); ?>"><?= $this->getText('Uninstall') ?></button>
-                                <button data-reload="<?= \phpOMS\Uri\UriFactory::build('POST:/{/lang}/backend/admin/module/deactivate?{?}&id=' . $id); ?>"><?= $this->getText('Activate') ?></button>
+                                <button data-reload="<?= \phpOMS\Uri\UriFactory::build('POST:/{/lang}/backend/admin/module/deactivate?{?}&id=' . $id); ?>"><?= $this->getHtml('Uninstall'); ?></button>
+                                <button data-reload="<?= \phpOMS\Uri\UriFactory::build('POST:/{/lang}/backend/admin/module/deactivate?{?}&id=' . $id); ?>"><?= $this->getHtml('Activate'); ?></button>
                             <?php elseif (isset($modules[$id])) : ?>
-                                <button data-reload="<?= \phpOMS\Uri\UriFactory::build('PUT:/{/lang}/backend/admin/module/install?{?}&id=' . $id); ?>"><?= $this->getText('Install') ?></button>
-                                <button data-reload="<?= \phpOMS\Uri\UriFactory::build('DELETE:/{/lang}/backend/admin/module/delete?{?}&id=' . $id); ?>"><?= $this->getText('Delete', 0) ?></button>
+                                <button data-reload="<?= \phpOMS\Uri\UriFactory::build('PUT:/{/lang}/backend/admin/module/install?{?}&id=' . $id); ?>"><?= $this->getHtml('Install'); ?></button>
+                                <button data-reload="<?= \phpOMS\Uri\UriFactory::build('DELETE:/{/lang}/backend/admin/module/delete?{?}&id=' . $id); ?>"><?= $this->getHtml('Delete', 0); ?></button>
                             <?php endif; ?>
                 </table>
             </div>
@@ -65,7 +65,7 @@ $id = $this->request->getData('id') ?? 1;
 
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Settings') ?></h1></header>
+            <header><h1><?= $this->getHtml('Settings'); ?></h1></header>
 
             <div class="inner">
 
@@ -75,7 +75,7 @@ $id = $this->request->getData('id') ?? 1;
 
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Groups') ?></h1></header>
+            <header><h1><?= $this->getHtml('Groups'); ?></h1></header>
 
             <div class="inner">
 
@@ -85,7 +85,7 @@ $id = $this->request->getData('id') ?? 1;
 
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= $this->getText('Permissions') ?></h1></header>
+            <header><h1><?= $this->getHtml('Permissions'); ?></h1></header>
 
             <div class="inner">
 
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php
index 15de4a7..27dd467 100644
--- a/Theme/Backend/settings-general.tpl.php
+++ b/Theme/Backend/settings-general.tpl.php
@@ -36,8 +36,8 @@ $currencies    = \phpOMS\Localization\ISO4217Enum::getConstants();
 <div class="tabular-2">
     <div class="box wf-100">
         <ul class="tab-links">
-            <li><label for="c-tab-1"><?= $this->getText('General') ?></label></li>
-            <li><label for="c-tab-2"><?= $this->getText('Localization') ?></label></li>
+            <li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label></li>
+            <li><label for="c-tab-2"><?= $this->getHtml('Localization'); ?></label></li>
         </ul>
     </div>
     <div class="tab-content">
@@ -46,16 +46,16 @@ $currencies    = \phpOMS\Localization\ISO4217Enum::getConstants();
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getText('Settings') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Settings'); ?></h1></header>
                         <div class="inner">
                             <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/settings/general'); ?>" method="post">
                                 <table class="layout wf-100">
                                     <tbody>
-                                        <tr><td><label for="iOname"><?= $this->getText('OrganizationName') ?></label>
-                                        <tr><td><input id="iOname" name="oname" type="text" value="<?= $_oname; ?>" placeholder="&#xf12e; Money Bin" required>
-                                        <tr><td><label for="iPassword"><?= $this->getText('PasswordRegex') ?></label>
-                                        <tr><td><input id="iPassword" name="passpattern" type="text" value="<?= $_password; ?>" placeholder="&#xf023; ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
-                                        <tr><td><input type="submit" value="<?= $this->getText('Save', 0) ?>">
+                                        <tr><td><label for="iOname"><?= $this->getHtml('OrganizationName'); ?></label>
+                                        <tr><td><input id="iOname" name="oname" type="text" value="<?= htmlspecialchars($_oname, ENT_COMPAT, 'utf-8'); ?>" placeholder="&#xf12e; Money Bin" required>
+                                        <tr><td><label for="iPassword"><?= $this->getHtml('PasswordRegex'); ?></label>
+                                        <tr><td><input id="iPassword" name="passpattern" type="text" value="<?= htmlspecialchars($_password, ENT_COMPAT, 'utf-8'); ?>" placeholder="&#xf023; ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
+                                        <tr><td><input type="submit" value="<?= $this->getHtml('Save', 0); ?>">
                                 </table>
                             </form>
                         </div>
@@ -68,39 +68,39 @@ $currencies    = \phpOMS\Localization\ISO4217Enum::getConstants();
             <div class="row">
                 <div class="col-xs-12 col-md-4">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getText('Localization') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Localization'); ?></h1></header>
                         <div class="inner">
                             <form id="fLocalization" action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/settings/localization'); ?>" method="post">
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td colspan="2"><label for="iCountries"><?= $this->getText('Country') ?></label>
+                                    <tr><td colspan="2"><label for="iCountries"><?= $this->getHtml('Country'); ?></label>
                                     <tr><td colspan="2"><select id="iCountries" name="country">
                                                 <?php foreach($countries as $code => $country) : ?>
-                                                <option value="<?= $code; ?>"<?= strtolower($code) == strtolower($_country) ? ' selected' : ''; ?>><?= $country; ?>
+                                                <option value="<?= htmlspecialchars($code, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars(strtolower($code) == strtolower($_country) ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= htmlspecialchars($country, ENT_COMPAT, 'utf-8'); ?>
                                                     <?php endforeach; ?>
                                             </select>
-                                    <tr><td colspan="2"><label for="iTimezones"><?= $this->getText('Timezone') ?></label>
+                                    <tr><td colspan="2"><label for="iTimezones"><?= $this->getHtml('Timezone'); ?></label>
                                     <tr><td colspan="2"><select id="iTimezones" name="timezone">
                                                 <?php foreach($timezones as $code => $timezone) : ?>
-                                                <option value="<?= $code; ?>"<?= $timezone == $_timezone ? ' selected' : ''; ?>><?= $timezone; ?>
+                                                <option value="<?= htmlspecialchars($code, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($timezone == $_timezone ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= htmlspecialchars($timezone, ENT_COMPAT, 'utf-8'); ?>
                                                     <?php endforeach; ?>
                                             </select>
-                                    <tr><td colspan="2"><label for="iTimeformats"><?= $this->getText('Timeformat') ?></label>
+                                    <tr><td colspan="2"><label for="iTimeformats"><?= $this->getHtml('Timeformat'); ?></label>
                                     <tr><td colspan="2"><select id="iTimeformats" name="timeformat">
                                                 <?php foreach($timeformats as $code => $timeformat) : ?>
-                                                <option value="<?= $code; ?>"<?= strtolower($timeformat) == strtolower($_timeformat) ? ' selected' : ''; ?>><?= $timeformat; ?>
+                                                <option value="<?= htmlspecialchars($code, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars(strtolower($timeformat) == strtolower($_timeformat) ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= htmlspecialchars($timeformat, ENT_COMPAT, 'utf-8'); ?>
                                                     <?php endforeach; ?>
                                             </select>
-                                    <tr><td colspan="2"><label for="iLanguages"><?= $this->getText('Language') ?></label>
+                                    <tr><td colspan="2"><label for="iLanguages"><?= $this->getHtml('Language'); ?></label>
                                     <tr><td colspan="2"><select id="iLanguages" name="language">
                                                 <?php foreach($languages as $code => $language) : ?>
-                                                <option value="<?= $code; ?>"<?= strtolower($code) == strtolower($_language) ? ' selected' : ''; ?>><?= $language; ?>
+                                                <option value="<?= htmlspecialchars($code, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars(strtolower($code) == strtolower($_language) ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= htmlspecialchars($language, ENT_COMPAT, 'utf-8'); ?>
                                                     <?php endforeach; ?>
                                             </select>
-                                    <tr><td colspan="2"><label for="iTemperature"><?= $this->getText('Temperature') ?></label>
+                                    <tr><td colspan="2"><label for="iTemperature"><?= $this->getHtml('Temperature'); ?></label>
                                     <tr><td colspan="2"><select id="iTemperature" name="temperature">
                                             </select>
-                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Save', 0) ?>">
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Save', 0); ?>">
                                 </table>
                             </form>
                         </div>
@@ -109,21 +109,21 @@ $currencies    = \phpOMS\Localization\ISO4217Enum::getConstants();
 
             <div class="col-xs-12 col-md-4">
                 <section class="box wf-100 green">
-                    <header><h1><?= $this->getText('Numeric') ?></h1></header>
+                    <header><h1><?= $this->getHtml('Numeric'); ?></h1></header>
                     <div class="inner">
                         <form>
                             <table class="layout wf-100">
-                                    <tr><td colspan="2"><label for="iCurrencies"><?= $this->getText('Currency') ?></label>
+                                    <tr><td colspan="2"><label for="iCurrencies"><?= $this->getHtml('Currency'); ?></label>
                                 <tr><td colspan="2"><select form="fLocalization" id="iCurrencies" name="currency">
                                             <?php foreach($currencies as $code => $currency) : ?>
-                                            <option value="<?= $code; ?>"<?= strtolower($code) == strtolower($_currency) ? ' selected' : ''; ?>><?= $currency; ?>
+                                            <option value="<?= htmlspecialchars($code, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars(strtolower($code) == strtolower($_currency) ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= htmlspecialchars($currency, ENT_COMPAT, 'utf-8'); ?>
                                                 <?php endforeach; ?>
                                         </select>
-                                <tr><td colspan="2"><h2><?= $this->getText('Numberformat') ?></h2>
-                                <tr><td><label for="iDecimalPoint"><?= $this->getText('DecimalPoint') ?></label>
-                                    <td><label for="iThousandSep"><?= $this->getText('ThousandsSeparator') ?></label>
-                                <tr><td><input form="fLocalization" id="iDecimalPoint" name="decimalpoint" type="text" value="<?= $_decimal_point; ?>" placeholder="." required>
-                                    <td><input form="fLocalization" id="iThousandSep" name="thousandsep" type="text" value="<?= $_thousands_sep; ?>" placeholder="," required>
+                                <tr><td colspan="2"><h2><?= $this->getHtml('Numberformat'); ?></h2>
+                                <tr><td><label for="iDecimalPoint"><?= $this->getHtml('DecimalPoint'); ?></label>
+                                    <td><label for="iThousandSep"><?= $this->getHtml('ThousandsSeparator'); ?></label>
+                                <tr><td><input form="fLocalization" id="iDecimalPoint" name="decimalpoint" type="text" value="<?= htmlspecialchars($_decimal_point, ENT_COMPAT, 'utf-8'); ?>" placeholder="." required>
+                                    <td><input form="fLocalization" id="iThousandSep" name="thousandsep" type="text" value="<?= htmlspecialchars($_thousands_sep, ENT_COMPAT, 'utf-8'); ?>" placeholder="," required>
                             </table>
                         </form>
                     </div>
@@ -132,24 +132,24 @@ $currencies    = \phpOMS\Localization\ISO4217Enum::getConstants();
 
 <div class="col-xs-12 col-md-4">
             <section class="box wf-100 red">
-                <header><h1><?= $this->getText('Weight') ?></h1></header>
+                <header><h1><?= $this->getHtml('Weight'); ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout wf-100">
                             <tbody>
-                            <tr><label for="iVeryLight"><?= $this->getText('VeryLight') ?></label>
+                            <tr><label for="iVeryLight"><?= $this->getHtml('VeryLight'); ?></label>
                             <tr><select form="fLocalization" id="iVeryLight" name="very_light">
                                     </select>
-                            <tr><label for="iLight"><?= $this->getText('Light') ?></label>
+                            <tr><label for="iLight"><?= $this->getHtml('Light'); ?></label>
                             <tr><select form="fLocalization" id="iLight" name="light">
                                     </select>
-                            <tr><label for="iMedium"><?= $this->getText('Medium') ?></label>
+                            <tr><label for="iMedium"><?= $this->getHtml('Medium'); ?></label>
                             <tr><select form="fLocalization" id="iMedium" name="medium">
                                     </select>
-                            <tr><label for="iHeavy"><?= $this->getText('Heavy') ?></label>
+                            <tr><label for="iHeavy"><?= $this->getHtml('Heavy'); ?></label>
                             <tr><select form="fLocalization" id="iHeavy" name="heavy">
                                     </select>
-                            <tr><label for="iVeryHeavy"><?= $this->getText('VeryHeavy') ?></label>
+                            <tr><label for="iVeryHeavy"><?= $this->getHtml('VeryHeavy'); ?></label>
                             <tr><select form="fLocalization" id="iVeryHeavy" name="very_heavy">
                                     </select>
                         </table>
@@ -162,27 +162,27 @@ $currencies    = \phpOMS\Localization\ISO4217Enum::getConstants();
             <div class="row">
                 <div class="col-xs-12 col-md-4">
             <section class="box wf-100 blue">
-                <header><h1><?= $this->getText('Speed') ?></h1></header>
+                <header><h1><?= $this->getHtml('Speed'); ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout wf-100">
                             <tbody>
-                            <tr><label for="iVerySlow"><?= $this->getText('VerySlow') ?></label>
+                            <tr><label for="iVerySlow"><?= $this->getHtml('VerySlow'); ?></label>
                             <tr><select form="fLocalization" id="iVerySlow" name="very_slow">
                                     </select>
-                            <tr><label for="iSlow"><?= $this->getText('Slow') ?></label>
+                            <tr><label for="iSlow"><?= $this->getHtml('Slow'); ?></label>
                             <tr><select form="fLocalization" id="iSlow" name="slow">
                                     </select>
-                            <tr><label for="iMedium"><?= $this->getText('Medium') ?></label>
+                            <tr><label for="iMedium"><?= $this->getHtml('Medium'); ?></label>
                             <tr><select form="fLocalization" id="iMedium" name="medium">
                                     </select>
-                            <tr><label for="iFast"><?= $this->getText('Fast') ?></label>
+                            <tr><label for="iFast"><?= $this->getHtml('Fast'); ?></label>
                             <tr><select form="fLocalization" id="iFast" name="fast">
                                     </select>
-                            <tr><label for="iVeryFast"><?= $this->getText('VeryFast') ?></label>
+                            <tr><label for="iVeryFast"><?= $this->getHtml('VeryFast'); ?></label>
                             <tr><select form="fLocalization" id="iVeryFast" name="very_fast">
                                     </select>
-                            <tr><label for="iSeaSpeed"><?= $this->getText('Sea') ?></label>
+                            <tr><label for="iSeaSpeed"><?= $this->getHtml('Sea'); ?></label>
                             <tr><select form="fLocalization" id="iSeaSpeed" name="sea_speed">
                                     </select>
                         </table>
@@ -193,27 +193,27 @@ $currencies    = \phpOMS\Localization\ISO4217Enum::getConstants();
 
         <div class="col-xs-12 col-md-4">
             <section class="box wf-100 purple">
-                <header><h1><?= $this->getText('Length') ?></h1></header>
+                <header><h1><?= $this->getHtml('Length'); ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout wf-100">
                             <tbody>
-                            <tr><label for="iVeryShort"><?= $this->getText('VeryShort') ?></label>
+                            <tr><label for="iVeryShort"><?= $this->getHtml('VeryShort'); ?></label>
                             <tr><select form="fLocalization" id="iVeryShort" name="very_short">
                                     </select>
-                            <tr><label for="iShort"><?= $this->getText('Short') ?></label>
+                            <tr><label for="iShort"><?= $this->getHtml('Short'); ?></label>
                             <tr><select form="fLocalization" id="iShort" name="short">
                                     </select>
-                            <tr><label for="iMedium"><?= $this->getText('Medium') ?></label>
+                            <tr><label for="iMedium"><?= $this->getHtml('Medium'); ?></label>
                             <tr><select form="fLocalization" id="iMedium" name="medium">
                                     </select>
-                            <tr><label for="iLong"><?= $this->getText('Long') ?></label>
+                            <tr><label for="iLong"><?= $this->getHtml('Long'); ?></label>
                             <tr><select form="fLocalization" id="iLong" name="long">
                                     </select>
-                            <tr><label for="iVeryLong"><?= $this->getText('VeryLong') ?></label>
+                            <tr><label for="iVeryLong"><?= $this->getHtml('VeryLong'); ?></label>
                             <tr><select form="fLocalization" id="iVeryLong" name="very_long">
                                     </select>
-                            <tr><label for="iSeaLength"><?= $this->getText('Sea') ?></label>
+                            <tr><label for="iSeaLength"><?= $this->getHtml('Sea'); ?></label>
                             <tr><select form="fLocalization" id="iSeaLength" name="sea_length">
                                     </select>
                         </table>
@@ -224,24 +224,24 @@ $currencies    = \phpOMS\Localization\ISO4217Enum::getConstants();
 
 <div class="col-xs-12 col-md-4">
             <section class="box wf-100">
-                <header><h1><?= $this->getText('Area') ?></h1></header>
+                <header><h1><?= $this->getHtml('Area'); ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout wf-100">
                             <tbody>
-                            <tr><label for="iVerySmall"><?= $this->getText('VerySmall') ?></label>
+                            <tr><label for="iVerySmall"><?= $this->getHtml('VerySmall'); ?></label>
                             <tr><select form="fLocalization" id="iVerySmall" name="very_small">
                                     </select>
-                            <tr><label for="iSmall"><?= $this->getText('Small') ?></label>
+                            <tr><label for="iSmall"><?= $this->getHtml('Small'); ?></label>
                             <tr><select form="fLocalization" id="iSmall" name="small">
                                     </select>
-                            <tr><label for="iMedium"><?= $this->getText('Medium') ?></label>
+                            <tr><label for="iMedium"><?= $this->getHtml('Medium'); ?></label>
                             <tr><select form="fLocalization" id="iMedium" name="medium">
                                     </select>
-                            <tr><label for="iLarge"><?= $this->getText('Large') ?></label>
+                            <tr><label for="iLarge"><?= $this->getHtml('Large'); ?></label>
                             <tr><select form="fLocalization" id="iLarge" name="large">
                                     </select>
-                            <tr><label for="iVeryLarge"><?= $this->getText('VeryLarge') ?></label>
+                            <tr><label for="iVeryLarge"><?= $this->getHtml('VeryLarge'); ?></label>
                             <tr><select form="fLocalization" id="iVeryLarge" name="very_large">
                                     </select>
                         </table>
@@ -254,33 +254,33 @@ $currencies    = \phpOMS\Localization\ISO4217Enum::getConstants();
             <div class="row">
                 <div class="col-xs-12 col-md-4">
             <section class="box wf-100">
-                <header><h1><?= $this->getText('Volume') ?></h1></header>
+                <header><h1><?= $this->getHtml('Volume'); ?></h1></header>
                 <div class="inner">
                     <form>
                         <table class="layout wf-100">
                             <tbody>
-                            <tr><label for="iVerySmall"><?= $this->getText('VerySmall') ?></label>
+                            <tr><label for="iVerySmall"><?= $this->getHtml('VerySmall'); ?></label>
                             <tr><select form="fLocalization" id="iVerySmall" name="very_small">
                                     </select>
-                            <tr><label for="iSmall"><?= $this->getText('Small') ?></label>
+                            <tr><label for="iSmall"><?= $this->getHtml('Small'); ?></label>
                             <tr><select form="fLocalization" id="iSmall" name="small">
                                     </select>
-                            <tr><label for="iMedium"><?= $this->getText('Medium') ?></label>
+                            <tr><label for="iMedium"><?= $this->getHtml('Medium'); ?></label>
                             <tr><select form="fLocalization" id="iMedium" name="medium">
                                     </select>
-                            <tr><label for="iLarge"><?= $this->getText('Large') ?></label>
+                            <tr><label for="iLarge"><?= $this->getHtml('Large'); ?></label>
                             <tr><select form="fLocalization" id="iLarge" name="large">
                                     </select>
-                            <tr><label for="iVeryLarge"><?= $this->getText('VeryLarge') ?></label>
+                            <tr><label for="iVeryLarge"><?= $this->getHtml('VeryLarge'); ?></label>
                             <tr><select form="fLocalization" id="iVeryLarge" name="very_large">
                                     </select>
-                            <tr><label for="iTeaspoon"><?= $this->getText('Teaspoon') ?></label>
+                            <tr><label for="iTeaspoon"><?= $this->getHtml('Teaspoon'); ?></label>
                             <tr><select form="fLocalization" id="iTeaspoon" name="teaspoon">
                                     </select>
-                            <tr><label for="iTablespoon"><?= $this->getText('Tablespoon') ?></label>
+                            <tr><label for="iTablespoon"><?= $this->getHtml('Tablespoon'); ?></label>
                             <tr><select form="fLocalization" id="iTablespoon" name="tablespoon">
                                     </select>
-                            <tr><label for="iGlass"><?= $this->getText('Glass') ?></label>
+                            <tr><label for="iGlass"><?= $this->getHtml('Glass'); ?></label>
                             <tr><select form="fLocalization" id="iGlass" name="glass">
                                     </select>
                         </table>