diff --git a/modules/backend/behaviors/relationcontroller/partials/_button_delete.htm b/modules/backend/behaviors/relationcontroller/partials/_button_delete.htm
index 9a7d557f2..108ff4af2 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_button_delete.htm
+++ b/modules/backend/behaviors/relationcontroller/partials/_button_delete.htm
@@ -10,5 +10,5 @@
     data-trigger="#<?= $this->relationGetId('view') ?> .control-list input[type=checkbox]"
     data-trigger-condition="checked"
     data-stripe-load-indicator>
-    <?= trans('backend::lang.relation.delete') ?>
+    <?= e(trans('backend::lang.relation.delete')) ?>
 </button>
\ No newline at end of file
diff --git a/modules/backend/behaviors/relationcontroller/partials/_button_remove.htm b/modules/backend/behaviors/relationcontroller/partials/_button_remove.htm
index 6e680af62..2ddd2770f 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_button_remove.htm
+++ b/modules/backend/behaviors/relationcontroller/partials/_button_remove.htm
@@ -9,5 +9,5 @@
     data-trigger="#<?= $this->relationGetId('view') ?> .control-list input[type=checkbox]"
     data-trigger-condition="checked"
     data-stripe-load-indicator>
-    <?= trans('backend::lang.relation.remove') ?>
+    <?= e(trans('backend::lang.relation.remove')) ?>
 </button>
\ No newline at end of file
diff --git a/modules/backend/behaviors/relationcontroller/partials/_manage_form.htm b/modules/backend/behaviors/relationcontroller/partials/_manage_form.htm
index f65746ca8..a29cc76fa 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_manage_form.htm
+++ b/modules/backend/behaviors/relationcontroller/partials/_manage_form.htm
@@ -7,7 +7,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="popup">&times;</button>
             <h4 class="modal-title">
-                <?= trans('backend::lang.relation.create_name', ['name'=>$relationLabel]) ?>
+                <?= e(trans('backend::lang.relation.create_name', ['name'=>$relationLabel])) ?>
             </h4>
         </div>
         <div class="modal-body">
@@ -20,7 +20,7 @@
                 type="submit"
                 class="btn btn-primary"
                 data-dismiss="popup">
-                <?= trans('backend::lang.relation.update') ?>
+                <?= e(trans('backend::lang.relation.update')) ?>
             </button>
             <button
                 type="button"
@@ -40,7 +40,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="popup">&times;</button>
             <h4 class="modal-title">
-                <?= trans('backend::lang.relation.create_name', ['name'=>$relationLabel]) ?>
+                <?= e(trans('backend::lang.relation.create_name', ['name'=>$relationLabel])) ?>
             </h4>
         </div>
         <div class="modal-body">
@@ -53,13 +53,13 @@
                 type="submit"
                 class="btn btn-primary"
                 data-dismiss="popup">
-                <?= trans('backend::lang.relation.create') ?>
+                <?= e(trans('backend::lang.relation.create')) ?>
             </button>
             <button
                 type="button"
                 class="btn btn-default"
                 data-dismiss="popup">
-                <?= trans('backend::lang.relation.cancel') ?>
+                <?= e(trans('backend::lang.relation.cancel')) ?>
             </button>
         </div>
     <?= Form::close() ?>
diff --git a/modules/backend/controllers/auth/reset.htm b/modules/backend/controllers/auth/reset.htm
index cd49622ab..369a04288 100644
--- a/modules/backend/controllers/auth/reset.htm
+++ b/modules/backend/controllers/auth/reset.htm
@@ -1,4 +1,4 @@
-<h2><?= trans('backend::lang.account.enter_new_password') ?></h2>
+<h2><?= e(trans('backend::lang.account.enter_new_password')) ?></h2>
 
 <?= Form::open() ?>
     <input type="hidden" name="postback" value="1" />
@@ -26,7 +26,7 @@
 
         <p class="pull-right forgot-password">
             <a href="<?= Backend::url('backend/auth') ?>" class="text-muted">
-                <?= trans('backend::lang.form.cancel') ?>
+                <?= e(trans('backend::lang.form.cancel')) ?>
             </a>
         </p>
     </div>
diff --git a/modules/backend/controllers/auth/restore.htm b/modules/backend/controllers/auth/restore.htm
index eedbd34ea..6dfe47573 100644
--- a/modules/backend/controllers/auth/restore.htm
+++ b/modules/backend/controllers/auth/restore.htm
@@ -1,4 +1,4 @@
-<h2><?= trans('backend::lang.account.enter_login') ?></h2>
+<h2><?= e(trans('backend::lang.account.enter_login')) ?></h2>
 
 <?= Form::open() ?>
     <input type="hidden" name="postback" value="1" />
@@ -22,7 +22,7 @@
 
         <p class="pull-right forgot-password">
             <a href="<?= Backend::url('backend/auth') ?>" class="text-muted">
-                <?= trans('backend::lang.form.cancel') ?>
+                <?= e(trans('backend::lang.form.cancel')) ?>
             </a>
         </p>
     </div>
diff --git a/modules/backend/controllers/auth/signin.htm b/modules/backend/controllers/auth/signin.htm
index b9a38da4f..82ce38808 100644
--- a/modules/backend/controllers/auth/signin.htm
+++ b/modules/backend/controllers/auth/signin.htm
@@ -1,4 +1,4 @@
-<h2><?= trans('system::lang.app.motto') ?></h2>
+<h2><?= e(trans('system::lang.app.motto')) ?></h2>
 
 <?= Form::open() ?>
     <input type="hidden" name="postback" value="1" />
@@ -34,7 +34,7 @@
         <p class="oc-icon-lock pull-right forgot-password">
             <!-- Forgot your password? -->
             <a href="<?= Backend::url('backend/auth/restore') ?>" class="text-muted">
-                <?= trans('backend::lang.account.forgot_password') ?>
+                <?= e(trans('backend::lang.account.forgot_password')) ?>
             </a>
         </p>
 
diff --git a/modules/backend/layouts/_footer.htm b/modules/backend/layouts/_footer.htm
index 9ecfb7f77..97a3a97e8 100644
--- a/modules/backend/layouts/_footer.htm
+++ b/modules/backend/layouts/_footer.htm
@@ -1,9 +1,9 @@
 <footer id="layout-footer">
     <div class="brand">
         <span class="logo"><i class="icon-leaf"></i></span>
-        <span class="name"><?= trans('system::lang.app.name') ?></span>
+        <span class="name"><?= e(trans('system::lang.app.name')) ?></span>
     </div>
     <div class="motto">
-        <p><?= trans('system::lang.app.motto') ?></p>
+        <p><?= e(trans('system::lang.app.motto')) ?></p>
     </div>
 </footer>
\ No newline at end of file
diff --git a/modules/backend/layouts/_mainmenu.htm b/modules/backend/layouts/_mainmenu.htm
index 81e2ae1aa..61e18be3f 100644
--- a/modules/backend/layouts/_mainmenu.htm
+++ b/modules/backend/layouts/_mainmenu.htm
@@ -28,7 +28,12 @@
                 */
             ?>
             <li class="icon preview">
-                <a href="<?= URL::to('/') ?>" target="_blank" data-toggle="tooltip" data-placement="bottom" title="<?= trans('backend::lang.tooltips.preview_website') ?>">
+                <a
+                    href="<?= URL::to('/') ?>"
+                    target="_blank"
+                    data-toggle="tooltip"
+                    data-placement="bottom"
+                    title="<?= e(trans('backend::lang.tooltips.preview_website')) ?>">
                     <i class="icon-crosshairs"></i>
                 </a>
             </li>
@@ -41,7 +46,13 @@
                 </a>
             </li>
             <li class="icon power-off">
-                <a data-toggle="tooltip" data-placement="left" href="<?= Backend::url('backend/auth/signout') ?>" title="<?= trans('backend::lang.account.sign_out') ?>"><i class="icon-power-off"></i></a>
+                <a
+                    data-toggle="tooltip"
+                    data-placement="left"
+                    href="<?= Backend::url('backend/auth/signout') ?>"
+                    title="<?= e(trans('backend::lang.account.sign_out')) ?>">
+                    <i class="icon-power-off"></i>
+                </a>
             </li>
         </ul>
     </div>
diff --git a/modules/backend/layouts/auth.htm b/modules/backend/layouts/auth.htm
index f2ba4eff0..331cb34de 100644
--- a/modules/backend/layouts/auth.htm
+++ b/modules/backend/layouts/auth.htm
@@ -26,7 +26,7 @@
             <div class="layout">
                 <div class="layout-row min-size layout-head">
                     <div class="layout-cell">
-                        <h1><?= trans('system::lang.app.name') ?></h1>
+                        <h1><?= e(trans('system::lang.app.name')) ?></h1>
                     </div>
                 </div>
                 <div class="layout-row">
diff --git a/modules/cms/widgets/assetlist/partials/_items.htm b/modules/cms/widgets/assetlist/partials/_items.htm
index 53ae8fcbd..68d426b9c 100644
--- a/modules/cms/widgets/assetlist/partials/_items.htm
+++ b/modules/cms/widgets/assetlist/partials/_items.htm
@@ -1,7 +1,7 @@
-<?php 
+<?php
     $searchMode = $this->isSearchMode();
 
-    if (($upPath = $this->getUpPath()) !== null && !$searchMode): 
+    if (($upPath = $this->getUpPath()) !== null && !$searchMode):
 ?>
     <p class="parent">
         <a href="<?= $upPath ?>" data-path="<?= $upPath ?>" class="link"><?= $this->getCurrentRelativePath() ?></a>
@@ -25,10 +25,10 @@
                     </a>
 
                     <div class="controls">
-                        <a 
+                        <a
                             href="javascript:;"
                             class="control icon btn-primary oc-icon-terminal" 
-                            title="Rename" 
+                            title="Rename"
                             data-control="popup"
                             data-request-data="renamePath: '<?= e($item->path) ?>'"
                             data-handler="<?= $this->getEventHandler('onLoadRenamePopup') ?>"
@@ -39,20 +39,20 @@
                     <div class="checkbox custom-checkbox nolabel">
                         <?php $cbId = 'cb'.md5($item->path) ?>
                         <input 
-                            id="<?= $cbId ?>" 
+                            id="<?= $cbId ?>"
                             type="checkbox"
-                            name="file[<?= e($item->path) ?>]" 
+                            name="file[<?= e($item->path) ?>]"
                             <?= $this->isFileSelected($item) ? 'checked' : null ?> 
                             data-request="<?= $this->getEventHandler('onSelect') ?>"
                             value="1">
-                        <label for="<?= $cbId ?>"><?= trans('cms::lang.asset.select') ?></label>
+                        <label for="<?= $cbId ?>"><?= e(trans('cms::lang.asset.select')) ?></label>
                     </div>
 
                 </li>
             <?php endforeach ?>
         </ul>
     <?php else: ?>
-        <p class="no-data"><?= trans($this->noRecordsMessage) ?></p>
+        <p class="no-data"><?= e(trans($this->noRecordsMessage)) ?></p>
     <?php endif ?>
 </div>
 
diff --git a/modules/cms/widgets/assetlist/partials/_move_form.htm b/modules/cms/widgets/assetlist/partials/_move_form.htm
index 2526b96f3..85e91d7b4 100644
--- a/modules/cms/widgets/assetlist/partials/_move_form.htm
+++ b/modules/cms/widgets/assetlist/partials/_move_form.htm
@@ -6,12 +6,15 @@
 ]) ?>
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
-        <h4 class="modal-title"><?= trans('cms::lang.asset.move_popup_title') ?></h4>
+        <h4 class="modal-title"><?= e(trans('cms::lang.asset.move_popup_title')) ?></h4>
     </div>
     <div class="modal-body">
         <div class="form-group">
-            <label><?= trans('cms::lang.asset.move_destination') ?></label>
-            <select class="form-control custom-select" name="dest" data-placeholder="<?= trans('cms::lang.asset.move_please_select') ?>">
+            <label><?= e(trans('cms::lang.asset.move_destination')) ?></label>
+            <select
+                class="form-control custom-select"
+                name="dest"
+                data-placeholder="<?= e(trans('cms::lang.asset.move_please_select')) ?>">
                 <option></option>
                 <?php foreach ($directories as $path=>$directory):?>
                     <option value="<?= e($path) ?>"><?= e($directory) ?></option>
@@ -23,17 +26,16 @@
         <input type="hidden" name="selectedList" value="<?= e($selectedList) ?>">
     </div>
     <div class="modal-footer">
-        <button 
+        <button
             type="submit"
-            class="btn btn-primary"
-        >
-            <?= trans('cms::lang.asset.move_button') ?>
+            class="btn btn-primary">
+            <?= e(trans('cms::lang.asset.move_button')) ?>
         </button>
-        <button 
+        <button
             type="button"
             class="btn btn-default"
             data-dismiss="popup">
-            <?= trans('backend::lang.form.cancel') ?>
+            <?= e(trans('backend::lang.form.cancel')) ?>
         </button>
     </div>
 <?= Form::close() ?>
\ No newline at end of file
diff --git a/modules/cms/widgets/assetlist/partials/_new_dir_form.htm b/modules/cms/widgets/assetlist/partials/_new_dir_form.htm
index b6a95f170..e1f3c1f56 100644
--- a/modules/cms/widgets/assetlist/partials/_new_dir_form.htm
+++ b/modules/cms/widgets/assetlist/partials/_new_dir_form.htm
@@ -6,28 +6,27 @@
 ]) ?>
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
-        <h4 class="modal-title"><?= trans('cms::lang.asset.directory_popup_title') ?></h4>
+        <h4 class="modal-title"><?= e(trans('cms::lang.asset.directory_popup_title')) ?></h4>
     </div>
     <div class="modal-body">
         <div class="form-group">
-            <label><?= trans('cms::lang.asset.directory_name') ?></label>
+            <label><?= e(trans('cms::lang.asset.directory_name')) ?></label>
             <input type="text" class="form-control" name="name" value=""/>
         </div>
 
         <input type="hidden" name="theme" value="<?= e($this->theme->getDirName()) ?>">
     </div>
     <div class="modal-footer">
-        <button 
+        <button
             type="submit"
-            class="btn btn-primary"
-        >
-            <?= trans('backend::lang.form.create') ?>
+            class="btn btn-primary">
+            <?= e(trans('backend::lang.form.create')) ?>
         </button>
-        <button 
+        <button
             type="button"
             class="btn btn-default"
             data-dismiss="popup">
-            <?= trans('backend::lang.form.cancel') ?>
+            <?= e(trans('backend::lang.form.cancel')) ?>
         </button>
     </div>
     <script>
diff --git a/modules/cms/widgets/assetlist/partials/_rename_form.htm b/modules/cms/widgets/assetlist/partials/_rename_form.htm
index 257ce2f12..8513e68be 100644
--- a/modules/cms/widgets/assetlist/partials/_rename_form.htm
+++ b/modules/cms/widgets/assetlist/partials/_rename_form.htm
@@ -5,11 +5,11 @@
 ]) ?>
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
-        <h4 class="modal-title"><?= trans('cms::lang.asset.rename_popup_title') ?></h4>
+        <h4 class="modal-title"><?= e(trans('cms::lang.asset.rename_popup_title')) ?></h4>
     </div>
     <div class="modal-body">
         <div class="form-group">
-            <label><?= trans('cms::lang.asset.rename_new_name') ?></label>
+            <label><?= e(trans('cms::lang.asset.rename_new_name')) ?></label>
             <input type="text" class="form-control" name="name" value="<?= $name ?>" />
         </div>
 
@@ -19,15 +19,14 @@
     <div class="modal-footer">
         <button
             type="submit"
-            class="btn btn-primary"
-        >
-            <?= trans('backend::lang.form.apply') ?>
+            class="btn btn-primary">
+            <?= e(trans('backend::lang.form.apply')) ?>
         </button>
         <button
             type="button"
             class="btn btn-default"
             data-dismiss="popup">
-            <?= trans('backend::lang.form.cancel') ?>
+            <?= e(trans('backend::lang.form.cancel')) ?>
         </button>
     </div>
     <script>
diff --git a/modules/cms/widgets/componentlist/partials/_items.htm b/modules/cms/widgets/componentlist/partials/_items.htm
index 439048421..a182623a7 100644
--- a/modules/cms/widgets/componentlist/partials/_items.htm
+++ b/modules/cms/widgets/componentlist/partials/_items.htm
@@ -12,5 +12,5 @@
     <?php endforeach ?>
     </ul>
 <?php else: ?>
-    <p class="no-data"><?= trans('cms::lang.component.no_records') ?></p>
+    <p class="no-data"><?= e(trans('cms::lang.component.no_records')) ?></p>
 <?php endif ?>
\ No newline at end of file
diff --git a/modules/cms/widgets/templatelist/partials/_items.htm b/modules/cms/widgets/templatelist/partials/_items.htm
index 5b80b1183..1a37e578f 100644
--- a/modules/cms/widgets/templatelist/partials/_items.htm
+++ b/modules/cms/widgets/templatelist/partials/_items.htm
@@ -42,7 +42,7 @@
         <?php endforeach ?>
     </ul>
 <?php else: ?>
-    <p class="no-data"><?= trans($this->noRecordsMessage) ?></p>
+    <p class="no-data"><?= e(trans($this->noRecordsMessage)) ?></p>
 <?php endif ?>
 
 <?php if (!isset($nested)): ?>