diff --git a/app/modules/web/Controllers/AccountController.php b/app/modules/web/Controllers/AccountController.php
index 79352c19..fa9f6917 100644
--- a/app/modules/web/Controllers/AccountController.php
+++ b/app/modules/web/Controllers/AccountController.php
@@ -102,19 +102,16 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function searchAction()
     {
         try {
-            $this->checkSecurityToken($this->session, $this->request);
+            $this->checkSecurityToken($this->previousSk, $this->request);
 
             $accountSearchHelper = $this->dic->get(AccountSearchHelper::class);
             $accountSearchHelper->getAccountSearch();
 
             $this->eventDispatcher->notifyEvent('show.account.search', new Event($this));
 
-            $data = [
-                'sk' => $this->session->generateSecurityKey(),
+            return $this->returnJsonResponseData([
                 'html' => $this->render()
-            ];
-
-            return $this->returnJsonResponseData($data);
+            ]);
         } catch (\Exception $e) {
             processException($e);
 
@@ -133,6 +130,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function viewAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $accountDetailsResponse = $this->accountService->getById($id);
             $this->accountService
                 ->withUsersById($accountDetailsResponse)
@@ -178,10 +177,10 @@ final class AccountController extends ControllerBase implements CrudControllerIn
      */
     public function viewLinkAction($hash)
     {
-        $layoutHelper = $this->dic->get(LayoutHelper::class);
-        $layoutHelper->getPublicLayout('account-link', 'account');
-
         try {
+            $layoutHelper = $this->dic->get(LayoutHelper::class);
+            $layoutHelper->getPublicLayout('account-link', 'account');
+
             $publicLinkService = $this->dic->get(PublicLinkService::class);
             $publicLinkData = $publicLinkService->getByHash($hash);
 
@@ -247,6 +246,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function createAction()
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $accountHelper = $this->dic->get(AccountHelper::class);
             $accountHelper->setViewForBlank(Acl::ACCOUNT_CREATE);
 
@@ -285,6 +286,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function copyAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $accountDetailsResponse = $this->accountService->getById($id);
             $this->accountService
                 ->withUsersById($accountDetailsResponse)
@@ -329,6 +332,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function editAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $accountDetailsResponse = $this->accountService->getById($id);
             $this->accountService
                 ->withUsersById($accountDetailsResponse)
@@ -375,6 +380,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function deleteAction($id = null)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $accountDetailsResponse = $this->accountService->getById($id);
             $this->accountService
                 ->withUsersById($accountDetailsResponse)
@@ -418,6 +425,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function editPassAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $accountDetailsResponse = $this->accountService->getById($id);
             $this->accountService
                 ->withUsersById($accountDetailsResponse)
@@ -461,6 +470,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function viewHistoryAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $accountHistoryService = $this->dic->get(AccountHistoryService::class);
             $accountHistoryData = $accountHistoryService->getById($id);
 
@@ -504,6 +515,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function requestAccessAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $accountHelper = $this->dic->get(AccountHelper::class);
             $accountHelper->setIsView(true);
             $accountHelper->setViewForRequest($this->accountService->getById($id), Acl::ACCOUNT_REQUEST);
@@ -536,6 +549,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function viewPassAction($id, $parentId = 0)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $accountPassHelper = $this->dic->get(AccountPasswordHelper::class);
 
             $account = $this->accountService->getPasswordForId($id);
@@ -594,6 +609,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function viewPassHistoryAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $accountPassHelper = $this->dic->get(AccountPasswordHelper::class);
 
             $account = $this->accountService->getPasswordHistoryForId($id);
@@ -634,9 +651,12 @@ final class AccountController extends ControllerBase implements CrudControllerIn
      * @throws \SP\Core\Exceptions\QueryException
      * @throws \SP\Repositories\NoSuchItemException
      * @throws \SP\Services\ServiceException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function copyPassAction($id)
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         $accountPassHelper = $this->dic->get(AccountPasswordHelper::class);
 
         $account = $this->accountService->getPasswordForId($id);
@@ -668,9 +688,12 @@ final class AccountController extends ControllerBase implements CrudControllerIn
      * @throws \SP\Core\Exceptions\QueryException
      * @throws \SP\Repositories\NoSuchItemException
      * @throws \SP\Services\ServiceException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function copyPassHistoryAction($id)
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         $accountPassHelper = $this->dic->get(AccountPasswordHelper::class);
 
         $account = $this->accountService->getPasswordHistoryForId($id);
@@ -702,6 +725,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function saveCreateAction()
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $form = new AccountForm($this->dic);
             $form->validate(Acl::ACCOUNT_CREATE);
 
@@ -748,6 +773,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function saveEditAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $form = new AccountForm($this->dic, $id);
             $form->validate(Acl::ACCOUNT_EDIT);
 
@@ -793,6 +820,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function saveEditPassAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $form = new AccountForm($this->dic, $id);
             $form->validate(Acl::ACCOUNT_EDIT_PASS);
 
@@ -835,6 +864,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function saveEditRestoreAction($historyId, $id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $this->accountService->editRestore($historyId, $id);
 
             $accountDetails = $this->accountService->getById($id)->getAccountVData();
@@ -871,6 +902,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function saveDeleteAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             if ($id === null) {
                 $this->accountService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -914,6 +947,8 @@ final class AccountController extends ControllerBase implements CrudControllerIn
     public function saveRequestAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $description = $this->request->analyzeString('description');
 
             if (empty($description)) {
diff --git a/app/modules/web/Controllers/AccountFileController.php b/app/modules/web/Controllers/AccountFileController.php
index e49c8a25..56b9b96b 100644
--- a/app/modules/web/Controllers/AccountFileController.php
+++ b/app/modules/web/Controllers/AccountFileController.php
@@ -66,6 +66,8 @@ final class AccountFileController extends ControllerBase implements CrudControll
     public function viewAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             if (null === ($fileData = $this->accountFileService->getById($id))) {
                 throw new SPException(__u('El archivo no existe'), SPException::INFO);
             }
@@ -118,6 +120,8 @@ final class AccountFileController extends ControllerBase implements CrudControll
     public function downloadAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             if (null === ($fileData = $this->accountFileService->getById($id))) {
                 throw new SPException(__u('El archivo no existe'), SPException::INFO);
             }
@@ -155,6 +159,8 @@ final class AccountFileController extends ControllerBase implements CrudControll
     public function uploadAction($accountId)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $file = $this->router->request()->files()->get('inFile');
 
             if ($accountId === 0 || null === $file) {
@@ -252,11 +258,17 @@ final class AccountFileController extends ControllerBase implements CrudControll
     /**
      * Search action
      *
+     * @return bool
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::ACCOUNT_FILE_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -272,6 +284,8 @@ final class AccountFileController extends ControllerBase implements CrudControll
      * getSearchGrid
      *
      * @return $this
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
@@ -312,6 +326,8 @@ final class AccountFileController extends ControllerBase implements CrudControll
     public function deleteAction($id = null)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             if ($id === null) {
                 $this->accountFileService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -372,6 +388,8 @@ final class AccountFileController extends ControllerBase implements CrudControll
         }
 
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $this->view->addTemplate('files-list', 'account');
 
             $this->view->assign('deleteEnabled', $this->request->analyzeInt('del', false));
diff --git a/app/modules/web/Controllers/AccountHistoryManagerController.php b/app/modules/web/Controllers/AccountHistoryManagerController.php
index 6492e03f..ca7071d8 100644
--- a/app/modules/web/Controllers/AccountHistoryManagerController.php
+++ b/app/modules/web/Controllers/AccountHistoryManagerController.php
@@ -50,11 +50,16 @@ final class AccountHistoryManagerController extends ControllerBase
 
     /**
      * @return bool
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::ACCOUNTMGR_HISTORY_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -70,6 +75,8 @@ final class AccountHistoryManagerController extends ControllerBase
      * getSearchGrid
      *
      * @return $this
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
@@ -92,6 +99,8 @@ final class AccountHistoryManagerController extends ControllerBase
     public function deleteAction($id = null)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             if ($id === null) {
                 $this->accountHistoryService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -130,6 +139,8 @@ final class AccountHistoryManagerController extends ControllerBase
     public function restoreAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $accountDetails = $this->accountHistoryService->getById($id);
 
             $accountService = $this->dic->get(AccountService::class);
@@ -158,6 +169,8 @@ final class AccountHistoryManagerController extends ControllerBase
     /**
      * Initialize class
      *
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Services\Auth\AuthException
      */
     protected function initialize()
diff --git a/app/modules/web/Controllers/AccountManagerController.php b/app/modules/web/Controllers/AccountManagerController.php
index a2a7d05f..7d4eedca 100644
--- a/app/modules/web/Controllers/AccountManagerController.php
+++ b/app/modules/web/Controllers/AccountManagerController.php
@@ -73,6 +73,8 @@ final class AccountManagerController extends ControllerBase
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::ACCOUNTMGR_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -122,6 +124,8 @@ final class AccountManagerController extends ControllerBase
     public function deleteAction($id = null)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             if ($id === null) {
                 $this->accountService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -163,6 +167,8 @@ final class AccountManagerController extends ControllerBase
     public function saveBulkEditAction()
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $form = new AccountForm($this->dic);
             $form->validate(Acl::ACCOUNTMGR_BULK_EDIT);
 
@@ -200,16 +206,18 @@ final class AccountManagerController extends ControllerBase
      */
     public function bulkEditAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::ACCOUNTMGR)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Actualización Masiva'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'accountManager/saveBulkEdit');
-        $this->view->assign('itemsId', $this->getItemsIdFromRequest($this->request));
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::ACCOUNTMGR)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Actualización Masiva'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'accountManager/saveBulkEdit');
+            $this->view->assign('itemsId', $this->getItemsIdFromRequest($this->request));
+
             $this->setViewData();
 
             $this->eventDispatcher->notifyEvent('show.account.bulkEdit', new Event($this));
@@ -229,7 +237,6 @@ final class AccountManagerController extends ControllerBase
     {
         $this->view->addTemplate('account_bulkedit', 'itemshow');
 
-        $this->view->assign('sk', $this->session->generateSecurityKey());
         $this->view->assign('nextAction', Acl::getActionRoute(Acl::ITEMS_MANAGE));
 
         $clients = SelectItemAdapter::factory(ClientService::getItemsBasic())->getItemsFromModel();
@@ -250,8 +257,8 @@ final class AccountManagerController extends ControllerBase
             $this->view->assign('disabled', 'disabled');
             $this->view->assign('readonly', 'readonly');
         } else {
-            $this->view->assign('disabled');
-            $this->view->assign('readonly');
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
         }
     }
 
diff --git a/app/modules/web/Controllers/AuthTokenController.php b/app/modules/web/Controllers/AuthTokenController.php
index 722c3248..d00290f8 100644
--- a/app/modules/web/Controllers/AuthTokenController.php
+++ b/app/modules/web/Controllers/AuthTokenController.php
@@ -61,9 +61,12 @@ final class AuthTokenController extends ControllerBase implements CrudController
      * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::AUTHTOKEN_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -101,16 +104,17 @@ final class AuthTokenController extends ControllerBase implements CrudController
      */
     public function createAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::AUTHTOKEN_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Nueva Autorización'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'authToken/saveCreate');
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::AUTHTOKEN_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Nueva Autorización'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'authToken/saveCreate');
+
             $this->setViewData();
 
             $this->eventDispatcher->notifyEvent('show.authToken.create', new Event($this));
@@ -143,15 +147,14 @@ final class AuthTokenController extends ControllerBase implements CrudController
         $this->view->assign('users', SelectItemAdapter::factory(UserService::getItemsBasic())->getItemsFromModelSelected([$authToken->getUserId()]));
         $this->view->assign('actions', SelectItemAdapter::factory(AuthTokenService::getTokenActions())->getItemsFromArraySelected([$authToken->getActionId()]));
 
-        $this->view->assign('sk', $this->session->generateSecurityKey());
         $this->view->assign('nextAction', Acl::getActionRoute(Acl::ACCESS_MANAGE));
 
         if ($this->view->isView === true) {
             $this->view->assign('disabled', 'disabled');
             $this->view->assign('readonly', 'readonly');
         } else {
-            $this->view->assign('disabled');
-            $this->view->assign('readonly');
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
         }
 
         $this->view->assign('customFields', $this->getCustomFieldsForItem(Acl::AUTHTOKEN, $authTokenId));
@@ -166,15 +169,18 @@ final class AuthTokenController extends ControllerBase implements CrudController
      */
     public function editAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::AUTHTOKEN_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Editar Autorización'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'authToken/saveEdit/' . $id);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::AUTHTOKEN_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Editar Autorización'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'authToken/saveEdit/' . $id);
+
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.authToken.edit', new Event($this));
@@ -196,11 +202,13 @@ final class AuthTokenController extends ControllerBase implements CrudController
      */
     public function deleteAction($id = null)
     {
-        if (!$this->acl->checkUserAccess(Acl::AUTHTOKEN_DELETE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::AUTHTOKEN_DELETE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             if ($id === null) {
                 $this->authTokenService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -239,11 +247,14 @@ final class AuthTokenController extends ControllerBase implements CrudController
      */
     public function saveCreateAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::AUTHTOKEN_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::AUTHTOKEN_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+
             $form = new AuthTokenForm($this->dic);
             $form->validate(Acl::AUTHTOKEN_CREATE);
 
@@ -274,11 +285,14 @@ final class AuthTokenController extends ControllerBase implements CrudController
      */
     public function saveEditAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::AUTHTOKEN_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::AUTHTOKEN_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+
             $form = new AuthTokenForm($this->dic, $id);
             $form->validate(Acl::AUTHTOKEN_EDIT);
 
@@ -323,14 +337,17 @@ final class AuthTokenController extends ControllerBase implements CrudController
      */
     public function viewAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::AUTHTOKEN_VIEW)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Ver Autorización'));
-        $this->view->assign('isView', true);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::AUTHTOKEN_VIEW)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Ver Autorización'));
+            $this->view->assign('isView', true);
+
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.authToken',
diff --git a/app/modules/web/Controllers/CategoryController.php b/app/modules/web/Controllers/CategoryController.php
index 78410fd5..574a3d02 100644
--- a/app/modules/web/Controllers/CategoryController.php
+++ b/app/modules/web/Controllers/CategoryController.php
@@ -59,9 +59,12 @@ final class CategoryController extends ControllerBase implements CrudControllerI
      * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::CATEGORY_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -96,16 +99,17 @@ final class CategoryController extends ControllerBase implements CrudControllerI
      */
     public function createAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::CATEGORY_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Nueva Categoría'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'category/saveCreate');
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CATEGORY_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Nueva Categoría'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'category/saveCreate');
+
             $this->setViewData();
 
             $this->eventDispatcher->notifyEvent('show.category.create', new Event($this));
@@ -136,15 +140,14 @@ final class CategoryController extends ControllerBase implements CrudControllerI
 
         $this->view->assign('category', $category);
 
-        $this->view->assign('sk', $this->session->generateSecurityKey());
         $this->view->assign('nextAction', Acl::getActionRoute(Acl::ITEMS_MANAGE));
 
         if ($this->view->isView === true) {
             $this->view->assign('disabled', 'disabled');
             $this->view->assign('readonly', 'readonly');
         } else {
-            $this->view->assign('disabled');
-            $this->view->assign('readonly');
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
         }
 
         $this->view->assign('showViewCustomPass', $this->acl->checkUserAccess(Acl::CUSTOMFIELD_VIEW_PASS));
@@ -160,15 +163,18 @@ final class CategoryController extends ControllerBase implements CrudControllerI
      */
     public function editAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::CATEGORY_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Editar Categoría'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'category/saveEdit/' . $id);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CATEGORY_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Editar Categoría'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'category/saveEdit/' . $id);
+
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.category.edit', new Event($this));
@@ -190,11 +196,13 @@ final class CategoryController extends ControllerBase implements CrudControllerI
      */
     public function deleteAction($id = null)
     {
-        if (!$this->acl->checkUserAccess(Acl::CATEGORY_DELETE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CATEGORY_DELETE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             if ($id === null) {
                 $this->categoryService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -233,11 +241,13 @@ final class CategoryController extends ControllerBase implements CrudControllerI
      */
     public function saveCreateAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::CATEGORY_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CATEGORY_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new CategoryForm($this->dic);
             $form->validate(Acl::CATEGORY_CREATE);
 
@@ -273,11 +283,13 @@ final class CategoryController extends ControllerBase implements CrudControllerI
      */
     public function saveEditAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::CATEGORY_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CATEGORY_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new CategoryForm($this->dic, $id);
             $form->validate(Acl::CATEGORY_EDIT);
 
@@ -313,14 +325,16 @@ final class CategoryController extends ControllerBase implements CrudControllerI
      */
     public function viewAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::CATEGORY_VIEW)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Ver Categoría'));
-        $this->view->assign('isView', true);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CATEGORY_VIEW)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Ver Categoría'));
+            $this->view->assign('isView', true);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.category', new Event($this));
diff --git a/app/modules/web/Controllers/ClientController.php b/app/modules/web/Controllers/ClientController.php
index 12b96368..9302cb1e 100644
--- a/app/modules/web/Controllers/ClientController.php
+++ b/app/modules/web/Controllers/ClientController.php
@@ -55,11 +55,17 @@ final class ClientController extends ControllerBase implements CrudControllerInt
     /**
      * Search action
      *
+     * @return bool
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::CLIENT_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -75,6 +81,8 @@ final class ClientController extends ControllerBase implements CrudControllerInt
      * getSearchGrid
      *
      * @return $this
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
@@ -92,16 +100,17 @@ final class ClientController extends ControllerBase implements CrudControllerInt
      */
     public function createAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::CLIENT_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Nuevo Cliente'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'client/saveCreate');
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CLIENT_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Nuevo Cliente'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'client/saveCreate');
+
             $this->setViewData();
 
             $this->eventDispatcher->notifyEvent('show.client.create', new Event($this));
@@ -132,15 +141,14 @@ final class ClientController extends ControllerBase implements CrudControllerInt
 
         $this->view->assign('client', $client);
 
-        $this->view->assign('sk', $this->session->generateSecurityKey());
         $this->view->assign('nextAction', Acl::getActionRoute(Acl::ITEMS_MANAGE));
 
         if ($this->view->isView === true) {
             $this->view->assign('disabled', 'disabled');
             $this->view->assign('readonly', 'readonly');
         } else {
-            $this->view->assign('disabled');
-            $this->view->assign('readonly');
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
         }
 
         $this->view->assign('showViewCustomPass', $this->acl->checkUserAccess(Acl::CUSTOMFIELD_VIEW_PASS));
@@ -156,15 +164,17 @@ final class ClientController extends ControllerBase implements CrudControllerInt
      */
     public function editAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::CLIENT_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Editar Cliente'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'client/saveEdit/' . $id);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CLIENT_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Editar Cliente'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'client/saveEdit/' . $id);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.client.edit', new Event($this));
@@ -186,11 +196,13 @@ final class ClientController extends ControllerBase implements CrudControllerInt
      */
     public function deleteAction($id = null)
     {
-        if (!$this->acl->checkUserAccess(Acl::CLIENT_DELETE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CLIENT_DELETE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             if ($id === null) {
                 $this->clientService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -226,11 +238,13 @@ final class ClientController extends ControllerBase implements CrudControllerInt
      */
     public function saveCreateAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::CLIENT_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CLIENT_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new ClientForm($this->dic);
             $form->validate(Acl::CLIENT_CREATE);
 
@@ -264,11 +278,13 @@ final class ClientController extends ControllerBase implements CrudControllerInt
      */
     public function saveEditAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::CLIENT_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CLIENT_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new ClientForm($this->dic, $id);
             $form->validate(Acl::CLIENT_EDIT);
 
@@ -300,14 +316,16 @@ final class ClientController extends ControllerBase implements CrudControllerInt
      */
     public function viewAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::CLIENT_VIEW)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Ver Cliente'));
-        $this->view->assign('isView', true);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CLIENT_VIEW)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Ver Cliente'));
+            $this->view->assign('isView', true);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.client', new Event($this));
diff --git a/app/modules/web/Controllers/ConfigAccountController.php b/app/modules/web/Controllers/ConfigAccountController.php
index a42f3c1b..9cb7ddab 100644
--- a/app/modules/web/Controllers/ConfigAccountController.php
+++ b/app/modules/web/Controllers/ConfigAccountController.php
@@ -43,9 +43,13 @@ final class ConfigAccountController extends SimpleControllerBase
 
     /**
      * saveAction
+     *
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function saveAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         $configData = $this->config->getConfigData();
 
         $eventMessage = EventMessage::factory();
diff --git a/app/modules/web/Controllers/ConfigBackupController.php b/app/modules/web/Controllers/ConfigBackupController.php
index 522a052c..15d66780 100644
--- a/app/modules/web/Controllers/ConfigBackupController.php
+++ b/app/modules/web/Controllers/ConfigBackupController.php
@@ -46,9 +46,12 @@ final class ConfigBackupController extends SimpleControllerBase
 
     /**
      * @return bool
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function fileBackupAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if ($this->config->getConfigData()->isDemoEnabled()) {
             return $this->returnJsonResponse(JsonResponse::JSON_WARNING, __u('Ey, esto es una DEMO!!'));
         }
diff --git a/app/modules/web/Controllers/ConfigEncryptionController.php b/app/modules/web/Controllers/ConfigEncryptionController.php
index ea8f7d02..0f51bde8 100644
--- a/app/modules/web/Controllers/ConfigEncryptionController.php
+++ b/app/modules/web/Controllers/ConfigEncryptionController.php
@@ -50,11 +50,16 @@ final class ConfigEncryptionController extends SimpleControllerBase
 
     /**
      * @return bool
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
+     * @throws \SP\Core\Exceptions\SPException
      * @throws \SP\Repositories\NoSuchItemException
      * @throws \SP\Services\ServiceException
      */
     public function saveAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         $mastePassService = $this->dic->get(MasterPassService::class);
 
         $currentMasterPass = $this->request->analyzeEncrypted('current_masterpass');
@@ -147,11 +152,13 @@ final class ConfigEncryptionController extends SimpleControllerBase
      */
     public function refreshAction()
     {
-        if ($this->config->getConfigData()->isDemoEnabled()) {
-            return $this->returnJsonResponse(JsonResponse::JSON_WARNING, __u('Ey, esto es una DEMO!!'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if ($this->config->getConfigData()->isDemoEnabled()) {
+                return $this->returnJsonResponse(JsonResponse::JSON_WARNING, __u('Ey, esto es una DEMO!!'));
+            }
+
             $masterPassService = $this->dic->get(MasterPassService::class);
             $masterPassService->updateConfig(Hash::hashKey(CryptSession::getSessionKey($this->session)));
 
@@ -175,6 +182,8 @@ final class ConfigEncryptionController extends SimpleControllerBase
     public function saveTempAction()
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $temporaryMasterPassService = $this->dic->get(TemporaryMasterPassService::class);
             $key = $temporaryMasterPassService->create($this->request->analyzeInt('temporary_masterpass_maxtime', 3600));
 
diff --git a/app/modules/web/Controllers/ConfigGeneralController.php b/app/modules/web/Controllers/ConfigGeneralController.php
index f642fc16..df293f6d 100644
--- a/app/modules/web/Controllers/ConfigGeneralController.php
+++ b/app/modules/web/Controllers/ConfigGeneralController.php
@@ -43,9 +43,13 @@ final class ConfigGeneralController extends SimpleControllerBase
 
     /**
      * saveAction
+     *
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function saveAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         $configData = $this->config->getConfigData();
         $eventMessage = EventMessage::factory();
 
diff --git a/app/modules/web/Controllers/ConfigImportController.php b/app/modules/web/Controllers/ConfigImportController.php
index 887e4767..1a8be2a7 100644
--- a/app/modules/web/Controllers/ConfigImportController.php
+++ b/app/modules/web/Controllers/ConfigImportController.php
@@ -49,9 +49,12 @@ final class ConfigImportController extends SimpleControllerBase
     /**
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function importAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if ($this->config->getConfigData()->isDemoEnabled()) {
             return $this->returnJsonResponse(JsonResponse::JSON_WARNING, __u('Ey, esto es una DEMO!!'));
         }
@@ -64,7 +67,6 @@ final class ConfigImportController extends SimpleControllerBase
         $importParams->setCsvDelimiter($this->request->analyzeString('csvDelimiter'));
 
         try {
-
             $this->eventDispatcher->notifyEvent('run.import.start', new Event($this));
 
             SessionContext::close();
diff --git a/app/modules/web/Controllers/ConfigLdapController.php b/app/modules/web/Controllers/ConfigLdapController.php
index a0ac0389..1ccaf39f 100644
--- a/app/modules/web/Controllers/ConfigLdapController.php
+++ b/app/modules/web/Controllers/ConfigLdapController.php
@@ -54,6 +54,8 @@ final class ConfigLdapController extends SimpleControllerBase
     public function saveAction()
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $eventMessage = EventMessage::factory();
             $configData = $this->config->getConfigData();
 
@@ -98,7 +100,7 @@ final class ConfigLdapController extends SimpleControllerBase
             return $this->saveConfig($configData, $this->config, function () use ($eventMessage) {
                 $this->eventDispatcher->notifyEvent('save.config.ldap', new Event($this, $eventMessage));
             });
-        } catch (ValidationException $e) {
+        } catch (\Exception $e) {
             return $this->returnJsonResponseException($e);
         }
     }
@@ -132,6 +134,8 @@ final class ConfigLdapController extends SimpleControllerBase
     public function checkAction()
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $ldapParams = $this->getLdapParamsFromRequest();
 
             // Valores para la configuración de LDAP
@@ -168,6 +172,8 @@ final class ConfigLdapController extends SimpleControllerBase
     public function checkImportAction()
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $ldapParams = $this->getLdapParamsFromRequest();
 
             // Valores para la configuración de LDAP
@@ -214,6 +220,8 @@ final class ConfigLdapController extends SimpleControllerBase
     public function importAction()
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             if ($this->configData->isDemoEnabled()) {
                 return $this->returnJsonResponse(JsonResponse::JSON_WARNING, __u('Ey, esto es una DEMO!!'));
             }
diff --git a/app/modules/web/Controllers/ConfigMailController.php b/app/modules/web/Controllers/ConfigMailController.php
index 9a5ff0a1..67bcf254 100644
--- a/app/modules/web/Controllers/ConfigMailController.php
+++ b/app/modules/web/Controllers/ConfigMailController.php
@@ -45,9 +45,13 @@ final class ConfigMailController extends SimpleControllerBase
 
     /**
      * saveAction
+     *
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function saveAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         $eventMessage = EventMessage::factory();
         $configData = $this->config->getConfigData();
 
@@ -109,9 +113,13 @@ final class ConfigMailController extends SimpleControllerBase
 
     /**
      * checkAction
+     *
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function checkAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         $mailParams = new MailParams();
         $mailParams->server = $this->request->analyzeString('mail_server');
         $mailParams->port = $this->request->analyzeInt('mail_port', 25);
diff --git a/app/modules/web/Controllers/ConfigWikiController.php b/app/modules/web/Controllers/ConfigWikiController.php
index d1916a57..128b1379 100644
--- a/app/modules/web/Controllers/ConfigWikiController.php
+++ b/app/modules/web/Controllers/ConfigWikiController.php
@@ -42,9 +42,13 @@ final class ConfigWikiController extends SimpleControllerBase
 
     /**
      * saveAction
+     *
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function saveAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         $eventMessage = EventMessage::factory();
         $configData = $this->config->getConfigData();
 
diff --git a/app/modules/web/Controllers/ControllerBase.php b/app/modules/web/Controllers/ControllerBase.php
index dad66d74..f5254e2f 100644
--- a/app/modules/web/Controllers/ControllerBase.php
+++ b/app/modules/web/Controllers/ControllerBase.php
@@ -73,9 +73,13 @@ abstract class ControllerBase
      */
     protected $dic;
     /**
-     * @var
+     * @var bool
      */
     protected $isAjax = false;
+    /**
+     * @var string
+     */
+    protected $previousSk;
 
     /**
      * Constructor
@@ -98,6 +102,7 @@ abstract class ControllerBase
         $this->view->setBase(strtolower($this->controllerName));
 
         $this->isAjax = $this->request->isAjax();
+        $this->previousSk = $this->session->getSecurityKey();
 
         if ($this->session->isLoggedIn()) {
             $this->userData = clone $this->session->getUserData();
@@ -116,7 +121,7 @@ abstract class ControllerBase
      */
     private function setViewVars()
     {
-        $this->view->assign('timeStart', $this->router->request()->server()->get('REQUEST_TIME_FLOAT'));
+        $this->view->assign('timeStart', $this->request->getServer('REQUEST_TIME_FLOAT'));
         $this->view->assign('queryTimeStart', microtime());
         $this->view->assign('ctx_userId', $this->userData->getId());
         $this->view->assign('ctx_userGroupId', $this->userData->getUserGroupId());
@@ -126,9 +131,10 @@ abstract class ControllerBase
         $this->view->assign('isDemo', $this->configData->isDemoEnabled());
         $this->view->assign('icons', $this->theme->getIcons());
         $this->view->assign('configData', $this->configData);
+        $this->view->assign('sk', $this->session->isLoggedIn() ? $this->session->generateSecurityKey() : '');
 
         // Pass the action name to the template as a variable
-        $this->view->assign($this->actionName);
+        $this->view->assign($this->actionName, true);
     }
 
     /**
diff --git a/app/modules/web/Controllers/CustomFieldController.php b/app/modules/web/Controllers/CustomFieldController.php
index d0deb210..1b3884e9 100644
--- a/app/modules/web/Controllers/CustomFieldController.php
+++ b/app/modules/web/Controllers/CustomFieldController.php
@@ -56,11 +56,17 @@ final class CustomFieldController extends ControllerBase implements CrudControll
     /**
      * Search action
      *
+     * @return bool
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::CUSTOMFIELD_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -76,6 +82,8 @@ final class CustomFieldController extends ControllerBase implements CrudControll
      * getSearchGrid
      *
      * @return $this
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
@@ -93,16 +101,17 @@ final class CustomFieldController extends ControllerBase implements CrudControll
      */
     public function createAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::CUSTOMFIELD_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Nuevo Campo'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'customField/saveCreate');
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CUSTOMFIELD_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Nuevo Campo'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'customField/saveCreate');
+
             $this->setViewData();
 
             $this->eventDispatcher->notifyEvent('show.customField.create', new Event($this));
@@ -134,15 +143,14 @@ final class CustomFieldController extends ControllerBase implements CrudControll
         $this->view->assign('types', SelectItemAdapter::factory(CustomFieldTypeService::getItemsBasic())->getItemsFromModelSelected([$customField->getTypeId()]));
         $this->view->assign('modules', SelectItemAdapter::factory(CustomFieldDefService::getFieldModules())->getItemsFromArraySelected([$customField->getModuleId()]));
 
-        $this->view->assign('sk', $this->session->generateSecurityKey());
         $this->view->assign('nextAction', Acl::getActionRoute(Acl::ITEMS_MANAGE));
 
         if ($this->view->isView === true) {
             $this->view->assign('disabled', 'disabled');
             $this->view->assign('readonly', 'readonly');
         } else {
-            $this->view->assign('disabled');
-            $this->view->assign('readonly');
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
         }
     }
 
@@ -155,15 +163,17 @@ final class CustomFieldController extends ControllerBase implements CrudControll
      */
     public function editAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::CUSTOMFIELD_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Editar Campo'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'customField/saveEdit/' . $id);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CUSTOMFIELD_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Editar Campo'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'customField/saveEdit/' . $id);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.customField.edit', new Event($this));
@@ -185,11 +195,13 @@ final class CustomFieldController extends ControllerBase implements CrudControll
      */
     public function deleteAction($id = null)
     {
-        if (!$this->acl->checkUserAccess(Acl::CUSTOMFIELD_DELETE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CUSTOMFIELD_DELETE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             if ($id === null) {
                 $this->customFieldService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -217,11 +229,13 @@ final class CustomFieldController extends ControllerBase implements CrudControll
      */
     public function saveCreateAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::CUSTOMFIELD_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CUSTOMFIELD_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new CustomFieldDefForm($this->dic);
             $form->validate(Acl::CUSTOMFIELD_CREATE);
 
@@ -254,11 +268,13 @@ final class CustomFieldController extends ControllerBase implements CrudControll
      */
     public function saveEditAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::CUSTOMFIELD_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CUSTOMFIELD_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new CustomFieldDefForm($this->dic, $id);
             $form->validate(Acl::CUSTOMFIELD_EDIT);
 
@@ -291,14 +307,16 @@ final class CustomFieldController extends ControllerBase implements CrudControll
      */
     public function viewAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::CUSTOMFIELD_VIEW)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Ver Campo'));
-        $this->view->assign('isView', true);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::CUSTOMFIELD_VIEW)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Ver Campo'));
+            $this->view->assign('isView', true);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.customField', new Event($this));
diff --git a/app/modules/web/Controllers/EventlogController.php b/app/modules/web/Controllers/EventlogController.php
index 2d604808..468118cd 100644
--- a/app/modules/web/Controllers/EventlogController.php
+++ b/app/modules/web/Controllers/EventlogController.php
@@ -54,9 +54,12 @@ final class EventlogController extends ControllerBase
      * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function indexAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::EVENTLOG)) {
             return;
         }
@@ -94,9 +97,12 @@ final class EventlogController extends ControllerBase
      * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::EVENTLOG_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -113,6 +119,8 @@ final class EventlogController extends ControllerBase
     public function clearAction()
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $this->eventLogService->clear();
 
             $this->eventDispatcher->notifyEvent('clear.eventlog',
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php
index 7b25a074..99b4dcec 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php
@@ -523,7 +523,7 @@ final class AccountActionsHelper extends HelperBase
      */
     protected function initialize()
     {
-        $this->sk = $this->context->generateSecurityKey();
+        $this->sk = $this->view->get('sk');
         $this->icons = $this->view->getTheme()->getIcons();
     }
 }
\ No newline at end of file
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php
index 6d066c12..37f37b51 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php
@@ -156,9 +156,12 @@ final class AccountHelper extends HelperBase
         $this->view->assign('users', $selectUsers->getItemsFromModelSelected([$accountData->getUserId()]));
         $this->view->assign('userGroups', $selectUserGroups->getItemsFromModelSelected([$accountData->getUserGroupId()]));
 
-        $this->view->assign('tags', $selectTags->getItemsFromModelSelected(SelectItemAdapter::getIdFromArrayOfObjects($accountDetailsResponse->getTags())));
+        $this->view->assign('tags',
+            $selectTags->getItemsFromModelSelected(SelectItemAdapter::getIdFromArrayOfObjects($accountDetailsResponse->getTags())));
 
-        $this->view->assign('historyData', $this->accountHistoryService->getHistoryForAccount($this->accountId));
+        $this->view->assign('historyData', SelectItemAdapter::factory(
+            $this->accountHistoryService->getHistoryForAccount($this->accountId))
+            ->getItemsFromArray());
 
         $this->view->assign('isModified', strtotime($accountData->getDateEdit()) !== false);
         $this->view->assign('maxFileSize', round($this->configData->getFilesAllowedSize() / 1024, 1));
@@ -185,11 +188,19 @@ final class AccountHelper extends HelperBase
         $userData = $this->context->getUserData();
         $userProfileData = $this->context->getUserProfile();
 
-        $this->view->assign('allowPrivate', ($userProfileData->isAccPrivate() && $accountData->getUserId() === $userData->getId()) || $userData->getIsAdminApp());
-        $this->view->assign('allowPrivateGroup', ($userProfileData->isAccPrivateGroup() && $accountData->getUserGroupId() === $userData->getUserGroupId()) || $userData->getIsAdminApp());
+        $this->view->assign('allowPrivate',
+            ($userProfileData->isAccPrivate()
+                && $accountData->getUserId() === $userData->getId())
+            || $userData->getIsAdminApp());
+
+        $this->view->assign('allowPrivateGroup',
+            ($userProfileData->isAccPrivateGroup()
+                && $accountData->getUserGroupId() === $userData->getUserGroupId())
+            || $userData->getIsAdminApp());
 
         $this->view->assign('accountPassDate', date('Y-m-d H:i:s', $accountData->getPassDate()));
-        $this->view->assign('accountPassDateChange', $accountData->getPassDateChange() > 0 ? gmdate('Y-m-d', $accountData->getPassDateChange()) : 0);
+        $this->view->assign('accountPassDateChange',
+            $accountData->getPassDateChange() > 0 ? gmdate('Y-m-d', $accountData->getPassDateChange()) : 0);
         $this->view->assign('linkedAccounts', $this->accountService->getLinked($this->accountId));
 
         $this->view->assign('accountId', $accountData->getId());
@@ -239,7 +250,8 @@ final class AccountHelper extends HelperBase
      */
     protected function checkAccess(AccountDetailsResponse $accountDetailsResponse)
     {
-        $accountAcl = $this->dic->get(AccountAclService::class)->getAcl($this->actionId, AccountAclDto::makeFromAccount($accountDetailsResponse));
+        $accountAcl = $this->dic->get(AccountAclService::class)
+            ->getAcl($this->actionId, AccountAclDto::makeFromAccount($accountDetailsResponse));
 
         if ($accountAcl === null || $accountAcl->checkAccountAccess($this->actionId) === false) {
             throw new AccountPermissionException(AccountPermissionException::INFO);
@@ -259,27 +271,36 @@ final class AccountHelper extends HelperBase
      */
     protected function setViewCommon()
     {
-        $this->view->assign('actionId', $this->actionId);
         $this->view->assign('isView', $this->isView);
 
         $this->view->assign('accountIsHistory', false);
 
         $this->view->assign('customFields', $this->getCustomFieldsForItem(ActionsInterface::ACCOUNT, $this->accountId));
-        $this->view->assign('categories', SelectItemAdapter::factory($this->dic->get(CategoryService::class)->getAllBasic())->getItemsFromModel());
-        $this->view->assign('clients', SelectItemAdapter::factory($this->dic->get(ClientService::class)->getAllForUser())->getItemsFromModel());
+
+        $this->view->assign('categories',
+            SelectItemAdapter::factory($this->dic->get(CategoryService::class)
+                ->getAllBasic())->getItemsFromModel());
+
+        $this->view->assign('clients',
+            SelectItemAdapter::factory($this->dic->get(ClientService::class)
+                ->getAllForUser())->getItemsFromModel());
 
         $this->view->assign('mailRequestEnabled', $this->configData->isMailRequestsEnabled());
         $this->view->assign('passToImageEnabled', $this->configData->isAccountPassToImage());
 
         $this->view->assign('otherAccounts', $this->accountService->getForUser($this->accountId));
 
-        $this->view->assign('addClientEnabled', !$this->isView && $this->acl->checkUserAccess(ActionsInterface::CLIENT));
+        $this->view->assign('addClientEnabled',
+            !$this->isView && $this->acl->checkUserAccess(ActionsInterface::CLIENT));
         $this->view->assign('addClientRoute', Acl::getActionRoute(ActionsInterface::CLIENT_CREATE));
 
-        $this->view->assign('addCategoryEnabled', !$this->isView && $this->acl->checkUserAccess(ActionsInterface::CATEGORY));
+        $this->view->assign('addCategoryEnabled',
+            !$this->isView && $this->acl->checkUserAccess(ActionsInterface::CATEGORY));
+
         $this->view->assign('addCategoryRoute', Acl::getActionRoute(ActionsInterface::CATEGORY_CREATE));
 
-        $this->view->assign('addTagEnabled', !$this->isView && $this->acl->checkUserAccess(ActionsInterface::TAG));
+        $this->view->assign('addTagEnabled',
+            !$this->isView && $this->acl->checkUserAccess(ActionsInterface::TAG));
         $this->view->assign('addTagRoute', Acl::getActionRoute(ActionsInterface::TAG_CREATE));
 
         $this->view->assign('fileListRoute', Acl::getActionRoute(ActionsInterface::ACCOUNT_FILE_LIST));
@@ -367,7 +388,9 @@ final class AccountHelper extends HelperBase
         $this->view->assign('accountId', 0);
         $this->view->assign('gotData', false);
 
-        $this->view->assign('accountActions', $this->dic->get(AccountActionsHelper::class)->getActionsForAccount($this->accountAcl, new AccountActionsDto($this->accountId)));
+        $this->view->assign('accountActions',
+            $this->dic->get(AccountActionsHelper::class)
+                ->getActionsForAccount($this->accountAcl, new AccountActionsDto($this->accountId)));
 
         $this->setViewCommon();
     }
@@ -399,7 +422,9 @@ final class AccountHelper extends HelperBase
         $this->view->assign('accountId', $accountData->getId());
         $this->view->assign('accountData', $accountDetailsResponse->getAccountVData());
 
-        $this->view->assign('accountActions', $this->dic->get(AccountActionsHelper::class)->getActionsForAccount($this->accountAcl, new AccountActionsDto($this->accountId, null, $accountData->getParentId())));
+        $this->view->assign('accountActions',
+            $this->dic->get(AccountActionsHelper::class)
+                ->getActionsForAccount($this->accountAcl, new AccountActionsDto($this->accountId, null, $accountData->getParentId())));
 
         return true;
     }
@@ -424,9 +449,8 @@ final class AccountHelper extends HelperBase
         $this->publicLinkService = $this->dic->get(PublicLinkService::class);
         $this->itemPresetService = $this->dic->get(ItemPresetService::class);
 
-        $this->view->assign('changesHash');
-        $this->view->assign('chkUserEdit');
-        $this->view->assign('chkGroupEdit');
-        $this->view->assign('sk', $this->context->generateSecurityKey());
+        $this->view->assign('changesHash', '');
+        $this->view->assign('chkUserEdit', false);
+        $this->view->assign('chkGroupEdit', false);
     }
 }
\ No newline at end of file
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php
index 2ab5e536..048de2bf 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php
@@ -79,6 +79,8 @@ final class AccountHistoryHelper extends HelperBase
      * @throws AccountPermissionException
      * @throws UnauthorizedPageException
      * @throws UpdatedMasterPassException
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      * @throws \SP\Repositories\NoSuchItemException
@@ -99,23 +101,36 @@ final class AccountHistoryHelper extends HelperBase
         $this->view->assign('accountAcl', $this->accountAcl);
         $this->view->assign('actionId', $this->actionId);
         $this->view->assign('accountId', $this->accountId);
-        $this->view->assign('accountHistoryId', $this->accountHistoryId);
-        $this->view->assign('historyData', $this->accountHistoryService->getHistoryForAccount($this->accountId));
+
+        $this->view->assign('historyData',
+            SelectItemAdapter::factory($this->accountHistoryService->getHistoryForAccount($this->accountId))
+                ->getItemsFromArraySelected([$this->accountHistoryId]));
+
         $this->view->assign('accountPassDate', date('Y-m-d H:i:s', $accountHistoryData->getPassDate()));
         $this->view->assign('accountPassDateChange', date('Y-m-d', $accountHistoryData->getPassDateChange() ?: 0));
-        $this->view->assign('categories', SelectItemAdapter::factory(CategoryService::getItemsBasic())->getItemsFromModelSelected([$accountHistoryData->getCategoryId()]));
-        $this->view->assign('clients', SelectItemAdapter::factory(ClientService::getItemsBasic())->getItemsFromModelSelected([$accountHistoryData->getClientId()]));
+        $this->view->assign('categories',
+            SelectItemAdapter::factory(CategoryService::getItemsBasic())
+                ->getItemsFromModelSelected([$accountHistoryData->getCategoryId()]));
+        $this->view->assign('clients',
+            SelectItemAdapter::factory(ClientService::getItemsBasic())
+                ->getItemsFromModelSelected([$accountHistoryData->getClientId()]));
         $this->view->assign('isModified', strtotime($accountHistoryData->getDateEdit()) !== false);
 
         $accountActionsHelper = $this->dic->get(AccountActionsHelper::class);
 
-        $this->view->assign('accountActions', $accountActionsHelper->getActionsForAccount($this->accountAcl, new AccountActionsDto($this->accountId, $this->accountHistoryId, 0)));
-        $this->view->assign('accountActionsMenu', $accountActionsHelper->getActionsGrouppedForAccount($this->accountAcl, new AccountActionsDto($this->accountId, $this->accountHistoryId, 0)));
+        $accountActionsDto = new AccountActionsDto($this->accountId, $this->accountHistoryId, 0);
+
+        $this->view->assign('accountActions',
+            $accountActionsHelper->getActionsForAccount($this->accountAcl, $accountActionsDto));
+        $this->view->assign('accountActionsMenu',
+            $accountActionsHelper->getActionsGrouppedForAccount($this->accountAcl, $accountActionsDto));
     }
 
     /**
      * @throws UnauthorizedPageException
      * @throws UpdatedMasterPassException
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Repositories\NoSuchItemException
      * @throws \SP\Services\ServiceException
      */
@@ -125,7 +140,9 @@ final class AccountHistoryHelper extends HelperBase
             throw new UnauthorizedPageException(UnauthorizedPageException::INFO);
         }
 
-        if (!$this->dic->get(MasterPassService::class)->checkUserUpdateMPass($this->context->getUserData()->getLastUpdateMPass())) {
+        if (!$this->dic->get(MasterPassService::class)
+            ->checkUserUpdateMPass($this->context->getUserData()->getLastUpdateMPass())
+        ) {
             throw new UpdatedMasterPassException(UpdatedMasterPassException::INFO);
         }
     }
@@ -136,6 +153,8 @@ final class AccountHistoryHelper extends HelperBase
      * @param AccountHistoryData $accountHistoryData
      *
      * @throws AccountPermissionException
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
@@ -147,9 +166,12 @@ final class AccountHistoryHelper extends HelperBase
             $this->accountHistoryService->getUserGroupsByAccountId($this->accountId)
         );
 
-        $this->accountAcl = $this->dic->get(AccountAclService::class)->getAcl($this->actionId, $acccountAclDto, true);
+        $this->accountAcl = $this->dic->get(AccountAclService::class)
+            ->getAcl($this->actionId, $acccountAclDto, true);
 
-        if ($this->accountAcl === null || $this->accountAcl->checkAccountAccess($this->actionId) === false) {
+        if ($this->accountAcl === null
+            || $this->accountAcl->checkAccountAccess($this->actionId) === false
+        ) {
             throw new AccountPermissionException(SPException::INFO);
         }
     }
@@ -164,7 +186,5 @@ final class AccountHistoryHelper extends HelperBase
     {
         $this->acl = $this->dic->get(Acl::class);
         $this->accountHistoryService = $this->dic->get(AccountHistoryService::class);;
-
-        $this->view->assign('sk', $this->context->generateSecurityKey());
     }
 }
\ No newline at end of file
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php
index 5bdd7791..6d986d8e 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php
@@ -53,10 +53,12 @@ final class AccountPasswordHelper extends HelperBase
      *
      * @return array
      * @throws HelperException
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \Defuse\Crypto\Exception\CryptoException
+     * @throws \SP\Core\Exceptions\FileNotFoundException
      * @throws \SP\Repositories\NoSuchItemException
      * @throws \SP\Services\ServiceException
-     * @throws \SP\Core\Exceptions\FileNotFoundException
      */
     public function getPasswordView(AccountPassData $accountData, bool $useImage)
     {
@@ -79,8 +81,6 @@ final class AccountPasswordHelper extends HelperBase
             $this->view->assign('pass', htmlentities($pass));
         }
 
-        $this->view->assign('sk', $this->context->generateSecurityKey());
-
         return [
             'useimage' => $useImage,
             'html' => $this->view->render()
@@ -104,6 +104,8 @@ final class AccountPasswordHelper extends HelperBase
      *
      * @return string
      * @throws HelperException
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \Defuse\Crypto\Exception\CryptoException
      * @throws \SP\Repositories\NoSuchItemException
      * @throws \SP\Services\ServiceException
@@ -119,6 +121,10 @@ final class AccountPasswordHelper extends HelperBase
         return trim(Crypt::decrypt($accountData->getPass(), $accountData->getKey(), CryptSession::getSessionKey($this->context)));
     }
 
+    /**
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
+     */
     protected function initialize()
     {
         $this->acl = $this->dic->get(Acl::class);
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
index 6e8b52ce..efd84a46 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
@@ -148,16 +148,16 @@ final class AccountSearchHelper extends HelperBase
 
         $accountSearchService = $this->dic->get(AccountSearchService::class);
 
-        $Grid = $this->getGrid();
-        $Grid->getData()->setData($accountSearchService->processSearchResults($this->accountSearchFilter));
-        $Grid->updatePager();
-        $Grid->setTime(round(getElapsedTime($this->queryTimeStart), 5));
+        $dataGrid = $this->getGrid();
+        $dataGrid->getData()->setData($accountSearchService->processSearchResults($this->accountSearchFilter));
+        $dataGrid->updatePager();
+        $dataGrid->setTime(round(getElapsedTime($this->queryTimeStart), 5));
 
 
         // Establecer el filtro de búsqueda en la sesión como un objeto
         $this->context->setSearchFilters($this->accountSearchFilter);
 
-        $this->view->assign('data', $Grid);
+        $this->view->assign('data', $dataGrid);
     }
 
     /**
@@ -200,23 +200,23 @@ final class AccountSearchHelper extends HelperBase
 
         $actions = $this->dic->get(AccountActionsHelper::class);
 
-        $grid = new DataGrid($this->view->getTheme());
-        $grid->setId('gridSearch');
-        $grid->setDataHeaderTemplate('search-header', $this->view->getBase());
-        $grid->setDataRowTemplate('search-rows', $this->view->getBase());
-        $grid->setDataPagerTemplate('datagrid-nav-full', 'grid');
-        $grid->setHeader($this->getHeaderSort());
-        $grid->addDataAction($actions->getViewAction());
-        $grid->addDataAction($actions->getViewPassAction());
-        $grid->addDataAction($actions->getCopyPassAction());
-        $grid->addDataAction($actions->getEditAction(), !$showOptionalActions);
-        $grid->addDataAction($actions->getCopyAction(), !$showOptionalActions);
-        $grid->addDataAction($actions->getDeleteAction(), !$showOptionalActions);
-        $grid->addDataAction($actions->getRequestAction());
-        $grid->setPager($gridPager);
-        $grid->setData(new DataGridData());
+        $dataGrid = new DataGrid($this->view->getTheme());
+        $dataGrid->setId('gridSearch');
+        $dataGrid->setDataHeaderTemplate('search-header', $this->view->getBase());
+        $dataGrid->setDataRowTemplate('search-rows', $this->view->getBase());
+        $dataGrid->setDataPagerTemplate('datagrid-nav-full', 'grid');
+        $dataGrid->setHeader($this->getHeaderSort());
+        $dataGrid->addDataAction($actions->getViewAction());
+        $dataGrid->addDataAction($actions->getViewPassAction());
+        $dataGrid->addDataAction($actions->getCopyPassAction());
+        $dataGrid->addDataAction($actions->getEditAction(), !$showOptionalActions);
+        $dataGrid->addDataAction($actions->getCopyAction(), !$showOptionalActions);
+        $dataGrid->addDataAction($actions->getDeleteAction(), !$showOptionalActions);
+        $dataGrid->addDataAction($actions->getRequestAction());
+        $dataGrid->setPager($gridPager);
+        $dataGrid->setData(new DataGridData());
 
-        return $grid;
+        return $dataGrid;
     }
 
     /**
@@ -275,14 +275,11 @@ final class AccountSearchHelper extends HelperBase
 
     /**
      * Initialize
-     *
-     * @throws \Psr\Container\ContainerExceptionInterface
      */
     protected function initialize()
     {
         $this->queryTimeStart = microtime(true);
-        $this->sk = $this->context->generateSecurityKey();
-        $this->view->assign('sk', $this->sk);
+        $this->sk = $this->view->get('sk');
         $this->setVars();
     }
 
diff --git a/app/modules/web/Controllers/Helpers/Grid/AccountGrid.php b/app/modules/web/Controllers/Helpers/Grid/AccountGrid.php
index 87dfa7f5..163f5eef 100644
--- a/app/modules/web/Controllers/Helpers/Grid/AccountGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/AccountGrid.php
@@ -69,11 +69,16 @@ final class AccountGrid extends GridBase
         $grid->addDataAction($this->getViewAction());
         $grid->addDataAction($this->getDeleteAction());
 
-        $grid->addDataAction($this->getBulkEditAction(), true);
+        $grid->addDataAction(
+            $this->getBulkEditAction()
+                ->setIsSelection(true),
+            true);
+
         $grid->addDataAction(
             $this->getDeleteAction()
                 ->setName(__('Eliminar Seleccionados'))
-                ->setTitle(__('Eliminar Seleccionados')),
+                ->setTitle(__('Eliminar Seleccionados'))
+                ->setIsSelection(true),
             true);
 
         $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5));
diff --git a/app/modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php b/app/modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php
index 5f26f880..f392f40b 100644
--- a/app/modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php
@@ -68,7 +68,8 @@ final class AccountHistoryGrid extends GridBase
         $grid->addDataAction(
             $this->getDeleteAction()
                 ->setName(__('Eliminar Seleccionados'))
-                ->setTitle(__('Eliminar Seleccionados')),
+                ->setTitle(__('Eliminar Seleccionados'))
+                ->setIsSelection(true),
             true);
 
         $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5));
diff --git a/app/modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php b/app/modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php
index 1c503d00..76a83dd3 100644
--- a/app/modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php
@@ -71,7 +71,8 @@ final class AuthTokenGrid extends GridBase
         $grid->addDataAction(
             $this->getDeleteAction()
                 ->setName(__('Eliminar Seleccionados'))
-                ->setTitle(__('Eliminar Seleccionados')),
+                ->setTitle(__('Eliminar Seleccionados'))
+                ->setIsSelection(true),
             true);
 
         $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5));
diff --git a/app/modules/web/Controllers/Helpers/Grid/CategoryGrid.php b/app/modules/web/Controllers/Helpers/Grid/CategoryGrid.php
index 65faf865..68e897ac 100644
--- a/app/modules/web/Controllers/Helpers/Grid/CategoryGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/CategoryGrid.php
@@ -70,7 +70,8 @@ final class CategoryGrid extends GridBase
         $grid->addDataAction(
             $this->getDeleteAction()
                 ->setName(__('Eliminar Seleccionados'))
-                ->setTitle(__('Eliminar Seleccionados')),
+                ->setTitle(__('Eliminar Seleccionados'))
+                ->setIsSelection(true),
             true);
 
         $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5));
diff --git a/app/modules/web/Controllers/Helpers/Grid/ClientGrid.php b/app/modules/web/Controllers/Helpers/Grid/ClientGrid.php
index a3c72ae9..c9b7cacf 100644
--- a/app/modules/web/Controllers/Helpers/Grid/ClientGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/ClientGrid.php
@@ -69,7 +69,8 @@ final class ClientGrid extends GridBase
         $grid->addDataAction(
             $this->getDeleteAction()
                 ->setName(__('Eliminar Seleccionados'))
-                ->setTitle(__('Eliminar Seleccionados')),
+                ->setTitle(__('Eliminar Seleccionados'))
+                ->setIsSelection(true),
             true);
 
         $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5));
diff --git a/app/modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php b/app/modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php
index d000dbd6..90570b69 100644
--- a/app/modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php
@@ -70,7 +70,8 @@ final class CustomFieldGrid extends GridBase
         $grid->addDataAction(
             $this->getDeleteAction()
                 ->setName(__('Eliminar Seleccionados'))
-                ->setTitle(__('Eliminar Seleccionados')),
+                ->setTitle(__('Eliminar Seleccionados'))
+                ->setIsSelection(true),
             true);
 
 
diff --git a/app/modules/web/Controllers/Helpers/Grid/FileGrid.php b/app/modules/web/Controllers/Helpers/Grid/FileGrid.php
index 907fe441..f81166aa 100644
--- a/app/modules/web/Controllers/Helpers/Grid/FileGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/FileGrid.php
@@ -69,7 +69,8 @@ final class FileGrid extends GridBase
         $grid->addDataAction(
             $this->getDeleteAction()
                 ->setName(__('Eliminar Seleccionados'))
-                ->setTitle(__('Eliminar Seleccionados')),
+                ->setTitle(__('Eliminar Seleccionados'))
+                ->setIsSelection(true),
             true);
 
 
diff --git a/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php b/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php
index 1ca33017..120b92b5 100644
--- a/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php
@@ -70,9 +70,12 @@ final class ItemPresetGrid extends GridBase
         $grid->addDataAction($this->getCreateAccountPasswordAction(), true);
         $grid->addDataAction($this->getEditAction());
         $grid->addDataAction($this->getDeleteAction());
-        $grid->addDataAction($this->getDeleteAction()
-            ->setTitle(__('Eliminar Seleccionados'))
-            ->setName(__('Eliminar Seleccionados')), true);
+        $grid->addDataAction(
+            $this->getDeleteAction()
+                ->setTitle(__('Eliminar Seleccionados'))
+                ->setName(__('Eliminar Seleccionados'))
+                ->setIsSelection(true),
+            true);
 
         $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5));
 
diff --git a/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php b/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php
index 0fd424f5..b951264f 100644
--- a/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php
@@ -84,7 +84,8 @@ final class NotificationGrid extends GridBase
             $this->setNonAdminFilter(
                 $this->getDeleteAction()
                     ->setTitle(__('Eliminar Seleccionados'))
-                    ->setName(__('Eliminar Seleccionados'))),
+                    ->setName(__('Eliminar Seleccionados'))
+                    ->setIsSelection(true)),
             true);
 
 
diff --git a/app/modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php b/app/modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php
index baf11484..71847224 100644
--- a/app/modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php
@@ -71,7 +71,8 @@ final class PublicLinkGrid extends GridBase
         $grid->addDataAction(
             $this->getDeleteAction()
                 ->setName(__('Eliminar Seleccionados'))
-                ->setTitle(__('Eliminar Seleccionados')),
+                ->setTitle(__('Eliminar Seleccionados'))
+                ->setIsSelection(true),
             true);
 
 
diff --git a/app/modules/web/Controllers/Helpers/Grid/TagGrid.php b/app/modules/web/Controllers/Helpers/Grid/TagGrid.php
index 3ef2e8e9..7bd1ae66 100644
--- a/app/modules/web/Controllers/Helpers/Grid/TagGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/TagGrid.php
@@ -70,7 +70,8 @@ final class TagGrid extends GridBase
         $grid->addDataAction(
             $this->getDeleteAction()
                 ->setName(__('Eliminar Seleccionados'))
-                ->setTitle(__('Eliminar Seleccionados')),
+                ->setTitle(__('Eliminar Seleccionados'))
+                ->setIsSelection(true),
             true);
 
         $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5));
diff --git a/app/modules/web/Controllers/Helpers/Grid/UserGrid.php b/app/modules/web/Controllers/Helpers/Grid/UserGrid.php
index aa0e03e6..ec0c8b94 100644
--- a/app/modules/web/Controllers/Helpers/Grid/UserGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/UserGrid.php
@@ -80,7 +80,8 @@ final class UserGrid extends GridBase
         $grid->addDataAction(
             $this->getDeleteAction()
                 ->setName(__('Eliminar Seleccionados'))
-                ->setTitle(__('Eliminar Seleccionados')),
+                ->setTitle(__('Eliminar Seleccionados'))
+                ->setIsSelection(true),
             true);
 
         $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5));
diff --git a/app/modules/web/Controllers/Helpers/Grid/UserGroupGrid.php b/app/modules/web/Controllers/Helpers/Grid/UserGroupGrid.php
index 615f346f..06001a08 100644
--- a/app/modules/web/Controllers/Helpers/Grid/UserGroupGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/UserGroupGrid.php
@@ -71,7 +71,8 @@ final class UserGroupGrid extends GridBase
         $grid->addDataAction(
             $this->getDeleteAction()
                 ->setName(__('Eliminar Seleccionados'))
-                ->setTitle(__('Eliminar Seleccionados')),
+                ->setTitle(__('Eliminar Seleccionados'))
+                ->setIsSelection(true),
             true);
 
         $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5));
diff --git a/app/modules/web/Controllers/Helpers/Grid/UserProfileGrid.php b/app/modules/web/Controllers/Helpers/Grid/UserProfileGrid.php
index 71be7d31..2ad63903 100644
--- a/app/modules/web/Controllers/Helpers/Grid/UserProfileGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/UserProfileGrid.php
@@ -71,7 +71,8 @@ final class UserProfileGrid extends GridBase
         $grid->addDataAction(
             $this->getDeleteAction()
                 ->setName(__('Eliminar Seleccionados'))
-                ->setTitle(__('Eliminar Seleccionados')),
+                ->setTitle(__('Eliminar Seleccionados'))
+                ->setIsSelection(true),
             true);
 
         $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5));
diff --git a/app/modules/web/Controllers/Helpers/LayoutHelper.php b/app/modules/web/Controllers/Helpers/LayoutHelper.php
index e377e3ca..46810345 100644
--- a/app/modules/web/Controllers/Helpers/LayoutHelper.php
+++ b/app/modules/web/Controllers/Helpers/LayoutHelper.php
@@ -66,7 +66,7 @@ final class LayoutHelper extends HelperBase
     public function getFullLayout($page, Acl $acl = null)
     {
         $this->view->addTemplate('main', '_layouts');
-        $this->view->assign('useFixedHeader');
+        $this->view->assign('useFixedHeader', true);
 
         $this->setPage($page);
         $this->initBody();
@@ -97,17 +97,12 @@ final class LayoutHelper extends HelperBase
      */
     public function initBody()
     {
-        $this->view->assign('startTime', microtime());
-
         $this->view->assign('isInstalled', $this->configData->isInstalled());
-        $this->view->assign('sk', $this->loggedIn ? $this->context->generateSecurityKey() : '');
         $this->view->assign('app_name', AppInfoInterface::APP_NAME);
         $this->view->assign('app_desc', AppInfoInterface::APP_DESC);
         $this->view->assign('app_website_url', AppInfoInterface::APP_WEBSITE_URL);
         $this->view->assign('app_blog_url', AppInfoInterface::APP_BLOG_URL);
         $this->view->assign('app_version', Installer::VERSION_TEXT);
-        $this->view->assign('isDemoMode', $this->configData->isDemoEnabled());
-        $this->view->assign('icons', $this->theme->getIcons());
         $this->view->assign('logoIcon', Bootstrap::$WEBURI . '/public/images/logo_icon.png');
         $this->view->assign('logoNoText', Bootstrap::$WEBURI . '/public/images/logo_icon.svg');
         $this->view->assign('logo', Bootstrap::$WEBURI . '/public/images/logo_full_bg.png');
@@ -117,6 +112,7 @@ final class LayoutHelper extends HelperBase
 
         $this->loggedIn = $this->context->isLoggedIn();
 
+        $this->view->assign('sk', $this->view->get('sk') ?: $this->context->generateSecurityKey());
         $this->view->assign('loggedIn', $this->loggedIn);
         $this->view->assign('lang', $this->loggedIn ? Language::$userLang : substr(Language::$globalLang, 0, 2));
         $this->view->assign('loadApp', $this->context->getAuthCompleted());
@@ -193,7 +189,7 @@ final class LayoutHelper extends HelperBase
         foreach ($this->dic->get(PluginManager::class)->getLoadedPlugins() as $plugin) {
             $base = str_replace(APP_ROOT, '', $plugin->getBase());
             $base .= DIRECTORY_SEPARATOR . 'public';
-            
+
             $jsResources = $plugin->getJsResources();
             $cssResources = $plugin->getCssResources();
 
@@ -373,7 +369,7 @@ final class LayoutHelper extends HelperBase
     {
         $this->view->addTemplate('main', '_layouts');
         $this->view->addContentTemplate($template);
-        $this->view->assign('useFixedHeader');
+        $this->view->assign('useFixedHeader', true);
 
         $this->setPage($page);
         $this->initBody();
diff --git a/app/modules/web/Controllers/Helpers/TabsGridHelper.php b/app/modules/web/Controllers/Helpers/TabsGridHelper.php
index a80b922e..cb5024b7 100644
--- a/app/modules/web/Controllers/Helpers/TabsGridHelper.php
+++ b/app/modules/web/Controllers/Helpers/TabsGridHelper.php
@@ -56,7 +56,6 @@ final class TabsGridHelper extends HelperBase
         $this->view->assign('activeTab', $activeTab);
         $this->view->assign('maxNumActions', self::MAX_NUM_ACTIONS);
         $this->view->assign('tabsRoute', $route);
-        $this->view->assign('sk', $this->context->generateSecurityKey());
     }
 
     /**
diff --git a/app/modules/web/Controllers/Helpers/TabsHelper.php b/app/modules/web/Controllers/Helpers/TabsHelper.php
index 5ec64fa1..00d38ff9 100644
--- a/app/modules/web/Controllers/Helpers/TabsHelper.php
+++ b/app/modules/web/Controllers/Helpers/TabsHelper.php
@@ -56,7 +56,6 @@ final class TabsHelper extends HelperBase
         $this->view->assign('activeTab', $activeTab);
         $this->view->assign('maxNumActions', self::MAX_NUM_ACTIONS);
         $this->view->assign('tabsRoute', $route);
-        $this->view->assign('sk', $this->context->generateSecurityKey());
     }
 
     /**
diff --git a/app/modules/web/Controllers/ItemPresetController.php b/app/modules/web/Controllers/ItemPresetController.php
index f105135d..7e660fcb 100644
--- a/app/modules/web/Controllers/ItemPresetController.php
+++ b/app/modules/web/Controllers/ItemPresetController.php
@@ -63,14 +63,16 @@ final class ItemPresetController extends ControllerBase implements CrudControlle
      */
     public function viewAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::ITEMPRESET_VIEW)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Ver Valor'));
-        $this->view->assign('isView', true);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::ITEMPRESET_VIEW)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Ver Valor'));
+            $this->view->assign('isView', true);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.itemPreset', new Event($this));
@@ -126,15 +128,14 @@ final class ItemPresetController extends ControllerBase implements CrudControlle
         }
 
         $this->view->assign('preset', $itemPresetData);
-        $this->view->assign('sk', $this->session->generateSecurityKey());
         $this->view->assign('nextAction', Acl::getActionRoute(Acl::ACCESS_MANAGE));
 
         if ($this->view->isView === true) {
             $this->view->assign('disabled', 'disabled');
             $this->view->assign('readonly', 'readonly');
         } else {
-            $this->view->assign('disabled');
-            $this->view->assign('readonly');
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
         }
     }
 
@@ -142,11 +143,16 @@ final class ItemPresetController extends ControllerBase implements CrudControlle
      * Search action
      *
      * @return bool
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::ITEMPRESET_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -184,23 +190,24 @@ final class ItemPresetController extends ControllerBase implements CrudControlle
      */
     public function createAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::ITEMPRESET_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $args = func_get_args();
-        $type = null;
-
-        if (count($args) > 0) {
-            $type = Filter::getString($args[0]);
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Nuevo Valor'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'itemPreset/saveCreate');
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::ITEMPRESET_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $args = func_get_args();
+            $type = null;
+
+            if (count($args) > 0) {
+                $type = Filter::getString($args[0]);
+            }
+
+            $this->view->assign('header', __('Nuevo Valor'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'itemPreset/saveCreate');
+
             $this->setViewData(null, $type);
 
             $this->eventDispatcher->notifyEvent('show.itemPreset.create', new Event($this));
@@ -222,15 +229,17 @@ final class ItemPresetController extends ControllerBase implements CrudControlle
      */
     public function editAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::ITEMPRESET_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Editar Valor'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'itemPreset/saveEdit/' . $id);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::ITEMPRESET_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Editar Valor'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'itemPreset/saveEdit/' . $id);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.itemPreset.edit', new Event($this));
@@ -252,11 +261,13 @@ final class ItemPresetController extends ControllerBase implements CrudControlle
      */
     public function deleteAction($id = null)
     {
-        if (!$this->acl->checkUserAccess(Acl::ITEMPRESET_DELETE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::ITEMPRESET_DELETE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             if ($id === null) {
                 $this->itemPresetService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -291,11 +302,13 @@ final class ItemPresetController extends ControllerBase implements CrudControlle
      */
     public function saveCreateAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::ITEMPRESET_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::ITEMPRESET_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new ItemsPresetForm($this->dic);
             $form->validate(Acl::ITEMPRESET_CREATE);
 
@@ -330,11 +343,13 @@ final class ItemPresetController extends ControllerBase implements CrudControlle
      */
     public function saveEditAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::ITEMPRESET_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::ITEMPRESET_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new ItemsPresetForm($this->dic, $id);
             $form->validate(Acl::ITEMPRESET_EDIT);
 
diff --git a/app/modules/web/Controllers/ItemsController.php b/app/modules/web/Controllers/ItemsController.php
index 1ed2b1ec..24ec5dbc 100644
--- a/app/modules/web/Controllers/ItemsController.php
+++ b/app/modules/web/Controllers/ItemsController.php
@@ -133,7 +133,6 @@ final class ItemsController extends SimpleControllerBase
             'notifications' => $notifications,
             'hash' => sha1(implode('', $notifications))
         ]);
-        $jsonResponse->setCsrf($this->session->getSecurityKey());
 
         Json::factory($this->router->response())
             ->returnJson($jsonResponse);
diff --git a/app/modules/web/Controllers/LoginController.php b/app/modules/web/Controllers/LoginController.php
index 74263dfc..ab021b02 100644
--- a/app/modules/web/Controllers/LoginController.php
+++ b/app/modules/web/Controllers/LoginController.php
@@ -51,6 +51,8 @@ final class LoginController extends ControllerBase
     public function loginAction()
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $loginService = $this->dic->get(LoginService::class);
 
             $from = $this->getSignedUriFromRequest();
diff --git a/app/modules/web/Controllers/NotificationController.php b/app/modules/web/Controllers/NotificationController.php
index 2a79527a..7348399a 100644
--- a/app/modules/web/Controllers/NotificationController.php
+++ b/app/modules/web/Controllers/NotificationController.php
@@ -55,11 +55,16 @@ final class NotificationController extends ControllerBase implements CrudControl
     /**
      * indexAction
      *
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function indexAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::NOTIFICATION)) {
             return;
         }
@@ -98,14 +103,16 @@ final class NotificationController extends ControllerBase implements CrudControl
      */
     public function viewAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_VIEW)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Ver Notificación'));
-        $this->view->assign('isView', true);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_VIEW)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Ver Notificación'));
+            $this->view->assign('isView', true);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.notification', new Event($this));
@@ -139,15 +146,14 @@ final class NotificationController extends ControllerBase implements CrudControl
             $this->view->assign('users', SelectItemAdapter::factory(UserService::getItemsBasic())->getItemsFromModelSelected([$notification->userId]));
         }
 
-        $this->view->assign('sk', $this->session->generateSecurityKey());
         $this->view->assign('nextAction', Acl::getActionRoute(Acl::NOTIFICATION));
 
         if ($this->view->isView === true) {
             $this->view->assign('disabled', 'disabled');
             $this->view->assign('readonly', 'readonly');
         } else {
-            $this->view->assign('disabled');
-            $this->view->assign('readonly');
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
         }
     }
 
@@ -157,9 +163,12 @@ final class NotificationController extends ControllerBase implements CrudControl
      * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -175,16 +184,17 @@ final class NotificationController extends ControllerBase implements CrudControl
      */
     public function createAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Nueva Notificación'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'notification/saveCreate');
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Nueva Notificación'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'notification/saveCreate');
+
             $this->setViewData();
 
             $this->eventDispatcher->notifyEvent('show.notification.create', new Event($this));
@@ -206,16 +216,17 @@ final class NotificationController extends ControllerBase implements CrudControl
      */
     public function editAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Editar Notificación'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'notification/saveEdit/' . $id);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Editar Notificación'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'notification/saveEdit/' . $id);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.notification.edit', new Event($this));
@@ -237,11 +248,13 @@ final class NotificationController extends ControllerBase implements CrudControl
      */
     public function deleteAction($id = null)
     {
-        if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_DELETE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_DELETE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             if ($id === null) {
                 if ($this->userData->getIsAdminApp()) {
                     $this->notificationService->deleteAdminBatch($this->getItemsIdFromRequest($this->request));
@@ -288,11 +301,13 @@ final class NotificationController extends ControllerBase implements CrudControl
      */
     public function checkAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_CHECK)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_CHECK)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $this->notificationService->setCheckedById($id);
 
             $this->eventDispatcher->notifyEvent('check.notification',
@@ -315,11 +330,13 @@ final class NotificationController extends ControllerBase implements CrudControl
      */
     public function saveCreateAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new NotificationForm($this->dic);
             $form->validate(Acl::NOTIFICATION_CREATE);
 
@@ -348,11 +365,13 @@ final class NotificationController extends ControllerBase implements CrudControl
      */
     public function saveEditAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::NOTIFICATION_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new NotificationForm($this->dic, $id);
             $form->validate(Acl::NOTIFICATION_EDIT);
 
diff --git a/app/modules/web/Controllers/PluginController.php b/app/modules/web/Controllers/PluginController.php
index eb421a29..f589e213 100644
--- a/app/modules/web/Controllers/PluginController.php
+++ b/app/modules/web/Controllers/PluginController.php
@@ -54,11 +54,16 @@ final class PluginController extends ControllerBase
     /**
      * indexAction
      *
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function indexAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::PLUGIN)) {
             return;
         }
@@ -96,9 +101,12 @@ final class PluginController extends ControllerBase
      * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::PLUGIN_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -118,14 +126,16 @@ final class PluginController extends ControllerBase
      */
     public function viewAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::PLUGIN_VIEW)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Ver Plugin'));
-        $this->view->assign('isView', true);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PLUGIN_VIEW)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Ver Plugin'));
+            $this->view->assign('isView', true);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.plugin', new Event($this));
@@ -159,15 +169,14 @@ final class PluginController extends ControllerBase
         $this->view->assign('plugin', $pluginData);
         $this->view->assign('pluginInfo', $pluginInfo);
 
-        $this->view->assign('sk', $this->session->generateSecurityKey());
         $this->view->assign('nextAction', Acl::getActionRoute(Acl::ITEMS_MANAGE));
 
         if ($this->view->isView === true) {
             $this->view->assign('disabled', 'disabled');
             $this->view->assign('readonly', 'readonly');
         } else {
-            $this->view->assign('disabled');
-            $this->view->assign('readonly');
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
         }
     }
 
@@ -181,6 +190,8 @@ final class PluginController extends ControllerBase
     public function enableAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $this->pluginService->toggleEnabled($id, 1);
 
             $this->eventDispatcher->notifyEvent('edit.plugin.enable',
@@ -206,6 +217,8 @@ final class PluginController extends ControllerBase
     public function disableAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $this->pluginService->toggleEnabled($id, 0);
 
             $this->eventDispatcher->notifyEvent('edit.plugin.disable',
@@ -231,6 +244,8 @@ final class PluginController extends ControllerBase
     public function resetAction($id)
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $this->pluginService->resetById($id);
 
             $this->eventDispatcher->notifyEvent('edit.plugin.reset',
diff --git a/app/modules/web/Controllers/PublicLinkController.php b/app/modules/web/Controllers/PublicLinkController.php
index 6cbbb51a..99449c8a 100644
--- a/app/modules/web/Controllers/PublicLinkController.php
+++ b/app/modules/web/Controllers/PublicLinkController.php
@@ -64,9 +64,12 @@ final class PublicLinkController extends ControllerBase implements CrudControlle
      * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -101,16 +104,17 @@ final class PublicLinkController extends ControllerBase implements CrudControlle
      */
     public function createAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Nuevo Enlace Público'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'publicLink/saveCreate');
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Nuevo Enlace Público'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'publicLink/saveCreate');
+
             $this->setViewData();
 
             $this->eventDispatcher->notifyEvent('show.publicLink.create', new Event($this));
@@ -141,7 +145,6 @@ final class PublicLinkController extends ControllerBase implements CrudControlle
         $this->view->assign('usageInfo', unserialize($publicLink->getUseInfo()));
         $this->view->assign('accounts', SelectItemAdapter::factory($this->dic->get(AccountService::class)->getForUser())->getItemsFromModelSelected([$publicLink->getItemId()]));
 
-        $this->view->assign('sk', $this->session->generateSecurityKey());
         $this->view->assign('nextAction', Acl::getActionRoute(Acl::ACCESS_MANAGE));
 
         if ($this->view->isView === true) {
@@ -149,8 +152,8 @@ final class PublicLinkController extends ControllerBase implements CrudControlle
             $this->view->assign('disabled', 'disabled');
             $this->view->assign('readonly', 'readonly');
         } else {
-            $this->view->assign('disabled');
-            $this->view->assign('readonly');
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
         }
     }
 
@@ -163,11 +166,13 @@ final class PublicLinkController extends ControllerBase implements CrudControlle
      */
     public function refreshAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_REFRESH)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_REFRESH)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $this->publicLinkService->refresh($id);
 
             $this->eventDispatcher->notifyEvent('edit.publicLink.refresh', new Event($this));
@@ -189,15 +194,17 @@ final class PublicLinkController extends ControllerBase implements CrudControlle
      */
     public function editAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Editar Enlace Público'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'publicLink/saveEdit/' . $id);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Editar Enlace Público'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'publicLink/saveEdit/' . $id);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.publicLink.edit', new Event($this));
@@ -219,11 +226,13 @@ final class PublicLinkController extends ControllerBase implements CrudControlle
      */
     public function deleteAction($id = null)
     {
-        if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_DELETE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_DELETE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             if ($id === null) {
                 $this->publicLinkService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -260,11 +269,13 @@ final class PublicLinkController extends ControllerBase implements CrudControlle
      */
     public function saveCreateAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new PublicLinkForm($this->dic);
             $form->validate(Acl::PUBLICLINK_CREATE);
 
@@ -292,11 +303,13 @@ final class PublicLinkController extends ControllerBase implements CrudControlle
      */
     public function saveCreateFromAccountAction($accountId, $notify)
     {
-        if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $publicLinkData = new PublicLinkData();
             $publicLinkData->setTypeId(PublicLinkService::TYPE_ACCOUNT);
             $publicLinkData->setItemId($accountId);
@@ -334,14 +347,16 @@ final class PublicLinkController extends ControllerBase implements CrudControlle
      */
     public function viewAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_VIEW)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Ver Enlace'));
-        $this->view->assign('isView', true);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PUBLICLINK_VIEW)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Ver Enlace'));
+            $this->view->assign('isView', true);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.publicLink', new Event($this));
diff --git a/app/modules/web/Controllers/SimpleControllerBase.php b/app/modules/web/Controllers/SimpleControllerBase.php
index 29dffddb..7d6c57cb 100644
--- a/app/modules/web/Controllers/SimpleControllerBase.php
+++ b/app/modules/web/Controllers/SimpleControllerBase.php
@@ -42,6 +42,10 @@ abstract class SimpleControllerBase
      * @var ContainerInterface
      */
     protected $dic;
+    /**
+     * @var string
+     */
+    protected $previousSk;
 
     /**
      * SimpleControllerBase constructor.
@@ -59,6 +63,8 @@ abstract class SimpleControllerBase
 
         $this->setUp($container);
 
+        $this->previousSk = $this->session->getSecurityKey();
+
         if (method_exists($this, 'initialize')) {
             $this->initialize();
         }
@@ -90,7 +96,9 @@ abstract class SimpleControllerBase
      */
     protected function checkAccess($action)
     {
-        if (!$this->session->getUserData()->getIsAdminApp() && !$this->acl->checkUserAccess($action)) {
+        if (!$this->session->getUserData()->getIsAdminApp()
+            && !$this->acl->checkUserAccess($action)
+        ) {
             throw new UnauthorizedPageException(UnauthorizedPageException::INFO);
         }
     }
diff --git a/app/modules/web/Controllers/TagController.php b/app/modules/web/Controllers/TagController.php
index a972f507..e036cca7 100644
--- a/app/modules/web/Controllers/TagController.php
+++ b/app/modules/web/Controllers/TagController.php
@@ -58,9 +58,12 @@ final class TagController extends ControllerBase implements CrudControllerInterf
      * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::TAG_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -95,16 +98,17 @@ final class TagController extends ControllerBase implements CrudControllerInterf
      */
     public function createAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::TAG_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Nueva Etiqueta'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'tag/saveCreate');
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::TAG_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Nueva Etiqueta'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'tag/saveCreate');
+
             $this->setViewData();
 
             $this->eventDispatcher->notifyEvent('show.tag.create', new Event($this));
@@ -134,15 +138,14 @@ final class TagController extends ControllerBase implements CrudControllerInterf
 
         $this->view->assign('tag', $tag);
 
-        $this->view->assign('sk', $this->session->generateSecurityKey());
         $this->view->assign('nextAction', Acl::getActionRoute(Acl::ITEMS_MANAGE));
 
         if ($this->view->isView === true) {
             $this->view->assign('disabled', 'disabled');
             $this->view->assign('readonly', 'readonly');
         } else {
-            $this->view->assign('disabled');
-            $this->view->assign('readonly');
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
         }
     }
 
@@ -155,15 +158,17 @@ final class TagController extends ControllerBase implements CrudControllerInterf
      */
     public function editAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::TAG_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Editar Etiqueta'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'tag/saveEdit/' . $id);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::TAG_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Editar Etiqueta'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'tag/saveEdit/' . $id);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.tag.edit', new Event($this));
@@ -185,11 +190,13 @@ final class TagController extends ControllerBase implements CrudControllerInterf
      */
     public function deleteAction($id = null)
     {
-        if (!$this->acl->checkUserAccess(Acl::TAG_DELETE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::TAG_DELETE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             if ($id === null) {
                 $this->tagService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -219,11 +226,13 @@ final class TagController extends ControllerBase implements CrudControllerInterf
      */
     public function saveCreateAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::TAG_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::TAG_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new TagForm($this->dic);
             $form->validate(Acl::TAG_CREATE);
 
@@ -250,11 +259,13 @@ final class TagController extends ControllerBase implements CrudControllerInterf
      */
     public function saveEditAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::TAG_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::TAG_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new TagForm($this->dic, $id);
             $form->validate(Acl::TAG_EDIT);
 
@@ -281,14 +292,16 @@ final class TagController extends ControllerBase implements CrudControllerInterf
      */
     public function viewAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::TAG_VIEW)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Ver Etiqueta'));
-        $this->view->assign('isView', true);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::TAG_VIEW)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Ver Etiqueta'));
+            $this->view->assign('isView', true);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.tag', new Event($this));
diff --git a/app/modules/web/Controllers/TrackController.php b/app/modules/web/Controllers/TrackController.php
index 0c6e9bad..fc8ca254 100644
--- a/app/modules/web/Controllers/TrackController.php
+++ b/app/modules/web/Controllers/TrackController.php
@@ -56,9 +56,12 @@ final class TrackController extends ControllerBase
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      * @throws UnauthorizedActionException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::TRACK_SEARCH)) {
             throw new UnauthorizedActionException(UnauthorizedActionException::ERROR);
         }
@@ -98,11 +101,13 @@ final class TrackController extends ControllerBase
      */
     public function unlockAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::TRACK_UNLOCK)) {
-            throw new UnauthorizedActionException(UnauthorizedActionException::ERROR);
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::TRACK_UNLOCK)) {
+                throw new UnauthorizedActionException(UnauthorizedActionException::ERROR);
+            }
+
             $this->trackService->unlock($id);
 
             $this->eventDispatcher->notifyEvent('unlock.track', new Event($this));
@@ -123,11 +128,13 @@ final class TrackController extends ControllerBase
      */
     public function clearAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::TRACK_CLEAR)) {
-            throw new UnauthorizedActionException(UnauthorizedActionException::ERROR);
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::TRACK_CLEAR)) {
+                throw new UnauthorizedActionException(UnauthorizedActionException::ERROR);
+            }
+
             $this->trackService->clear();
 
             $this->eventDispatcher->notifyEvent('clear.track', new Event($this));
diff --git a/app/modules/web/Controllers/Traits/JsonTrait.php b/app/modules/web/Controllers/Traits/JsonTrait.php
index ced1a8d7..aedd0329 100644
--- a/app/modules/web/Controllers/Traits/JsonTrait.php
+++ b/app/modules/web/Controllers/Traits/JsonTrait.php
@@ -112,6 +112,10 @@ trait JsonTrait
             $jsonResponse->setMessages([$exception->getHint()]);
         }
 
+        if (property_exists($this, 'session')) {
+            $jsonResponse->setCsrf($this->session->getSecurityKey());
+        }
+
         return Json::fromDic()->returnJson($jsonResponse);
     }
 }
\ No newline at end of file
diff --git a/app/modules/web/Controllers/UserController.php b/app/modules/web/Controllers/UserController.php
index 0a1bfd3b..35d355bb 100644
--- a/app/modules/web/Controllers/UserController.php
+++ b/app/modules/web/Controllers/UserController.php
@@ -60,11 +60,17 @@ final class UserController extends ControllerBase implements CrudControllerInter
     /**
      * Search action
      *
+     * @return bool
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::USER_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -80,6 +86,8 @@ final class UserController extends ControllerBase implements CrudControllerInter
      * getSearchGrid
      *
      * @return $this
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
@@ -97,16 +105,17 @@ final class UserController extends ControllerBase implements CrudControllerInter
      */
     public function createAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::USER_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Nuevo Usuario'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'user/saveCreate');
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::USER_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Nuevo Usuario'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'user/saveCreate');
+
             $this->setViewData();
 
             $this->eventDispatcher->notifyEvent('show.user.create', new Event($this));
@@ -137,7 +146,6 @@ final class UserController extends ControllerBase implements CrudControllerInter
         $this->view->assign('groups', SelectItemAdapter::factory(UserGroupService::getItemsBasic())->getItemsFromModel());
         $this->view->assign('profiles', SelectItemAdapter::factory(UserProfileService::getItemsBasic())->getItemsFromModel());
         $this->view->assign('isUseSSO', $this->configData->isAuthBasicAutoLoginEnabled());
-        $this->view->assign('sk', $this->session->generateSecurityKey());
         $this->view->assign('mailEnabled', $this->configData->isMailEnabled());
         $this->view->assign('nextAction', Acl::getActionRoute(Acl::ACCESS_MANAGE));
 
@@ -165,8 +173,8 @@ final class UserController extends ControllerBase implements CrudControllerInter
                 return $value;
             }, $this->userService->getUsageForUser($userId)));
         } else {
-            $this->view->assign('disabled');
-            $this->view->assign('readonly');
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
         }
 
         $this->view->assign('showViewCustomPass', $this->acl->checkUserAccess(Acl::CUSTOMFIELD_VIEW_PASS));
@@ -182,16 +190,17 @@ final class UserController extends ControllerBase implements CrudControllerInter
      */
     public function editAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::USER_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Editar Usuario'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'user/saveEdit/' . $id);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::USER_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Editar Usuario'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'user/saveEdit/' . $id);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.user.edit', new Event($this));
@@ -213,20 +222,20 @@ final class UserController extends ControllerBase implements CrudControllerInter
      */
     public function editPassAction($id)
     {
-        // Comprobar si el usuario a modificar es distinto al de la sesión
-        if (!$this->acl->checkUserAccess(Acl::USER_EDIT_PASS, $id)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->addTemplate('user_pass', 'itemshow');
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Cambio de Clave'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'user/saveEditPass/' . $id);
-        $this->view->assign('sk', $this->session->generateSecurityKey());
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            // Comprobar si el usuario a modificar es distinto al de la sesión
+            if (!$this->acl->checkUserAccess(Acl::USER_EDIT_PASS, $id)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->addTemplate('user_pass', 'itemshow');
+
+            $this->view->assign('header', __('Cambio de Clave'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'user/saveEditPass/' . $id);
+
             $user = $id ? $this->userService->getById($id) : new UserData();
 
             $this->view->assign('user', $user);
@@ -250,13 +259,13 @@ final class UserController extends ControllerBase implements CrudControllerInter
      */
     public function deleteAction($id = null)
     {
-        if (!$this->acl->checkUserAccess(Acl::USER_DELETE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::USER_DELETE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             if ($id === null) {
                 $this->userService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -292,11 +301,13 @@ final class UserController extends ControllerBase implements CrudControllerInter
      */
     public function saveCreateAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::USER_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::USER_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new UserForm($this->dic);
             $form->validate(Acl::USER_CREATE);
 
@@ -328,6 +339,8 @@ final class UserController extends ControllerBase implements CrudControllerInter
      * @param int      $userId
      * @param UserData $userData
      *
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \Defuse\Crypto\Exception\EnvironmentIsBrokenException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
@@ -353,11 +366,13 @@ final class UserController extends ControllerBase implements CrudControllerInter
      */
     public function saveEditAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::USER_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::USER_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new UserForm($this->dic, $id);
             $form->validate(Acl::USER_EDIT);
 
@@ -394,11 +409,13 @@ final class UserController extends ControllerBase implements CrudControllerInter
      */
     public function saveEditPassAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::USER_EDIT_PASS, $id)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::USER_EDIT_PASS, $id)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new UserForm($this->dic, $id);
             $form->validate(Acl::USER_EDIT_PASS);
 
@@ -431,15 +448,16 @@ final class UserController extends ControllerBase implements CrudControllerInter
      */
     public function viewAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::USER_VIEW)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Ver Usuario'));
-        $this->view->assign('isView', true);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::USER_VIEW)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Ver Usuario'));
+            $this->view->assign('isView', true);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.user', new Event($this));
diff --git a/app/modules/web/Controllers/UserGroupController.php b/app/modules/web/Controllers/UserGroupController.php
index 45d595db..5a1a069c 100644
--- a/app/modules/web/Controllers/UserGroupController.php
+++ b/app/modules/web/Controllers/UserGroupController.php
@@ -67,9 +67,12 @@ final class UserGroupController extends ControllerBase implements CrudController
      * @throws \DI\DependencyException
      * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::GROUP_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -104,16 +107,17 @@ final class UserGroupController extends ControllerBase implements CrudController
      */
     public function createAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::GROUP_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Nuevo Grupo'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'userGroup/saveCreate');
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::GROUP_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Nuevo Grupo'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'userGroup/saveCreate');
+
             $this->setViewData();
 
             $this->eventDispatcher->notifyEvent('show.userGroup.create', new Event($this));
@@ -151,15 +155,14 @@ final class UserGroupController extends ControllerBase implements CrudController
                 ->getItemsFromModelSelected($users));
         $this->view->assign('usedBy', $this->userGroupService->getUsageByUsers($userGroupId));
 
-        $this->view->assign('sk', $this->session->generateSecurityKey());
         $this->view->assign('nextAction', Acl::getActionRoute(Acl::ACCESS_MANAGE));
 
         if ($this->view->isView === true) {
             $this->view->assign('disabled', 'disabled');
             $this->view->assign('readonly', 'readonly');
         } else {
-            $this->view->assign('disabled');
-            $this->view->assign('readonly');
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
         }
 
         $this->view->assign('showViewCustomPass', $this->acl->checkUserAccess(Acl::CUSTOMFIELD_VIEW_PASS));
@@ -175,15 +178,17 @@ final class UserGroupController extends ControllerBase implements CrudController
      */
     public function editAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::GROUP_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Editar Grupo'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'userGroup/saveEdit/' . $id);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::GROUP_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Editar Grupo'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'userGroup/saveEdit/' . $id);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.userGroup.edit', new Event($this));
@@ -205,11 +210,13 @@ final class UserGroupController extends ControllerBase implements CrudController
      */
     public function deleteAction($id = null)
     {
-        if (!$this->acl->checkUserAccess(Acl::GROUP_DELETE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::GROUP_DELETE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             if ($id === null) {
                 $this->userGroupService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -245,11 +252,13 @@ final class UserGroupController extends ControllerBase implements CrudController
      */
     public function saveCreateAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::GROUP_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::GROUP_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new UserGroupForm($this->dic);
             $form->validate(Acl::GROUP_CREATE);
 
@@ -284,11 +293,13 @@ final class UserGroupController extends ControllerBase implements CrudController
      */
     public function saveEditAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::GROUP_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::GROUP_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new UserGroupForm($this->dic, $id);
             $form->validate(Acl::GROUP_EDIT);
 
@@ -323,14 +334,16 @@ final class UserGroupController extends ControllerBase implements CrudController
      */
     public function viewAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::GROUP_VIEW)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Ver Grupo'));
-        $this->view->assign('isView', true);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::GROUP_VIEW)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Ver Grupo'));
+            $this->view->assign('isView', true);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.userGroup', new Event($this));
diff --git a/app/modules/web/Controllers/UserPassResetController.php b/app/modules/web/Controllers/UserPassResetController.php
index d14183eb..543cfd7a 100644
--- a/app/modules/web/Controllers/UserPassResetController.php
+++ b/app/modules/web/Controllers/UserPassResetController.php
@@ -79,6 +79,8 @@ final class UserPassResetController extends ControllerBase
     public function saveRequestAction()
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $this->checkTracking();
 
             $login = $this->request->analyzeString('login');
@@ -142,9 +144,12 @@ final class UserPassResetController extends ControllerBase
      *
      * @throws \DI\DependencyException
      * @throws \DI\NotFoundException
+     * @throws SPException
      */
     public function resetAction($hash = null)
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         $this->dic->get(LayoutHelper::class)
             ->getCustomLayout('reset', strtolower($this->controllerName));
 
@@ -163,6 +168,8 @@ final class UserPassResetController extends ControllerBase
     public function saveResetAction()
     {
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
             $this->checkTracking();
 
             $pass = $this->request->analyzeEncrypted('password');
@@ -201,6 +208,8 @@ final class UserPassResetController extends ControllerBase
     }
 
     /**
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\InvalidArgumentException
      */
     protected function initialize()
diff --git a/app/modules/web/Controllers/UserProfileController.php b/app/modules/web/Controllers/UserProfileController.php
index 5a0f2bfb..4676b36b 100644
--- a/app/modules/web/Controllers/UserProfileController.php
+++ b/app/modules/web/Controllers/UserProfileController.php
@@ -55,11 +55,17 @@ final class UserProfileController extends ControllerBase implements CrudControll
     /**
      * Search action
      *
+     * @return bool
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function searchAction()
     {
+        $this->checkSecurityToken($this->previousSk, $this->request);
+
         if (!$this->acl->checkUserAccess(Acl::PROFILE_SEARCH)) {
             return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
         }
@@ -75,6 +81,8 @@ final class UserProfileController extends ControllerBase implements CrudControll
      * getSearchGrid
      *
      * @return $this
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
@@ -92,16 +100,17 @@ final class UserProfileController extends ControllerBase implements CrudControll
      */
     public function createAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::PROFILE_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign(__FUNCTION__, 1);
-        $this->view->assign('header', __('Nuevo Perfil'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'userProfile/saveCreate');
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PROFILE_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Nuevo Perfil'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'userProfile/saveCreate');
+
             $this->setViewData();
 
             $this->eventDispatcher->notifyEvent('show.userProfile.create', new Event($this));
@@ -133,7 +142,6 @@ final class UserProfileController extends ControllerBase implements CrudControll
         $this->view->assign('profile', $profile);
         $this->view->assign('profileData', $profile->getProfile() ?: new ProfileData());
 
-        $this->view->assign('sk', $this->session->generateSecurityKey());
         $this->view->assign('nextAction', Acl::getActionRoute(Acl::ACCESS_MANAGE));
 
         if ($this->view->isView === true) {
@@ -142,8 +150,8 @@ final class UserProfileController extends ControllerBase implements CrudControll
             $this->view->assign('disabled', 'disabled');
             $this->view->assign('readonly', 'readonly');
         } else {
-            $this->view->assign('disabled');
-            $this->view->assign('readonly');
+            $this->view->assign('disabled', false);
+            $this->view->assign('readonly', false);
         }
 
         $this->view->assign('showViewCustomPass', $this->acl->checkUserAccess(Acl::CUSTOMFIELD_VIEW_PASS));
@@ -159,15 +167,17 @@ final class UserProfileController extends ControllerBase implements CrudControll
      */
     public function editAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::PROFILE_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Editar Perfil'));
-        $this->view->assign('isView', false);
-        $this->view->assign('route', 'userProfile/saveEdit/' . $id);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PROFILE_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Editar Perfil'));
+            $this->view->assign('isView', false);
+            $this->view->assign('route', 'userProfile/saveEdit/' . $id);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.userProfile.edit', new Event($this));
@@ -189,11 +199,13 @@ final class UserProfileController extends ControllerBase implements CrudControll
      */
     public function deleteAction($id = null)
     {
-        if (!$this->acl->checkUserAccess(Acl::PROFILE_DELETE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PROFILE_DELETE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             if ($id === null) {
                 $this->userProfileService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
 
@@ -229,11 +241,13 @@ final class UserProfileController extends ControllerBase implements CrudControll
      */
     public function saveCreateAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::PROFILE_CREATE)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PROFILE_CREATE)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new UserProfileForm($this->dic);
             $form->validate(Acl::PROFILE_CREATE);
 
@@ -264,11 +278,13 @@ final class UserProfileController extends ControllerBase implements CrudControll
      */
     public function saveEditAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::PROFILE_EDIT)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PROFILE_EDIT)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
             $form = new UserProfileForm($this->dic, $id);
             $form->validate(Acl::PROFILE_EDIT);
 
@@ -300,14 +316,16 @@ final class UserProfileController extends ControllerBase implements CrudControll
      */
     public function viewAction($id)
     {
-        if (!$this->acl->checkUserAccess(Acl::PROFILE_VIEW)) {
-            return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
-        }
-
-        $this->view->assign('header', __('Ver Perfil'));
-        $this->view->assign('isView', true);
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            if (!$this->acl->checkUserAccess(Acl::PROFILE_VIEW)) {
+                return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('No tiene permisos para realizar esta operación'));
+            }
+
+            $this->view->assign('header', __('Ver Perfil'));
+            $this->view->assign('isView', true);
+
             $this->setViewData($id);
 
             $this->eventDispatcher->notifyEvent('show.userProfile', new Event($this));
diff --git a/app/modules/web/Controllers/UserSettingsGeneralController.php b/app/modules/web/Controllers/UserSettingsGeneralController.php
index c3804734..806faba0 100644
--- a/app/modules/web/Controllers/UserSettingsGeneralController.php
+++ b/app/modules/web/Controllers/UserSettingsGeneralController.php
@@ -47,22 +47,24 @@ final class UserSettingsGeneralController extends SimpleControllerBase
      */
     public function saveAction()
     {
-        $userData = $this->session->getUserData();
-
-        $userPreferencesData = clone $userData->getPreferences();
-
-        $userPreferencesData->setUserId($userData->getId());
-        $userPreferencesData->setLang($this->request->analyzeString('userlang'));
-        $userPreferencesData->setTheme($this->request->analyzeString('usertheme', 'material-blue'));
-        $userPreferencesData->setResultsPerPage($this->request->analyzeInt('resultsperpage', 12));
-        $userPreferencesData->setAccountLink($this->request->analyzeBool('account_link', false));
-        $userPreferencesData->setSortViews($this->request->analyzeBool('sort_views', false));
-        $userPreferencesData->setTopNavbar($this->request->analyzeBool('top_navbar', false));
-        $userPreferencesData->setOptionalActions($this->request->analyzeBool('optional_actions', false));
-        $userPreferencesData->setResultsAsCards($this->request->analyzeBool('resultsascards', false));
-        $userPreferencesData->setCheckNotifications($this->request->analyzeBool('check_notifications', false));
-
         try {
+            $this->checkSecurityToken($this->previousSk, $this->request);
+
+            $userData = $this->session->getUserData();
+
+            $userPreferencesData = clone $userData->getPreferences();
+
+            $userPreferencesData->setUserId($userData->getId());
+            $userPreferencesData->setLang($this->request->analyzeString('userlang'));
+            $userPreferencesData->setTheme($this->request->analyzeString('usertheme', 'material-blue'));
+            $userPreferencesData->setResultsPerPage($this->request->analyzeInt('resultsperpage', 12));
+            $userPreferencesData->setAccountLink($this->request->analyzeBool('account_link', false));
+            $userPreferencesData->setSortViews($this->request->analyzeBool('sort_views', false));
+            $userPreferencesData->setTopNavbar($this->request->analyzeBool('top_navbar', false));
+            $userPreferencesData->setOptionalActions($this->request->analyzeBool('optional_actions', false));
+            $userPreferencesData->setResultsAsCards($this->request->analyzeBool('resultsascards', false));
+            $userPreferencesData->setCheckNotifications($this->request->analyzeBool('check_notifications', false));
+
             $this->userService->updatePreferencesById($userData->getId(), $userPreferencesData);
 
             // Guardar las preferencias en la sesión
diff --git a/app/modules/web/Controllers/UserSettingsManagerController.php b/app/modules/web/Controllers/UserSettingsManagerController.php
index fcab6593..58b349c7 100644
--- a/app/modules/web/Controllers/UserSettingsManagerController.php
+++ b/app/modules/web/Controllers/UserSettingsManagerController.php
@@ -81,13 +81,7 @@ final class UserSettingsManagerController extends ControllerBase implements Exte
 
         $template->assign('langs', SelectItemAdapter::factory(Language::getAvailableLanguages())->getItemsFromArraySelected([$userPreferences->getLang() ?: $this->configData->getSiteLang()]));
         $template->assign('themes', SelectItemAdapter::factory($this->theme->getThemesAvailable())->getItemsFromArraySelected([$userPreferences->getTheme() ?: $this->configData->getSiteTheme()]));
-        $template->assign('chkAccountLink', $userPreferences->isAccountLink() ? 'checked="checked"' : '');
-        $template->assign('resultsPerPage', $userPreferences->getResultsPerPage() ?: $this->configData->getAccountCount());
-        $template->assign('chkSortViews', $userPreferences->isSortViews() ? 'checked="checked"' : '');
-        $template->assign('chkTopNavbar', $userPreferences->isTopNavbar() ? 'checked="checked"' : '');
-        $template->assign('chkOptionalActions', $userPreferences->isOptionalActions() ? 'checked="checked"' : '');
-        $template->assign('chkResultsAsCards', $userPreferences->isResultsAsCards() ? 'checked="checked"' : '');
-        $template->assign('chkNotifications', $userPreferences->isCheckNotifications() ? 'checked="checked"' : '');
+        $template->assign('userPreferences', $userPreferences);
         $template->assign('route', 'userSettingsGeneral/save');
 
         return new DataTab(__('Preferencias'), $template);
diff --git a/app/modules/web/themes/material-blue/views/_layouts/main.inc b/app/modules/web/themes/material-blue/views/_layouts/main.inc
index 6f5bec87..ff395cec 100644
--- a/app/modules/web/themes/material-blue/views/_layouts/main.inc
+++ b/app/modules/web/themes/material-blue/views/_layouts/main.inc
@@ -1,16 +1,21 @@
-<?php /** @var \SP\Mvc\View\Template $this */ ?>
+<?php
+/**
+ * @var callable              $_getvar
+ * @var \SP\Mvc\View\Template $this
+ */
+?>
 <!DOCTYPE html>
-<html lang="<?php echo $lang; ?>">
+<html lang="<?php echo $_getvar('lang'); ?>">
 <head>
-    <title><?php printf('%s :: %s', $app_name, $app_desc); ?></title>
+    <title><?php printf('%s :: %s', $_getvar('app_name'), $_getvar('app_desc')); ?></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="icon" type="image/png" href="<?php echo $logoIcon; ?>">
-    <?php foreach ($cssLinks as $cssLink): ?>
+    <link rel="icon" type="image/png" href="<?php echo $_getvar('logoIcon'); ?>">
+    <?php foreach ($_getvar('cssLinks') as $cssLink): ?>
         <link rel="stylesheet" href="<?php echo $cssLink; ?>"/>
     <?php endforeach; ?>
 </head>
-<body class="<?php echo $page; ?>">
+<body class="<?php echo $_getvar('page'); ?>">
 <div id="wrap">
     <noscript>
         <div id="nojs"><?php echo __('Javascript es necesario para el correcto funcionamiento'); ?></div>
@@ -21,10 +26,10 @@
         <div id="taskStatus"></div>
     </div>
 
-    <div id="container" class="<?php echo $page; ?>" data-page="<?php echo $page; ?>"
+    <div id="container" class="<?php echo $_getvar('page'); ?>" data-page="<?php echo $_getvar('page'); ?>"
          data-upgraded="<?php echo (int)$this->isUpgraded(); ?>">
         <?php
-        if (isset($useFixedHeader)):
+        if ($_getvar('useFixedHeader')):
             include $this->includePartial('fixed-header');
         elseif ($this->hashContentTemplates()):
             foreach ($this->getContentTemplates() as $template):
@@ -37,7 +42,7 @@
     <?php include $this->includePartial('footer'); ?>
 </div> <!-- Close wrap -->
 
-<?php foreach ($jsLinks as $jsLink): ?>
+<?php foreach ($_getvar('jsLinks') as $jsLink): ?>
     <script type="text/javascript" src="<?php echo $jsLink; ?>"></script>
 <?php endforeach; ?>
 
@@ -47,7 +52,7 @@
 
         sysPassApp.log.info("ready");
 
-        sysPassApp.sk.set("<?php echo $sk; ?>");
+        sysPassApp.sk.set("<?php echo $_getvar('sk'); ?>");
     });
 </script>
 
diff --git a/app/modules/web/themes/material-blue/views/_partials/error-list.inc b/app/modules/web/themes/material-blue/views/_partials/error-list.inc
index 2363ceb4..c54aa6fd 100644
--- a/app/modules/web/themes/material-blue/views/_partials/error-list.inc
+++ b/app/modules/web/themes/material-blue/views/_partials/error-list.inc
@@ -1,11 +1,12 @@
 <?php
 /**
- * @var $icons \SP\Core\UI\ThemeIcons
+ * @var callable              $_getvar
+ * @var \SP\Mvc\View\Template $this
  */
 ?>
-<?php if (count($errors) > 0): ?>
+<?php if (count($_getvar('errors')) > 0): ?>
     <ul class="errors round">
-        <?php foreach ($errors as $err): ?>
+        <?php foreach ($_getvar('errors') as $err): ?>
             <?php if (is_array($err)): ?>
                 <?php if ($err['type'] === \SP\Core\Exceptions\SPException::CRITICAL): ?>
                     <li class="msg-critical">
diff --git a/app/modules/web/themes/material-blue/views/_partials/error.inc b/app/modules/web/themes/material-blue/views/_partials/error.inc
index 907a38e6..779141dd 100644
--- a/app/modules/web/themes/material-blue/views/_partials/error.inc
+++ b/app/modules/web/themes/material-blue/views/_partials/error.inc
@@ -1,13 +1,13 @@
 <?php
 /**
- * @var \SP\Core\UI\ThemeIcons $icons
- * @var \SP\Mvc\View\Template  $this
+ * @var callable              $_getvar
+ * @var \SP\Mvc\View\Template $this
  */
 ?>
 <div id="actions" align="center">
     <?php include $this->includePartial('error-list'); ?>
 
-    <?php if (!isset($skipBackButton)): ?>
+    <?php if (!$_getvar('skipBackButton')): ?>
         <div class="buttons">
             <button id="btnBack" class="btn-back mdl-button mdl-js-button mdl-button--raised mdl-button--accent">
                 <i class="material-icons"
diff --git a/app/modules/web/themes/material-blue/views/_partials/fixed-header.inc b/app/modules/web/themes/material-blue/views/_partials/fixed-header.inc
index e6af50f7..31cbf8c9 100644
--- a/app/modules/web/themes/material-blue/views/_partials/fixed-header.inc
+++ b/app/modules/web/themes/material-blue/views/_partials/fixed-header.inc
@@ -1,22 +1,28 @@
+<?php
+/**
+ * @var callable              $_getvar
+ * @var \SP\Mvc\View\Template $this
+ */
+?>
 <div class="mdl-layout mdl-js-layout mdl-layout--fixed-header mdl-layout--no-desktop-drawer-button">
     <header class="mdl-layout__header mdl-color--indigo-400">
         <div class="mdl-layout__header-row">
             <!-- Title -->
             <span class="mdl-layout-icon">
-                <img class="logo btn-menu" src="<?php echo $logonobg; ?>"
+                <img class="logo btn-menu" src="<?php echo $_getvar('logonobg'); ?>"
                      alt="logo"
-                     data-route="<?php echo $homeRoute; ?>"
+                     data-route="<?php echo $_getvar('homeRoute'); ?>"
                      data-view="account"
                      data-historyReset="1"/>
             </span>
 
-            <?php if (isset($useMenu) && $loggedIn): ?>
+            <?php if ($_getvar('useMenu') && $_getvar('loggedIn')): ?>
                 <!-- Add spacer, to align navigation to the right -->
                 <div class="mdl-layout-spacer"></div>
                 <!-- Navigation -->
                 <nav class="mdl-navigation mdl-layout--large-screen-only">
                     <?php /** @var \SP\Html\DataGrid\Action\DataGridAction $action */
-                    foreach ($actions as $action): ?>
+                    foreach ($_getvar('actions') as $action): ?>
                         <a id="btn-<?php echo $action->getId(); ?>" class="btn-menu mdl-navigation__link"
                             <?php foreach ($action->getData() as $dataName => $dataValue): ?>
                                 <?php echo 'data-', $dataName, '="', $dataValue, '"'; ?>
@@ -47,12 +53,12 @@
 
                     <ul class="mdl-menu mdl-menu--bottom-right mdl-js-menu mdl-js-ripple-effect"
                         for="users-menu-lower-right">
-                        <?php if ($showPassIcon): ?>
+                        <?php if ($_getvar('showPassIcon')): ?>
                             <li id="btnUserPass" class="btn-action mdl-menu__item"
                                 data-onclick="appMgmt/show"
                                 data-action-route="user/editPass"
-                                data-item-id="<?php echo $ctx_userId; ?>"
-                                data-sk="<?php echo $sk; ?>">
+                                data-item-id="<?php echo $_getvar('ctx_userId'); ?>"
+                                data-sk="<?php echo $_getvar('sk'); ?>">
                                 <i class="material-icons">lock</i>
                                 <?php echo __('Cambiar Clave de Usuario'); ?>
                             </li>
@@ -76,12 +82,12 @@
         </div>
     </header>
 
-    <?php if (isset($useMenu) && $loggedIn): ?>
+    <?php if ($_getvar('useMenu') && $_getvar('loggedIn')): ?>
         <div class="mdl-layout__drawer">
-            <span class="mdl-layout-title"><?php echo $app_name; ?></span>
+            <span class="mdl-layout-title"><?php echo $_getvar('app_name'); ?></span>
             <nav class="mdl-navigation">
                 <?php /** @var \SP\Html\DataGrid\Action\DataGridAction $action */
-                foreach ($actions as $action): ?>
+                foreach ($_getvar('actions') as $action): ?>
                     <a id="btn-drawer-<?php echo $action->getId(); ?>" class="btn-menu mdl-navigation__link"
                         <?php foreach ($action->getData() as $dataName => $dataValue): ?>
                             <?php echo 'data-', $dataName, '="', $dataValue, '"'; ?>
@@ -105,13 +111,13 @@
 
                 <span class="mdl-menu__item--full-bleed-divider"></span>
 
-                <?php if ($showPassIcon): ?>
+                <?php if ($_getvar('showPassIcon')): ?>
                     <a class="btn-action mdl-navigation__link"
                        title="<?php echo __('Cambiar Clave de Usuario'); ?>"
                        data-onclick="appMgmt/show"
                        data-action-route="user/editPass"
-                       data-item-id="<?php echo $ctx_userId; ?>"
-                       data-sk="<?php echo $sk; ?>">
+                       data-item-id="<?php echo $_getvar('ctx_userId'); ?>"
+                       data-sk="<?php echo $_getvar('sk'); ?>">
                         <i class="btn-action material-icons">security</i>
                         <?php echo __('Cambiar Clave de Usuario'); ?>
                     </a>
@@ -122,11 +128,14 @@
                    data-onclick="user/showSettings"
                    data-action-route="userSettingsManager/index">
                     <i class="btn-action material-icons">account_circle</i>
-                    <span id="user-name"><?php echo $ctx_userName; ?></span>
+                    <span id="user-name"><?php echo $_getvar('ctx_userName'); ?></span>
                     <span for="user-name"
-                          class="mdl-tooltip mdl-tooltip--top"><?php printf('%s : %s', __('Grupo'), $ctx_userGroup); ?></span>
-                    <?php /** @var \SP\Html\Assets\IconInterface $userType */
-                    if ($ctx_userType !== null): ?>
+                          class="mdl-tooltip mdl-tooltip--top"><?php printf('%s : %s', __('Grupo'), $_getvar('ctx_userGroup')); ?></span>
+                    <?php
+                    /** @var \SP\Html\Assets\IconInterface $ctx_userType */
+                    $ctx_userType = $_getvar('ctx_userType');
+
+                    if ($ctx_userType): ?>
                         <i id="user-type" class="material-icons"><?php echo $ctx_userType->getIcon(); ?></i>
                         <span for="user-type"
                               class="mdl-tooltip mdl-tooltip--top"><?php echo $ctx_userType->getTitle(); ?></span>
@@ -145,26 +154,25 @@
                 <span class="mdl-menu__item--full-bleed-divider"></span>
 
                 <a class="mdl-navigation__link" href="#">
-                    <?php if ($httpsEnabled): ?>
+                    <?php if ($_getvar('httpsEnabled')): ?>
                         <i class="material-icons mdl-color-text--teal-500">lock</i>
                     <?php else: ?>
                         <i class="material-icons mdl-color-text--red-900">lock_open</i>
                     <?php endif; ?>
 
-                    <?php if ($isDemoMode): ?>
+                    <?php if ($_getvar('isDemo')): ?>
                         <span class="status-info"><?php echo __('Demo'); ?></span>
                     <?php endif; ?>
 
-                    <?php echo $app_name, ' ', $app_version; ?>
+                    <?php echo $_getvar('app_name'), ' ', $_getvar('app_version'); ?>
                 </a>
             </nav>
         </div>
     <?php endif; ?>
 
     <main class="mdl-layout__content">
-        <div id="content" data-page="<?php echo isset($contentPage) ? $contentPage : '' ?>">
-            <?php /** @var \SP\Mvc\View\Template $this */
-            if ($this->hashContentTemplates()):
+        <div id="content" data-page="<?php echo $_getvar('contentPage', ''); ?>">
+            <?php if ($this->hashContentTemplates()):
                 foreach ($this->getContentTemplates() as $template):
                     include $template;
                 endforeach;
diff --git a/app/modules/web/themes/material-blue/views/_partials/footer.inc b/app/modules/web/themes/material-blue/views/_partials/footer.inc
index 4976a6e5..ff771c16 100644
--- a/app/modules/web/themes/material-blue/views/_partials/footer.inc
+++ b/app/modules/web/themes/material-blue/views/_partials/footer.inc
@@ -1,18 +1,28 @@
+<?php
+/**
+ * @var callable              $_getvar
+ * @var \SP\Mvc\View\Template $this
+ */
+?>
 <footer>
     <div id="footer-left" class="footer-parts">
-        <?php if ($loadApp === true && isset($ctx_userName)): ?>
+        <?php if ($_getvar('loadApp') === true && $_getvar('ctx_userName')): ?>
             <div id="session">
                 <span id="user-info">
-                    <?php if ($ctx_userType !== null): ?>
+                    <?php
+                    /** @var \SP\Html\Assets\IconInterface $ctx_userType */
+                    $ctx_userType = $_getvar('ctx_userType');
+
+                    if ($ctx_userType): ?>
                         <i id="user-type-footer" class="material-icons"><?php echo $ctx_userType->getIcon(); ?></i>
                         <span for="user-type-footer"
                               class="mdl-tooltip mdl-tooltip--top"><?php echo $ctx_userType->getTitle(); ?></span>
                     <?php else: ?>
                         <i class="material-icons">face</i>
                     <?php endif; ?>
-                    <span id="user-name-footer"><?php echo $ctx_userName; ?></span>
+                    <span id="user-name-footer"><?php echo $_getvar('ctx_userName'); ?></span>
                     <span for="user-name-footer"
-                          class="mdl-tooltip mdl-tooltip--top"><?php printf('%s : %s', __('Grupo'), $ctx_userGroup); ?></span>
+                          class="mdl-tooltip mdl-tooltip--top"><?php printf('%s : %s', __('Grupo'), $_getvar('ctx_userGroup')); ?></span>
                 </span>
             </div>
         <?php endif; ?>
@@ -20,7 +30,7 @@
 
     <div id="footer-right" class="footer-parts">
         <div id="status">
-            <?php if ($httpsEnabled): ?>
+            <?php if ($_getvar('httpsEnabled')): ?>
                 <span id="secure-info" class="status-info">
                     <i class="material-icons mdl-color-text--teal-500">https</i>
                 </span>
@@ -38,7 +48,7 @@
                 <i class="material-icons mdl-color-text--red-900" title="Debug ON">bug_report</i>
             <?php endif; ?>
 
-            <?php if ($isDemoMode): ?>
+            <?php if ($_getvar('isDemo')): ?>
                 <span class="status-info">
                     <i class="material-icons mdl-color-text--teal-500" title="<?php echo __('Demo'); ?>">play_circle_outline</i>
                 </span>
@@ -49,13 +59,13 @@
         </div>
 
         <div id="project">
-            <a id="app-info" href="<?php echo $app_website_url; ?>" target="_blank">
-                <?php echo $app_name, ' ', $app_version; ?>
+            <a id="app-info" href="<?php echo $_getvar('app_website_url'); ?>" target="_blank">
+                <?php echo $_getvar('app_name'), ' ', $_getvar('app_version'); ?>
             </a>
             <span for="app-info"
                   class="mdl-tooltip mdl-tooltip--top mdl-tooltip--large"><?php echo __('Ayuda :: FAQ :: Changelog'); ?></span>
             &nbsp;::&nbsp;
-            <a id="app-project" href="<?php echo $app_blog_url; ?>" target="_blank">cygnux.org</a>
+            <a id="app-project" href="<?php echo $_getvar('app_blog_url'); ?>" target="_blank">cygnux.org</a>
             <span for="app-project"
                   class="mdl-tooltip mdl-tooltip--top mdl-tooltip--large"><?php echo __('Un proyecto de cygnux.org'); ?></span>
         </div>
diff --git a/app/modules/web/themes/material-blue/views/_partials/no_records_found.inc b/app/modules/web/themes/material-blue/views/_partials/no_records_found.inc
index 8932eceb..0a44649d 100644
--- a/app/modules/web/themes/material-blue/views/_partials/no_records_found.inc
+++ b/app/modules/web/themes/material-blue/views/_partials/no_records_found.inc
@@ -1,5 +1,11 @@
-<?php if (isset($message)): ?>
-    <div class="noRes round"><?php echo $message; ?></div>
+<?php
+/**
+ * @var callable              $_getvar
+ * @var \SP\Mvc\View\Template $this
+ */
+?>
+<?php if ($_getvar('message')): ?>
+    <div class="noRes round"><?php echo $_getvar('message'); ?></div>
 <?php else: ?>
     <div class="noRes round"><?php echo __('No se encontraron registros'); ?></div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/account/account-editpass.inc b/app/modules/web/themes/material-blue/views/account/account-editpass.inc
index e3a5a2b2..ebc2905e 100644
--- a/app/modules/web/themes/material-blue/views/account/account-editpass.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-editpass.inc
@@ -1,21 +1,29 @@
 <?php
 /**
- * @var \SP\Core\UI\ThemeIcons     $icons
- * @var \SP\DataModel\AccountVData $accountData
- * @var \SP\Config\ConfigData      $configData
+ * @var callable                        $_getvar
+ * @var \SP\Core\UI\ThemeIcons          $icons
+ * @var \SP\DataModel\AccountExtData    $accountData
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\Config\ConfigData           $configData
  */
+
+/** @var \SP\DataModel\AccountExtData $accountData */
+$accountData = $_getvar('accountData');
+
+/** @var \SP\Services\Account\AccountAcl $accountAcl */
+$accountAcl = $_getvar('accountAcl');
 ?>
 
 <div class="data-container">
     <div id="title" class="titleNormal">
-        <i class="material-icons"><?php echo $title['icon']; ?></i>
-        <?php echo $title['name']; ?>
+        <i class="material-icons"><?php echo $_getvar('title')['icon']; ?></i>
+        <?php echo $_getvar('title')['name']; ?>
     </div>
 
     <form method="post" name="editpass" id="frmEditPass" class="form-action"
           data-onsubmit="account/save"
-          data-action-route="<?php echo isset($formRoute) ? $formRoute : ''; ?>"
-          data-item-id="<?php echo isset($accountId) ? $accountId : ''; ?>"
+          data-action-route="<?php echo $_getvar('formRoute', ''); ?>"
+          data-item-id="<?php echo $_getvar('accountId', ''); ?>"
           data-hash="">
         <table class="data">
             <tr>
@@ -91,7 +99,7 @@
                         <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                             <input id="password_date_expire" name="password_date_expire" type="date"
                                    class="mdl-textfield__input mdl-color-text--indigo-400 password-datefield__input"
-                                   value="<?php echo $accountPassDateChange; ?>"
+                                   value="<?php echo $_getvar('accountPassDateChange'); ?>"
                                    data-dst-unix="password_date_expire_unix">
                             <input type='hidden' name='password_date_expire_unix' value=""/>
                             <label class="mdl-textfield__label"
@@ -103,7 +111,8 @@
                 </tr>
             <?php endif; ?>
         </table>
-        <input type="hidden" name="sk" value="">
+
+        <input type="hidden" name="sk" value="<?php echo $sk; ?>">
         <input type="hidden" name="isAjax" value="1">
 
         <div class="item-actions">
@@ -128,6 +137,5 @@
 </div>
 
 <script>
-    sysPassApp.sk.set("<?php echo $sk; ?>");
     $('input:password:visible:first').focus();
 </script>
diff --git a/app/modules/web/themes/material-blue/views/account/account-history.inc b/app/modules/web/themes/material-blue/views/account/account-history.inc
index 7acec6d8..ed9d192f 100644
--- a/app/modules/web/themes/material-blue/views/account/account-history.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-history.inc
@@ -1,13 +1,23 @@
 <?php
+/**
+ * @var callable                        $_getvar
+ * @var \SP\Core\UI\ThemeIcons          $icons
+ * @var \SP\DataModel\AccountExtData    $accountData
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\Config\ConfigData           $configData
+ */
+
+/** @var \SP\DataModel\AccountExtData $accountData */
+$accountData = $_getvar('accountData');
+
 /** @var \SP\Services\Account\AccountAcl $accountAcl */
-/** @var \SP\DataModel\AccountHistoryData $accountData */
-/** @var \SP\Mvc\View\Template $this */
+$accountAcl = $_getvar('accountAcl');
 ?>
 
 <div class="data-container">
     <div id="title" class="titleNormal">
-        <i class="material-icons" title="<?php echo __('Histórico'); ?>"><?php echo $title['icon']; ?></i>
-        <?php echo $title['name']; ?>
+        <i class="material-icons" title="<?php echo __('Histórico'); ?>"><?php echo $_getvar('title')['icon']; ?></i>
+        <?php echo $_getvar('title')['name']; ?>
     </div>
 
     <div class="mdl-tabs mdl-js-tabs mdl-js-ripple-effect">
@@ -22,10 +32,10 @@
         <div class="mdl-tabs__panel is-active" id="account-panel">
             <form method="post" name="frmaccount" id="frmAccount" class="form-action"
                   data-onsubmit="account/save"
-                  data-action-route="<?php echo isset($formRoute) ? $formRoute : ''; ?>"
-                  data-item-id="<?php echo isset($accountId) ? $accountId : ''; ?>"
+                  data-action-route="<?php echo $_getvar('formRoute', ''); ?>"
+                  data-item-id="<?php echo $_getvar('accountId', ''); ?>"
                   data-hash="">
-                <input type="hidden" name="sk" value="">
+                <input type="hidden" name="sk" value="<?php echo $sk; ?>">
                 <input type="hidden" name="isAjax" value="1">
 
                 <table class="data">
@@ -50,8 +60,8 @@
 
                             <select id="client_id" name="client_id" class="select-box sel-chosen-client"
                                     tabindex="2" required disabled>
-                                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $clients */
-                                foreach ($clients as $client): ?>
+                                <?php /** @var \SP\Mvc\View\Components\SelectItem $client */
+                                foreach ($_getvar('clients') as $client): ?>
                                     <option
                                             value="<?php echo $client->getId(); ?>" <?php echo $client->isSelected() ? 'selected' : ''; ?>><?php echo $client->getName(); ?></option>
                                 <?php endforeach; ?>
@@ -66,8 +76,8 @@
                             <select id="category_id" name="category_id" class="select-box"
                                     tabindex="3" required disabled>
                                 <option value=""><?php echo __('Seleccionar Categoría'); ?></option>
-                                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $categories */
-                                foreach ($categories as $category): ?>
+                                <?php /** @var \SP\Mvc\View\Components\SelectItem $category */
+                                foreach ($_getvar('categories') as $category): ?>
                                     <option
                                             value="<?php echo $category->getId(); ?>" <?php echo $category->isSelected() ? 'selected' : ''; ?>><?php echo $category->getName(); ?></option>
                                 <?php endforeach; ?>
@@ -107,7 +117,7 @@
                                 <input id="password_date_expire" name="password_date_expire" type="date"
                                        class="mdl-textfield__input mdl-color-text--indigo-400 password-datefield__input"
                                        tabindex="8"
-                                       value="<?php echo $accountPassDateChange; ?>" readonly>
+                                       value="<?php echo $_getvar('accountPassDateChange'); ?>" readonly>
                                 <label class="mdl-textfield__label"
                                        for="password_date_expire"><?php echo __('Fecha'); ?></label>
                             </div>
@@ -124,7 +134,8 @@
                                        for="notes"><?php echo __('Notas sobre la cuenta'); ?></label>
                             </div>
                     </tr>
-                    <?php if ($accountAcl->isShowHistory() && count($historyData) > 0): ?>
+                    <?php if ($accountAcl->isShowHistory()
+                        && count($_getvar('historyData', [])) > 0): ?>
                         <tr>
                             <td class="descField"><?php echo __('Historial'); ?></td>
                             <td class="valField">
@@ -134,9 +145,11 @@
                                         data-action-route="account/viewHistory"
                                         data-onchange="account/viewHistory">
                                     <option value=""><?php echo __('Seleccionar fecha'); ?></option>
-                                    <?php foreach ($historyData as $historyId => $historyData): ?>
+                                    <?php /** @var \SP\Mvc\View\Components\SelectItem $history */
+                                    foreach ($_getvar('historyData') as $history): ?>
                                         <option
-                                                value="<?php echo $historyId; ?>" <?php echo ($accountIsHistory && $historyId === $accountHistoryId) ? 'selected' : ''; ?>><?php echo $historyData; ?></option>
+                                                value="<?php echo $history->getId(); ?>"
+                                            <?php echo $history->isSelected() ? 'selected' : ''; ?>><?php echo $history->getName(); ?></option>
                                     <?php endforeach; ?>
                                 </select>
                             </td>
@@ -160,8 +173,3 @@
 
     <?php include $this->includeTemplate('actions'); ?>
 </div>
-<script>
-    (function () {
-        sysPassApp.sk.set("<?php echo $sk; ?>");
-    })();
-</script>
diff --git a/app/modules/web/themes/material-blue/views/account/account-link.inc b/app/modules/web/themes/material-blue/views/account/account-link.inc
index 1a615a47..e08a2b7f 100644
--- a/app/modules/web/themes/material-blue/views/account/account-link.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-link.inc
@@ -1,14 +1,21 @@
 <?php
 /**
- * @var \SP\DataModel\AccountExtData $accountData
+ * @var callable                        $_getvar
+ * @var \SP\Core\UI\ThemeIcons          $icons
+ * @var \SP\DataModel\AccountExtData    $accountData
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\Config\ConfigData           $configData
  */
+
+/** @var \SP\DataModel\AccountExtData $accountData */
+$accountData = $_getvar('accountData');
 ?>
 
 <div id="actions" class="public-link" align="center">
     <div id="content" class="public-link">
         <div id="title" class="titleNormal">
-            <i class="material-icons"><?php echo $title['icon']; ?></i>
-            <?php echo $title['name']; ?>
+            <i class="material-icons"><?php echo $_getvar('title')['icon']; ?></i>
+            <?php echo $_getvar('title')['name']; ?>
         </div>
         <table class="data">
             <tr>
@@ -81,10 +88,11 @@
             <tr>
                 <td class="descField"><?php echo __('Clave'); ?></td>
                 <td class="valField">
-                    <?php if ($useImage): ?>
+                    <?php if ($_getvar('useImage')): ?>
                         <div class="lowres-title"><?php echo __('Clave'); ?></div>
 
-                        <img class="account-pass-image" src="data:image/png;base64,<?php echo $accountPassImage; ?>"/>
+                        <img class="account-pass-image"
+                             src="data:image/png;base64,<?php echo $_getvar('accountPassImage'); ?>"/>
                     <?php else: ?>
                         <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                             <input id="password" name="password" type="text"
@@ -98,13 +106,13 @@
 
         <div class="item-actions">
             <ul>
-                <?php if (!$useImage): ?>
+                <?php if (!$_getvar('useImage')): ?>
                     <li>
                         <button id="btnClipPass"
                                 class="clip-pass-icon mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored mdl-color--indigo-A200"
                                 data-clipboard-target="#password"
                                 data-item-id="<?php echo $accountData->getId(); ?>"
-                                data-sk="<?php echo $sk; ?>"
+                                data-sk="<?php echo $_getvar('sk'); ?>"
                                 data-history="0"
                                 data-onclick="account/copypass">
                             <i class="material-icons">content_paste</i>
diff --git a/app/modules/web/themes/material-blue/views/account/account-permissions.inc b/app/modules/web/themes/material-blue/views/account/account-permissions.inc
index 8c1e466f..c398e877 100644
--- a/app/modules/web/themes/material-blue/views/account/account-permissions.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-permissions.inc
@@ -1,8 +1,10 @@
 <?php
 /**
- * @var \SP\Services\Account\AccountAcl         $accountAcl
- * @var \SP\DataModel\AccountExtData            $accountData
+ * @var callable                                $_getvar
  * @var \SP\Core\UI\ThemeIcons                  $icons
+ * @var \SP\DataModel\AccountExtData            $accountData
+ * @var \SP\Services\Account\AccountAcl         $accountAcl
+ * @var \SP\Config\ConfigData                   $configData
  * @var \SP\DataModel\ItemPreset\AccountPrivate $accountPrivate
  */
 ?>
@@ -15,12 +17,12 @@
                 <td class="valField">
                     <div class="account-permissions">
                         <div class="tag-list-box">
-                            <?php if (!$isView): ?>
+                            <?php if (!$_getvar('isView')): ?>
                                 <select id="other_users_view" name="other_users_view[]" multiple="multiple"
-                                        class="select-box-tags" <?php echo $disabled; ?>>
+                                        class="select-box-tags" <?php echo $_getvar('disabled'); ?>>
                                     <option value=""><?php echo __('Seleccionar Usuarios'); ?></option>
-                                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $otherUsersView */
-                                    foreach ($otherUsersView as $otherUser): ?>
+                                    <?php /** @var \SP\Mvc\View\Components\SelectItem $otherUser */
+                                    foreach ($_getvar('otherUsersView') as $otherUser): ?>
                                         <?php if ($otherUser->isSkip()): continue; endif; ?>
                                         <option
                                                 value="<?php echo $otherUser->getId(); ?>"
@@ -34,8 +36,8 @@
                                     <i class="material-icons select-icon"
                                        title="<?php echo __('Ver'); ?>"><?php echo $icons->getIconView()->getIcon(); ?></i>
                                     <div class="tags-list-items">
-                                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $otherUsersView */
-                                        foreach ($otherUsersView as $otherUser): ?>
+                                        <?php /** @var \SP\Mvc\View\Components\SelectItem $otherUser */
+                                        foreach ($_getvar('otherUsersView') as $otherUser): ?>
                                             <?php if ($otherUser->isSelected()): ?>
                                                 <span class="tag"><?php echo $otherUser->getName(); ?></span>
                                             <?php endif; ?>
@@ -46,12 +48,12 @@
                         </div>
 
                         <div class="tag-list-box">
-                            <?php if (!$isView): ?>
+                            <?php if (!$_getvar('isView')): ?>
                                 <select id="other_users_edit" name="other_users_edit[]" multiple="multiple"
-                                        class="select-box-tags" <?php echo $disabled; ?>>
+                                        class="select-box-tags" <?php echo $_getvar('disabled'); ?>>
                                     <option value=""><?php echo __('Seleccionar Usuarios'); ?></option>
-                                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $otherUsersEdit */
-                                    foreach ($otherUsersEdit as $otherUser): ?>
+                                    <?php /** @var \SP\Mvc\View\Components\SelectItem $otherUser */
+                                    foreach ($_getvar('otherUsersEdit') as $otherUser): ?>
                                         <?php if ($otherUser->isSkip()): continue; endif; ?>
                                         <option
                                                 value="<?php echo $otherUser->getId(); ?>"
@@ -65,8 +67,8 @@
                                     <i class="material-icons select-icon"
                                        title="<?php echo __('Editar'); ?>"><?php echo $icons->getIconEdit()->getIcon(); ?></i>
                                     <div class="tags-list-items">
-                                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $otherUsersEdit */
-                                        foreach ($otherUsersEdit as $otherUser): ?>
+                                        <?php /** @var \SP\Mvc\View\Components\SelectItem $otherUser */
+                                        foreach ($_getvar('otherUsersEdit') as $otherUser): ?>
                                             <?php if ($otherUser->isSelected()): ?>
                                                 <span class="tag"><?php echo $otherUser->getName(); ?></span>
                                             <?php endif; ?>
@@ -83,12 +85,12 @@
                 <td class="valField">
                     <div class="account-permissions">
                         <div class="tag-list-box">
-                            <?php if (!$isView): ?>
+                            <?php if (!$_getvar('isView')): ?>
                                 <select id="other_usergroups_view" name="other_usergroups_view[]" multiple="multiple"
-                                        class="select-box-tags" <?php echo $disabled; ?>>
+                                        class="select-box-tags" <?php echo $_getvar('disabled'); ?>>
                                     <option value=""><?php echo __('Seleccionar Grupos'); ?></option>
-                                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $otherUserGroupsView */
-                                    foreach ($otherUserGroupsView as $otherUserGroup): ?>
+                                    <?php /** @var \SP\Mvc\View\Components\SelectItem $otherUserGroup */
+                                    foreach ($_getvar('otherUserGroupsView') as $otherUserGroup): ?>
                                         <?php if ($otherUserGroup->isSkip()): continue; endif; ?>
                                         <option
                                                 value="<?php echo $otherUserGroup->getId(); ?>"
@@ -102,10 +104,10 @@
                                     <i class="material-icons select-icon"
                                        title="<?php echo __('Ver'); ?>"><?php echo $icons->getIconView()->getIcon(); ?></i>
                                     <div class="tags-list-items">
-                                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $otherUserGroupsView */
-                                        foreach ($otherUserGroupsView as $otherGroup): ?>
-                                            <?php if ($otherGroup->isSelected()): ?>
-                                                <span class="tag"><?php echo $otherGroup->getName(); ?></span>
+                                        <?php /** @var \SP\Mvc\View\Components\SelectItem $otherUserGroup */
+                                        foreach ($_getvar('otherUserGroupsView') as $otherUserGroup): ?>
+                                            <?php if ($otherUserGroup->isSelected()): ?>
+                                                <span class="tag"><?php echo $otherUserGroup->getName(); ?></span>
                                             <?php endif; ?>
                                         <?php endforeach; ?>
                                     </div>
@@ -114,12 +116,12 @@
                         </div>
 
                         <div class="tag-list-box">
-                            <?php if (!$isView): ?>
+                            <?php if (!$_getvar('isView')): ?>
                                 <select id="other_usergroups_edit" name="other_usergroups_edit[]" multiple="multiple"
-                                        class="select-box-tags" <?php echo $disabled; ?>>
+                                        class="select-box-tags" <?php echo $_getvar('disabled'); ?>>
                                     <option value=""><?php echo __('Seleccionar Grupos'); ?></option>
-                                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $otherUserGroupsEdit */
-                                    foreach ($otherUserGroupsEdit as $otherUserGroup): ?>
+                                    <?php /** @var \SP\Mvc\View\Components\SelectItem $otherUserGroup */
+                                    foreach ($_getvar('otherUserGroupsEdit') as $otherUserGroup): ?>
                                         <?php if ($otherUserGroup->isSkip()): continue; endif; ?>
                                         <option
                                                 value="<?php echo $otherUserGroup->getId(); ?>"
@@ -133,10 +135,10 @@
                                     <i class="material-icons select-icon"
                                        title="<?php echo __('Editar'); ?>"><?php echo $icons->getIconEdit()->getIcon(); ?></i>
                                     <div class="tags-list-items">
-                                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $otherUserGroupsEdit */
-                                        foreach ($otherUserGroupsEdit as $otherGroup): ?>
-                                            <?php if ($otherGroup->isSelected()): ?>
-                                                <span class="tag"><?php echo $otherGroup->getName(); ?></span>
+                                        <?php /** @var \SP\Mvc\View\Components\SelectItem $otherUserGroup */
+                                        foreach ($_getvar('otherUserGroupsEdit') as $otherUserGroup): ?>
+                                            <?php if ($otherUserGroup->isSelected()): ?>
+                                                <span class="tag"><?php echo $otherUserGroup->getName(); ?></span>
                                             <?php endif; ?>
                                         <?php endforeach; ?>
                                     </div>
@@ -148,17 +150,17 @@
             </tr>
         <?php endif; ?>
 
-        <?php if (isset($editAction)
-            && ($ctx_userIsAdminApp
-                || $ctx_userIsAdminAcc
-                || $ctx_userId === $accountData->getUserId())): ?>
+        <?php if ($_getvar('editAction')
+            && ($_getvar('ctx_userIsAdminApp')
+                || $_getvar('ctx_userIsAdminAcc')
+                || $_getvar('ctx_userId') === $accountData->getUserId())): ?>
             <tr>
                 <td class="descField"><?php echo __('Propietario'); ?></td>
                 <td class="valField">
-                    <select id="owner_id" name="owner_id" class="select-box" <?php echo $disabled; ?>>
+                    <select id="owner_id" name="owner_id" class="select-box" <?php echo $_getvar('disabled'); ?>>
                         <option value=""><?php echo __('Seleccionar Usuario'); ?></option>
-                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $users */
-                        foreach ($users as $user): ?>
+                        <?php /** @var \SP\Mvc\View\Components\SelectItem $user */
+                        foreach ($_getvar('users') as $user): ?>
                             <option
                                     value="<?php echo $user->getId(); ?>"
                                 <?php echo $user->isSelected() ? 'selected' : ''; ?>><?php echo $user->getName(); ?></option>
@@ -168,14 +170,15 @@
             </tr>
         <?php endif; ?>
 
-        <?php if ($ctx_userIsAdminApp || $ctx_userIsAdminAcc): ?>
+        <?php if ($_getvar('ctx_userIsAdminApp') || $_getvar('ctx_userIsAdminAcc')): ?>
             <tr>
                 <td class="descField"><?php echo __('Grupo Principal'); ?></td>
                 <td class="valField">
-                    <select id="main_usergroup_id" name="main_usergroup_id" class="select-box" <?php echo $disabled; ?>>
+                    <select id="main_usergroup_id" name="main_usergroup_id"
+                            class="select-box" <?php echo $_getvar('disabled'); ?>>
                         <option value=""><?php echo __('Seleccionar Grupo'); ?></option>
-                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $userGroups */
-                        foreach ($userGroups as $userGroup): ?>
+                        <?php /** @var \SP\Mvc\View\Components\SelectItem $userGroup */
+                        foreach ($_getvar('userGroups') as $userGroup): ?>
                             <option
                                     value="<?php echo $userGroup->getId(); ?>"
                                 <?php echo $userGroup->isSelected() ? 'selected' : ''; ?>><?php echo $userGroup->getName(); ?></option>
@@ -185,34 +188,38 @@
             </tr>
         <?php endif; ?>
 
-        <?php if ($allowPrivate === true):
+        <?php if ($_getvar('allowPrivate') === true):
+            $accountPrivate = $_getvar('accountPrivate');
+
             $privateUserCheck = (($gotData && $accountData->getIsPrivate())
-                || (isset($accountPrivate) && $accountPrivate->isPrivateUser())) ? 'checked' : '';
+                || (is_object($accountPrivate) && $accountPrivate->isPrivateUser())) ? 'checked' : '';
             ?>
             <tr>
                 <td class="descField"><?php echo __('Cuenta Privada'); ?></td>
                 <td class="valField">
                     <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="private_enabled">
                         <input name="private_enabled" type="checkbox" id="private_enabled"
-                               class="mdl-switch__input" <?php echo $privateUserCheck;
-                        echo $disabled; ?>/>
+                               class="mdl-switch__input" <?php echo $_getvar('privateUserCheck');
+                        echo $_getvar('disabled'); ?>/>
                         <span class="mdl-switch__label"><?php echo __('Privada'); ?></span>
                     </label>
                 </td>
             </tr>
         <?php endif; ?>
 
-        <?php if ($allowPrivateGroup === true):
+        <?php if ($_getvar('allowPrivateGroup') === true):
+            $accountPrivate = $_getvar('accountPrivate');
+
             $privateUserGroupCheck = (($gotData && $accountData->getIsPrivateGroup())
-                || (isset($accountPrivate) && $accountPrivate->isPrivateGroup())) ? 'checked' : '';
+                || (is_object($accountPrivate) && $accountPrivate->isPrivateGroup())) ? 'checked' : '';
             ?>
             <tr>
                 <td class="descField"><?php echo __('Cuenta Privada Grupo'); ?></td>
                 <td class="valField">
                     <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="private_group_enabled">
                         <input name="private_group_enabled" type="checkbox" id="private_group_enabled"
-                               class="mdl-switch__input" <?php echo $privateUserGroupCheck;
-                        echo $disabled; ?>/>
+                               class="mdl-switch__input" <?php echo $_getvar('privateUserGroupCheck');
+                        echo $_getvar('disabled'); ?>/>
                         <span class="mdl-switch__label"><?php echo __('Privada Grupo'); ?></span>
                     </label>
                 </td>
diff --git a/app/modules/web/themes/material-blue/views/account/account-request.inc b/app/modules/web/themes/material-blue/views/account/account-request.inc
index 408f4a24..8d1d581c 100644
--- a/app/modules/web/themes/material-blue/views/account/account-request.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-request.inc
@@ -1,8 +1,14 @@
 <?php
 /**
- * @var $icons \SP\Core\UI\ThemeIcons
- * @var $accountData \SP\DataModel\AccountVData
+ * @var callable                        $_getvar
+ * @var \SP\Core\UI\ThemeIcons          $icons
+ * @var \SP\DataModel\AccountExtData    $accountData
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\Config\ConfigData           $configData
  */
+
+/** @var \SP\DataModel\AccountExtData $accountData */
+$accountData = $_getvar('accountData');
 ?>
 
 <div class="data-container">
@@ -10,8 +16,8 @@
 
     <form method="post" name="requestmodify" id="frmRequestModify" class="form-action"
           data-onsubmit="account/request"
-          data-action-route="<?php echo isset($formRoute) ? $formRoute : ''; ?>"
-          data-item-id="<?php echo isset($accountId) ? $accountId : ''; ?>"
+          data-action-route="<?php echo $_getvar('formRoute', ''); ?>"
+          data-item-id="<?php echo $_getvar('accountId', ''); ?>"
           data-hash="">
         <table class="data">
             <tr>
@@ -48,7 +54,8 @@
                 </td>
             </tr>
         </table>
-        <input type="hidden" name="sk" value="">
+
+        <input type="hidden" name="sk" value="<?php echo $sk; ?>">
         <input type="hidden" name="isAjax" value="1">
     </form>
 
@@ -70,7 +77,4 @@
             </li>
         </ul>
     </div>
-</div>
-<script>
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/account/account.inc b/app/modules/web/themes/material-blue/views/account/account.inc
index 72c61d22..88678d2a 100644
--- a/app/modules/web/themes/material-blue/views/account/account.inc
+++ b/app/modules/web/themes/material-blue/views/account/account.inc
@@ -1,22 +1,28 @@
 <?php
 /**
- * @var \SP\Services\Account\AccountAcl $accountAcl
- * @var \SP\DataModel\AccountExtData    $accountData
- * @var \SP\Config\ConfigData           $configData
+ * @var callable $_getvar
  */
 
-$showLinked = $gotData && count($linkedAccounts) > 0;
+/** @var \SP\DataModel\AccountExtData $accountData */
+$accountData = $_getvar('accountData');
+
+/** @var \SP\Services\Account\AccountAcl $accountAcl */
+$accountAcl = $_getvar('accountAcl');
+
+$gotData = $_getvar('gotData', false);
+$showLinked = $gotData && count($_getvar('linkedAccounts', [])) > 0;
 $showFiles = $gotData && $configData->isFilesEnabled() && $accountAcl->isShowFiles();
 $showDetails = $gotData && $accountAcl->isShowDetails();
-$showPermissions = $accountAcl->isShowPermission() || $allowPrivate || $allowPrivateGroup;
-$showCustomFields = count($customFields) > 0;
-
+$showPermissions = $accountAcl->isShowPermission()
+    || $_getvar('allowPrivate', false)
+    || $_getvar('allowPrivateGroup', false);
+$showCustomFields = count($_getvar('customFields', 0)) > 0;
 ?>
 
 <div class="data-container">
     <div id="title" class="titleNormal">
-        <i class="material-icons"><?php echo $title['icon']; ?></i>
-        <?php echo $title['name']; ?>
+        <i class="material-icons"><?php echo $_getvar('title')['icon']; ?></i>
+        <?php echo $_getvar('title')['name']; ?>
     </div>
 
     <div class="mdl-tabs mdl-js-tabs mdl-js-ripple-effect">
@@ -46,8 +52,8 @@ $showCustomFields = count($customFields) > 0;
 
         <form method="post" name="frmaccount" id="frmAccount" class="form-action"
               data-onsubmit="account/save"
-              data-action-route="<?php echo isset($formRoute) ? $formRoute : ''; ?>"
-              data-item-id="<?php echo isset($accountId) ? $accountId : ''; ?>"
+              data-action-route="<?php echo $_getvar('formRoute') ?: ''; ?>"
+              data-item-id="<?php echo $_getvar('accountId') ?: ''; ?>"
               data-hash="">
 
             <input type="hidden" name="sk" value="<?php echo $sk; ?>">
@@ -62,7 +68,7 @@ $showCustomFields = count($customFields) > 0;
                                 <input id="name" name="name" type="text" required
                                        class="mdl-textfield__input mdl-color-text--indigo-400"
                                        maxlength="50"
-                                       value="<?php echo $gotData ? htmlentities($accountData->getName()) : ''; ?>" <?php echo $readonly; ?>>
+                                       value="<?php echo $gotData ? htmlentities($accountData->getName()) : ''; ?>" <?php echo $_getvar('readonly'); ?>>
                                 <label class="mdl-textfield__label"
                                        for="name"><?php echo __('Nombre de cuenta'); ?></label>
                             </div>
@@ -74,18 +80,18 @@ $showCustomFields = count($customFields) > 0;
                             <div class="lowres-title"><?php echo __('Cliente'); ?></div>
 
                             <select id="client_id" name="client_id" class="select-box"
-                                    required <?php echo $disabled; ?>>
+                                    required <?php echo $_getvar('disabled'); ?>>
                                 <option value=""><?php echo __('Seleccionar Cliente'); ?></option>
-                                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $clients */
-                                foreach ($clients as $client): ?>
+                                <?php /** @var \SP\Mvc\View\Components\SelectItem $client */
+                                foreach ($_getvar('clients') as $client): ?>
                                     <option
                                             value="<?php echo $client->getId(); ?>" <?php echo ($gotData && $client->getId() === $accountData->getClientId()) ? 'selected' : ''; ?>><?php echo $client->getName(); ?></option>
                                 <?php endforeach; ?>
                             </select>
-                            <?php if ($addClientEnabled): ?>
+                            <?php if ($_getvar('addClientEnabled')): ?>
                                 <i class="material-icons btn-action btn-add-select"
                                    title="<?php echo __('Nuevo Cliente'); ?>"
-                                   data-action-route="<?php echo $addClientRoute; ?>"
+                                   data-action-route="<?php echo $_getvar('addClientRoute'); ?>"
                                    data-item-route="items/clients"
                                    data-item-dst="client_id"
                                    data-item-id="0"
@@ -99,18 +105,18 @@ $showCustomFields = count($customFields) > 0;
                             <div class="lowres-title"><?php echo __('Categoría'); ?></div>
 
                             <select id="category_id" name="category_id" class="select-box"
-                                    required <?php echo $disabled; ?>>
+                                    required <?php echo $_getvar('disabled'); ?>>
                                 <option value=""><?php echo __('Seleccionar Categoría'); ?></option>
-                                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $categories */
-                                foreach ($categories as $category): ?>
+                                <?php /** @var \SP\Mvc\View\Components\SelectItem $category */
+                                foreach ($_getvar('categories') as $category): ?>
                                     <option
                                             value="<?php echo $category->getId(); ?>" <?php echo ($gotData && $category->getId() === $accountData->getCategoryId()) ? 'selected' : ''; ?>><?php echo $category->getName(); ?></option>
                                 <?php endforeach; ?>
                             </select>
-                            <?php if ($addCategoryEnabled): ?>
+                            <?php if ($_getvar('addCategoryEnabled')): ?>
                                 <i class="material-icons btn-action btn-add-select"
                                    title="<?php echo __('Nueva Categoría'); ?>"
-                                   data-action-route="<?php echo $addCategoryRoute; ?>"
+                                   data-action-route="<?php echo $_getvar('addCategoryRoute'); ?>"
                                    data-item-route="items/categories"
                                    data-item-dst="category_id"
                                    data-item-id="0"
@@ -125,7 +131,7 @@ $showCustomFields = count($customFields) > 0;
                                 <input id="url" name="url" type="text"
                                        class="mdl-textfield__input mdl-color-text--indigo-400"
                                        maxlength="255"
-                                       value="<?php echo $gotData ? $accountData->getUrl() : ''; ?>" <?php echo $readonly; ?>>
+                                       value="<?php echo $gotData ? $accountData->getUrl() : ''; ?>" <?php echo $_getvar('readonly'); ?>>
                                 <label class="mdl-textfield__label"
                                        for="name"><?php echo __('URL o IP de acceso'); ?></label>
                             </div>
@@ -138,7 +144,7 @@ $showCustomFields = count($customFields) > 0;
                                 <input id="login" name="login" type="text"
                                        class="mdl-textfield__input mdl-color-text--indigo-400"
                                        maxlength="50"
-                                       value="<?php echo $gotData ? htmlentities($accountData->getLogin()) : ''; ?>" <?php echo $readonly; ?>>
+                                       value="<?php echo $gotData ? htmlentities($accountData->getLogin()) : ''; ?>" <?php echo $_getvar('readonly'); ?>>
                                 <label class="mdl-textfield__label"
                                        for="name"><?php echo __('Usuario de acceso'); ?></label>
                             </div>
@@ -177,8 +183,8 @@ $showCustomFields = count($customFields) > 0;
                                     <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                                         <input id="password_date_expire" name="password_date_expire" type="date"
                                                class="mdl-textfield__input mdl-color-text--indigo-400 password-datefield__input"
-                                               value="<?php echo $accountPassDateChange; ?>"
-                                               data-dst-unix="password_date_expire_unix" <?php echo $readonly; ?>>
+                                               value="<?php echo $_getvar('accountPassDateChange'); ?>"
+                                               data-dst-unix="password_date_expire_unix" <?php echo $_getvar('readonly'); ?>>
                                         <input type='hidden' name='password_date_expire_unix' value=""/>
                                         <label class="mdl-textfield__label"
                                                for="password_date_expire"><?php echo __('Fecha'); ?></label>
@@ -196,7 +202,7 @@ $showCustomFields = count($customFields) > 0;
                             <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                         <textarea class="mdl-textfield__input mdl-color-text--indigo-400" rows="3" id="notes"
                                   name="notes"
-                                  maxlength="5000" <?php echo $readonly; ?>><?php echo $gotData ? htmlentities($accountData->getNotes()) : ''; ?></textarea>
+                                  maxlength="5000" <?php echo $_getvar('readonly'); ?>><?php echo $gotData ? htmlentities($accountData->getNotes()) : ''; ?></textarea>
                                 <label class="mdl-textfield__label"
                                        for="notes"><?php echo __('Notas sobre la cuenta'); ?></label>
                             </div>
@@ -206,19 +212,19 @@ $showCustomFields = count($customFields) > 0;
                         <td class="valField">
                             <div class="lowres-title"><?php echo __('Etiquetas'); ?></div>
 
-                            <?php if (!$isView): ?>
+                            <?php if (!$_getvar('isView')): ?>
                                 <select id="tags" name="tags[]" multiple="multiple"
                                         class="select-box-tags">
                                     <option value=""><?php echo __('Seleccionar Etiquetas'); ?></option>
-                                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $tags */
-                                    foreach ($tags as $tag): ?>
+                                    <?php /** @var \SP\Mvc\View\Components\SelectItem $tag */
+                                    foreach ($_getvar('tags') as $tag): ?>
                                         <option value="<?php echo $tag->getId(); ?>" <?php echo $tag->isSelected() ? 'selected' : ''; ?>><?php echo $tag->getName(); ?></option>
                                     <?php endforeach; ?>
                                 </select>
-                                <?php if ($addTagEnabled): ?>
+                                <?php if ($_getvar('addTagEnabled')): ?>
                                     <i class="material-icons btn-action btn-add-select"
                                        title="<?php echo __('Nueva Etiqueta'); ?>"
-                                       data-action-route="<?php echo $addTagRoute; ?>"
+                                       data-action-route="<?php echo $_getvar('addTagRoute'); ?>"
                                        data-item-route="items/tags"
                                        data-item-dst="tags"
                                        data-item-id="0"
@@ -228,8 +234,8 @@ $showCustomFields = count($customFields) > 0;
                                 <div class="tag-list-box">
                                     <div class="tag-list-body">
                                         <div class="tags-list-items">
-                                            <?php /** @var \SP\Mvc\View\Components\SelectItem[] $tags */
-                                            foreach ($tags as $tag): ?>
+                                            <?php /** @var \SP\Mvc\View\Components\SelectItem $tag */
+                                            foreach ($_getvar('tags') as $tag): ?>
                                                 <?php if ($tag->isSelected()): ?>
                                                     <span class="tag"><?php echo $tag->getName(); ?></span>
                                                 <?php endif; ?>
@@ -240,24 +246,27 @@ $showCustomFields = count($customFields) > 0;
                             <?php endif; ?>
                         </td>
                     </tr>
-                    <?php if (isset($linkedAccounts) && count($linkedAccounts) === 0): ?>
+
+                    <?php if (!$showLinked): ?>
                         <tr>
                             <td class="descField"><?php echo __('Cuenta Vinculada'); ?></td>
                             <td class="valField">
                                 <div class="lowres-title"><?php echo __('Cuenta Vinculada'); ?></div>
 
                                 <select id="parent_account_id" name="parent_account_id"
-                                        class="select-box select-box-deselect" <?php echo $disabled; ?>
-                                        data-sk="<?php echo $sk; ?>"
+                                        class="select-box select-box-deselect" <?php echo $_getvar('disabled'); ?>
+                                        data-sk="<?php echo $_getvar('sk'); ?>"
                                         data-action-route="items/accountsUser"
-                                        data-item-id="<?php echo $gotData ? $accountId : ''; ?>"
+                                        data-item-id="<?php echo $gotData ? $_getvar('accountId') : ''; ?>"
                                         data-selected-id="<?php echo $gotData ? $accountData->getParentId() : ''; ?>">
                                     <option value=""><?php echo __('Seleccionar Cuenta'); ?></option>
                                 </select>
                             </td>
                         </tr>
                     <?php endif; ?>
-                    <?php if ($accountAcl->isShowHistory() && count($historyData) > 0): ?>
+
+                    <?php if ($accountAcl->isShowHistory()
+                        && count($_getvar('historyData', [])) > 0): ?>
                         <tr>
                             <td class="descField"><?php echo __('Historial'); ?></td>
                             <td class="valField">
@@ -267,29 +276,33 @@ $showCustomFields = count($customFields) > 0;
                                         data-action-route="account/viewHistory"
                                         data-onchange="account/viewHistory">
                                     <option value=""><?php echo __('Seleccionar fecha'); ?></option>
-                                    <?php foreach ($historyData as $historyId => $historyData): ?>
+                                    <?php /** @var \SP\Mvc\View\Components\SelectItem $history */
+                                    foreach ($_getvar('historyData') as $history): ?>
                                         <option
-                                                value="<?php echo $historyId; ?>" <?php echo ($gotData && $accountIsHistory && $historyId === $accountHistoryId) ? 'selected' : ''; ?>><?php echo $historyData; ?></option>
+                                                value="<?php echo $history->getId(); ?>"><?php echo $history->getName(); ?></option>
                                     <?php endforeach; ?>
                                 </select>
                             </td>
                         </tr>
                     <?php endif; ?>
 
-                    <?php if (isset($editAction) && $isModified && $accountData->getUserEditName()): ?>
+                    <?php if ($_getvar('editAction')
+                        && $_getvar('isModified', false)
+                        && $accountData->getUserEditName()): ?>
                         <tr>
                             <td class="descField"><?php echo __('Última Modificación'); ?></td>
                             <td class="valField"><?php printf('%s (%s)', $accountData->getDateEdit(), $accountData->getUserEditName()); ?></td>
                         </tr>
                     <?php endif; ?>
 
-                    <?php if (isset($publicLinkShow) && $publicLinkShow && $publicLinkUrl !== null): ?>
+                    <?php if ($_getvar('publicLinkShow', false) === true
+                        && $_getvar('publicLinkUrl') !== null): ?>
                         <tr>
                             <td class="descField"><?php echo __('Enlace Público'); ?></td>
                             <td class="valField">
                                 <div class="lowres-title"><?php echo __('Enlace Público'); ?></div>
 
-                                <a href="<?php echo $publicLinkUrl; ?>" target="_blank"
+                                <a href="<?php echo $_getvar('publicLinkUrl'); ?>" target="_blank"
                                    title="<?php echo __('Enlace Público'); ?>">
                                     <i class="material-icons"><?php echo $icons->getIconPublicLink()->getIcon(); ?></i>
                                 </a>
@@ -302,7 +315,7 @@ $showCustomFields = count($customFields) > 0;
                         <td class="valField">
                             <div class="lowres-title"><?php echo __('Enlace Directo'); ?></div>
 
-                            <a href="<?php echo $deepLink; ?>" target="_blank"
+                            <a href="<?php echo $_getvar('deepLink'); ?>" target="_blank"
                                title="<?php echo __('Enlace Directo'); ?>">
                                 <i class="material-icons"><?php echo $icons->getIconPublicLink()->getIcon(); ?></i>
                             </a>
@@ -322,20 +335,28 @@ $showCustomFields = count($customFields) > 0;
             </div>
 
             <div class="mdl-tabs__panel" id="permission-panel">
-                <?php if ($showPermissions): include $this->includeTemplate('account-permissions'); endif; ?>
+                <?php if ($showPermissions):
+                    include $this->includeTemplate('account-permissions');
+                endif; ?>
             </div>
         </form>
 
         <div class="mdl-tabs__panel" id="file-panel">
-            <?php if ($showFiles) : include $this->includeTemplate('files'); endif; ?>
+            <?php if ($showFiles) :
+                include $this->includeTemplate('files');
+            endif; ?>
         </div>
 
         <div class="mdl-tabs__panel" id="detail-panel">
-            <?php if ($showDetails): include $this->includeTemplate('details'); endif; ?>
+            <?php if ($showDetails):
+                include $this->includeTemplate('details');
+            endif; ?>
         </div>
 
         <div class="mdl-tabs__panel" id="linked-panel">
-            <?php if ($showLinked): include $this->includeTemplate('linkedAccounts'); endif; ?>
+            <?php if ($showLinked):
+                include $this->includeTemplate('linkedAccounts');
+            endif; ?>
         </div>
     </div>
 
diff --git a/app/modules/web/themes/material-blue/views/account/actions.inc b/app/modules/web/themes/material-blue/views/account/actions.inc
index fa1b47f7..7c373af2 100644
--- a/app/modules/web/themes/material-blue/views/account/actions.inc
+++ b/app/modules/web/themes/material-blue/views/account/actions.inc
@@ -1,13 +1,17 @@
 <?php
 /**
- * @var \SP\Core\UI\ThemeIcons                             $icons
- * @var \SP\Html\DataGrid\Action\DataGridActionInterface[] $accountActions
- * @var \SP\Html\DataGrid\Action\DataGridActionInterface[] $accountActionsMenu
+ * @var \SP\Core\UI\ThemeIcons          $icons
+ * @var callable                        $_getvar
+ * @var \SP\DataModel\AccountExtData    $accountData
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\Config\ConfigData           $configData
  */
 ?>
+
 <div class="item-actions">
     <ul>
-        <?php foreach ($accountActions as $action): ?>
+        <?php /** @var \SP\Html\DataGrid\Action\DataGridActionInterface $action */
+        foreach ($_getvar('accountActions') as $action): ?>
             <li>
                 <button id="<?php echo $action->getId(); ?>"
                         class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $action->getClassesAsString(), ' ', $action->getIcon()->getClassButton(); ?>"
@@ -19,7 +23,9 @@
             </li>
         <?php endforeach; ?>
     </ul>
-    <?php if (isset($accountActionsMenu) && count($accountActionsMenu) > 0): ?>
+    <?php
+    $accountActionsMenu = $_getvar('accountActionsMenu');
+    if ($accountActionsMenu && count($accountActionsMenu) > 0): ?>
         <div>
             <button id="actions-menu-account"
                     class="mdl-button mdl-js-button mdl-button--icon">
diff --git a/app/modules/web/themes/material-blue/views/account/details.inc b/app/modules/web/themes/material-blue/views/account/details.inc
index dc00174f..b1293df9 100644
--- a/app/modules/web/themes/material-blue/views/account/details.inc
+++ b/app/modules/web/themes/material-blue/views/account/details.inc
@@ -1,6 +1,11 @@
 <?php
-/** @var \SP\Services\Account\AccountAcl $AccountAcl */
-/** @var \SP\DataModel\AccountExtData $accountData */
+/**
+ * @var \SP\Core\UI\ThemeIcons          $icons
+ * @var callable                        $_getvar
+ * @var \SP\DataModel\AccountExtData    $accountData
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\Config\ConfigData           $configData
+ */
 ?>
 
 <div id="data-details">
@@ -22,7 +27,7 @@
             </td>
         </tr>
 
-        <?php if ($isModified && $accountData->getUserEditName()): ?>
+        <?php if ($_getvar('isModified') && $accountData->getUserEditName()): ?>
             <tr>
                 <td class="descField"><?php echo __('Última Modificación'); ?></td>
                 <td class="valField">
@@ -74,17 +79,17 @@
             <td class="valField">
                 <div class="lowres-title"><?php echo __('Fecha de Clave'); ?></div>
 
-                <?php echo $accountPassDate; ?>
+                <?php echo $_getvar('accountPassDate'); ?>
             </td>
         </tr>
 
-        <?php if (isset($accountPassDateChange) && $accountPassDateChange > 0): ?>
+        <?php if ($_getvar('accountPassDateChange', 0) > 0): ?>
             <tr>
                 <td class="descField"><?php echo __('Fecha Caducidad Clave'); ?></td>
                 <td class="valField">
                     <div class="lowres-title"><?php echo __('Fecha Caducidad Clave'); ?></div>
 
-                    <?php echo $accountPassDateChange; ?>
+                    <?php echo $_getvar('accountPassDateChange'); ?>
                 </td>
             </tr>
         <?php endif; ?>
diff --git a/app/modules/web/themes/material-blue/views/account/files-list.inc b/app/modules/web/themes/material-blue/views/account/files-list.inc
index 44e75c4b..8c4fcbfa 100644
--- a/app/modules/web/themes/material-blue/views/account/files-list.inc
+++ b/app/modules/web/themes/material-blue/views/account/files-list.inc
@@ -1,13 +1,15 @@
 <?php
 /**
- * @var \SP\Core\UI\ThemeIcons   $icons
- * @var \SP\DataModel\FileData[] $files
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var callable               $_getvar
+ * @var \SP\Config\ConfigData  $configData
+ * @var \SP\DataModel\FileData $file
  */
 ?>
 
 <div id="files-wrap">
     <ul id="files-list " class="mdl-list">
-        <?php foreach ($files as $file): ?>
+        <?php foreach ($_getvar('files') as $file): ?>
             <li class="mdl-list__item">
                 <span class="mdl-list__item-primary-content" title="<?php echo $file->getName(); ?>">
                     <i class="material-icons  mdl-list__item-icon">attachment</i>
@@ -19,17 +21,17 @@
                         <span title="<?php echo $file->getName(); ?>"
                               class="btn-action"
                               data-item-id="<?php echo $file->getId(); ?>"
-                              data-action-route="<?php echo $fileViewRoute; ?>"
+                              data-action-route="<?php echo $_getvar('fileViewRoute'); ?>"
                               data-onclick="file/view">
                             <img src="data:image/png;base64,<?php echo $file->getThumb(); ?>" alt="thumbnail"/>
                         </span>
                     <?php endif; ?>
 
-                    <?php if ($deleteEnabled === 1): ?>
+                    <?php if ($_getvar('deleteEnabled') === 1): ?>
                         <i class="material-icons btn-action <?php echo $icons->getIconDelete()->getClass(); ?>"
                            title="<?php echo __('Eliminar Archivo'); ?>"
                            data-item-id="<?php echo $file->getId(); ?>"
-                           data-action-route="<?php echo $fileDeleteRoute; ?>"
+                           data-action-route="<?php echo $_getvar('fileDeleteRoute'); ?>"
                            data-onclick="file/delete">
                             <?php echo $icons->getIconDelete()->getIcon(); ?></i>
                     <?php endif; ?>
@@ -37,22 +39,18 @@
                     <i class="material-icons btn-action mdl-list__item-icon <?php echo $icons->getIconDownload()->getClass(); ?>"
                        title="<?php echo __('Descargar Archivo'); ?>"
                        data-item-id="<?php echo $file->getId(); ?>"
-                       data-action-route="<?php echo $fileDownloadRoute; ?>"
+                       data-action-route="<?php echo $_getvar('fileDownloadRoute'); ?>"
                        data-onclick="file/download">
                         <?php echo $icons->getIconDownload()->getIcon(); ?></i>
 
                     <i class="material-icons btn-action mdl-list__item-icon <?php echo $icons->getIconView()->getClass(); ?>"
                        title="<?php echo __('Ver Archivo'); ?>"
                        data-item-id="<?php echo $file->getId(); ?>"
-                       data-action-route="<?php echo $fileViewRoute; ?>"
+                       data-action-route="<?php echo $_getvar('fileViewRoute'); ?>"
                        data-onclick="file/view">
                         <?php echo $icons->getIconView()->getIcon(); ?></i>
                 </span>
             </li>
         <?php endforeach; ?>
     </ul>
-</div>
-
-<script type="text/javascript">
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/account/files.inc b/app/modules/web/themes/material-blue/views/account/files.inc
index d77ca557..b7ad735b 100644
--- a/app/modules/web/themes/material-blue/views/account/files.inc
+++ b/app/modules/web/themes/material-blue/views/account/files.inc
@@ -1,27 +1,30 @@
 <?php
 /**
- * @var \SP\Services\Account\AccountAcl $accountAcl
  * @var \SP\Core\UI\ThemeIcons          $icons
+ * @var callable                        $_getvar
+ * @var \SP\DataModel\AccountExtData    $accountData
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\Config\ConfigData           $configData
  */
 ?>
 
 <div id="data-files">
     <div class="data">
         <div id="list-account-files"
-             data-action-route="<?php echo $fileListRoute; ?>"
-             data-item-id="<?php echo $accountId; ?>"
-             data-history="<?php $accountIsHistory; ?>"
+             data-action-route="<?php echo $_getvar('fileListRoute'); ?>"
+             data-item-id="<?php echo $_getvar('accountId'); ?>"
+             data-history="<?php echo $_getvar('accountIsHistory', false); ?>"
              data-delete="<?php echo (int)$accountAcl->isShowDelete(); ?>"
-             data-sk="<?php echo $sk; ?>">
+             data-sk="<?php echo $_getvar('sk'); ?>">
         </div>
 
-        <?php if (isset($editAction)): ?>
+        <?php if ($_getvar('editAction')): ?>
             <div id="box-upload-files">
                 <div id="drop-account-files" class="round active-tooltip dropzone"
-                     data-files-ext="<?php echo $filesAllowedExts; ?>"
-                     data-item-id="<?php echo $accountId; ?>"
-                     data-sk="<?php echo $sk; ?>"
-                     data-action-route="<?php echo $fileUploadRoute; ?>"
+                     data-files-ext="<?php echo $_getvar('filesAllowedExts'); ?>"
+                     data-item-id="<?php echo $_getvar('accountId'); ?>"
+                     data-sk="<?php echo $_getvar('sk'); ?>"
+                     data-action-route="<?php echo $_getvar('fileUploadRoute'); ?>"
                      data-delete="<?php echo (int)$accountAcl->isShowDelete(); ?>">
                     <i class="material-icons md-60 mdl-color-text--teal-500">cloud_upload</i>
                 </div>
@@ -30,7 +33,11 @@
                     <input type="file" id="inFile" multiple name="inFile"/>
                 </form>
                 <div class="mdl-tooltip" for="drop-account-files">
-                    <?php printf(__('Soltar archivos aquí (max. 5) o click para seleccionar') . '<br><br>' . __('Tamaño máximo de archivo: %d MB'), $maxFileSize); ?>
+                    <?php printf(
+                        __('Soltar archivos aquí (max. 5) o click para seleccionar')
+                        . '<br><br>'
+                        . __('Tamaño máximo de archivo: %d MB'),
+                        $_getvar('maxFileSize')); ?>
                 </div>
             </div>
         <?php endif; ?>
diff --git a/app/modules/web/themes/material-blue/views/account/linkedAccounts.inc b/app/modules/web/themes/material-blue/views/account/linkedAccounts.inc
index 3eb06775..78a8219c 100644
--- a/app/modules/web/themes/material-blue/views/account/linkedAccounts.inc
+++ b/app/modules/web/themes/material-blue/views/account/linkedAccounts.inc
@@ -1,13 +1,15 @@
 <?php
 /**
  * @var \SP\Core\UI\ThemeIcons $icons
+ * @var callable               $_getvar
+ * @var \SP\Config\ConfigData  $configData
  */
 ?>
 
 <div id="data-linkedAccounts">
     <div class="data">
         <ul class="mdl-list">
-            <?php foreach ($linkedAccounts as $account): ?>
+            <?php foreach ($_getvar('linkedAccounts') as $account): ?>
                 <li class="mdl-list__item">
                     <span class="btn-action mdl-list__item-primary-content">
                         <i class="material-icons mdl-list__item-icon">layers</i>
@@ -19,7 +21,7 @@
                            data-action-route="account/edit"
                            data-item-id="<?php echo $account->id; ?>"
                            data-onclick="account/edit"
-                           data-action-sk="<?php echo $sk; ?>">
+                           data-action-sk="<?php echo $_getvar('sk'); ?>">
                             <?php echo $icons->getIconEdit()->getIcon(); ?></i>
 
                         <i class="material-icons btn-action mdl-list__item-icon <?php echo $icons->getIconView()->getClass(); ?>"
@@ -27,7 +29,7 @@
                            data-action-route="account/view"
                            data-item-id="<?php echo $account->id; ?>"
                            data-onclick="account/view"
-                           data-action-sk="<?php echo $sk; ?>">
+                           data-action-sk="<?php echo $_getvar('sk'); ?>">
                         <?php echo $icons->getIconView()->getIcon(); ?></i>
                     </span>
                 </li>
diff --git a/app/modules/web/themes/material-blue/views/account/search-header.inc b/app/modules/web/themes/material-blue/views/account/search-header.inc
index 1fa222f6..c4096298 100644
--- a/app/modules/web/themes/material-blue/views/account/search-header.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-header.inc
@@ -1,10 +1,17 @@
 <?php
 /**
- * @var $data    SP\Html\DataGrid\DataGridTab
- * @var $account \SP\Services\Account\AccountSearchItem
- * @var $this    \SP\Mvc\View\Template
+ * @var \SP\Core\UI\ThemeIcons                 $icons
+ * @var callable                               $_getvar
+ * @var \SP\Config\ConfigData                  $configData
+ * @var \SP\Services\Account\AccountSearchItem $account
+ * @var \SP\Html\DataGrid\DataGridTab          $data
  */
+
+if (!isset($data)) {
+    $data = $_getvar('data');
+}
 ?>
+
 <div id="data-search-header" class="data-header data-header-minimal">
     <ul>
         <?php foreach ($data->getHeader()->getSortFields() as $field): ?>
@@ -16,8 +23,10 @@
                 <span for="btn-order-<?php echo $field->getSortKey(); ?>"
                       class="mdl-tooltip mdl-tooltip--bottom"><?php echo $field->getTitle(); ?></span>
                 <?php
-                $classDown = ($data->getPager()->getSortKey() == $field->getSortKey() && $data->getPager()->getSortOrder() === 0) ? 'mdl-color--amber-A200' : 'md-dark md-inactive';
-                $classUp = ($data->getPager()->getSortKey() == $field->getSortKey() && $data->getPager()->getSortOrder() === 1) ? 'mdl-color--amber-A200' : 'md-dark md-inactive';
+                $classDown = ($data->getPager()->getSortKey() == $field->getSortKey()
+                    && $data->getPager()->getSortOrder() === 0) ? 'mdl-color--amber-A200' : 'md-dark md-inactive';
+                $classUp = ($data->getPager()->getSortKey() == $field->getSortKey()
+                    && $data->getPager()->getSortOrder() === 1) ? 'mdl-color--amber-A200' : 'md-dark md-inactive';
                 ?>
                 <div
                         class="icon material-icons sort-down cursor-pointer <?php echo $classDown; ?>"
diff --git a/app/modules/web/themes/material-blue/views/account/search-index.inc b/app/modules/web/themes/material-blue/views/account/search-index.inc
index 2f5059f4..1a727d26 100644
--- a/app/modules/web/themes/material-blue/views/account/search-index.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-index.inc
@@ -1,9 +1,15 @@
 <?php
 /**
- * @var $data    SP\Html\DataGrid\DataGridTab
- * @var $account \SP\Services\Account\AccountSearchItem
- * @var $this    \SP\Mvc\View\Template
+ * @var \SP\Core\UI\ThemeIcons                 $icons
+ * @var callable                               $_getvar
+ * @var \SP\Config\ConfigData                  $configData
+ * @var \SP\Services\Account\AccountSearchItem $account
+ * @var \SP\Html\DataGrid\DataGrid             $data
  */
+
+if (!isset($data)) {
+    $data = $_getvar('data');
+}
 ?>
 
 <div id="res-content">
diff --git a/app/modules/web/themes/material-blue/views/account/search-rows.inc b/app/modules/web/themes/material-blue/views/account/search-rows.inc
index c23189c3..a045a8a2 100644
--- a/app/modules/web/themes/material-blue/views/account/search-rows.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-rows.inc
@@ -1,13 +1,24 @@
 <?php
 /**
- * @var $data              \SP\Html\DataGrid\DataGridTab
- * @var $accountSearchItem \SP\Services\Account\AccountSearchItem
- * @var $this              \SP\Mvc\View\Template
- * @var $action            \SP\Html\DataGrid\Action\DataGridActionBase
- * @var $actionMenu        \SP\Html\DataGrid\Action\DataGridActionBase
- * @var $icons             \SP\Core\UI\ThemeIcons
+ * @var \SP\Core\UI\ThemeIcons                      $icons
+ * @var callable                                    $_getvar
+ * @var \SP\Config\ConfigData                       $configData
+ * @var \SP\Services\Account\AccountSearchItem      $account
+ * @var \SP\Html\DataGrid\DataGridTab               $data
+ * @var \SP\Html\DataGrid\Action\DataGridActionBase $actionMenu
+ * @var \SP\Html\DataGrid\Action\DataGridActionBase $action
+ * @var \SP\Services\Account\AccountSearchItem      $accountSearchItem
  */
+
+if (!isset($data)) {
+    $data = $_getvar('data');
+}
+
+$wikiFilter = $_getvar('wikiFilter');
+$favoriteRouteOn = $_getvar('favoriteRouteOn');
+$favoriteRouteOff = $_getvar('favoriteRouteOff');
 ?>
+
 <div id="data-search">
     <?php foreach ($data->getData()->getData() as $index => $accountSearchItem):
         if ($index === 'count'): continue; endif;
@@ -43,7 +54,7 @@
                         <div class="field-name"><?php echo __('Nombre'); ?></div>
                         <?php if ($accountSearchItem->isShow() && $accountSearchItem->getLink()): ?>
                             <a title="<?php echo __('Detalles de Cuenta'); ?>" class="btn-action"
-                               data-action-route="<?php echo $viewAccountRoute; ?>"
+                               data-action-route="<?php echo $_getvar('viewAccountRoute'); ?>"
                                data-item-id="<?php echo $accountSearchData->getId(); ?>"
                                data-onclick="account/view"><?php echo $accountSearchData->getName(); ?></a>
                         <?php else: ?>
@@ -187,33 +198,33 @@
                             </div>
                         <?php endif; ?>
 
-                        <?php if (isset($wikiFilter)): ?>
-                            <?php if (preg_match('/^(' . $wikiFilter . ').*/i', $accountSearchData->getName())): ?>
-                                <?php if (\SP\Services\Account\AccountSearchItem::$dokuWikiEnabled): ?>
-                                    <a href="<?php echo $wikiPageUrl, $accountSearchData->getName(); ?>"
-                                       target="_blank">
-                                        <i class="material-icons"
-                                           title="<?php echo __('Enlace a Wiki'); ?>">library_books</i>
-                                    </a>
-                                    <i class="btn-action material-icons fg-green100"
-                                       title="<?php echo __('Ver en Wiki'); ?>"
-                                       data-action-id="<?php echo \SP\Core\Acl\ActionsInterface::WIKI_VIEW; ?>"
-                                       data-pagename="<?php echo $accountSearchData->getName(); ?>"
-                                       data-onclick="wiki/show">library_books</i>
-                                <?php else: ?>
-                                    <a href="<?php echo $wikiPageUrl, $accountSearchData->getName(); ?>"
-                                       target="_blank">
-                                        <i class="material-icons"
-                                           title="<?php echo __('Enlace a Wiki'); ?>">library_books</i>
-                                    </a>
-                                <?php endif; ?>
+                        <?php if ($wikiFilter
+                            && $accountSearchItem->isWikiMatch($wikiFilter)): ?>
+                            <?php if (\SP\Services\Account\AccountSearchItem::$dokuWikiEnabled): ?>
+                                <a href="<?php echo $_getvar('wikiPageUrl'), $accountSearchData->getName(); ?>"
+                                   target="_blank">
+                                    <i class="material-icons"
+                                       title="<?php echo __('Enlace a Wiki'); ?>">library_books</i>
+                                </a>
+                                <i class="btn-action material-icons fg-green100"
+                                   title="<?php echo __('Ver en Wiki'); ?>"
+                                   data-action-route="<?php echo \SP\Core\Acl\ActionsInterface::WIKI_VIEW; ?>"
+                                   data-pagename="<?php echo $accountSearchData->getName(); ?>"
+                                   data-onclick="wiki/show">library_books</i>
+                            <?php else: ?>
+                                <a href="<?php echo $_getvar('wikiPageUrl'), $accountSearchData->getName(); ?>"
+                                   target="_blank">
+                                    <i class="material-icons"
+                                       title="<?php echo __('Enlace a Wiki'); ?>">library_books</i>
+                                </a>
                             <?php endif; ?>
                         <?php endif; ?>
                     <?php endif; ?>
                 </div>
 
 
-                <?php if ($accountSearchItem->isShow() || $accountSearchItem->isShowRequest()): ?>
+                <?php if ($accountSearchItem->isShow()
+                    || $accountSearchItem->isShowRequest()): ?>
                     <div class="account-actions">
                         <?php foreach ($data->getDataActionsFiltered($accountSearchItem) as $action):
                             $actionUid = uniqid('btn-action-', true);
diff --git a/app/modules/web/themes/material-blue/views/account/search-searchbox.inc b/app/modules/web/themes/material-blue/views/account/search-searchbox.inc
index 0eab99ae..7e17ca3a 100644
--- a/app/modules/web/themes/material-blue/views/account/search-searchbox.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-searchbox.inc
@@ -1,18 +1,26 @@
 <?php
 /**
- * @var $data    SP\Html\DataGrid\DataGridTab
- * @var $account \SP\Services\Account\AccountSearchItem
- * @var $this    \SP\Mvc\View\Template
- * @var $icons   \SP\Core\UI\ThemeIcons
+ * @var \SP\Core\UI\ThemeIcons                 $icons
+ * @var callable                               $_getvar
+ * @var \SP\Config\ConfigData                  $configData
+ * @var \SP\Services\Account\AccountSearchItem $account
+ * @var \SP\Html\DataGrid\DataGrid             $data
  */
+
+if (!isset($data)) {
+    $data = $_getvar('data');
+}
+
+$searchFavorites = $_getvar('searchFavorites');
+$pager = $data->getPager();
 ?>
 <div id="searchbox" class="round5 shadow">
     <form method="post" name="frmSearch" id="frmSearch" class="form-action" data-onsubmit="account/search"
-          data-action-route="<?php echo $searchRoute; ?>">
+          data-action-route="<?php echo $_getvar('searchRoute'); ?>">
         <div class="search-text">
             <div class="mdl-textfield mdl-js-textfield">
                 <input class="mdl-textfield__input mdl-color-text--indigo-400" type="text" id="search"
-                       name="search" value="<?php echo $searchTxt; ?>" tabindex="1"/>
+                       name="search" value="<?php echo $_getvar('searchTxt'); ?>" tabindex="1"/>
                 <label class="mdl-textfield__label" for="search"><?php echo __('Texto a buscar'); ?></label>
             </div>
 
@@ -22,8 +30,8 @@
         <div class="search-filters">
             <select id="client" name="client" class="select-box select-box-deselect" tabindex="3">
                 <option value=""><?php echo __('Seleccionar Cliente'); ?></option>
-                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $clients */
-                foreach ($clients as $client): ?>
+                <?php /** @var \SP\Mvc\View\Components\SelectItem $client */
+                foreach ($_getvar('clients') as $client): ?>
                     <option
                             value="<?php echo $client->getId(); ?>" <?php echo $client->isSelected() ? 'selected' : ''; ?>><?php echo $client->getName(); ?></option>
                 <?php endforeach; ?>
@@ -31,8 +39,8 @@
 
             <select id="category" name="category" class="select-box select-box-deselect" tabindex="4">
                 <option value=""><?php echo __('Seleccionar Categoría'); ?></option>
-                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $categories */
-                foreach ($categories as $category): ?>
+                <?php /** @var \SP\Mvc\View\Components\SelectItem $category */
+                foreach ($_getvar('categories') as $category): ?>
                     <option
                             value="<?php echo $category->getId(); ?>" <?php echo $category->isSelected() ? 'selected' : ''; ?>><?php echo $category->getName(); ?></option>
                 <?php endforeach; ?>
@@ -42,24 +50,35 @@
         <div class="search-filters">
 
             <div class="filter-buttons">
-                <?php if ($showGlobalSearch && !$isAdmin): ?>
+                <?php if ($_getvar('showGlobalSearch')
+                    && !$_getvar('isAdmin')):
+                    ?>
                     <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect mdl-switch--inline" for="globalSearch"
                            title="<?php echo __('Búsqueda global'); ?>">
                         <input type="checkbox" id="globalSearch" class="mdl-switch__input mdl-color-text--indigo-400"
                                name="chkgsearch" tabindex="2"
-                            <?php echo $searchGlobal ? 'checked="checked"' : ''; ?>/>
+                            <?php echo $_getvar('searchGlobal') ? 'checked="checked"' : ''; ?>/>
                         <span class="mdl-switch__label" title="<?php echo __('Búsqueda global'); ?>"></span>
                     </label>
-                    <input type="hidden" name="gsearch" value="<?php echo $searchGlobal; ?>">
+                    <input type="hidden" name="gsearch" value="<?php echo $_getvar('searchGlobal'); ?>">
                 <?php endif; ?>
             </div>
 
             <div class="filter-buttons">
-                <button type="button" id="btn-favorite"
-                        class="icon-searchfav mdl-button mdl-js-button mdl-button--icon" tabindex="5">
-                    <i class="material-icons <?php echo ($searchFavorites === true) ? 'mdl-color-text--amber-A200' : ''; ?>"
-                       title="<?php echo __(($searchFavorites === true) ? 'Mostrar Todos' : 'Mostrar Favoritos'); ?>">star</i>
-                </button>
+                <?php if ($searchFavorites === true): ?>
+                    <button type="button" id="btn-favorite"
+                            class="icon-searchfav mdl-button mdl-js-button mdl-button--icon" tabindex="5">
+                        <i class="material-icons mdl-color-text--amber-A200"
+                           title="<?php echo __('Mostrar Todos'); ?>">star</i>
+                    </button>
+                <?php else: ?>
+                    <button type="button" id="btn-favorite"
+                            class="icon-searchfav mdl-button mdl-js-button mdl-button--icon" tabindex="5">
+                        <i class="material-icons"
+                           title="<?php echo __('Mostrar Favoritos'); ?>">star</i>
+                    </button>
+                <?php endif; ?>
+
                 <span for="btn-favorite"
                       class="mdl-tooltip mdl-tooltip--bottom"><?php echo __('Filtrar Favoritos'); ?></span>
 
@@ -74,7 +93,7 @@
             <div class="filter-buttons filter-slider">
                 <span id="txt-slider"></span>
                 <input id="rpp" name="rpp" class="mdl-slider mdl-js-slider" type="range"
-                       min="3" step="3" value="<?php echo $data->getPager()->getLimitCount(); ?>" tabindex="7"/>
+                       min="3" step="3" value="<?php echo $pager->getLimitCount(); ?>" tabindex="7"/>
                 <span for="rpp"
                       class="mdl-tooltip mdl-tooltip--bottom"><?php echo __('Cuentas por página'); ?></span>
             </div>
@@ -88,22 +107,19 @@
         <div class="search-filters-tags">
             <select id="tags" name="tags[]" class="select-box" multiple tabindex="8">
                 <option value=""><?php echo __('Seleccionar Etiqueta'); ?></option>
-                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $tags */
-                foreach ($tags as $tag): ?>
+                <?php /** @var \SP\Mvc\View\Components\SelectItem $tag */
+                foreach ($_getvar('tags') as $tag): ?>
                     <option
                             value="<?php echo $tag->getId(); ?>" <?php echo $tag->isSelected() ? 'selected' : ''; ?>><?php echo $tag->getName(); ?></option>
                 <?php endforeach; ?>
             </select>
         </div>
 
-        <input type="hidden" name="start" value="<?php echo $data->getPager()->getLimitStart(); ?>">
-        <input type="hidden" name="skey" value="<?php echo $data->getPager()->getSortKey(); ?>"/>
-        <input type="hidden" name="sorder" value="<?php echo $data->getPager()->getSortOrder(); ?>"/>
+        <input type="hidden" name="start" value="<?php echo $pager->getLimitStart(); ?>">
+        <input type="hidden" name="skey" value="<?php echo $pager->getSortKey(); ?>"/>
+        <input type="hidden" name="sorder" value="<?php echo $pager->getSortOrder(); ?>"/>
         <input type="hidden" name="searchfav" value="<?php echo $searchFavorites; ?>"/>
-        <input type="hidden" name="sk" value="<?php echo $sk; ?>">
+        <input type="hidden" name="sk" value="<?php echo $_getvar('sk'); ?>">
         <input type="hidden" name="isAjax" value="1">
     </form>
-</div>
-<script type="text/javascript">
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/account/viewpass.inc b/app/modules/web/themes/material-blue/views/account/viewpass.inc
index 7bef7e42..cee727cd 100644
--- a/app/modules/web/themes/material-blue/views/account/viewpass.inc
+++ b/app/modules/web/themes/material-blue/views/account/viewpass.inc
@@ -1,10 +1,15 @@
 <?php
-/** @var  \SP\DataModel\CategoryData $category */
-/** @var  \SP\Core\UI\ThemeIcons $icons */
+/**
+ * @var callable                        $_getvar
+ * @var \SP\Core\UI\ThemeIcons          $icons
+ * @var \SP\DataModel\AccountExtData    $accountData
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\Config\ConfigData           $configData
+ */
 ?>
 <div id="box-popup" class="box-password-view">
-    <h2 class="center"><?php echo $header; ?>&nbsp;
-        <?php if ($isLinked): ?>
+    <h2 class="center"><?php echo $_getvar('header'); ?>&nbsp;
+        <?php if ($_getvar('isLinked')): ?>
             <i title="<?php echo __('Cuenta Vinculada'); ?>"
                class="material-icons"><?php echo $icons->getIconPublicLink()->getIcon(); ?></i>
         <?php endif; ?>
@@ -12,8 +17,8 @@
     <table>
         <tbody>
         <tr>
-            <?php if (!$isImage): ?>
-                <td class="dialog-text dialog-user-text"><?php echo wordwrap($login, 50, PHP_EOL, true); ?></td>
+            <?php if (!$_getvar('isImage')): ?>
+                <td class="dialog-text dialog-user-text"><?php echo wordwrap($_getvar('login'), 50, PHP_EOL, true); ?></td>
                 <td class="dialog-button right">
                     <button class="dialog-clip-button mdl-button mdl-js-button mdl-js-ripple-effect"
                             title="<?php echo __('Copiar Usuario'); ?>" data-clipboard-target=".dialog-user-text">
@@ -23,14 +28,14 @@
                 </td>
             <?php else: ?>
                 <td class="dialog-user-text">
-                    <img src="data:image/png;base64,<?php echo $login; ?>"/>
+                    <img src="data:image/png;base64,<?php echo $_getvar('login'); ?>"/>
                 </td>
                 <td>&nbsp;</td>
             <?php endif; ?>
         </tr>
         <tr>
-            <?php if (!$isImage): ?>
-                <td class="dialog-text dialog-pass-text"><?php echo wordwrap($pass, 50, PHP_EOL, true); ?></td>
+            <?php if (!$_getvar('isImage')): ?>
+                <td class="dialog-text dialog-pass-text"><?php echo wordwrap($_getvar('pass'), 50, PHP_EOL, true); ?></td>
                 <td class="dialog-button right">
                     <button class="dialog-clip-button mdl-button mdl-js-button mdl-js-ripple-effect"
                             title="<?php echo __('Copiar Clave'); ?>" data-clipboard-target=".dialog-pass-text">
@@ -40,7 +45,7 @@
                 </td>
             <?php else: ?>
                 <td class="dialog-pass-text">
-                    <img src="data:image/png;base64,<?php echo $pass; ?>"/>
+                    <img src="data:image/png;base64,<?php echo $_getvar('pass'); ?>"/>
                 </td>
                 <td>&nbsp;</td>
             <?php endif; ?>
@@ -48,6 +53,3 @@
         </tbody>
     </table>
 </div>
-<script>
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
diff --git a/app/modules/web/themes/material-blue/views/common/aux-customfields.inc b/app/modules/web/themes/material-blue/views/common/aux-customfields.inc
index 1ee07e42..5653d417 100644
--- a/app/modules/web/themes/material-blue/views/common/aux-customfields.inc
+++ b/app/modules/web/themes/material-blue/views/common/aux-customfields.inc
@@ -2,8 +2,12 @@
 /**
  * @var \SP\Core\UI\ThemeIcons                     $icons
  * @var \SP\Services\CustomField\CustomFieldItem[] $customFields
+ * @var callable                                   $_getvar
+ * @var \SP\Mvc\View\Template                      $this
  */
 
+$customFields = $_getvar('customFields');
+
 foreach ($customFields as $index => $field):?>
     <tr>
         <td class="descField">
@@ -37,7 +41,7 @@ foreach ($customFields as $index => $field):?>
             <?php endif; ?>
         </td>
         <td class="valField">
-            <?php if ($field->typeName === 'color' && $isView): ?>
+            <?php if ($field->typeName === 'color' && $_getvar('isView')): ?>
                 <span class="round custom-input-color"
                       style="background-color: <?php echo $field->value; ?>;"></span>
             <?php elseif ($field->typeName === 'password'): ?>
@@ -45,10 +49,10 @@ foreach ($customFields as $index => $field):?>
                     <input id="<?php echo $field->formId; ?>"
                            name="customfield[<?php echo $field->definitionId; ?>]"
                            type="password"
-                           class="mdl-textfield__input mdl-color-text--indigo-400 passwordfield__no-pki <?php echo $isView ? 'passwordfield__input-show' : 'passwordfield__input'; ?>"
+                           class="mdl-textfield__input mdl-color-text--indigo-400 passwordfield__no-pki <?php echo $_getvar('isView') ? 'passwordfield__input-show' : 'passwordfield__input'; ?>"
                            data-clipboard="1"
                            maxlength="500"
-                           value="<?php echo !$showViewCustomPass && !empty($field->value) ? '***' : htmlspecialchars($field->value, ENT_QUOTES); ?>" <?php echo $field->required ? 'required' : ''; ?> <?php echo $readonly; ?>>
+                           value="<?php echo !$_getvar('showViewCustomPass') && !empty($field->value) ? '***' : htmlspecialchars($field->value, ENT_QUOTES); ?>" <?php echo $field->required ? 'required' : ''; ?> <?php echo $_getvar('readonly'); ?>>
                     <label class="mdl-textfield__label"
                            for="<?php echo $field->formId; ?>"><?php echo $field->definitionName; ?></label>
                 </div>
@@ -56,7 +60,7 @@ foreach ($customFields as $index => $field):?>
                 <div class="mdl-textfield mdl-js-textfield">
                     <textarea class="mdl-textfield__input mdl-color-text--indigo-400" type="text" rows="3"
                               name="customfield[<?php echo $field->definitionId; ?>]"
-                              id="<?php echo $field->formId; ?>" <?php echo $readonly; ?>><?php echo SP\Html\Html::sanitize($field->value); ?></textarea>
+                              id="<?php echo $field->formId; ?>" <?php echo $_getvar('readonly'); ?>><?php echo htmlspecialchars($field->value, ENT_QUOTES); ?></textarea>
                     <label class="mdl-textfield__label"
                            for="<?php echo $field->formId; ?>"><?php echo $field->definitionName; ?></label>
                 </div>
@@ -67,7 +71,7 @@ foreach ($customFields as $index => $field):?>
                            type="<?php echo $field->typeName; ?>"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="500"
-                           value="<?php echo SP\Html\Html::sanitize($field->value); ?>" <?php echo $field->required ? 'required' : ''; ?> <?php echo $readonly; ?>>
+                           value="<?php echo htmlspecialchars($field->value, ENT_QUOTES); ?>" <?php echo $field->required ? 'required' : ''; ?> <?php echo $_getvar('readonly'); ?>>
                     <label class="mdl-textfield__label"
                            for="<?php echo $field->formId; ?>"><?php echo $field->definitionName; ?></label>
                 </div>
diff --git a/app/modules/web/themes/material-blue/views/common/datatabs.inc b/app/modules/web/themes/material-blue/views/common/datatabs.inc
index ce0ad643..f7f8b977 100644
--- a/app/modules/web/themes/material-blue/views/common/datatabs.inc
+++ b/app/modules/web/themes/material-blue/views/common/datatabs.inc
@@ -1,10 +1,14 @@
 <?php
 /**
- * @var $icons   SP\Core\UI\ThemeIcons
- * @var $this    \SP\Mvc\View\Template
- * @var $tabs    \SP\Mvc\View\Components\DataTab[]
+ * @var \SP\Mvc\View\Components\DataTab[] $tabs
+ * @var \SP\Core\UI\ThemeIcons            $icons
+ * @var callable                          $_getvar
+ * @var \SP\Mvc\View\Template             $this
  */
+
+$tabs = $_getvar('tabs');
 ?>
+
 <!-- Start Tabs-->
 <div class="mdl-tabs mdl-js-tabs mdl-js-ripple-effect">
     <div id="tabsHeader" class="mdl-tabs__tab-bar"></div>
@@ -12,7 +16,7 @@
     <?php foreach ($tabs as $index => $tab): ?>
         <div id="tabs-<?php echo $index; ?>"
              class="mdl-tabs__panel"
-             data-tab-route="<?php echo $tabsRoute; ?>"
+             data-tab-route="<?php echo $_getvar('tabsRoute'); ?>"
              data-tab-index="<?php echo $index; ?>">
             <div class="tab-data">
                 <?php echo $tab->render(); ?>
@@ -20,12 +24,8 @@
         </div>
 
         <script type="text/javascript">
-            sysPassApp.theme.html.tabs.add("#tabsHeader", <?php echo $index; ?>, "<?php echo $tab->getTitle(); ?>", <?php echo $index === $activeTab ? 1 : 0; ?>);
+            sysPassApp.theme.html.tabs.add("#tabsHeader", <?php echo $index; ?>, "<?php echo $tab->getTitle(); ?>", <?php echo $index === $_getvar('activeTab') ? 1 : 0; ?>);
         </script>
     <?php endforeach; ?>
 </div>
-<!-- End Tabs-->
-
-<script type="text/javascript">
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
+<!-- End Tabs-->
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/common/debug.inc b/app/modules/web/themes/material-blue/views/common/debug.inc
index 880ac69b..df43dc55 100644
--- a/app/modules/web/themes/material-blue/views/common/debug.inc
+++ b/app/modules/web/themes/material-blue/views/common/debug.inc
@@ -1,18 +1,18 @@
+<?php
+/**
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+?>
 <div ID='debuginfo' class='round'>
     <h3>DEBUG INFO</h3>
     <ul>
-        <li>RENDER -> <?php echo $time; ?> sec</li>
-        <li>MEM -> Init: <?php echo $memInit; ?> KB - End: <?php echo $memEnd; ?> KB -
-            Total: <?php echo $memEnd - $memInit; ?> KB
+        <li>RENDER -> <?php echo $_getvar('time'); ?> sec</li>
+        <li>MEM -> Init: <?php echo $_getvar('memInit'); ?> KB - End: <?php echo $_getvar('memEnd'); ?> KB -
+            Total: <?php echo $_getvar('memEnd') - $_getvar('memInit'); ?> KB
         </li>
         <li>SESSION:
             <pre><?php echo print_r($_SESSION, true) ?></pre>
         </li>
-        <li>CONFIG FILE:
-            <pre><?php echo print_r(\SP\Core\SessionFactory::getConfig(), true); ?></pre>
-        </li>
 </div>
-
-<?php //foreach ($debugTxt as $out): ?>
-<!--    --><?php //echo $out; ?>
-<?php //endforeach; ?>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/common/tabs-end.inc b/app/modules/web/themes/material-blue/views/common/tabs-end.inc
deleted file mode 100644
index 9aa8500e..00000000
--- a/app/modules/web/themes/material-blue/views/common/tabs-end.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-</div> <!-- End Tabs-->
-
-<script type="text/javascript">
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-
-    <?php foreach($tabs as $index => $tab): ?>
-        sysPassApp.theme.html.tabs.add("#tabsHeader", <?php echo $index; ?>, "<?php echo $tab['title']; ?>", <?php echo $index === $activeTabId ? 1 : 0; ?>);
-    <?php endforeach; ?>
-</script>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/common/tabs-start.inc b/app/modules/web/themes/material-blue/views/common/tabs-start.inc
deleted file mode 100644
index 2453d7b1..00000000
--- a/app/modules/web/themes/material-blue/views/common/tabs-start.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- Start Tabs-->
-<div class="mdl-tabs mdl-js-tabs mdl-js-ripple-effect">
-    <div id="tabsHeader" class="mdl-tabs__tab-bar"></div>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/config/accounts.inc b/app/modules/web/themes/material-blue/views/config/accounts.inc
index 3a0ec545..41c5ab7a 100644
--- a/app/modules/web/themes/material-blue/views/config/accounts.inc
+++ b/app/modules/web/themes/material-blue/views/config/accounts.inc
@@ -2,9 +2,12 @@
 /**
  * @var \SP\Core\UI\ThemeIcons $icons
  * @var \SP\Config\ConfigData  $configData
- */ ?>
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+?>
 
-<?php if (!$gdIsAvailable): ?>
+<?php if ($_getvar('gdIsAvailable') !== true): ?>
     <div class="msg-option-unvailable">
         <?php printf(__('La extensión \'%s\' no está disponible'), 'gd'); ?>
         <i id="help-gd" class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
diff --git a/app/modules/web/themes/material-blue/views/config/backup.inc b/app/modules/web/themes/material-blue/views/config/backup.inc
index 064c1108..76f7d3a3 100644
--- a/app/modules/web/themes/material-blue/views/config/backup.inc
+++ b/app/modules/web/themes/material-blue/views/config/backup.inc
@@ -1,6 +1,13 @@
-<?php /** @var $icons \SP\Core\UI\ThemeIcons */ ?>
+<?php
+/**
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+?>
 
-<?php if (!$pharIsAvailable): ?>
+<?php if ($_getvar('pharIsAvailable') !== true): ?>
     <div class="msg-option-unvailable">
         <?php printf(__('La extensión \'%s\' no está disponible'), 'phar'); ?>
         <i id="help-phar" class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
@@ -25,10 +32,13 @@
         <td class="valField">
             <div class="lowres-title"><?php echo __('Resultado'); ?></div>
 
-            <?php echo $lastBackupTime; ?>
+            <?php echo $_getvar('lastBackupTime'); ?>
         </td>
     </tr>
-    <?php if ($ctx_userIsAdminApp): ?>
+    <?php if ($_getvar('ctx_userIsAdminApp')):
+        $backupFile = $_getvar('backupFile');
+        $backupDbFile = $_getvar('backupDbFile');
+        ?>
         <tr>
             <td class="descField">
                 <?php echo __('Descargar Actual'); ?>
@@ -103,10 +113,12 @@
             <td class="valField">
                 <div class="lowres-title"><?php echo __('Resultado'); ?></div>
 
-                <?php echo $lastExportTime; ?>
+                <?php echo $_getvar('lastExportTime'); ?>
             </td>
         </tr>
-        <?php if ($ctx_userIsAdminApp): ?>
+        <?php if ($_getvar('ctx_userIsAdminApp')):
+            $exportFile = $_getvar('exportFile');
+            ?>
             <tr>
                 <td class="descField">
                     <?php echo __('Descargar Actual'); ?>
@@ -119,7 +131,7 @@
                            download="<?php echo $exportFile['filename']; ?>"
                            class="download">
                             <button type="button" class="mdl-button mdl-js-button">
-                                XML <?php echo $siteName; ?>
+                                XML <?php echo $_getvar('siteName'); ?>
                             </button>
                         </a>
                     <?php else: echo __('No hay archivos XML para descargar'); ?>
diff --git a/app/modules/web/themes/material-blue/views/config/encryption.inc b/app/modules/web/themes/material-blue/views/config/encryption.inc
index da8828b1..7c731e65 100644
--- a/app/modules/web/themes/material-blue/views/config/encryption.inc
+++ b/app/modules/web/themes/material-blue/views/config/encryption.inc
@@ -1,8 +1,11 @@
 <?php
 /**
- * @var $icons      \SP\Core\UI\ThemeIcons
- * @var $configData \SP\Config\ConfigData
- */ ?>
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+?>
 
 <form method="post" name="frmCrypt" id="frmCrypt" class="form-action"
       data-onsubmit="config/save"
@@ -15,7 +18,7 @@
     </div>
 
     <table class="data tblConfig round">
-        <?php if ($lastUpdateMPass > 0): ?>
+        <?php if ($_getvar('lastUpdateMPass') > 0): ?>
             <tr>
                 <td class="descField">
                     <?php echo __('Último cambio'); ?>
@@ -23,7 +26,7 @@
                 <td class="valField">
                     <div class="lowres-title"><?php echo __('Último cambio'); ?></div>
 
-                    <?php echo date('r', $lastUpdateMPass); ?>
+                    <?php echo date('r', $_getvar('lastUpdateMPass')); ?>
                 </td>
             </tr>
         <?php endif; ?>
@@ -86,7 +89,7 @@
                 <br>
                 <div
                         class="icon material-icons <?php echo $icons->getIconWarning()->getClass(); ?>"><?php echo $icons->getIconWarning()->getIcon(); ?></div>
-                <strong><?php printf(__('Se van a actualizar %s cuentas. Este proceso puede tardar algo de tiempo.'), $numAccounts); ?></strong>
+                <strong><?php printf(__('Se van a actualizar %s cuentas. Este proceso puede tardar algo de tiempo.'), $_getvar('numAccounts')); ?></strong>
             </td>
         </tr>
         <tr>
@@ -132,8 +135,8 @@
         </tr>
     </table>
 
-    <?php if (isset($taskId)): ?>
-        <input type="hidden" name="taskId" value="<?php echo $taskId; ?>">
+    <?php if ($_getvar('taskId')): ?>
+        <input type="hidden" name="taskId" value="<?php echo $_getvar('taskId'); ?>">
         <input type="hidden" name="lock" value="masterpass">
     <?php endif; ?>
 </form>
@@ -157,7 +160,7 @@
                 </div>
             </div>
         </li>
-        <?php if ($ctx_userIsAdminApp): ?>
+        <?php if ($_getvar('ctx_userIsAdminApp')): ?>
             <li>
                 <button type="button"
                         class="btn-action mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconCheck()->getClassButton(); ?>"
@@ -169,7 +172,7 @@
             </li>
         <?php endif; ?>
 
-        <?php if ($numAccounts > 0): ?>
+        <?php if ($_getvar('numAccounts') > 0): ?>
             <li>
                 <button form="frmCrypt"
                         class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconPlay()->getClassButton(); ?>"
@@ -197,7 +200,7 @@
             <td class="valField">
                 <div class="lowres-title"><?php echo __('Último cambio'); ?></div>
 
-                <?php echo ($tempMasterPassTime > 0) ? date('r', $tempMasterPassTime) : __('No generada'); ?>
+                <?php echo ($_getvar('tempMasterPassTime') > 0) ? date('r', $_getvar('tempMasterPassTime')) : __('No generada'); ?>
             </td>
         </tr>
         <tr>
@@ -207,7 +210,9 @@
             <td class="valField">
                 <div class="lowres-title"><?php echo __('Válido hasta'); ?></div>
 
-                <?php if (time() > $tempMasterMaxTime): ?>
+                <?php
+                $tempMasterMaxTime = $_getvar('tempMasterMaxTime');
+                if (time() > $tempMasterMaxTime): ?>
                     <span style="color: red"><?php echo date('r', $tempMasterMaxTime); ?></span>
                 <?php elseif ($tempMasterMaxTime > 0): echo date('r', $tempMasterMaxTime); ?>
                 <?php else: echo __('No generada'); ?>
@@ -221,7 +226,7 @@
             <td class="valField">
                 <div class="lowres-title"><?php echo __('Intentos'); ?></div>
 
-                <?php echo $tempMasterAttempts; ?>
+                <?php echo $_getvar('tempMasterAttempts'); ?>
             </td>
         </tr>
         <tr>
@@ -274,15 +279,15 @@
                 <select id="temporary_masterpass_group" name="temporary_masterpass_group"
                         class="select-box select-box-deselect" <?php echo !$configData->isMailEnabled() ? 'disabled' : ''; ?>>
                     <option value=""><?php echo __('Seleccionar Grupo'); ?></option>
-                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $userGroups */
-                    foreach ($userGroups as $userGroup): ?>
+                    <?php /** @var \SP\Mvc\View\Components\SelectItem $userGroup */
+                    foreach ($_getvar('userGroups') as $userGroup): ?>
                         <option
                                 value="<?php echo $userGroup->getId(); ?>"><?php echo $userGroup->getName(); ?></option>
                     <?php endforeach; ?>
                 </select>
             </td>
         </tr>
-        <?php if (!empty($tempMasterPass)): ?>
+        <?php if (!empty($_getvar('tempMasterPass'))): ?>
             <tr>
                 <td class="descField">
                     <?php echo __('Clave'); ?>
@@ -290,7 +295,7 @@
                 <td class="valField">
                     <div class="lowres-title"><?php echo __('Clave'); ?></div>
 
-                    <?php echo $tempMasterPass; ?>
+                    <?php echo $_getvar('tempMasterPass'); ?>
                 </td>
             </tr>
         <?php endif; ?>
diff --git a/app/modules/web/themes/material-blue/views/config/general-auth.inc b/app/modules/web/themes/material-blue/views/config/general-auth.inc
index 30d4ea9c..e2c313c0 100644
--- a/app/modules/web/themes/material-blue/views/config/general-auth.inc
+++ b/app/modules/web/themes/material-blue/views/config/general-auth.inc
@@ -1,7 +1,9 @@
 <?php
 /**
  * @var \SP\Core\UI\ThemeIcons $icons
- * @var \SP\Config\ConfigData $configData
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
  */
 ?>
 
@@ -85,8 +87,8 @@
             <select id="sso_defaultgroup" name="sso_defaultgroup"
                     class="select-box sel-chosen-usergroup">
                 <option value=""><?php echo __('Seleccionar Grupo'); ?></option>
-                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $userGroups */
-                foreach ($userGroups as $userGroup): ?>
+                <?php /** @var \SP\Mvc\View\Components\SelectItem $userGroup */
+                foreach ($_getvar('userGroups') as $userGroup): ?>
                     <option
                             value="<?php echo $userGroup->getId(); ?>" <?php echo $userGroup->getId() === $configData->getSsoDefaultGroup() ? 'selected' : ''; ?>><?php echo $userGroup->getName(); ?></option>
                 <?php endforeach; ?>
@@ -110,8 +112,8 @@
             <select id="sso_defaultprofile" name="sso_defaultprofile"
                     class="select-box sel-chosen-profile">
                 <option value=""><?php echo __('Seleccionar Usuario'); ?></option>
-                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $userProfiles */
-                foreach ($userProfiles as $userProfile): ?>
+                <?php /** @var \SP\Mvc\View\Components\SelectItem $userProfile */
+                foreach ($_getvar('userProfiles') as $userProfile): ?>
                     <option
                             value="<?php echo $userProfile->getId(); ?>" <?php echo ($userProfile->getId() === $configData->getSsoDefaultProfile()) ? 'selected' : ''; ?>><?php echo $userProfile->getName(); ?></option>
                 <?php endforeach; ?>
diff --git a/app/modules/web/themes/material-blue/views/config/general-events.inc b/app/modules/web/themes/material-blue/views/config/general-events.inc
index 98f7f879..a9fe69e0 100644
--- a/app/modules/web/themes/material-blue/views/config/general-events.inc
+++ b/app/modules/web/themes/material-blue/views/config/general-events.inc
@@ -1,7 +1,9 @@
 <?php
 /**
  * @var \SP\Core\UI\ThemeIcons $icons
- * @var \SP\Config\ConfigData $configData
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
  */
 ?>
 
@@ -99,8 +101,8 @@
             <div class="lowres-title"><?php echo __('Eventos'); ?></div>
 
             <select id="log_events" name="log_events[]" multiple="multiple" class="select-box" data-create="true">
-                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $logEvents */
-                foreach ($logEvents as $logEvent): ?>
+                <?php /** @var \SP\Mvc\View\Components\SelectItem $logEvent */
+                foreach ($_getvar('logEvents') as $logEvent): ?>
                     <option
                             value="<?php echo $logEvent->getName(); ?>"
                         <?php echo $logEvent->isSelected() ? 'selected' : '' ?>><?php echo $logEvent->getName(); ?></option>
diff --git a/app/modules/web/themes/material-blue/views/config/general-proxy.inc b/app/modules/web/themes/material-blue/views/config/general-proxy.inc
index 97d86909..a897138a 100644
--- a/app/modules/web/themes/material-blue/views/config/general-proxy.inc
+++ b/app/modules/web/themes/material-blue/views/config/general-proxy.inc
@@ -1,7 +1,9 @@
 <?php
 /**
  * @var \SP\Core\UI\ThemeIcons $icons
- * @var \SP\Config\ConfigData $configData
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
  */
 ?>
 
diff --git a/app/modules/web/themes/material-blue/views/config/general-site.inc b/app/modules/web/themes/material-blue/views/config/general-site.inc
index 72633649..887f6cfa 100644
--- a/app/modules/web/themes/material-blue/views/config/general-site.inc
+++ b/app/modules/web/themes/material-blue/views/config/general-site.inc
@@ -1,11 +1,13 @@
 <?php
 /**
  * @var \SP\Core\UI\ThemeIcons $icons
- * @var \SP\Config\ConfigData $configData
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
  */
 ?>
 
-<?php if (!$curlIsAvailable): ?>
+<?php if (!$_getvar('curlIsAvailable')): ?>
     <div class="msg-option-unvailable">
         <?php printf(__('La extensión \'%s\' no está disponible'), 'curl'); ?>
         <i id="help-curl" class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
@@ -42,8 +44,8 @@
             <div class="lowres-title"><?php echo __('Idioma'); ?></div>
 
             <select name="sitelang" id="sel-sitelang" size="1" class="select-box sel-chosen-ns">
-                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $langs */
-                foreach ($langs as $lang): ?>
+                <?php /** @var \SP\Mvc\View\Components\SelectItem $lang */
+                foreach ($_getvar('langs') as $lang): ?>
                     <option
                             value='<?php echo $lang->getId(); ?>' <?php echo $lang->isSelected() ? 'selected' : ''; ?>><?php echo $lang->getName(); ?></option>
                 <?php endforeach; ?>
@@ -66,8 +68,8 @@
 
             <select name="sitetheme" id="sel-sitetheme" size="1"
                     class="select-box sel-chosen-ns">
-                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $themes */
-                foreach ($themes as $theme): ?>
+                <?php /** @var \SP\Mvc\View\Components\SelectItem $theme */
+                foreach ($_getvar('themes') as $theme): ?>
                     <option
                             value='<?php echo $theme->getId(); ?>' <?php echo $theme->isSelected() ? 'selected' : ""; ?>><?php echo $theme->getName(); ?></option>
                 <?php endforeach; ?>
diff --git a/app/modules/web/themes/material-blue/views/config/general.inc b/app/modules/web/themes/material-blue/views/config/general.inc
index 831565a6..5cc2ede8 100644
--- a/app/modules/web/themes/material-blue/views/config/general.inc
+++ b/app/modules/web/themes/material-blue/views/config/general.inc
@@ -1,6 +1,10 @@
 <?php
-/** @var $icons \SP\Core\UI\ThemeIcons */
-/** @var $this \SP\Mvc\View\Template */
+/**
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
 ?>
 <form method="post" name="frmConfig" id="frmConfig" class="form-action"
       data-onsubmit="config/save"
@@ -12,6 +16,8 @@
     <?php include $this->includeTemplate('general-events'); ?>
     <?php include $this->includeTemplate('general-proxy'); ?>
     <?php include $this->includeTemplate('general-auth'); ?>
+
+    <input type="hidden" name="sk" value="<?php echo $sk; ?>">
 </form>
 
 <div class="tab-actions">
diff --git a/app/modules/web/themes/material-blue/views/config/import.inc b/app/modules/web/themes/material-blue/views/config/import.inc
index cd5c57fd..5f6054c0 100644
--- a/app/modules/web/themes/material-blue/views/config/import.inc
+++ b/app/modules/web/themes/material-blue/views/config/import.inc
@@ -1,7 +1,9 @@
 <?php
 /**
- * @var  $icons \SP\Core\UI\ThemeIcons
- * @var  $this  \SP\Mvc\View\Template
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
  */
 ?>
 
@@ -28,8 +30,8 @@
             <select id="import_defaultuser" name="import_defaultuser"
                     class="select-box sel-chosen-user" required>
                 <option value=""><?php echo __('Seleccionar Usuario'); ?></option>
-                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $users */
-                foreach ($users as $user): ?>
+                <?php /** @var \SP\Mvc\View\Components\SelectItem $user */
+                foreach ($_getvar('users') as $user): ?>
                     <option
                             value="<?php echo $user->getId(); ?>" <?php echo $user->isSelected() ? 'selected' : ''; ?>>
                         <?php echo $user->getName(); ?>
@@ -55,8 +57,8 @@
             <select id="import_defaultgroup" name="import_defaultgroup"
                     class="select-box sel-chosen-usergroup" required>
                 <option value=""><?php echo __('Seleccionar Grupo'); ?></option>
-                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $userGroups */
-                foreach ($userGroups as $userGroup): ?>
+                <?php /** @var \SP\Mvc\View\Components\SelectItem $userGroup */
+                foreach ($_getvar('userGroups') as $userGroup): ?>
                     <option
                             value="<?php echo $userGroup->getId(); ?>" <?php echo $userGroup->isSelected() ? 'selected' : ''; ?>>
                         <?php echo $userGroup->getName(); ?>
diff --git a/app/modules/web/themes/material-blue/views/config/info.inc b/app/modules/web/themes/material-blue/views/config/info.inc
index 9d7fe9b9..690c64cb 100644
--- a/app/modules/web/themes/material-blue/views/config/info.inc
+++ b/app/modules/web/themes/material-blue/views/config/info.inc
@@ -1,3 +1,12 @@
+<?php
+/**
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+?>
+
 <div id="title" class="titleNormal">
     <i class="material-icons">info</i>
     <?php use SP\Util\Version;
@@ -23,11 +32,11 @@
         <td class="valField">
             <div class="lowres-title"><?php echo __('Base de Datos'); ?></div>
 
-            <?php foreach ($dbInfo as $infoattr => $infoval): ?>
+            <?php foreach ($_getvar('dbInfo') as $infoattr => $infoval): ?>
                 <?php printf('%s : %s', \SP\Html\Html::strongText($infoattr), $infoval); ?>
                 <br>
             <?php endforeach; ?>
-            <?php printf('%s: %s', \SP\Html\Html::strongText(__('Nombre')), (!$isDemo) ? $dbName : '***'); ?>
+            <?php printf('%s: %s', \SP\Html\Html::strongText(__('Nombre')), (!$_getvar('isDemo')) ? $_getvar('dbName') : '***'); ?>
         </td>
     </tr>
     <tr>
@@ -42,14 +51,14 @@
             <?php printf('%s: %s', \SP\Html\Html::strongText(__('Extensiones')), implode(', ', get_loaded_extensions())); ?>
             <br>
             <?php
-                if (!empty($missingExtensions)) {
-                    printf('%s: %s', \SP\Html\Html::strongText(__('Extensiones no disponibles')), implode(', ', $missingExtensions));
-                    echo '<br>';
-                }
+            if (!empty($_getvar('missingExtensions'))) {
+                printf('%s: %s', \SP\Html\Html::strongText(__('Extensiones no disponibles')), implode(', ', $_getvar('missingExtensions')));
+                echo '<br>';
+            }
             ?>
             <?php printf('%s: %d KB', \SP\Html\Html::strongText(__('Memoria Usada')), (memory_get_usage(true) / 1024)); ?>
             <br>
-            <?php printf('%s: %s', \SP\Html\Html::strongText(__('Usuario')), (!$isDemo) ? get_current_user() : '***'); ?>
+            <?php printf('%s: %s', \SP\Html\Html::strongText(__('Usuario')), (!$_getvar('isDemo')) ? get_current_user() : '***'); ?>
             <?php if (function_exists('opcache_get_status') && version_compare(PHP_VERSION, '5.6.0', '>=')): ?>
                 <br>
                 <?php echo \SP\Html\Html::strongText(__('OP Cache')); ?>
@@ -66,7 +75,7 @@
         <td class="valField">
             <div class="lowres-title"><?php echo __('Servidor'); ?></div>
 
-            <?php echo (!$isDemo) ? \SP\Html\Html::strongText($_SERVER['SERVER_SOFTWARE']) : '***'; ?>
+            <?php echo (!$_getvar('isDemo')) ? \SP\Html\Html::strongText($_SERVER['SERVER_SOFTWARE']) : '***'; ?>
         </td>
     </tr>
     <tr>
@@ -76,7 +85,7 @@
         <td class="valField">
             <div class="lowres-title"><?php echo __('Copia de Configuración'); ?></div>
 
-            <?php echo $configBackupDate; ?>
+            <?php echo $_getvar('configBackupDate'); ?>
         </td>
     </tr>
     <tr>
@@ -97,7 +106,7 @@
         <td class="valField">
             <div class="lowres-title"><?php echo __('Idioma'); ?></div>
 
-            <?php echo $locale; ?>
+            <?php echo $_getvar('locale'); ?>
         </td>
     </tr>
     <tr>
@@ -114,7 +123,7 @@
         <td class="valField">
             <div class="lowres-title"><?php echo __('Sesión Encriptada'); ?></div>
 
-            <?php echo $securedSession ? __('Sí') : __('No'); ?>
+            <?php echo $_getvar('securedSession') ? __('Sí') : __('No'); ?>
         </td>
     </tr>
     <tr>
@@ -125,8 +134,8 @@
             <div class="lowres-title"><?php echo __('Plugins Cargados'); ?></div>
 
             <ul class="mdl-list">
-                <?php /** @var \SP\Plugin\PluginInterface[] $plugins */
-                foreach ($plugins as $name => $plugin): ?>
+                <?php /** @var \SP\Plugin\PluginInterface $plugin */
+                foreach ($_getvar('plugins') as $name => $plugin): ?>
                     <li class="mdl-list__item">
                                 <span class="mdl-list__item-primary-content">
                                 <i class="material-icons mdl-list__item-icon">extension</i>
diff --git a/app/modules/web/themes/material-blue/views/config/ldap.inc b/app/modules/web/themes/material-blue/views/config/ldap.inc
index dd87d01f..13935392 100644
--- a/app/modules/web/themes/material-blue/views/config/ldap.inc
+++ b/app/modules/web/themes/material-blue/views/config/ldap.inc
@@ -2,9 +2,12 @@
 /**
  * @var \SP\Core\UI\ThemeIcons $icons
  * @var \SP\Config\ConfigData  $configData
- */ ?>
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+?>
 
-<?php if (!$ldapIsAvailable): ?>
+<?php if (!$_getvar('ldapIsAvailable')): ?>
     <div class="msg-option-unvailable">
         <?php printf(__('La extensión \'%s\' no está disponible'), 'ldap'); ?>
         <i id="help-ldap" class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
@@ -248,8 +251,8 @@
                 <select id="ldap_defaultgroup" name="ldap_defaultgroup"
                         class="select-box sel-chosen-usergroup" required>
                     <option value=""><?php echo __('Seleccionar Grupo'); ?></option>
-                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $userGroups */
-                    foreach ($userGroups as $userGroup): ?>
+                    <?php /** @var \SP\Mvc\View\Components\SelectItem $userGroup */
+                    foreach ($_getvar('userGroups') as $userGroup): ?>
                         <option
                                 value="<?php echo $userGroup->getId(); ?>" <?php echo $userGroup->getId() === $configData->getLdapDefaultGroup() ? 'selected' : ''; ?>><?php echo $userGroup->getName(); ?></option>
                     <?php endforeach; ?>
@@ -273,8 +276,8 @@
                 <select id="ldap_defaultprofile" name="ldap_defaultprofile"
                         class="select-box sel-chosen-profile" required>
                     <option value=""><?php echo __('Seleccionar Usuario'); ?></option>
-                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $userProfiles */
-                    foreach ($userProfiles as $userProfile): ?>
+                    <?php /** @var \SP\Mvc\View\Components\SelectItem $userProfile */
+                    foreach ($_getvar('userProfiles') as $userProfile): ?>
                         <option
                                 value="<?php echo $userProfile->getId(); ?>" <?php echo ($userProfile->getId() === $configData->getLdapDefaultProfile()) ? 'selected' : ''; ?>><?php echo $userProfile->getName(); ?></option>
                     <?php endforeach; ?>
diff --git a/app/modules/web/themes/material-blue/views/config/mail.inc b/app/modules/web/themes/material-blue/views/config/mail.inc
index 1ba9a39a..ca14fe10 100644
--- a/app/modules/web/themes/material-blue/views/config/mail.inc
+++ b/app/modules/web/themes/material-blue/views/config/mail.inc
@@ -2,6 +2,8 @@
 /**
  * @var \SP\Core\UI\ThemeIcons $icons
  * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
  */
 ?>
 
@@ -134,7 +136,7 @@
 
                 <select name="mail_security" id="sel-mailsecurity" size="1" class="select-box select-box-deselect">
                     <option value=""><?php echo __('Deshabilitada'); ?></option>
-                    <?php foreach ($mailSecurity as $security): ?>
+                    <?php foreach ($_getvar('mailSecurity') as $security): ?>
                         <option
                                 value="<?php echo $security; ?>" <?php echo ($configData->getMailSecurity() === $security) ? 'selected' : ''; ?>><?php echo $security; ?></option>
                     <?php endforeach; ?>
@@ -174,8 +176,8 @@
                 <div class="lowres-title"><?php echo __('Eventos'); ?></div>
 
                 <select id="mail_events" name="mail_events[]" multiple="multiple" class="select-box" data-create="true">
-                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $mailEvents */
-                    foreach ($mailEvents as $mailEvent): ?>
+                    <?php /** @var \SP\Mvc\View\Components\SelectItem $mailEvent */
+                    foreach ($_getvar('mailEvents') as $mailEvent): ?>
                         <option
                                 value="<?php echo $mailEvent->getName(); ?>"
                             <?php echo $mailEvent->isSelected() ? 'selected' : '' ?>><?php echo $mailEvent->getName(); ?></option>
@@ -184,8 +186,6 @@
             </td>
         </tr>
     </table>
-
-    <input type="hidden" name="sk" value="">
 </form>
 
 <div class="tab-actions">
diff --git a/app/modules/web/themes/material-blue/views/config/wiki.inc b/app/modules/web/themes/material-blue/views/config/wiki.inc
index 699fa36a..6d82cc32 100644
--- a/app/modules/web/themes/material-blue/views/config/wiki.inc
+++ b/app/modules/web/themes/material-blue/views/config/wiki.inc
@@ -2,9 +2,12 @@
 /**
  * @var \SP\Core\UI\ThemeIcons $icons
  * @var \SP\Config\ConfigData  $configData
- */ ?>
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+?>
 
-<?php if (!$curlIsAvailable): ?>
+<?php if (!$_getvar('curlIsAvailable')): ?>
     <div class="msg-option-unvailable">
         <?php printf(__('La extensión \'%s\' no está disponible'), 'curl'); ?>
         <i id="help-curl" class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
diff --git a/app/modules/web/themes/material-blue/views/error/error-database.inc b/app/modules/web/themes/material-blue/views/error/error-database.inc
index f243053d..52329750 100644
--- a/app/modules/web/themes/material-blue/views/error/error-database.inc
+++ b/app/modules/web/themes/material-blue/views/error/error-database.inc
@@ -1,7 +1,7 @@
 <?php
 /**
  * @var \SP\Core\UI\ThemeIcons $icons
- * @var \SP\Mvc\View\Template $this
+ * @var \SP\Mvc\View\Template  $this
  */
 ?>
 <div id="actions" align="center">
diff --git a/app/modules/web/themes/material-blue/views/error/error-maintenance.inc b/app/modules/web/themes/material-blue/views/error/error-maintenance.inc
index 25df5e53..5ca9a098 100644
--- a/app/modules/web/themes/material-blue/views/error/error-maintenance.inc
+++ b/app/modules/web/themes/material-blue/views/error/error-maintenance.inc
@@ -1,7 +1,7 @@
 <?php
 /**
  * @var \SP\Core\UI\ThemeIcons $icons
- * @var \SP\Mvc\View\Template $this
+ * @var \SP\Mvc\View\Template  $this
  */
 ?>
 <div id="actions" align="center">
diff --git a/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc b/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc
index c10b86d5..2a559392 100644
--- a/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc
+++ b/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc
@@ -1,11 +1,16 @@
 <?php
 /**
- * @var $data  SP\Html\DataGrid\DataGridTab
- * @var $this  \SP\Mvc\View\Template
+ * @var SP\Html\DataGrid\DataGridTab $data
+ * @var \SP\Core\UI\ThemeIcons       $icons
+ * @var \SP\Config\ConfigData        $configData
+ * @var callable                     $_getvar
+ * @var \SP\Mvc\View\Template        $this
  */
+
+$data = $_getvar('data');
 ?>
 
-<!-- Rows -->
+    <!-- Rows -->
 <?php if ($data->getData()->getDataCount() > 0):
     foreach ($data->getData()->getData() as $dataIndex => $dataItem):
         if ($dataIndex === 'count'): continue; endif; ?>
diff --git a/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc b/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc
index 0d1b58e5..95d24846 100644
--- a/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc
+++ b/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc
@@ -1,12 +1,19 @@
 <?php
 /**
- * @var $icons   SP\Core\UI\ThemeIcons
- * @var $data    SP\Html\DataGrid\DataGridTab
- * @var $this    \SP\Mvc\View\Template
- * @var $action  \SP\Html\DataGrid\Action\DataGridAction|\SP\Html\DataGrid\Action\DataGridActionSearch
+ * @var \SP\Html\DataGrid\Action\DataGridAction|\SP\Html\DataGrid\Action\DataGridActionSearch $action
+ * @var SP\Html\DataGrid\DataGridTab                                                          $data
+ * @var \SP\Core\UI\ThemeIcons                                                                $icons
+ * @var \SP\Config\ConfigData                                                                 $configData
+ * @var callable                                                                              $_getvar
+ * @var \SP\Mvc\View\Template                                                                 $this
  */
 
-if (!isset($index)): $index = 0; endif; ?>
+if (!isset($data)) {
+    $data = $_getvar('data');
+}
+
+$index = isset($index) ? $index : 0;
+?>
 
 <div class="tab-actions">
     <ul>
@@ -61,7 +68,7 @@ if (!isset($index)): $index = 0; endif; ?>
                         <span for="btn-reset-<?php echo $index; ?>"
                               class="mdl-tooltip mdl-tooltip--bottom"><?php echo $icons->getIconClear()->getTitle(); ?></span>
 
-                        <input type="hidden" name="sk" value="">
+                        <input type="hidden" name="sk" value="<?php echo $sk; ?>">
                         <input type="hidden" name="activetab" value="<?php echo $index; ?>">
                         <input type="hidden" name="start" value="0">
                         <input type="hidden" name="count"
@@ -99,7 +106,9 @@ if (!isset($index)): $index = 0; endif; ?>
                     <?php foreach ($data->getDataActionsMenu() as $action): ?>
                         <li class="btn-action mdl-menu__item"
                             title="<?php echo $action->getTitle(); ?>"
-                            data-selection="#data-table-<?php echo $data->getId(); ?>"
+                            <?php if ($action->isSelection()): ?>
+                                data-selection="#data-table-<?php echo $data->getId(); ?>"
+                            <?php endif; ?>
                             data-onclick="<?php echo $action->getOnClick(); ?>"
                             <?php foreach ($action->getData() as $dataName => $dataValue): echo 'data-', $dataName, '=', '"', $dataValue, '"'; endforeach; ?>>
                             <i class="material-icons <?php echo $action->getIcon()->getClass(); ?>"><?php echo $action->getIcon()->getIcon(); ?></i>
diff --git a/app/modules/web/themes/material-blue/views/grid/datagrid-nav-full.inc b/app/modules/web/themes/material-blue/views/grid/datagrid-nav-full.inc
index f499caef..a0497758 100644
--- a/app/modules/web/themes/material-blue/views/grid/datagrid-nav-full.inc
+++ b/app/modules/web/themes/material-blue/views/grid/datagrid-nav-full.inc
@@ -1,66 +1,73 @@
 <?php
 /**
- * @var $data  SP\Html\DataGrid\DataGridInterface
- * @var $this  \SP\Mvc\View\Template
+ * @var SP\Html\DataGrid\DataGridInterface $data
+ * @var \SP\Mvc\View\Template              $this
+ * @var callable                           $_getvar
  */
+
+if (!isset($data)) {
+    $data = $_getvar('data');
+}
+
+$pager = $data->getPager();
 ?>
 <div class="pager round5 shadow">
     <div class="pager-left">
         <?php echo $data->getData()->getDataCount(); ?> @ <?php echo $data->getTime(); ?>s
-        <?php if ($data->getPager()->getFilterOn()): ?>
+        <?php if ($pager->getFilterOn()): ?>
             <span class="filter-on round"><?php echo __('Filtro ON'); ?></span>
         <?php endif; ?>
     </div>
     <div class="pager-right">
-        <?php if ($data->getPager()->getLimitStart() > 1): ?>
+        <?php if ($pager->getLimitStart() > 1): ?>
             <i id="btn-pager-first"
-                class="btn-action-pager material-icons <?php echo $data->getPager()->getIconFirst()->getClass(); ?>"
-               data-action-id="<?php echo $data->getPager()->getSourceAction()->getId(); ?>"
-               data-action-form="<?php echo $data->getPager()->getSourceAction()->getName(); ?>"
-               data-start="<?php echo $data->getPager()->getFirst(); ?>"
-               data-count="<?php echo $data->getPager()->getLimitCount(); ?>"
-               data-onclick="<?php echo $data->getPager()->getOnClick(); ?>"><?php echo $data->getPager()->getIconFirst()->getIcon(); ?></i>
+               class="btn-action-pager material-icons <?php echo $pager->getIconFirst()->getClass(); ?>"
+               data-action-id="<?php echo $pager->getSourceAction()->getId(); ?>"
+               data-action-form="<?php echo $pager->getSourceAction()->getName(); ?>"
+               data-start="<?php echo $pager->getFirst(); ?>"
+               data-count="<?php echo $pager->getLimitCount(); ?>"
+               data-onclick="<?php echo $pager->getOnClick(); ?>"><?php echo $pager->getIconFirst()->getIcon(); ?></i>
             <span
-                for="btn-pager-first"
-                class="mdl-tooltip mdl-tooltip--top"><?php echo $data->getPager()->getIconFirst()->getTitle(); ?></span>
+                    for="btn-pager-first"
+                    class="mdl-tooltip mdl-tooltip--top"><?php echo $pager->getIconFirst()->getTitle(); ?></span>
 
             <i id="btn-pager-prev"
-               class="btn-action-pager material-icons <?php echo $data->getPager()->getIconPrev()->getClass(); ?>"
-               data-action-id="<?php echo $data->getPager()->getSourceAction()->getId(); ?>"
-               data-action-form="<?php echo $data->getPager()->getSourceAction()->getName(); ?>"
-               data-start="<?php echo $data->getPager()->getPrev(); ?>"
-               data-count="<?php echo $data->getPager()->getLimitCount(); ?>"
-               data-onclick="<?php echo $data->getPager()->getOnClick(); ?>"><?php echo $data->getPager()->getIconPrev()->getIcon(); ?></i>
+               class="btn-action-pager material-icons <?php echo $pager->getIconPrev()->getClass(); ?>"
+               data-action-id="<?php echo $pager->getSourceAction()->getId(); ?>"
+               data-action-form="<?php echo $pager->getSourceAction()->getName(); ?>"
+               data-start="<?php echo $pager->getPrev(); ?>"
+               data-count="<?php echo $pager->getLimitCount(); ?>"
+               data-onclick="<?php echo $pager->getOnClick(); ?>"><?php echo $pager->getIconPrev()->getIcon(); ?></i>
 
             <span
-                for="btn-pager-prev"
-                class="mdl-tooltip mdl-tooltip--top"><?php echo $data->getPager()->getIconPrev()->getTitle(); ?></span>
+                    for="btn-pager-prev"
+                    class="mdl-tooltip mdl-tooltip--top"><?php echo $pager->getIconPrev()->getTitle(); ?></span>
         <?php endif; ?>
         &nbsp;
-        <?php printf('%d / %d (%d)', $data->getPager()->getFirstPage(), $data->getPager()->getLastPage(), $data->getPager()->getLimitCount()); ?>
+        <?php printf('%d / %d (%d)', $pager->getFirstPage(), $pager->getLastPage(), $pager->getLimitCount()); ?>
         &nbsp;
-        <?php if ($data->getPager()->getLimitStart() < $data->getPager()->getTotalRows() && $data->getPager()->getFirstPage() != $data->getPager()->getLastPage()): ?>
+        <?php if ($pager->getLimitStart() < $pager->getTotalRows() && $pager->getFirstPage() != $pager->getLastPage()): ?>
             <i id="btn-pager-next"
-               class="btn-action-pager material-icons <?php echo $data->getPager()->getIconNext()->getClass(); ?>"
-               data-action-id="<?php echo $data->getPager()->getSourceAction()->getId(); ?>"
-               data-action-form="<?php echo $data->getPager()->getSourceAction()->getName(); ?>"
-               data-start="<?php echo $data->getPager()->getNext(); ?>"
-               data-count="<?php echo $data->getPager()->getLimitCount(); ?>"
-               data-onclick="<?php echo $data->getPager()->getOnClick(); ?>"><?php echo $data->getPager()->getIconNext()->getIcon(); ?></i>
+               class="btn-action-pager material-icons <?php echo $pager->getIconNext()->getClass(); ?>"
+               data-action-id="<?php echo $pager->getSourceAction()->getId(); ?>"
+               data-action-form="<?php echo $pager->getSourceAction()->getName(); ?>"
+               data-start="<?php echo $pager->getNext(); ?>"
+               data-count="<?php echo $pager->getLimitCount(); ?>"
+               data-onclick="<?php echo $pager->getOnClick(); ?>"><?php echo $pager->getIconNext()->getIcon(); ?></i>
 
             <span
-                for="btn-pager-next"
-                class="mdl-tooltip mdl-tooltip--top"><?php echo $data->getPager()->getIconNext()->getTitle(); ?></span>
+                    for="btn-pager-next"
+                    class="mdl-tooltip mdl-tooltip--top"><?php echo $pager->getIconNext()->getTitle(); ?></span>
             <i id="btn-pager-last"
-               class="btn-action-pager material-icons <?php echo $data->getPager()->getIconLast()->getClass(); ?>"
-               data-action-id="<?php echo $data->getPager()->getSourceAction()->getId(); ?>"
-               data-action-form="<?php echo $data->getPager()->getSourceAction()->getName(); ?>"
-               data-start="<?php echo $data->getPager()->getLast(); ?>"
-               data-count="<?php echo $data->getPager()->getLimitCount(); ?>"
-               data-onclick="<?php echo $data->getPager()->getOnClick(); ?>"><?php echo $data->getPager()->getIconLast()->getIcon(); ?></i>
+               class="btn-action-pager material-icons <?php echo $pager->getIconLast()->getClass(); ?>"
+               data-action-id="<?php echo $pager->getSourceAction()->getId(); ?>"
+               data-action-form="<?php echo $pager->getSourceAction()->getName(); ?>"
+               data-start="<?php echo $pager->getLast(); ?>"
+               data-count="<?php echo $pager->getLimitCount(); ?>"
+               data-onclick="<?php echo $pager->getOnClick(); ?>"><?php echo $pager->getIconLast()->getIcon(); ?></i>
             <span
-                for="btn-pager-last"
-                class="mdl-tooltip mdl-tooltip--top"><?php echo $data->getPager()->getIconLast()->getTitle(); ?></span>
+                    for="btn-pager-last"
+                    class="mdl-tooltip mdl-tooltip--top"><?php echo $pager->getIconLast()->getTitle(); ?></span>
         <?php endif; ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/grid/datagrid-rows.inc b/app/modules/web/themes/material-blue/views/grid/datagrid-rows.inc
index 66263668..da4ea2c8 100644
--- a/app/modules/web/themes/material-blue/views/grid/datagrid-rows.inc
+++ b/app/modules/web/themes/material-blue/views/grid/datagrid-rows.inc
@@ -1,11 +1,15 @@
 <?php
 /**
- * @var $data  SP\Html\DataGrid\DataGridTab
- * @var $this  \SP\Mvc\View\Template
+ * @var SP\Html\DataGrid\DataGridTab $data
+ * @var \SP\Mvc\View\Template        $this
+ * @var callable                     $_getvar
  */
 
 use SP\Html\Html;
 
+if (!isset($data)) {
+    $data = $_getvar('data');
+}
 ?>
 
     <!-- Rows -->
diff --git a/app/modules/web/themes/material-blue/views/grid/datagrid-table-simple.inc b/app/modules/web/themes/material-blue/views/grid/datagrid-table-simple.inc
index 6ad43880..1f62afd6 100644
--- a/app/modules/web/themes/material-blue/views/grid/datagrid-table-simple.inc
+++ b/app/modules/web/themes/material-blue/views/grid/datagrid-table-simple.inc
@@ -1,24 +1,28 @@
 <?php
 /**
- * @var $data    SP\Html\DataGrid\DataGridTab
- * @var $this    SP\Core\Template
- * @var $action  \SP\Html\DataGrid\Action\DataGridAction|\SP\Html\DataGrid\Action\DataGridActionSearch
+ * @var \SP\Html\DataGrid\DataGridTab                                                         $data
+ * @var \SP\Mvc\View\Template                                                                 $this
+ * @var \SP\Html\DataGrid\Action\DataGridAction|\SP\Html\DataGrid\Action\DataGridActionSearch $action
  */
+
+if (!isset($data)) {
+    $data = $_getvar('data');
+}
 ?>
 
-<table class="mdl-data-table mdl-js-data-table table-responsive data-table">
-    <thead>
-    <tr>
-        <?php foreach ($data->getHeader()->getHeaders() as $header): ?>
-            <th class="mdl-data-table__cell--non-numeric"><?php echo $header; ?></th>
-        <?php endforeach; ?>
-    </tr>
-    </thead>
+    <table class="mdl-data-table mdl-js-data-table table-responsive data-table">
+        <thead>
+        <tr>
+            <?php foreach ($data->getHeader()->getHeaders() as $header): ?>
+                <th class="mdl-data-table__cell--non-numeric"><?php echo $header; ?></th>
+            <?php endforeach; ?>
+        </tr>
+        </thead>
 
-    <tbody id="data-rows-<?php echo $data->getId(); ?>">
-    <?php include $data->getDataRowTemplate(); ?>
-    </tbody>
-</table>
+        <tbody id="data-rows-<?php echo $data->getId(); ?>">
+        <?php include $data->getDataRowTemplate(); ?>
+        </tbody>
+    </table>
 
-<!-- Pager -->
+    <!-- Pager -->
 <?php include $data->getDataPagerTemplate(); ?>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/grid/datagrid-table.inc b/app/modules/web/themes/material-blue/views/grid/datagrid-table.inc
index 677600a3..71a0a0db 100644
--- a/app/modules/web/themes/material-blue/views/grid/datagrid-table.inc
+++ b/app/modules/web/themes/material-blue/views/grid/datagrid-table.inc
@@ -1,28 +1,32 @@
 <?php
 /**
- * @var $data    SP\Html\DataGrid\DataGridTab
- * @var $this    \SP\Mvc\View\Template
- * @var $action  \SP\Html\DataGrid\Action\DataGridAction|\SP\Html\DataGrid\Action\DataGridActionSearch
+ * @var \SP\Html\DataGrid\DataGridTab                                                         $data
+ * @var \SP\Mvc\View\Template                                                                 $this
+ * @var \SP\Html\DataGrid\Action\DataGridAction|\SP\Html\DataGrid\Action\DataGridActionSearch $action
+ * @var callable                                                                              $_getvar
  */
+
+if (!isset($data)) {
+    $data = $_getvar('data');
+}
 ?>
+    <table class="mdl-data-table mdl-js-data-table mdl-data-table--selectable table-responsive data-table">
+        <thead>
+        <tr>
+            <?php foreach ($data->getHeader()->getHeaders() as $header): ?>
+                <th class="mdl-data-table__cell--non-numeric"><?php echo $header; ?></th>
+            <?php endforeach; ?>
 
-<table class="mdl-data-table mdl-js-data-table mdl-data-table--selectable table-responsive data-table">
-    <thead>
-    <tr>
-        <?php foreach ($data->getHeader()->getHeaders() as $header): ?>
-            <th class="mdl-data-table__cell--non-numeric"><?php echo $header; ?></th>
-        <?php endforeach; ?>
+            <?php if ($data->getDataActionsCount() > 0): ?>
+                <th class="mdl-data-table__cell--non-numeric">&nbsp;</th>
+            <?php endif; ?>
+        </tr>
+        </thead>
 
-        <?php if ($data->getDataActionsCount() > 0): ?>
-            <th class="mdl-data-table__cell--non-numeric">&nbsp;</th>
-        <?php endif; ?>
-    </tr>
-    </thead>
+        <tbody id="data-rows-<?php echo $data->getId(); ?>">
+        <?php include $data->getDataRowTemplate(); ?>
+        </tbody>
+    </table>
 
-    <tbody id="data-rows-<?php echo $data->getId(); ?>">
-    <?php include $data->getDataRowTemplate(); ?>
-    </tbody>
-</table>
-
-<!-- Pager -->
+    <!-- Pager -->
 <?php include $data->getDataPagerTemplate(); ?>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/grid/datatabs-grid.inc b/app/modules/web/themes/material-blue/views/grid/datatabs-grid.inc
index b669f34d..fe730dd1 100644
--- a/app/modules/web/themes/material-blue/views/grid/datatabs-grid.inc
+++ b/app/modules/web/themes/material-blue/views/grid/datatabs-grid.inc
@@ -1,12 +1,13 @@
-<!-- Start Tabs-->
-
 <?php
 /**
- * @var $icons   SP\Core\UI\ThemeIcons
- * @var $data    SP\Html\DataGrid\DataGridTab
- * @var $this    \SP\Mvc\View\Template
- * @var $action  \SP\Html\DataGrid\Action\DataGridAction|\SP\Html\DataGrid\Action\DataGridActionSearch
+ * @var SP\Html\DataGrid\DataGridTab $data
+ * @var \SP\Core\UI\ThemeIcons       $icons
+ * @var \SP\Config\ConfigData        $configData
+ * @var callable                     $_getvar
+ * @var \SP\Mvc\View\Template        $this
  */
+
+$tabs = $_getvar('tabs');
 ?>
 <div class="mdl-tabs mdl-js-tabs mdl-js-ripple-effect">
     <div id="tabsHeader" class="mdl-tabs__tab-bar"></div>
@@ -14,18 +15,15 @@
     <?php foreach ($tabs as $index => $data): ?>
         <div id="tabs-<?php echo $index; ?>"
              class="mdl-tabs__panel"
-             data-tab-route="<?php echo $tabsRoute; ?>"
+             data-tab-route="<?php echo $_getvar('tabsRoute'); ?>"
              data-tab-index="<?php echo $index; ?>">
 
             <?php include __DIR__ . DIRECTORY_SEPARATOR . 'datagrid-grid.inc'; ?>
         </div>
 
         <script type="text/javascript">
-            sysPassApp.theme.html.tabs.add("#tabsHeader", <?php echo $index; ?>, "<?php echo $data->getTitle(); ?>", <?php echo $index === $activeTab ? 1 : 0; ?>);
+            sysPassApp.theme.html.tabs.add("#tabsHeader", <?php echo $index; ?>, "<?php echo $data->getTitle(); ?>", <?php echo $index === $_getvar('activeTab') ? 1 : 0; ?>);
         </script>
     <?php endforeach; ?>
-</div> <!-- End Tabs-->
-
-<script type="text/javascript">
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
+</div>
+<!-- End Tabs-->
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/install/index.inc b/app/modules/web/themes/material-blue/views/install/index.inc
index 7c681265..fef163f5 100644
--- a/app/modules/web/themes/material-blue/views/install/index.inc
+++ b/app/modules/web/themes/material-blue/views/install/index.inc
@@ -1,11 +1,14 @@
 <?php
 /**
- * @var \SP\Mvc\View\Template $this
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
  */
 ?>
 <div id="actions" class="installer" align="center">
     <div id="page-title">
-        <h1><?php printf(__('Instalación  %s'), $app_version); ?></h1>
+        <h1><?php printf(__('Instalación  %s'), $_getvar('app_version')); ?></h1>
     </div>
 
     <?php include $this->includePartial('error-list'); ?>
@@ -134,8 +137,8 @@
                 <label for="sel-sitelang"><?php echo __('Idioma'); ?></label>
                 <select name="sitelang" id="sel-sitelang" size="1" class="select-box"
                         title="<?php echo __('Idioma'); ?>">
-                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $langs */
-                    foreach ($langs as $lang): ?>
+                    <?php /** @var \SP\Mvc\View\Components\SelectItem $lang */
+                    foreach ($_getvar('langs') as $lang): ?>
                         <option value="<?php echo $lang->getId(); ?>" <?php echo $lang->isSelected() ? 'selected' : ''; ?>><?php echo $lang->getName(); ?></option>
                     <?php endforeach; ?>
                 </select>
diff --git a/app/modules/web/themes/material-blue/views/itemshow/account_bulkedit.inc b/app/modules/web/themes/material-blue/views/itemshow/account_bulkedit.inc
index 93409886..7e0ac717 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/account_bulkedit.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/account_bulkedit.inc
@@ -1,16 +1,19 @@
 <?php
 /**
- * @var \SP\Core\UI\ThemeIcons               $icons
- * @var \SP\Mvc\View\Components\SelectItem[] $clients
- * @var \SP\Mvc\View\Components\SelectItem[] $categories
- * @var \SP\Mvc\View\Components\SelectItem[] $users
- * @var \SP\Mvc\View\Components\SelectItem[] $userGroups
- * @var \SP\Mvc\View\Components\SelectItem[] $tags
+ * @var \SP\Core\UI\ThemeIcons             $icons
+ * @var \SP\Config\ConfigData              $configData
+ * @var callable                           $_getvar
+ * @var \SP\Mvc\View\Template              $this
+ * @var \SP\Mvc\View\Components\SelectItem $client
+ * @var \SP\Mvc\View\Components\SelectItem $category
+ * @var \SP\Mvc\View\Components\SelectItem $user
+ * @var \SP\Mvc\View\Components\SelectItem $userGroup
+ * @var \SP\Mvc\View\Components\SelectItem $tag
  */
 ?>
 
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
 
     <div class="mdl-tabs mdl-js-tabs mdl-js-ripple-effect">
         <div class="mdl-tabs__tab-bar">
@@ -21,8 +24,7 @@
 
         <form method="post" name="frmAccountBulkEdit" id="frmAccountBulkEdit" class="form-action"
               data-onsubmit="appMgmt/save"
-              data-action-route="<?php echo isset($route) ? $route : ''; ?>"
-              data-activetab="<?php echo isset($activeTab) ? $activeTab : ''; ?>"
+              data-action-route="<?php echo $_getvar('route', ''); ?>"
               data-hash="">
 
             <div class="mdl-tabs__panel is-active" id="general-panel">
@@ -35,7 +37,7 @@
 
                             <select id="client_id" name="client_id" class="select-box">
                                 <option value=""><?php echo __('Seleccionar Cliente'); ?></option>
-                                <?php foreach ($clients as $client): ?>
+                                <?php foreach ($_getvar('clients') as $client): ?>
                                     <option
                                             value="<?php echo $client->getId(); ?>"><?php echo $client->getName(); ?></option>
                                 <?php endforeach; ?>
@@ -50,7 +52,7 @@
 
                             <select id="category_id" name="category_id" class="select-box">
                                 <option value=""><?php echo __('Seleccionar Categoría'); ?></option>
-                                <?php foreach ($categories as $category): ?>
+                                <?php foreach ($_getvar('categories') as $category): ?>
                                     <option
                                             value="<?php echo $category->getId(); ?>"><?php echo $category->getName(); ?></option>
                                 <?php endforeach; ?>
@@ -65,7 +67,7 @@
 
                             <select id="owner_id" name="owner_id" class="select-box">
                                 <option value=""><?php echo __('Seleccionar Usuario'); ?></option>
-                                <?php foreach ($users as $user): ?>
+                                <?php foreach ($_getvar('users') as $user): ?>
                                     <option
                                             value="<?php echo $user->getId(); ?>"><?php echo $user->getName(); ?></option>
                                 <?php endforeach; ?>
@@ -80,7 +82,7 @@
 
                             <select id="main_usergroup_id" name="main_usergroup_id" class="select-box">
                                 <option value=""><?php echo __('Seleccionar Grupo'); ?></option>
-                                <?php foreach ($userGroups as $group): ?>
+                                <?php foreach ($_getvar('userGroups') as $group): ?>
                                     <option
                                             value="<?php echo $group->getId(); ?>"><?php echo $group->getName(); ?></option>
                                 <?php endforeach; ?>
@@ -94,7 +96,7 @@
                             <select id="tags" name="tags[]" multiple="multiple"
                                     class="select-box-tags">
                                 <option value=""><?php echo __('Seleccionar Etiquetas'); ?></option>
-                                <?php foreach ($tags as $tag): ?>
+                                <?php foreach ($_getvar('tags') as $tag): ?>
                                     <option value="<?php echo $tag->getId(); ?>"><?php echo $tag->getName(); ?></option>
                                 <?php endforeach; ?>
                             </select>
@@ -115,7 +117,7 @@
                                     <select id="other_users_view" name="other_users_view[]"
                                             multiple="multiple" class="select-box-tags">
                                         <option value=""><?php echo __('Seleccionar Usuarios'); ?></option>
-                                        <?php foreach ($users as $user): ?>
+                                        <?php foreach ($_getvar('users') as $user): ?>
                                             <option
                                                     value="<?php echo $user->getId(); ?>"><?php echo $user->getName(); ?></option>
                                         <?php endforeach; ?>
@@ -136,7 +138,7 @@
                                     <select id="other_users_edit" name="other_users_edit[]"
                                             multiple="multiple" class="select-box-tags">
                                         <option value=""><?php echo __('Seleccionar Usuarios'); ?></option>
-                                        <?php foreach ($users as $user): ?>
+                                        <?php foreach ($_getvar('users') as $user): ?>
                                             <option
                                                     value="<?php echo $user->getId(); ?>"><?php echo $user->getName(); ?></option>
                                         <?php endforeach; ?>
@@ -164,7 +166,7 @@
                                     <select id="other_usergroups_view" name="other_usergroups_view[]"
                                             multiple="multiple" class="select-box-tags">
                                         <option value=""><?php echo __('Seleccionar Grupos'); ?></option>
-                                        <?php foreach ($userGroups as $userGroup): ?>
+                                        <?php foreach ($_getvar('userGroups') as $userGroup): ?>
                                             <option
                                                     value="<?php echo $userGroup->getId(); ?>"><?php echo $userGroup->getName(); ?></option>
                                         <?php endforeach; ?>
@@ -176,7 +178,8 @@
 
                                 <label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect"
                                        for="clear_permission_usergroups_view">
-                                    <input type="checkbox" id="clear_permission_usergroups_view" class="mdl-checkbox__input"
+                                    <input type="checkbox" id="clear_permission_usergroups_view"
+                                           class="mdl-checkbox__input"
                                            name="clear_permission_usergroups_view">
                                     <span class="mdl-checkbox__label"><?php echo __('Eliminar'); ?></span>
                                 </label>
@@ -185,7 +188,7 @@
                                     <select id="other_usergroups_edit" name="other_usergroups_edit[]"
                                             multiple="multiple" class="select-box-tags">
                                         <option value=""><?php echo __('Seleccionar Grupos'); ?></option>
-                                        <?php foreach ($userGroups as $userGroup): ?>
+                                        <?php foreach ($_getvar('userGroups') as $userGroup): ?>
                                             <option
                                                     value="<?php echo $userGroup->getId(); ?>"><?php echo $userGroup->getName(); ?></option>
                                         <?php endforeach; ?>
@@ -197,7 +200,8 @@
 
                                 <label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect"
                                        for="clear_permission_usergroups_edit">
-                                    <input type="checkbox" id="clear_permission_usergroups_edit" class="mdl-checkbox__input"
+                                    <input type="checkbox" id="clear_permission_usergroups_edit"
+                                           class="mdl-checkbox__input"
                                            name="clear_permission_usergroups_edit">
                                     <span class="mdl-checkbox__label"><?php echo __('Eliminar'); ?></span>
                                 </label>
@@ -255,7 +259,7 @@
                 </table>
             </div>
 
-            <input type="hidden" name="itemsId" value="<?php echo implode(',', $itemsId); ?>">
+            <input type="hidden" name="itemsId" value="<?php echo implode(',', $_getvar('itemsId')); ?>">
             <input type="hidden" name="isAjax" value="1">
         </form>
     </div>
@@ -268,6 +272,3 @@
         </button>
     </div>
 </div>
-<script type="text/javascript">
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
diff --git a/app/modules/web/themes/material-blue/views/itemshow/auth_token.inc b/app/modules/web/themes/material-blue/views/itemshow/auth_token.inc
index dd961794..74da7e4a 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/auth_token.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/auth_token.inc
@@ -1,14 +1,20 @@
 <?php
-/** @var  \SP\DataModel\AuthTokenData $authToken */
-/** @var  \SP\Core\UI\ThemeIcons $icons */
+/**
+ * @var  \SP\DataModel\AuthTokenData $authToken
+ * @var \SP\Core\UI\ThemeIcons       $icons
+ * @var \SP\Config\ConfigData        $configData
+ * @var callable                     $_getvar
+ * @var \SP\Mvc\View\Template        $this
+ */
+
+$authToken = $_getvar('authToken');
 ?>
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
 
     <form method="post" name="frmTokens" id="frmTokens" class="form-action"
           data-onsubmit="appMgmt/save"
-          data-action-route="<?php echo isset($route) ? $route : ''; ?>"
-          data-activetab="<?php echo isset($activeTab) ? $activeTab : ''; ?>"
+          data-action-route="<?php echo $_getvar('route', ''); ?>"
           data-hash="">
         <table class="popup-data">
             <tbody>
@@ -17,10 +23,10 @@
                 <td class="valField">
                     <div class="lowres-title"><?php echo __('Usuario'); ?></div>
 
-                    <select id="selUsers" name="users" class="select-box" required <?php echo $disabled; ?>>
+                    <select id="selUsers" name="users" class="select-box" required <?php echo $_getvar('disabled'); ?>>
                         <option value=""><?php echo __('Seleccionar Usuario'); ?></option>
-                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $users */
-                        foreach ($users as $user): ?>
+                        <?php /** @var \SP\Mvc\View\Components\SelectItem $user */
+                        foreach ($_getvar('users') as $user): ?>
                             <option value="<?php echo $user->getId(); ?>" <?php echo $user->isSelected() ? 'selected' : ''; ?>><?php printf('%s (%s)', $user->getName(), $user->getItemProperty('login')); ?></option>
                         <?php endforeach; ?>
                     </select>
@@ -32,16 +38,16 @@
                     <div class="lowres-title"><?php echo __('Acción'); ?></div>
 
                     <select id="selActions" name="actions"
-                            class="select-box" required <?php echo $disabled; ?>>
+                            class="select-box" required <?php echo $_getvar('disabled'); ?>>
                         <option value=""><?php echo __('Seleccionar Acción'); ?></option>
-                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $actions */
-                        foreach ($actions as $action): ?>
+                        <?php /** @var \SP\Mvc\View\Components\SelectItem $action */
+                        foreach ($_getvar('actions') as $action): ?>
                             <option value="<?php echo $action->getId(); ?>" <?php echo $action->isSelected() ? 'selected' : ''; ?>><?php echo $action->getName(); ?></option>
                         <?php endforeach; ?>
                     </select>
                 </td>
             </tr>
-            <?php if (!$isView): ?>
+            <?php if (!$_getvar('isView')): ?>
                 <tr>
                     <td class="descField"><?php echo __('Clave'); ?></td>
                     <td class="valField">
@@ -79,7 +85,6 @@
             </tbody>
         </table>
 
-        <input type="hidden" name="sk" value="">
         <input type="hidden" name="isAjax" value="1">
     </form>
     <div class="action-in-box">
@@ -89,7 +94,4 @@
             <i class="material-icons"><?php echo $icons->getIconSave()->getIcon(); ?></i>
         </button>
     </div>
-</div>
-<script type="text/javascript">
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/itemshow/category.inc b/app/modules/web/themes/material-blue/views/itemshow/category.inc
index f9cecb09..2e7263ca 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/category.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/category.inc
@@ -1,14 +1,20 @@
 <?php
-/** @var  \SP\DataModel\CategoryData $category */
-/** @var  \SP\Core\UI\ThemeIcons $icons */
+/**
+ * @var  \SP\DataModel\CategoryData $category
+ * @var \SP\Core\UI\ThemeIcons      $icons
+ * @var \SP\Config\ConfigData       $configData
+ * @var callable                    $_getvar
+ * @var \SP\Mvc\View\Template       $this
+ */
+
+$category = $_getvar('category');
 ?>
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
 
     <form method="post" name="frmCategories" id="frmCategories" class="form-action"
           data-onsubmit="appMgmt/save"
-          data-action-route="<?php echo isset($route) ? $route : ''; ?>"
-          data-activetab="<?php echo isset($activeTab) ? $activeTab : ''; ?>"
+          data-action-route="<?php echo $_getvar('route', ''); ?>"
           data-hash="">
         <table class="popup-data">
             <tbody>
@@ -36,23 +42,19 @@
                     </div>
                 </td>
             </tr>
-            <?php if ($customFields): ?>
+            <?php if ($_getvar('customFields')): ?>
                 <?php include $this->includeTemplate('aux-customfields', 'common'); ?>
             <?php endif; ?>
             </tbody>
         </table>
 
-        <input type="hidden" name="sk" value="">
         <input type="hidden" name="isAjax" value="1">
     </form>
     <div class="action-in-box">
         <button
-            class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconSave()->getClassButton(); ?>"
-            form="frmCategories" title="<?php echo $icons->getIconSave()->getTitle(); ?>">
+                class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconSave()->getClassButton(); ?>"
+                form="frmCategories" title="<?php echo $icons->getIconSave()->getTitle(); ?>">
             <i class="material-icons"><?php echo $icons->getIconSave()->getIcon(); ?></i>
         </button>
     </div>
 </div>
-<script>
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/itemshow/client.inc b/app/modules/web/themes/material-blue/views/itemshow/client.inc
index 34791b16..9c2ffbba 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/client.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/client.inc
@@ -1,17 +1,21 @@
 <?php
+/**
+ * @var \SP\DataModel\ClientData $client
+ * @var \SP\Core\UI\ThemeIcons   $icons
+ * @var \SP\Config\ConfigData    $configData
+ * @var callable                 $_getvar
+ * @var \SP\Mvc\View\Template    $this
+ */
 
-/** @var $icons \SP\Core\UI\ThemeIcons */
-/** @var $client \SP\DataModel\ClientData */
-
+$client = $_getvar('client');
 ?>
 
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
 
     <form method="post" name="frmClients" id="frmClients" class="form-action"
           data-onsubmit="appMgmt/save"
-          data-action-route="<?php echo isset($route) ? $route : ''; ?>"
-          data-activetab="<?php echo isset($activeTab) ? $activeTab : ''; ?>"
+          data-action-route="<?php echo $_getvar('route', ''); ?>"
           data-hash="">
         <table class="popup-data">
             <tbody>
@@ -64,13 +68,12 @@
                 </td>
             </tr>
 
-            <?php if ($customFields): ?>
+            <?php if ($_getvar('customFields')): ?>
                 <?php include $this->includeTemplate('aux-customfields', 'common'); ?>
             <?php endif; ?>
             </tbody>
         </table>
 
-        <input type="hidden" name="sk" value="">
         <input type="hidden" name="isAjax" value="1">
     </form>
     <div class="action-in-box">
@@ -80,7 +83,4 @@
             <i class="material-icons"><?php echo $icons->getIconSave()->getIcon(); ?></i>
         </button>
     </div>
-</div>
-<script>
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/itemshow/custom_field.inc b/app/modules/web/themes/material-blue/views/itemshow/custom_field.inc
index 737728da..3c6d2f57 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/custom_field.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/custom_field.inc
@@ -1,17 +1,21 @@
 <?php
+/**
+ * @var \SP\DataModel\CustomFieldDefinitionData $field
+ * @var \SP\Core\UI\ThemeIcons                  $icons
+ * @var \SP\Config\ConfigData                   $configData
+ * @var callable                                $_getvar
+ * @var \SP\Mvc\View\Template                   $this
+ */
 
-/** @var $icons \SP\Core\UI\ThemeIcons */
-/** @var \SP\DataModel\CustomFieldDefinitionData $field */
-
+$field = $_getvar('field');
 ?>
 
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
 
     <form method="post" name="frmCustomFields" id="frmCustomFields" class="form-action"
           data-onsubmit="appMgmt/save"
-          data-action-route="<?php echo isset($route) ? $route : ''; ?>"
-          data-activetab="<?php echo isset($activeTab) ? $activeTab : ''; ?>"
+          data-action-route="<?php echo $_getvar('route', ''); ?>"
           data-hash="">
         <table class="popup-data">
             <tbody>
@@ -33,8 +37,8 @@
                     <div class="lowres-title"><?php echo __('Tipo'); ?></div>
 
                     <select name="type" id="sel-type" size="1" class="select-box">
-                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $types */
-                        foreach ($types as $type): ?>
+                        <?php /** @var \SP\Mvc\View\Components\SelectItem $type */
+                        foreach ($_getvar('types') as $type): ?>
                             <option
                                     value='<?php echo $type->getId(); ?>' <?php echo ($type->getId() === $field->getTypeId()) ? 'selected' : ''; ?>><?php echo __($type->getItemProperty('text')); ?></option>
                         <?php endforeach; ?>
@@ -47,8 +51,8 @@
                     <div class="lowres-title"><?php echo __('Módulo'); ?></div>
 
                     <select name="module" id="sel-module" size="1" class="select-box">
-                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $modules */
-                        foreach ($modules as $module): ?>
+                        <?php /** @var \SP\Mvc\View\Components\SelectItem $module */
+                        foreach ($_getvar('modules') as $module): ?>
                             <option
                                     value='<?php echo $module->getId(); ?>' <?php echo $module->isSelected() ? 'selected' : ''; ?>><?php echo $module->getName(); ?></option>
                         <?php endforeach; ?>
@@ -90,7 +94,6 @@
             </tbody>
         </table>
 
-        <input type="hidden" name="sk" value="">
         <input type="hidden" name="isAjax" value="1">
     </form>
     <div class="action-in-box">
@@ -101,6 +104,3 @@
         </button>
     </div>
 </div>
-<script>
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
diff --git a/app/modules/web/themes/material-blue/views/itemshow/file.inc b/app/modules/web/themes/material-blue/views/itemshow/file.inc
index 32f574f0..42b68aa2 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/file.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/file.inc
@@ -1,6 +1,18 @@
-<?php if (isset($isImage)): ?>
-    <img src="data:'<?php echo $fileData->getType(); ?>;base64, <?php echo $data; ?>" border="0"/>
+<?php
+/**
+ * @var \SP\DataModel\FileData $fileData
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+
+$fileData = $_getvar('fileData');
+?>
+
+<?php if ($_getvar('isImage')): ?>
+    <img src="data:'<?php echo $fileData->getType(); ?>;base64, <?php echo $_getvar('data'); ?>" border="0"/>
     <div class="title"><?php echo $fileData->getName(); ?></div>
 <?php else: ?>
-    <pre><?php echo $data; ?></pre>
+    <pre><?php echo $_getvar('data'); ?></pre>
 <?php endif; ?>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/itemshow/item_preset-password.inc b/app/modules/web/themes/material-blue/views/itemshow/item_preset-password.inc
index 1f70eab6..5efdf833 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/item_preset-password.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset-password.inc
@@ -1,4 +1,14 @@
-<?php /** @var $password \SP\DataModel\ItemPreset\Password */ ?>
+<?php
+/**
+ * @var \SP\DataModel\ItemPreset\Password $password
+ * @var \SP\Core\UI\ThemeIcons            $icons
+ * @var \SP\Config\ConfigData             $configData
+ * @var callable                          $_getvar
+ * @var \SP\Mvc\View\Template             $this
+ */
+
+$password = $_getvar('password');
+?>
 
 <table class="popup-data">
     <tbody>
@@ -23,7 +33,7 @@
                 <input id="expire_time" name="expire_time" type="number"
                        class="mdl-textfield__input mdl-color-text--indigo-400"
                        min="0"
-                       value="<?php echo $password->getExpireTime() ? $password->getExpireTime() / $expireTimeMultiplier : 1; ?>"/>
+                       value="<?php echo $password->getExpireTime() ? $password->getExpireTime() / $_getvar('expireTimeMultiplier') : 1; ?>"/>
                 <label class="mdl-textfield__label"
                        for="expire_time"><?php echo __('Tiempo caducidad (días)'); ?></label>
             </div>
diff --git a/app/modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc b/app/modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc
index 848fd82c..b4b9833d 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc
@@ -1,6 +1,9 @@
 <?php
 /**
- * @var \SP\Core\UI\ThemeIcons                  $icons
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
  */
 ?>
 <table class="popup-data">
@@ -13,8 +16,8 @@
                     <select id="users_view" name="users_view[]" multiple="multiple"
                             class="select-box-tags">
                         <option value=""><?php echo __('Seleccionar Usuarios'); ?></option>
-                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $usersView */
-                        foreach ($usersView as $user): ?>
+                        <?php /** @var \SP\Mvc\View\Components\SelectItem $user */
+                        foreach ($_getvar('usersView') as $user): ?>
                             <?php if ($user->isSkip()): continue; endif; ?>
                             <option
                                     value="<?php echo $user->getId(); ?>"
@@ -30,8 +33,8 @@
                     <select id="users_edit" name="users_edit[]" multiple="multiple"
                             class="select-box-tags">
                         <option value=""><?php echo __('Seleccionar Usuarios'); ?></option>
-                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $usersEdit */
-                        foreach ($usersEdit as $user): ?>
+                        <?php /** @var \SP\Mvc\View\Components\SelectItem $user */
+                        foreach ($_getvar('usersEdit') as $user): ?>
                             <?php if ($user->isSkip()): continue; endif; ?>
                             <option
                                     value="<?php echo $user->getId(); ?>"
@@ -54,8 +57,8 @@
                     <select id="user_groups_view" name="user_groups_view[]" multiple="multiple"
                             class="select-box-tags">
                         <option value=""><?php echo __('Seleccionar Grupos'); ?></option>
-                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $userGroupsView */
-                        foreach ($userGroupsView as $userGroup): ?>
+                        <?php /** @var \SP\Mvc\View\Components\SelectItem $userGroup */
+                        foreach ($_getvar('userGroupsView') as $userGroup): ?>
                             <?php if ($userGroup->isSkip()): continue; endif; ?>
                             <option
                                     value="<?php echo $userGroup->getId(); ?>"
@@ -71,8 +74,8 @@
                     <select id="user_groups_edit" name="user_groups_edit[]" multiple="multiple"
                             class="select-box-tags">
                         <option value=""><?php echo __('Seleccionar Grupos'); ?></option>
-                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $userGroupsEdit */
-                        foreach ($userGroupsEdit as $userGroup): ?>
+                        <?php /** @var \SP\Mvc\View\Components\SelectItem $userGroup */
+                        foreach ($_getvar('userGroupsEdit') as $userGroup): ?>
                             <?php if ($userGroup->isSkip()): continue; endif; ?>
                             <option
                                     value="<?php echo $userGroup->getId(); ?>"
diff --git a/app/modules/web/themes/material-blue/views/itemshow/item_preset-private.inc b/app/modules/web/themes/material-blue/views/itemshow/item_preset-private.inc
index 1a347c2b..8ce421d6 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/item_preset-private.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset-private.inc
@@ -1,4 +1,14 @@
-<?php /** @var $private \SP\DataModel\ItemPreset\AccountPrivate */ ?>
+<?php
+/**
+ * @var \SP\DataModel\ItemPreset\AccountPrivate $private
+ * @var \SP\Core\UI\ThemeIcons                  $icons
+ * @var \SP\Config\ConfigData                   $configData
+ * @var callable                                $_getvar
+ * @var \SP\Mvc\View\Template                   $this
+ */
+
+$private = $_getvar('private');
+?>
 
 <table class="popup-data">
     <tbody>
diff --git a/app/modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc b/app/modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc
index d0ecd4cf..7fcc1d92 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc
@@ -1,4 +1,14 @@
-<?php /** @var $sessionTimeout \SP\DataModel\ItemPreset\SessionTimeout */ ?>
+<?php
+/**
+ * @var \SP\DataModel\ItemPreset\SessionTimeout $sessionTimeout
+ * @var \SP\Core\UI\ThemeIcons                  $icons
+ * @var \SP\Config\ConfigData                   $configData
+ * @var callable                                $_getvar
+ * @var \SP\Mvc\View\Template                   $this
+ */
+
+$sessionTimeout = $_getvar('sessionTimeout');
+?>
 
 <table class="popup-data">
     <tbody>
diff --git a/app/modules/web/themes/material-blue/views/itemshow/item_preset.inc b/app/modules/web/themes/material-blue/views/itemshow/item_preset.inc
index d4d8e1ef..f030e472 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/item_preset.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset.inc
@@ -1,22 +1,27 @@
 <?php
-/** @var $icons \SP\Core\UI\ThemeIcons */
-/** @var $preset \SP\DataModel\ItemPresetData */
-/** @var $this \SP\Mvc\View\Template */
+/**
+ * @var \SP\DataModel\ItemPresetData $preset
+ * @var \SP\Core\UI\ThemeIcons       $icons
+ * @var \SP\Config\ConfigData        $configData
+ * @var callable                     $_getvar
+ * @var \SP\Mvc\View\Template        $this
+ */
+
+$preset = $_getvar('preset');
 ?>
 
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
 
     <div class="mdl-tabs mdl-js-tabs mdl-js-ripple-effect">
         <div class="mdl-tabs__tab-bar">
             <a href="#general-panel" class="mdl-tabs__tab is-active"><?php echo __('General'); ?></a>
-            <a href="#presets-panel" class="mdl-tabs__tab"><?php echo $presetName; ?></a>
+            <a href="#presets-panel" class="mdl-tabs__tab"><?php echo $_getvar('presetName'); ?></a>
         </div>
 
         <form method="post" name="frmItemPreset" id="frmItemPreset" class="form-action"
               data-onsubmit="appMgmt/save"
-              data-action-route="<?php echo isset($route) ? $route : ''; ?>"
-              data-activetab="<?php echo isset($activeTab) ? $activeTab : ''; ?>"
+              data-action-route="<?php echo $_getvar('route', ''); ?>"
               data-hash="">
 
             <div class="mdl-tabs__panel is-active" id="general-panel">
@@ -28,10 +33,10 @@
                             <div class="lowres-title"><?php echo __('Usuario'); ?></div>
 
                             <select id="selUser" name="user_id" class="select-box select-box-deselect"
-                                    title="<?php echo __('Usuario'); ?>" <?php echo $disabled; ?>>
+                                    title="<?php echo __('Usuario'); ?>" <?php echo $_getvar('disabled'); ?>>
                                 <option value=""><?php echo __('Seleccionar Usuario'); ?></option>
-                                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $users */
-                                foreach ($users as $user): ?>
+                                <?php /** @var \SP\Mvc\View\Components\SelectItem $user */
+                                foreach ($_getvar('users') as $user): ?>
                                     <option
                                             value="<?php echo $user->getId(); ?>" <?php echo $user->isSelected() ? 'selected' : ''; ?>><?php echo $user->getName(); ?></option>
                                 <?php endforeach; ?>
@@ -45,10 +50,10 @@
                             <div class="lowres-title"><?php echo __('Grupo'); ?></div>
 
                             <select id="selUserGroup" name="user_group_id" class="select-box select-box-deselect"
-                                    title="<?php echo __('Grupo'); ?>" <?php echo $disabled; ?>>
+                                    title="<?php echo __('Grupo'); ?>" <?php echo $_getvar('disabled'); ?>>
                                 <option value=""><?php echo __('Seleccionar Grupo'); ?></option>
-                                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $userGroups */
-                                foreach ($userGroups as $userGroup): ?>
+                                <?php /** @var \SP\Mvc\View\Components\SelectItem $userGroup */
+                                foreach ($_getvar('userGroups') as $userGroup): ?>
                                     <option
                                             value="<?php echo $userGroup->getId(); ?>" <?php echo $userGroup->isSelected() ? 'selected' : ''; ?>><?php echo $userGroup->getName(); ?></option>
                                 <?php endforeach; ?>
@@ -62,10 +67,10 @@
                             <div class="lowres-title"><?php echo __('Perfil'); ?></div>
 
                             <select id="selUserProfile" name="user_profile_id" class="select-box select-box-deselect"
-                                    title="<?php echo __('Perfil'); ?>" <?php echo $disabled; ?>>
+                                    title="<?php echo __('Perfil'); ?>" <?php echo $_getvar('disabled'); ?>>
                                 <option value=""><?php echo __('Seleccionar Perfil'); ?></option>
-                                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $userProfiles */
-                                foreach ($userProfiles as $userProfile): ?>
+                                <?php /** @var \SP\Mvc\View\Components\SelectItem $userProfile */
+                                foreach ($_getvar('userProfiles') as $userProfile): ?>
                                     <option
                                             value="<?php echo $userProfile->getId(); ?>" <?php echo $userProfile->isSelected() ? 'selected' : ''; ?>><?php echo $userProfile->getName(); ?></option>
                                 <?php endforeach; ?>
@@ -128,12 +133,11 @@
             </div>
 
             <div class="mdl-tabs__panel" id="presets-panel">
-                <?php if (isset($typeTemplate)) : include $this->includeTemplate($typeTemplate, 'itemshow'); endif; ?>
+                <?php if ($_getvar('typeTemplate')) : include $this->includeTemplate($_getvar('typeTemplate'), 'itemshow'); endif; ?>
             </div>
 
 
             <input type="hidden" name="type" value="<?php echo $preset->getType(); ?>">
-            <input type="hidden" name="sk" value="">
             <input type="hidden" name="isAjax" value="1">
         </form>
     </div
@@ -146,6 +150,3 @@
         </button>
     </div>
 </div>
-<script>
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/itemshow/public_link.inc b/app/modules/web/themes/material-blue/views/itemshow/public_link.inc
index 64e99e37..9306da92 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/public_link.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/public_link.inc
@@ -1,14 +1,19 @@
 <?php
 /**
- * @var $publicLink SP\DataModel\PublicLinkListData
+ * @var \SP\DataModel\PublicLinkListData $publicLink
+ * @var \SP\Core\UI\ThemeIcons           $icons
+ * @var \SP\Config\ConfigData            $configData
+ * @var callable                         $_getvar
+ * @var \SP\Mvc\View\Template            $this
  */
+
+$publicLink = $_getvar('publicLink');
 ?>
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
     <form method="post" name="frmPublickLink" id="frmPublickLink" class="form-action"
           data-onsubmit="appMgmt/save"
-          data-action-route="<?php echo isset($route) ? $route : ''; ?>"
-          data-activetab="<?php echo isset($activeTab) ? $activeTab : ''; ?>"
+          data-action-route="<?php echo $_getvar('route', ''); ?>"
           data-hash="">
         <table class="popup-data">
             <tbody>
@@ -17,10 +22,10 @@
                 <td class="valField">
                     <div class="lowres-title"><?php echo __('Cuenta'); ?></div>
 
-                    <select id="accountId" name="accountId" class="select-box" <?php echo $disabled; ?>>
+                    <select id="accountId" name="accountId" class="select-box" <?php echo $_getvar('disabled'); ?>>
                         <option value=""><?php echo __('Seleccionar Cuenta'); ?></option>
-                        <?php /** @var \SP\Mvc\View\Components\SelectItem[] $accounts */
-                        foreach ($accounts as $account): ?>
+                        <?php /** @var \SP\Mvc\View\Components\SelectItem $account */
+                        foreach ($_getvar('accounts') as $account): ?>
                             <option
                                     value="<?php echo $account->getId(); ?>" <?php echo $account->isSelected() ? 'selected' : ''; ?>><?php printf('%s (%s)', $account->getName(), $account->getItemProperty('clientName')); ?></option>
                         <?php endforeach; ?>
@@ -34,12 +39,12 @@
                            title="<?php echo __('Notificar'); ?>">
                         <input type="checkbox" id="notify"
                                class="mdl-switch__input mdl-color-text--indigo-400"
-                               name="notify" <?php echo $isView && $publicLink->isNotify() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                               name="notify" <?php echo $_getvar('isView') && $publicLink->isNotify() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                         <span class="mdl-switch__label"><?php echo __('Notificar'); ?></span>
                     </label>
                 </td>
             </tr>
-            <?php if ($isView): ?>
+            <?php if ($_getvar('isView')): ?>
                 <tr>
                     <td class="descField"><?php echo __('Fecha Creación'); ?></td>
                     <td class="valField">
@@ -85,10 +90,11 @@
                     <td class="valField">
                         <div class="lowres-title"><?php echo __('URL'); ?></div>
 
-                        <a href="<?php echo $publicLinkURL; ?>" target="_blank"><?php echo $publicLinkURL; ?></a>
+                        <a href="<?php echo $_getvar('publicLinkURL'); ?>"
+                           target="_blank"><?php echo $_getvar('publicLinkURL'); ?></a>
                     </td>
                 </tr>
-                <?php if (is_array($usageInfo)): ?>
+                <?php if (is_array($_getvar('usageInfo'))): ?>
                     <tr>
                         <td class="descField"><?php echo __('Uso'); ?></td>
                         <td class="valField">
@@ -96,12 +102,11 @@
 
                             <div class="list-wrap">
                                 <ul class="mdl-list">
-                                    <?php /** @var array $usageInfo */
-                                    foreach ($usageInfo as $useInfo): ?>
+                                    <?php foreach ($_getvar('usageInfo') as $useInfo): ?>
                                         <li class="mdl-list__item">
                                 <span class="mdl-list__item-primary-content">
                                 <i class="material-icons mdl-list__item-icon">access_time</i>
-                                    <?php printf('%s - %s', $isDemo ? '*.*.*.*' : $useInfo['who'], date('Y-m-d H:i', $useInfo['time'])); ?>
+                                    <?php printf('%s - %s', $_getvar('isDemo') ? '*.*.*.*' : $useInfo['who'], date('Y-m-d H:i', $useInfo['time'])); ?>
                                 </span>
                                         </li>
                                     <?php endforeach; ?>
@@ -113,13 +118,11 @@
             <?php endif; ?>
             </tbody>
         </table>
-        <?php if (!$isView): ?>
-            <input type="hidden" name="sk" value="">
-            <input type="hidden" name="isAjax" value="1">
-        <?php endif; ?>
+
+        <input type="hidden" name="isAjax" value="1">
     </form>
 
-    <?php if (!$isView): ?>
+    <?php if (!$_getvar('isView')): ?>
         <div class="action-in-box">
             <button form="frmPublickLink"
                     class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconSave()->getClassButton(); ?>"
@@ -129,6 +132,3 @@
         </div>
     <?php endif; ?>
 </div>
-<script type="text/javascript">
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/itemshow/results.inc b/app/modules/web/themes/material-blue/views/itemshow/results.inc
index fd87807a..32c2dbce 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/results.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/results.inc
@@ -1,10 +1,18 @@
+<?php
+/**
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+?>
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
     <table class="popup-data">
         <tbody>
         <tr id="ldap-results">
             <td class="valField">
-                <div class="lowres-title"><?php echo $header; ?></div>
+                <div class="lowres-title"><?php echo $_getvar('header'); ?></div>
                 <div class="list-wrap"></div>
             </td>
         </tr>
diff --git a/app/modules/web/themes/material-blue/views/itemshow/tag.inc b/app/modules/web/themes/material-blue/views/itemshow/tag.inc
index dff10f76..6edff3ab 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/tag.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/tag.inc
@@ -1,14 +1,20 @@
 <?php
-/** @var $tag \SP\DataModel\TagData */
-/** @var $icons \SP\Core\UI\ThemeIcons */
+/**
+ * @var \SP\DataModel\TagData  $tag
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+
+$tag = $_getvar('tag');
 ?>
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
 
     <form method="post" name="frmTags" id="frmTags" class="form-action"
           data-onsubmit="appMgmt/save"
-          data-action-route="<?php echo isset($route) ? $route : ''; ?>"
-          data-activetab="<?php echo isset($activeTab) ? $activeTab : ''; ?>"
+          data-action-route="<?php echo $_getvar('route', ''); ?>"
           data-hash="">
         <table class="popup-data">
             <tbody>
@@ -27,17 +33,13 @@
             </tbody>
         </table>
 
-        <input type="hidden" name="sk" value="">
         <input type="hidden" name="isAjax" value="1">
     </form>
     <div class="action-in-box">
         <button
-            class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconSave()->getClassButton(); ?>"
-            form="frmTags" title="<?php echo $icons->getIconSave()->getTitle(); ?>">
+                class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconSave()->getClassButton(); ?>"
+                form="frmTags" title="<?php echo $icons->getIconSave()->getTitle(); ?>">
             <i class="material-icons"><?php echo $icons->getIconSave()->getIcon(); ?></i>
         </button>
     </div>
 </div>
-<script type="text/javascript">
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/itemshow/user.inc b/app/modules/web/themes/material-blue/views/itemshow/user.inc
index e9ee55a7..83ba4e11 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/user.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/user.inc
@@ -1,25 +1,31 @@
 <?php
-/** @var $icons \SP\Core\UI\ThemeIcons */
-/** @var $user \SP\DataModel\UserData */
+/**
+ * @var \SP\DataModel\UserData $user
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+
+$user = $_getvar('user');
 ?>
 
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
 
     <div class="mdl-tabs mdl-js-tabs mdl-js-ripple-effect">
         <div class="mdl-tabs__tab-bar">
             <a href="#user-panel" class="mdl-tabs__tab is-active"><?php echo __('Usuario'); ?></a>
             <a href="#options-panel" class="mdl-tabs__tab"><?php echo __('Opciones'); ?></a>
 
-            <?php if ($isView): ?>
+            <?php if ($_getvar('isView')): ?>
                 <a href="#details-panel" class="mdl-tabs__tab"><?php echo __('Detalles'); ?></a>
             <?php endif; ?>
         </div>
 
         <form method="post" name="frmUsers" id="frmUsers" class="form-action"
               data-onsubmit="appMgmt/save"
-              data-action-route="<?php echo isset($route) ? $route : ''; ?>"
-              data-activetab="<?php echo isset($activeTab) ? $activeTab : ''; ?>"
+              data-action-route="<?php echo $_getvar('route', ''); ?>"
               data-hash="">
 
             <div class="mdl-tabs__panel is-active" id="user-panel">
@@ -33,7 +39,7 @@
                                 <input id="name" name="name" type="text" required
                                        class="mdl-textfield__input mdl-color-text--indigo-400"
                                        value="<?php echo $user->getName(); ?>"
-                                       maxlength="80" <?php echo $readonly; ?>>
+                                       maxlength="80" <?php echo $_getvar('readonly'); ?>>
                                 <label class="mdl-textfield__label"
                                        for="name"><?php echo __('Nombre de usuario completo'); ?></label>
                             </div>
@@ -47,7 +53,7 @@
                                 <input id="login" name="login" type="text" required
                                        class="mdl-textfield__input mdl-color-text--indigo-400"
                                        value="<?php echo $user->getLogin(); ?>"
-                                       maxlength="80" <?php echo $user->isLdap() ? 'readonly' : $readonly; ?>>
+                                       maxlength="80" <?php echo $user->isLdap() ? 'readonly' : $_getvar('readonly'); ?>>
                                 <label class="mdl-textfield__label"
                                        for="login"><?php echo __('Login de inicio de sesión'); ?></label>
                             </div>
@@ -58,7 +64,7 @@
                         </td>
                     </tr>
 
-                    <?php if ($isUseSSO): ?>
+                    <?php if ($_getvar('isUseSSO')): ?>
                         <tr>
                             <td class="descField"><?php echo __('Login SSO'); ?></td>
                             <td class="valField">
@@ -66,7 +72,7 @@
                                     <input id="login_sso" name="login_sso" type="text"
                                            class="mdl-textfield__input mdl-color-text--indigo-400"
                                            value="<?php echo $user->getSsoLogin(); ?>"
-                                           maxlength="100" <?php echo $readonly; ?>>
+                                           maxlength="100" <?php echo $_getvar('readonly'); ?>>
                                     <label class="mdl-textfield__label"
                                            for="login_sso"><?php echo __('Login de inicio de sesión con SSO'); ?></label>
                                 </div>
@@ -80,7 +86,8 @@
                             <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                                 <input id="email" name="email" type="email" required
                                        class="mdl-textfield__input mdl-color-text--indigo-400"
-                                       value="<?php echo $user->getEmail(); ?>" maxlength="50" <?php echo $readonly; ?>>
+                                       value="<?php echo $user->getEmail(); ?>"
+                                       maxlength="50" <?php echo $_getvar('readonly'); ?>>
                                 <label class="mdl-textfield__label"
                                        for="email"><?php echo __('Dirección de correo'); ?></label>
                             </div
@@ -88,7 +95,7 @@
 
                     </tr>
 
-                    <?php if (isset($createAction)): ?>
+                    <?php if ($_getvar('createAction')): ?>
                         <tr>
                             <td class="descField"><?php echo __('Clave'); ?></td>
                             <td class="valField">
@@ -124,10 +131,10 @@
                             <div class="lowres-title"><?php echo __('Perfil'); ?></div>
 
                             <select id="userprofile_id" name="userprofile_id"
-                                    class="select-box" required <?php echo $disabled; ?>>
+                                    class="select-box" required <?php echo $_getvar('disabled'); ?>>
                                 <option value=""><?php echo __('Seleccionar Perfil'); ?></option>
-                                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $profiles */
-                                foreach ($profiles as $profile): ?>
+                                <?php /** @var \SP\Mvc\View\Components\SelectItem $profile */
+                                foreach ($_getvar('profiles') as $profile): ?>
                                     <option
                                             value="<?php echo $profile->getId(); ?>" <?php echo ($profile->getId() === $user->getUserProfileId()) ? 'selected' : ''; ?>><?php echo $profile->getName(); ?></option>
                                 <?php endforeach; ?>
@@ -141,10 +148,10 @@
                             <div class="lowres-title"><?php echo __('Grupo'); ?></div>
 
                             <select id="usergroup_id" name="usergroup_id"
-                                    class="select-box" required <?php echo $disabled; ?>>
+                                    class="select-box" required <?php echo $_getvar('disabled'); ?>>
                                 <option value=""><?php echo __('Seleccionar Grupo'); ?></option>
-                                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $groups */
-                                foreach ($groups as $group): ?>
+                                <?php /** @var \SP\Mvc\View\Components\SelectItem $group */
+                                foreach ($_getvar('groups') as $group): ?>
                                     <option
                                             value="<?php echo $group->getId(); ?>" <?php echo ($group->getId() === $user->getUserGroupId()) ? 'selected' : ''; ?>><?php echo $group->getName(); ?></option>
                                 <?php endforeach; ?>
@@ -157,14 +164,14 @@
                         <td class="valField">
                             <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                         <textarea class="mdl-textfield__input" rows="3" id="notes" name="notes"
-                                  maxlength="1000" <?php echo $readonly; ?>><?php echo $user->getNotes(); ?></textarea>
+                                  maxlength="1000" <?php echo $_getvar('readonly'); ?>><?php echo $user->getNotes(); ?></textarea>
                                 <label class="mdl-textfield__label"
                                        for="notes"><?php echo __('Notas'); ?></label>
                             </div>
                         </td>
                     </tr>
 
-                    <?php if ($customFields): ?>
+                    <?php if ($_getvar('customFields')): ?>
                         <?php include $this->includeTemplate('aux-customfields', 'common'); ?>
                     <?php endif; ?>
 
@@ -178,14 +185,14 @@
                     <tr>
                         <td>
                             <ul class="user-list-action mdl-list">
-                                <?php if ($ctx_userIsAdminApp || $isDemo): ?>
+                                <?php if ($_getvar('ctx_userIsAdminApp') || $_getvar('isDemo')): ?>
                                     <li class="mdl-list__item mdl-list__item--two-line">
                                         <div class="mdl-switch__box">
                                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
                                                    for="adminapp_enabled">
                                                 <input type="checkbox" id="adminapp_enabled"
                                                        class="mdl-switch__input"
-                                                       name="adminapp_enabled" <?php echo $user->isAdminApp() ? 'checked' : ' '; ?> <?php echo $disabled; ?>/>
+                                                       name="adminapp_enabled" <?php echo $user->isAdminApp() ? 'checked' : ' '; ?> <?php echo $_getvar('disabled'); ?>/>
                                             </label>
                                         </div>
 
@@ -203,7 +210,7 @@
                                                    for="adminacc_enabled">
                                                 <input type="checkbox" id="adminacc_enabled"
                                                        class="mdl-switch__input"
-                                                       name="adminacc_enabled" <?php echo $user->isAdminAcc() ? 'checked' : ' '; ?> <?php echo $disabled; ?>/>
+                                                       name="adminacc_enabled" <?php echo $user->isAdminAcc() ? 'checked' : ' '; ?> <?php echo $_getvar('disabled'); ?>/>
                                             </label>
                                         </div>
 
@@ -216,14 +223,14 @@
                                     </li>
                                 <?php endif; ?>
 
-                                <?php if ($mailEnabled): ?>
+                                <?php if ($_getvar('mailEnabled')): ?>
                                     <li class="mdl-list__item mdl-list__item--two-line">
                                         <div class="mdl-switch__box">
                                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
                                                    for="changepass_enabled">
                                                 <input type="checkbox" id="changepass_enabled"
                                                        class="mdl-switch__input"
-                                                       name="changepass_enabled" <?php echo $user->isChangePass() ? 'checked' : ' '; ?> <?php echo $disabled; ?>/>
+                                                       name="changepass_enabled" <?php echo $user->isChangePass() ? 'checked' : ' '; ?> <?php echo $_getvar('disabled'); ?>/>
                                             </label>
                                         </div>
 
@@ -242,7 +249,7 @@
                                                for="disabled">
                                             <input type="checkbox" id="disabled"
                                                    class="mdl-switch__input"
-                                                   name="disabled" <?php echo $user->isDisabled() ? 'checked' : ' '; ?> <?php echo $disabled; ?>/>
+                                                   name="disabled" <?php echo $user->isDisabled() ? 'checked' : ' '; ?> <?php echo $_getvar('disabled'); ?>/>
                                         </label>
                                     </div>
 
@@ -258,7 +265,7 @@
                 </table>
             </div>
 
-            <?php if ($isView): ?>
+            <?php if ($_getvar('isView')): ?>
                 <div class="mdl-tabs__panel" id="details-panel">
                     <table class="popup-data">
                         <tbody>
@@ -304,7 +311,7 @@
                                 <div class="lowres-title"><?php echo __('Usado en'); ?></div>
                                 <div class="list-wrap">
                                     <ul class="mdl-list">
-                                        <?php foreach ($usage as $item): ?>
+                                        <?php foreach ($_getvar('usage') as $item): ?>
                                             <li class="mdl-list__item mdl-list__item" title="<?php echo $item->ref; ?>">
                                                 <span class="mdl-list__item-primary-content">
                                                 <i class="material-icons mdl-list__item-icon"><?php echo $item->icon; ?></i>
@@ -322,15 +329,12 @@
                 </div>
             <?php endif; ?>
 
-            <?php if (!$isView): ?>
-                <input type="hidden" name="isLdap" value="<?php echo $user->isLdap(); ?>"/>
-                <input type="hidden" name="sk" value="<?php echo $sk; ?>">
-                <input type="hidden" name="isAjax" value="1">
-            <?php endif; ?>
+            <input type="hidden" name="isLdap" value="<?php echo $user->isLdap(); ?>"/>
+            <input type="hidden" name="isAjax" value="1">
         </form>
     </div>
 
-    <?php if (!$isView): ?>
+    <?php if (!$_getvar('isView')): ?>
         <div class="action-in-box">
             <button form="frmUsers"
                     class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconSave()->getClassButton(); ?>"
@@ -340,6 +344,3 @@
         </div>
     <?php endif; ?>
 </div>
-<script type="text/javascript">
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
diff --git a/app/modules/web/themes/material-blue/views/itemshow/user_group.inc b/app/modules/web/themes/material-blue/views/itemshow/user_group.inc
index d9042437..f4608118 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/user_group.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/user_group.inc
@@ -1,17 +1,22 @@
 <?php
+/**
+ * @var \SP\DataModel\UserToUserGroupData $groupUsers
+ * @var \SP\DataModel\UserGroupData       $group
+ * @var \SP\Core\UI\ThemeIcons            $icons
+ * @var \SP\Config\ConfigData             $configData
+ * @var callable                          $_getvar
+ * @var \SP\Mvc\View\Template             $this
+ */
 
-/** @var $icons \SP\Core\UI\ThemeIcons */
-/** @var $group \SP\DataModel\UserGroupData */
-/** @var $groupUsers \SP\DataModel\UserToUserGroupData */
+$group = $_getvar('group');
 ?>
 
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
 
     <form method="post" name="frmGroups" id="frmGroups" class="form-action"
           data-onsubmit="appMgmt/save"
-          data-action-route="<?php echo isset($route) ? $route : ''; ?>"
-          data-activetab="<?php echo isset($activeTab) ? $activeTab : ''; ?>"
+          data-action-route="<?php echo $_getvar('route', ''); ?>"
           data-hash="">
         <table class="popup-data">
             <tbody>
@@ -46,12 +51,12 @@
                 <td class="valField">
                     <div class="lowres-title"><?php echo __('Usuarios'); ?></div>
 
-                    <?php if (!$isView): ?>
+                    <?php if (!$_getvar('isView')): ?>
                         <select id="selUsers" name="users[]" multiple="multiple" class="select-box"
-                                title="<?php echo __('Usuarios'); ?>" <?php echo $disabled; ?>>
+                                title="<?php echo __('Usuarios'); ?>" <?php echo $_getvar('disabled'); ?>>
                             <option value=""><?php echo __('Seleccionar Usuarios'); ?></option>
-                            <?php /** @var \SP\Mvc\View\Components\SelectItem[] $users */
-                            foreach ($users as $user): ?>
+                            <?php /** @var \SP\Mvc\View\Components\SelectItem $user */
+                            foreach ($_getvar('users') as $user): ?>
                                 <option
                                         value="<?php echo $user->getId(); ?>" <?php echo $user->isSelected() ? 'selected' : ''; ?>><?php echo $user->getName(); ?></option>
                             <?php endforeach; ?>
@@ -60,8 +65,8 @@
                         <div class="tag-list-box">
                             <div class="tag-list-body">
                                 <div class="tags-list-items">
-                                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $users */
-                                    foreach ($users as $user): ?>
+                                    <?php /** @var \SP\Mvc\View\Components\SelectItem $user */
+                                    foreach ($_getvar('users') as $user): ?>
                                         <?php if ($user->isSelected()): ?>
                                             <span class="tag"><?php echo $user->getName(); ?></span>
                                         <?php endif; ?>
@@ -73,18 +78,19 @@
                 </td>
             </tr>
 
-            <?php if ($customFields): ?>
+            <?php if ($_getvar('customFields')): ?>
                 <?php include $this->includeTemplate('aux-customfields', 'common'); ?>
             <?php endif; ?>
 
-            <?php if (isset($usedBy)): ?>
+            <?php if ($_getvar('usedBy')): ?>
                 <tr>
                     <td class="descField"><?php echo __('Usado por'); ?></td>
                     <td class="valField">
                         <div class="lowres-title"><?php echo __('Usado por'); ?></div>
                         <div class="list-wrap">
                             <ul class="mdl-list">
-                                <?php foreach ($usedBy as $user): ?>
+                                <?php /** @var stdClass $user */
+                                foreach ($_getvar('usedBy') as $user): ?>
                                     <li class="mdl-list__item mdl-list__item">
                                         <span class="mdl-list__item-primary-content">
                                             <i class="material-icons mdl-list__item-icon"
@@ -107,10 +113,9 @@
             </tbody>
         </table>
 
-        <input type="hidden" name="sk" value="">
         <input type="hidden" name="isAjax" value="1">
     </form>
-    <?php if (!$isView): ?>
+    <?php if (!$_getvar('isView')): ?>
         <div class="action-in-box">
             <button
                     class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconSave()->getClassButton(); ?>"
@@ -120,6 +125,3 @@
         </div>
     <?php endif; ?>
 </div>
-<script type="text/javascript">
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/itemshow/user_pass.inc b/app/modules/web/themes/material-blue/views/itemshow/user_pass.inc
index d2413fb3..f99c0ae3 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/user_pass.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/user_pass.inc
@@ -1,14 +1,21 @@
 <?php
-/** @var $icons \SP\Core\UI\ThemeIcons */
-/** @var $user \SP\DataModel\UserData */
+/**
+ * @var \SP\DataModel\UserData $user
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+
+$user = $_getvar('user');
 ?>
 
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
 
     <form method="post" name="updUsrPass" id="frmUpdUsrPass" class="form-action"
           data-onsubmit="appMgmt/save"
-          data-action-route="<?php echo $route; ?>"
+          data-action-route="<?php echo $_getvar('route', ''); ?>"
           data-hash="">
         <table class="popup-data">
             <tr>
@@ -61,7 +68,6 @@
                 </td>
             </tr>
         </table>
-        <input type="hidden" name="sk" value="<?php echo $sk; ?>">
     </form>
 
     <div class="action-in-box">
@@ -71,8 +77,4 @@
             <i class="material-icons"><?php echo $icons->getIconSave()->getIcon(); ?></i>
         </button>
     </div>
-</div>
-
-<script type="text/javascript">
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/itemshow/user_profile.inc b/app/modules/web/themes/material-blue/views/itemshow/user_profile.inc
index 123285a9..1ecf3165 100644
--- a/app/modules/web/themes/material-blue/views/itemshow/user_profile.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/user_profile.inc
@@ -1,18 +1,23 @@
 <?php
 /**
- * @var $icons       \SP\Core\UI\ThemeIcons
- * @var $profile     \SP\DataModel\UserProfileData
- * @var $profileData \SP\DataModel\ProfileData
+ * @var \SP\DataModel\ProfileData     $profileData
+ * @var \SP\DataModel\UserProfileData $profile
+ * @var \SP\Core\UI\ThemeIcons        $icons
+ * @var \SP\Config\ConfigData         $configData
+ * @var callable                      $_getvar
+ * @var \SP\Mvc\View\Template         $this
  */
+
+$profile = $_getvar('profile');
+$profileData = $_getvar('profileData');
 ?>
 
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
 
     <form method="post" name="frmProfile" id="frmProfile" class="form-action"
           data-onsubmit="appMgmt/save"
-          data-action-route="<?php echo isset($route) ? $route : ''; ?>"
-          data-activetab="<?php echo isset($activeTab) ? $activeTab : ''; ?>"
+          data-action-route="<?php echo $_getvar('route', ''); ?>"
           data-hash="">
 
         <div class="mdl-tabs mdl-js-tabs mdl-js-ripple-effect">
@@ -37,7 +42,7 @@
                                    for="profile_accadd">
                                 <input type="checkbox" id="profile_accadd"
                                        class="mdl-switch__input"
-                                       name="profile_accadd" <?php echo $profileData->isAccAdd() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_accadd" <?php echo $profileData->isAccAdd() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -53,7 +58,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_accview">
                                 <input type="checkbox" id="profile_accview"
                                        class="mdl-switch__input"
-                                       name="profile_accview" <?php echo $profileData->isAccView() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_accview" <?php echo $profileData->isAccView() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -70,7 +75,7 @@
                                    for="profile_accviewpass">
                             <input type="checkbox" id="profile_accviewpass"
                                    class="mdl-switch__input"
-                                   name="profile_accviewpass" <?php echo $profileData->isAccViewPass() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                   name="profile_accviewpass" <?php echo $profileData->isAccViewPass() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -86,7 +91,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_accviewhistory">
                                 <input type="checkbox" id="profile_accviewhistory"
                                        class="mdl-switch__input"
-                                       name="profile_accviewhistory" <?php echo $profileData->isAccViewHistory() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_accviewhistory" <?php echo $profileData->isAccViewHistory() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -102,7 +107,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_accedit">
                                 <input type="checkbox" id="profile_accedit"
                                        class="mdl-switch__input"
-                                       name="profile_accedit" <?php echo $profileData->isAccEdit() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_accedit" <?php echo $profileData->isAccEdit() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -118,7 +123,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_acceditpass">
                                 <input type="checkbox" id="profile_acceditpass"
                                        class="mdl-switch__input"
-                                       name="profile_acceditpass" <?php echo $profileData->isAccEditPass() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_acceditpass" <?php echo $profileData->isAccEditPass() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -134,7 +139,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_accdel">
                                 <input type="checkbox" id="profile_accdel"
                                        class="mdl-switch__input"
-                                       name="profile_accdel" <?php echo $profileData->isAccDelete() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_accdel" <?php echo $profileData->isAccDelete() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -150,7 +155,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_accfiles">
                                 <input type="checkbox" id="profile_accfiles"
                                        class="mdl-switch__input"
-                                       name="profile_accfiles" <?php echo $profileData->isAccFiles() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_accfiles" <?php echo $profileData->isAccFiles() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -166,7 +171,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_accpublinks">
                                 <input type="checkbox" id="profile_accpublinks"
                                        class="mdl-switch__input"
-                                       name="profile_accpublinks" <?php echo $profileData->isAccPublicLinks() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_accpublinks" <?php echo $profileData->isAccPublicLinks() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -182,7 +187,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_accprivate">
                                 <input type="checkbox" id="profile_accprivate"
                                        class="mdl-switch__input"
-                                       name="profile_accprivate" <?php echo $profileData->isAccPrivate() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_accprivate" <?php echo $profileData->isAccPrivate() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -198,7 +203,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_accprivategroup">
                                 <input type="checkbox" id="profile_accprivategroup"
                                        class="mdl-switch__input"
-                                       name="profile_accprivategroup" <?php echo $profileData->isAccPrivateGroup() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_accprivategroup" <?php echo $profileData->isAccPrivateGroup() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -214,7 +219,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_accpermissions">
                                 <input type="checkbox" id="profile_accpermissions"
                                        class="mdl-switch__input"
-                                       name="profile_accpermissions" <?php echo $profileData->isAccPermission() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_accpermissions" <?php echo $profileData->isAccPermission() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -230,7 +235,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_accglobalsearch">
                                 <input type="checkbox" id="profile_accglobalsearch"
                                        class="mdl-switch__input"
-                                       name="profile_accglobalsearch" <?php echo $profileData->isAccGlobalSearch() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_accglobalsearch" <?php echo $profileData->isAccGlobalSearch() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -250,7 +255,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_users">
                                 <input type="checkbox" id="profile_users"
                                        class="mdl-switch__input"
-                                       name="profile_users" <?php echo $profileData->isMgmUsers() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_users" <?php echo $profileData->isMgmUsers() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -266,7 +271,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_groups">
                                 <input type="checkbox" id="profile_groups"
                                        class="mdl-switch__input"
-                                       name="profile_groups" <?php echo $profileData->isMgmGroups() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_groups" <?php echo $profileData->isMgmGroups() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -282,7 +287,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_profiles">
                                 <input type="checkbox" id="profile_profiles"
                                        class="mdl-switch__input"
-                                       name="profile_profiles" <?php echo $profileData->isMgmProfiles() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_profiles" <?php echo $profileData->isMgmProfiles() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -298,7 +303,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_categories">
                                 <input type="checkbox" id="profile_categories"
                                        class="mdl-switch__input"
-                                       name="profile_categories" <?php echo $profileData->isMgmCategories() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_categories" <?php echo $profileData->isMgmCategories() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -314,7 +319,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_tags">
                                 <input type="checkbox" id="profile_tags"
                                        class="mdl-switch__input"
-                                       name="profile_tags" <?php echo $profileData->isMgmTags() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_tags" <?php echo $profileData->isMgmTags() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -330,7 +335,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_customers">
                                 <input type="checkbox" id="profile_customers"
                                        class="mdl-switch__input"
-                                       name="profile_customers" <?php echo $profileData->isMgmCustomers() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_customers" <?php echo $profileData->isMgmCustomers() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -346,7 +351,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_customfields">
                                 <input type="checkbox" id="profile_customfields"
                                        class="mdl-switch__input"
-                                       name="profile_customfields" <?php echo $profileData->isMgmCustomFields() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_customfields" <?php echo $profileData->isMgmCustomFields() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -362,7 +367,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_apitokens">
                                 <input type="checkbox" id="profile_apitokens"
                                        class="mdl-switch__input"
-                                       name="profile_apitokens" <?php echo $profileData->isMgmApiTokens() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_apitokens" <?php echo $profileData->isMgmApiTokens() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -378,7 +383,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_publinks">
                                 <input type="checkbox" id="profile_publinks"
                                        class="mdl-switch__input"
-                                       name="profile_publinks" <?php echo $profileData->isMgmPublicLinks() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_publinks" <?php echo $profileData->isMgmPublicLinks() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -394,7 +399,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_accounts">
                                 <input type="checkbox" id="profile_accounts"
                                        class="mdl-switch__input"
-                                       name="profile_accounts" <?php echo $profileData->isMgmAccounts() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_accounts" <?php echo $profileData->isMgmAccounts() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -410,7 +415,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_files">
                                 <input type="checkbox" id="profile_files"
                                        class="mdl-switch__input"
-                                       name="profile_files" <?php echo $profileData->isMgmFiles() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_files" <?php echo $profileData->isMgmFiles() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -426,7 +431,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_items_preset">
                                 <input type="checkbox" id="profile_items_preset"
                                        class="mdl-switch__input"
-                                       name="profile_items_preset" <?php echo $profileData->isMgmItemsPreset() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_items_preset" <?php echo $profileData->isMgmItemsPreset() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -446,7 +451,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_config">
                                 <input type="checkbox" id="profile_config"
                                        class="mdl-switch__input"
-                                       name="profile_config" <?php echo $profileData->isConfigGeneral() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_config" <?php echo $profileData->isConfigGeneral() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -462,7 +467,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_configmpw">
                                 <input type="checkbox" id="profile_configmpw"
                                        class="mdl-switch__input"
-                                       name="profile_configmpw" <?php echo $profileData->isConfigEncryption() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_configmpw" <?php echo $profileData->isConfigEncryption() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -478,7 +483,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_configback">
                                 <input type="checkbox" id="profile_configback"
                                        class="mdl-switch__input"
-                                       name="profile_configback" <?php echo $profileData->isConfigBackup() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_configback" <?php echo $profileData->isConfigBackup() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -494,7 +499,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_configimport">
                                 <input type="checkbox" id="profile_configimport"
                                        class="mdl-switch__input"
-                                       name="profile_configimport" <?php echo $profileData->isConfigImport() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_configimport" <?php echo $profileData->isConfigImport() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -514,7 +519,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_eventlog">
                                 <input type="checkbox" id="profile_eventlog"
                                        class="mdl-switch__input"
-                                       name="profile_eventlog" <?php echo $profileData->isEvl() ? 'CHECKED' : ''; ?> <?php echo $disabled; ?>/>
+                                       name="profile_eventlog" <?php echo $profileData->isEvl() ? 'CHECKED' : ''; ?> <?php echo $_getvar('disabled'); ?>/>
                             </label>
                         </span>
                     </li>
@@ -531,21 +536,21 @@
                         <input id="profile_name" name="profile_name" type="text" required
                                class="mdl-textfield__input"
                                value="<?php echo $profile->getName(); ?>"
-                               maxlength="50" <?php echo $readonly; ?>>
+                               maxlength="50" <?php echo $_getvar('readonly'); ?>>
                         <label class="mdl-textfield__label"
                                for="profile_name"><?php echo __('Nombre del perfil'); ?></label>
                     </div>
                 </td>
             </tr>
 
-            <?php if ($isView): ?>
+            <?php if ($_getvar('isView')): ?>
                 <tr>
                     <td class="descField"><?php echo __('Usado por'); ?></td>
                     <td class="valField">
                         <div class="lowres-title"><?php echo __('Usado por'); ?></div>
                         <div class="list-wrap">
                             <ul class="mdl-list">
-                                <?php foreach ($usedBy as $user): ?>
+                                <?php foreach ($_getvar('usedBy') as $user): ?>
                                     <li class="mdl-list__item mdl-list__item">
                                 <span class="mdl-list__item-primary-content">
                                 <i class="material-icons mdl-list__item-icon">person</i>
@@ -563,13 +568,10 @@
             </tbody>
         </table>
 
-        <?php if (!$isView): ?>
-            <input type="hidden" name="sk" value="">
-            <input type="hidden" name="isAjax" value="1">
-        <?php endif; ?>
+        <input type="hidden" name="isAjax" value="1">
     </form>
 
-    <?php if (!$isView): ?>
+    <?php if (!$_getvar('isView')): ?>
         <div class="action-in-box">
             <button form="frmProfile"
                     class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconSave()->getClassButton(); ?>"
@@ -579,6 +581,3 @@
         </div>
     <?php endif; ?>
 </div>
-<script type="text/javascript">
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/login/index.inc b/app/modules/web/themes/material-blue/views/login/index.inc
index cad2aa7f..dddb182c 100644
--- a/app/modules/web/themes/material-blue/views/login/index.inc
+++ b/app/modules/web/themes/material-blue/views/login/index.inc
@@ -1,3 +1,12 @@
+<?php
+/**
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+?>
+
 <div id="box-pub-noheader">
     <div class="box-spacer"></div>
     <div id="box-login" class="box-form round">
@@ -49,13 +58,14 @@
                     </div>
                 </div>
 
-                <?php if (isset($from, $from_hash)): ?>
-                    <input type="hidden" name="from" value="<?php echo $from; ?>"/>
-                    <input type="hidden" name="h" value="<?php echo $from_hash; ?>"/>
+                <?php if ($_getvar('from') && $_getvar('from_hash')): ?>
+                    <input type="hidden" name="from" value="<?php echo $_getvar('from'); ?>"/>
+                    <input type="hidden" name="h" value="<?php echo $_getvar('from_hash'); ?>"/>
                 <?php endif; ?>
 
                 <input type="hidden" name="login" value="1"/>
                 <input type="hidden" name="isAjax" value="1"/>
+                <input type="hidden" name="sk" value="<?php echo $sk; ?>">
             </fieldset>
             <div id="box-buttons">
                 <button id="btnLogin" type="submit" form="frmLogin"
@@ -67,18 +77,18 @@
         </form>
 
         <!-- Close boxData -->
-        <?php if ($mailEnabled): ?>
+        <?php if ($_getvar('mailEnabled')): ?>
             <div id="box-actions">
                 <a href="index.php?r=userPassReset"><?php echo __('¿Olvidó su clave?'); ?></a>
             </div>
         <?php endif; ?>
     </div><!-- Close boxLogin -->
 
-    <?php if (isset($updated)): ?>
+    <?php if ($_getvar('updated')): ?>
         <div id="box-updated" class="round5"><?php echo __('Aplicación actualizada correctamente'); ?></div>
     <?php endif; ?>
 
-    <?php if ($isDemoMode): ?>
+    <?php if ($_getvar('isDemo')): ?>
         <div id="demo-info">
             <ul>
                 <li title="<?php echo __('Usuario'); ?>">
diff --git a/app/modules/web/themes/material-blue/views/main/update.inc b/app/modules/web/themes/material-blue/views/main/update.inc
index b99dc502..20982a2c 100644
--- a/app/modules/web/themes/material-blue/views/main/update.inc
+++ b/app/modules/web/themes/material-blue/views/main/update.inc
@@ -1,25 +1,34 @@
-<?php if (isset($numNotices) && $numNotices > 0): ?>
+<?php
+/**
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+?>
+
+<?php if ($_getvar('numNotices', 0) > 0): ?>
     <a href="https://github.com/nuxsmin/sysPass/labels/Notices" target="_blank">
         <div id="notices-info" class="material-icons mdl-badge mdl-badge--overlap mdl-color-text--amber-200"
-             data-badge="<?php echo $numNotices; ?>">feedback
+             data-badge="<?php echo $_getvar('numNotices'); ?>">feedback
         </div>
     </a>
     <span for="notices-info"
-          class="mdl-tooltip mdl-tooltip--top"><?php echo $noticesTitle; ?></span>
+          class="mdl-tooltip mdl-tooltip--top"><?php echo $_getvar('noticesTitle'); ?></span>
 <?php endif; ?>
 
-<?php if ($hasUpdates): ?>
-    <a id="link-updates" href="<?php echo $url; ?>" target="_blank">
-        <?php echo $title; ?>
+<?php if ($_getvar('hasUpdates')): ?>
+    <a id="link-updates" href="<?php echo $_getvar('url'); ?>" target="_blank">
+        <?php echo $_getvar('title'); ?>
         &nbsp;&nbsp;
         <div id="help-hasupdates" class="icon material-icons mdl-color-text--indigo-200">cloud_download</div>
     </a>
-    <span for="link-updates" class="mdl-tooltip mdl-tooltip--top"><?php echo $description; ?></span>
-<?php elseif ($updateStatus === true): ?>
+    <span for="link-updates" class="mdl-tooltip mdl-tooltip--top"><?php echo $_getvar('description'); ?></span>
+<?php elseif ($_getvar('updateStatus') === true): ?>
     <div id="updates-info" class="icon material-icons mdl-color-text--teal-200">check_circle</div>
     <span for="updates-info"
           class="mdl-tooltip mdl-tooltip--top"><?php echo __('Actualizado'); ?></span>
-<?php elseif ($updateStatus === false): ?>
+<?php elseif ($_getvar('updateStatus') === false): ?>
     <div id="updates-info" class="icon material-icons mdl-color-text--amber-200">
         warning
     </div>
diff --git a/app/modules/web/themes/material-blue/views/main/upgrade.inc b/app/modules/web/themes/material-blue/views/main/upgrade.inc
index b7b52b25..ff9d5e4f 100644
--- a/app/modules/web/themes/material-blue/views/main/upgrade.inc
+++ b/app/modules/web/themes/material-blue/views/main/upgrade.inc
@@ -1,16 +1,24 @@
+<?php
+/**
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+?>
 <main class="mdl-layout__content">
     <div id="actions" class="upgrade">
         <div id="page-title">
             <h1><?php use SP\Util\Version;
 
-                printf(__('Actualización  %s'), $upgradeVersion); ?></h1>
+                printf(__('Actualización  %s'), $_getvar('upgradeVersion')); ?></h1>
         </div>
 
         <form id="frmUpgrade" method="get" class="form-action" data-onsubmit="main/upgrade">
             <fieldset>
-                <?php if ($type === 'db'): ?>
+                <?php if ($_getvar('type') === 'db'): ?>
                     <legend><?php echo __('Actualización de BBDD'); ?></legend>
-                <?php elseif ($type === 'app'): ?>
+                <?php elseif ($_getvar('type') === 'app'): ?>
                     <legend><?php echo __('Actualización de Aplicación'); ?></legend>
                 <?php endif; ?>
 
@@ -29,7 +37,9 @@
                     <?php echo __('Este código se encuentra en el archivo de configuración de sysPass con la etiqueta "upgradeKey"'); ?>
                 </div>
 
-                <?php if (Version::checkVersion($version, '130.16011001') && count($constraints) > 0): ?>
+                <?php if (Version::checkVersion($_getvar('version'), '130.16011001')
+                    && count($_getvar('constraints')) > 0):
+                    ?>
                     <div>
                         <ul class="errors">
                             <li class="msg-warning">
@@ -42,13 +52,16 @@
                     </div>
                     <div>
                         <ul class="errors">
-                            <?php foreach ($constraints as $msg): ?>
+                            <?php foreach ($_getvar('constraints') as $msg): ?>
                                 <li class="msg-warning"><?php echo $msg; ?></li>
                             <?php endforeach; ?>
                         </ul>
                     </div>
 
-                    <?php if ($checkConstraints->accounts_user > 0
+                    <?php
+                    $checkConstraints = $_getvar('checkConstraints');
+
+                    if ($checkConstraints->accounts_user > 0
                         || $checkConstraints->accounts_useredit > 0
                         || $checkConstraints->accountshistory_user > 0
                         || $checkConstraints->accountshistory_useredit > 0
@@ -63,61 +76,58 @@
                     <?php endif; ?>
 
                     <?php if ($checkConstraints->accounts_category > 0
-                        || $checkConstraints->accountshistory_category > 0
-                    ): ?>
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                            <input id="categoryid" name="categoryid" type="number"
-                                   class="mdl-textfield__input mdl-color-text--indigo-400"
-                                   autocomplete="off" min="0" max="1000" value="0">
-                            <label class="mdl-textfield__label"
-                                   for="categoryid"><?php echo __('Introducir un ID de categoría válido para cuentas'); ?></label>
-                        </div>
-                    <?php endif; ?>
-
-                    <?php if ($checkConstraints->accounts_customer > 0
-                        || $checkConstraints->accountshistory_customer > 0
-                    ): ?>
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                            <input id="customerid" name="customerid" type="number"
-                                   class="mdl-textfield__input mdl-color-text--indigo-400"
-                                   autocomplete="off" min="0" max="1000" value="0">
-                            <label class="mdl-textfield__label"
-                                   for="customerid"><?php echo __('Introducir un ID de cliente válido para cuentas'); ?></label>
-                        </div>
-                    <?php endif; ?>
-
-                    <?php if ($checkConstraints->users_group > 0
-                        || $checkConstraints->accounts_group > 0
-                        || $checkConstraints->accountshistory_group > 0
-                    ): ?>
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                            <input id="groupid" name="groupid" type="number"
-                                   class="mdl-textfield__input mdl-color-text--indigo-400"
-                                   autocomplete="off" min="0" max="1000" value="0">
-                            <label class="mdl-textfield__label"
-                                   for="groupid"><?php echo __('Introducir un ID de grupo válido para usuarios'); ?></label>
-                        </div>
-                    <?php endif; ?>
-
-                    <?php if ($checkConstraints->users_profile > 0): ?>
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                            <input id="profileid" name="profileid" type="number"
-                                   class="mdl-textfield__input mdl-color-text--indigo-400"
-                                   autocomplete="off" min="0" max="1000" value="0">
-                            <label class="mdl-textfield__label"
-                                   for="profileid"><?php echo __('Introducir un ID de perfil válido para usuarios'); ?></label>
-                        </div>
-                    <?php endif; ?>
+                    || $checkConstraints->accountshistory_category > 0): ?>
+                    <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                        <input id="categoryid" name="categoryid" type="number"
+                               class="mdl-textfield__input mdl-color-text--indigo-400"
+                               autocomplete="off" min="0" max="1000" value="0">
+                        <label class="mdl-textfield__label"
+                               for="categoryid"><?php echo __('Introducir un ID de categoría válido para cuentas'); ?></label>
+                    </div>
                 <?php endif; ?>
 
-                <?php if (Version::checkVersion($version, '210.17022601')): ?>
+                    <?php if ($checkConstraints->accounts_customer > 0
+                    || $checkConstraints->accountshistory_customer > 0): ?>
+                    <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                        <input id="customerid" name="customerid" type="number"
+                               class="mdl-textfield__input mdl-color-text--indigo-400"
+                               autocomplete="off" min="0" max="1000" value="0">
+                        <label class="mdl-textfield__label"
+                               for="customerid"><?php echo __('Introducir un ID de cliente válido para cuentas'); ?></label>
+                    </div>
+                <?php endif; ?>
+
+                    <?php if ($checkConstraints->users_group > 0
+                    || $checkConstraints->accounts_group > 0
+                    || $checkConstraints->accountshistory_group > 0): ?>
+                    <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                        <input id="groupid" name="groupid" type="number"
+                               class="mdl-textfield__input mdl-color-text--indigo-400"
+                               autocomplete="off" min="0" max="1000" value="0">
+                        <label class="mdl-textfield__label"
+                               for="groupid"><?php echo __('Introducir un ID de grupo válido para usuarios'); ?></label>
+                    </div>
+                <?php endif; ?>
+
+                    <?php if ($checkConstraints->users_profile > 0): ?>
+                    <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                        <input id="profileid" name="profileid" type="number"
+                               class="mdl-textfield__input mdl-color-text--indigo-400"
+                               autocomplete="off" min="0" max="1000" value="0">
+                        <label class="mdl-textfield__label"
+                               for="profileid"><?php echo __('Introducir un ID de perfil válido para usuarios'); ?></label>
+                    </div>
+                <?php endif; ?>
+                <?php endif; ?>
+
+                <?php if (Version::checkVersion($_getvar('version'), '210.17022601')): ?>
                     <div>
                         <ul class="errors">
                             <li class="msg-warning">
                                 <i class="icon material-icons <?php echo $icons->getIconWarning()->getClass(); ?>"><?php echo $icons->getIconWarning()->getIcon(); ?></i>
                                 <?php echo __('Esta actualización utiliza un nuevo esquema de encriptación, por lo que es necesario reencriptar los datos almacenados'); ?>
                                 <br>
-                                <strong><?php printf(__('Se van a actualizar %s cuentas. Este proceso puede tardar algo de tiempo.'), $numAccounts); ?></strong>
+                                <strong><?php printf(__('Se van a actualizar %s cuentas. Este proceso puede tardar algo de tiempo.'), $_getvar('numAccounts')); ?></strong>
                                 <br>
                                 <?php printf(__('Para más información consulte: %s'), '<a target="_blank" href="https://doc.syspass.org">https://doc.syspass.org</a>'); ?>
                             </li>
@@ -140,9 +150,9 @@
                                for="userlogin"><?php echo __('Introducir login de usuario válido'); ?></label>
                     </div>
 
-                    <?php if ($numAccounts >= 500): ?>
+                    <?php if ($_getvar('numAccounts') >= 500): ?>
                         <input type="hidden" name="useTask" value="1">
-                        <input type="hidden" name="taskId" value="<?php echo $taskId; ?>">
+                        <input type="hidden" name="taskId" value="<?php echo $_getvar('taskId'); ?>">
                         <input type="hidden" name="lock" value="upgrade">
                     <?php endif; ?>
                 <?php endif; ?>
@@ -152,9 +162,9 @@
                     <span class="mdl-checkbox__label"><?php echo __('He realizado una copia de seguridad completa de sysPass'); ?></span>
                 </label>
 
-                <input type="hidden" name="a" value="<?php echo $action; ?>">
-                <input type="hidden" name="type" value="<?php echo $type; ?>">
-                <input type="hidden" name="version" value="<?php echo $version; ?>">
+                <input type="hidden" name="a" value="<?php echo $_getvar('action'); ?>">
+                <input type="hidden" name="type" value="<?php echo $_getvar('type'); ?>">
+                <input type="hidden" name="version" value="<?php echo $_getvar('version'); ?>">
                 <input type="hidden" name="upgrade" value="1">
                 <input type="hidden" name="isAjax" value="1">
             </fieldset>
diff --git a/app/modules/web/themes/material-blue/views/notification/notification.inc b/app/modules/web/themes/material-blue/views/notification/notification.inc
index 8c5abdc4..573f579e 100644
--- a/app/modules/web/themes/material-blue/views/notification/notification.inc
+++ b/app/modules/web/themes/material-blue/views/notification/notification.inc
@@ -1,14 +1,21 @@
 <?php
-/** @var  \SP\DataModel\NotificationData $notification */
-/** @var  \SP\Core\UI\ThemeIcons $icons */
+/**
+ * @var  \SP\DataModel\NotificationData $notification
+ * @var \SP\Core\UI\ThemeIcons          $icons
+ * @var \SP\Config\ConfigData           $configData
+ * @var callable                        $_getvar
+ * @var \SP\Mvc\View\Template           $this
+ */
+
+$notification = $_getvar('notification');
 ?>
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
 
     <form method="post" name="frmNotices" id="frmNotices" class="form-action"
           data-onsubmit="notification/save"
-          data-route="<?php echo isset($route) ? $route : ''; ?>"
-          data-action-next="<?php echo $nextAction; ?>"
+          data-route="<?php echo $_getvar('route', ''); ?>"
+          data-action-next="<?php echo $_getvar('nextAction'); ?>"
           data-hash="">
         <table class="popup-data">
             <tbody>
@@ -18,7 +25,7 @@
                     <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                         <input id="notification_type" name="notification_type" type="text"
                                class="mdl-textfield__input mdl-color-text--indigo-400"
-                               value="<?php echo $notification->getType(); ?>" <?php echo $disabled; ?>>
+                               value="<?php echo $notification->getType(); ?>" <?php echo $_getvar('disabled'); ?>>
                         <label class="mdl-textfield__label"
                                for="notification_type"><?php echo __('Tipo'); ?></label>
                     </div>
@@ -30,20 +37,20 @@
                     <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                         <input id="notification_component" name="notification_component" type="text"
                                class="mdl-textfield__input mdl-color-text--indigo-400"
-                               value="<?php echo $notification->getComponent(); ?>" <?php echo $disabled; ?>>
+                               value="<?php echo $notification->getComponent(); ?>" <?php echo $_getvar('disabled'); ?>>
                         <label class="mdl-textfield__label"
                                for="notification_component"><?php echo __('Componente'); ?></label>
                     </div>
                 </td>
             </tr>
-            <?php if ($isView): ?>
+            <?php if ($_getvar('isView')): ?>
                 <tr>
                     <td class="descField"><?php echo __('Fecha'); ?></td>
                     <td class="valField">
                         <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                             <input id="notification_date" name="notification_date" type="text"
                                    class="mdl-textfield__input mdl-color-text--indigo-400"
-                                   value="<?php echo \SP\Util\DateUtil::getDateFromUnix($notification->getDate()); ?>" <?php echo $disabled; ?>>
+                                   value="<?php echo \SP\Util\DateUtil::getDateFromUnix($notification->getDate()); ?>" <?php echo $_getvar('disabled'); ?>>
                             <label class="mdl-textfield__label"
                                    for="notification_date"><?php echo __('Fecha'); ?></label>
                         </div>
@@ -56,24 +63,24 @@
                     <div class="mdl-textfield mdl-js-textfield">
                         <textarea class="mdl-textfield__input mdl-color-text--indigo-400" type="text" rows="3"
                                   id="notification_description"
-                                  name="notification_description" <?php echo $readonly; ?>><?php echo $notification->getDescription(); ?></textarea>
+                                  name="notification_description" <?php echo $_getvar('readonly'); ?>><?php echo $notification->getDescription(); ?></textarea>
                         <label class="mdl-textfield__label"
                                for="notification_description"><?php echo __('Descripción'); ?></label>
                     </div>
                 </td>
             </tr>
 
-            <?php if (!$isView && $ctx_userIsAdminApp): ?>
+            <?php if (!$_getvar('isView') && $_getvar('ctx_userIsAdminApp')): ?>
                 <tr>
                     <td class="descField"><?php echo __('Usuario'); ?></td>
                     <td class="valField">
                         <div class="lowres-title"><?php echo __('Usuario'); ?></div>
 
                         <select id="notification_user" name="notification_user"
-                                class="select-box select-box-deselect" <?php echo $disabled; ?>>
+                                class="select-box select-box-deselect" <?php echo $_getvar('disabled'); ?>>
                             <option value=""><?php echo __('Seleccionar Usuario'); ?></option>
-                            <?php /** @var \SP\Mvc\View\Components\SelectItem[] $users */
-                            foreach ($users as $user): ?>
+                            <?php /** @var \SP\Mvc\View\Components\SelectItem $user */
+                            foreach ($_getvar('users') as $user): ?>
                                 <option
                                         value="<?php echo $user->getId(); ?>" <?php echo $user->isSelected() ? 'selected' : ''; ?>><?php echo $user->getName(); ?></option>
                             <?php endforeach; ?>
@@ -88,7 +95,7 @@
                                title="<?php echo __('Notificación global'); ?>">
                             <input type="checkbox" id="notification_sticky"
                                    class="mdl-switch__input mdl-color-text--indigo-400"
-                                   name="notification_sticky" <?php echo $notification->isSticky() ? 'checked' : ' '; ?> <?php echo $disabled; ?>/>
+                                   name="notification_sticky" <?php echo $notification->isSticky() ? 'checked' : ' '; ?> <?php echo $_getvar('disabled'); ?>/>
                             <span class="mdl-switch__label"><?php echo __('Global'); ?></span>
                         </label>
 
@@ -96,7 +103,7 @@
                                title="<?php echo __('Sólo para administradores de la aplicación'); ?>">
                             <input type="checkbox" id="notification_onlyadmin"
                                    class="mdl-switch__input mdl-color-text--indigo-400"
-                                   name="notification_onlyadmin" <?php echo $notification->isOnlyAdmin() ? 'checked' : ' '; ?> <?php echo $disabled; ?>/>
+                                   name="notification_onlyadmin" <?php echo $notification->isOnlyAdmin() ? 'checked' : ' '; ?> <?php echo $_getvar('disabled'); ?>/>
                             <span class="mdl-switch__label"><?php echo __('Solo Admins'); ?></span>
                         </label>
 
@@ -104,7 +111,7 @@
                                title="<?php echo __('Leída'); ?>">
                             <input type="checkbox" id="notification_checkout"
                                    class="mdl-switch__input mdl-color-text--indigo-400"
-                                   name="notification_checkout" <?php echo $notification->isChecked() ? 'checked' : ' '; ?> <?php echo $disabled; ?>/>
+                                   name="notification_checkout" <?php echo $notification->isChecked() ? 'checked' : ' '; ?> <?php echo $_getvar('disabled'); ?>/>
                             <span class="mdl-switch__label"><?php echo __('Leída'); ?></span>
                         </label>
                     </td>
@@ -114,7 +121,7 @@
             </tbody>
         </table>
     </form>
-    <?php if (!$isView): ?>
+    <?php if (!$_getvar('isView')): ?>
         <div class="action-in-box">
             <button
                     class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconSave()->getClassButton(); ?>"
diff --git a/app/modules/web/themes/material-blue/views/plugin/plugin.inc b/app/modules/web/themes/material-blue/views/plugin/plugin.inc
index ecec33de..513603b3 100644
--- a/app/modules/web/themes/material-blue/views/plugin/plugin.inc
+++ b/app/modules/web/themes/material-blue/views/plugin/plugin.inc
@@ -2,12 +2,18 @@
 /**
  * @var  \SP\DataModel\PluginData   $plugin
  * @var  \SP\Plugin\PluginInterface $pluginInfo
- * @var  \SP\Core\UI\ThemeIcons     $icons
+ * @var \SP\Core\UI\ThemeIcons      $icons
+ * @var \SP\Config\ConfigData       $configData
+ * @var callable                    $_getvar
+ * @var \SP\Mvc\View\Template       $this
  */
+
+$plugin = $_getvar('plugin');
+$pluginInfo = $_getvar('pluginInfo');
 ?>
 
 <div id="box-popup">
-    <h2 class="center"><?php echo $header; ?><i class="btn-popup-close material-icons">close</i></h2>
+    <h2 class="center"><?php echo $_getvar('header'); ?><i class="btn-popup-close material-icons">close</i></h2>
 
     <form method="post" name="frmCategories" id="frmPlugins">
         <table class="popup-data">
@@ -18,7 +24,7 @@
                     <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                         <input id="name" name="name" type="text"
                                class="mdl-textfield__input mdl-color-text--indigo-400"
-                               value="<?php echo $plugin->getName(); ?>" <?php echo $readonly; ?>>
+                               value="<?php echo $plugin->getName(); ?>" <?php echo $_getvar('readonly'); ?>>
                         <label class="mdl-textfield__label"
                                for="name"><?php echo __('Nombre del plugin'); ?></label>
                     </div>
@@ -30,7 +36,7 @@
                     <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                         <input id="version" name="version" type="text"
                                class="mdl-textfield__input mdl-color-text--indigo-400"
-                               value="<?php echo implode('.', $pluginInfo->getVersion()); ?>" <?php echo $readonly; ?>>
+                               value="<?php echo implode('.', $pluginInfo->getVersion()); ?>" <?php echo $_getvar('readonly'); ?>>
                         <label class="mdl-textfield__label"
                                for="version"><?php echo __('Versión del plugin'); ?></label>
                     </div>
@@ -42,7 +48,7 @@
                     <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                         <input id="compatible_version" name="compatible_version" type="text"
                                class="mdl-textfield__input mdl-color-text--indigo-400"
-                               value="<?php echo implode('.', $pluginInfo->getCompatibleVersion()); ?>" <?php echo $readonly; ?>>
+                               value="<?php echo implode('.', $pluginInfo->getCompatibleVersion()); ?>" <?php echo $_getvar('readonly'); ?>>
                         <label class="mdl-textfield__label"
                                for="compatible_version"><?php echo __('Versión de sysPass compatible'); ?></label>
                     </div>
@@ -54,7 +60,7 @@
                     <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                         <input id="author" name="author" type="text"
                                class="mdl-textfield__input mdl-color-text--indigo-400"
-                               value="<?php echo $pluginInfo->getAuthor(); ?>" <?php echo $readonly; ?>>
+                               value="<?php echo $pluginInfo->getAuthor(); ?>" <?php echo $_getvar('readonly'); ?>>
                         <label class="mdl-textfield__label"
                                for="author"><?php echo __('Autor del plugin'); ?></label>
                     </div>
@@ -81,7 +87,4 @@
             </tr>
         </table>
     </form>
-</div>
-<script>
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/upgrade/index.inc b/app/modules/web/themes/material-blue/views/upgrade/index.inc
index 7d0f39ee..72016f3b 100644
--- a/app/modules/web/themes/material-blue/views/upgrade/index.inc
+++ b/app/modules/web/themes/material-blue/views/upgrade/index.inc
@@ -1,6 +1,6 @@
 <?php
 /**
- * @var \SP\Mvc\View\Template $this
+ * @var \SP\Mvc\View\Template  $this
  * @var \SP\Core\UI\ThemeIcons $icons
  */
 ?>
diff --git a/app/modules/web/themes/material-blue/views/userpassreset/request.inc b/app/modules/web/themes/material-blue/views/userpassreset/request.inc
index db672a21..a6adc249 100644
--- a/app/modules/web/themes/material-blue/views/userpassreset/request.inc
+++ b/app/modules/web/themes/material-blue/views/userpassreset/request.inc
@@ -30,7 +30,6 @@
                     </div>
                 </div>
                 <input type="hidden" name="isAjax" value="1">
-                <input type="hidden" name="sk" value="">
             </fieldset>
 
             <div id="box-buttons">
diff --git a/app/modules/web/themes/material-blue/views/userpassreset/reset.inc b/app/modules/web/themes/material-blue/views/userpassreset/reset.inc
index b440d2dc..4684fe6b 100644
--- a/app/modules/web/themes/material-blue/views/userpassreset/reset.inc
+++ b/app/modules/web/themes/material-blue/views/userpassreset/reset.inc
@@ -1,4 +1,11 @@
-<?php /** @var $icons \SP\Core\UI\ThemeIcons */ ?>
+<?php
+/**
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+?>
 
 <div id="box-pub-noheader">
     <div class="box-spacer"></div>
@@ -31,9 +38,8 @@
                                for="password_repeat"><?php echo __('Clave (repetir)'); ?></label>
                     </div>
                 </div>
-                <input type="hidden" name="hash" value="<?php echo $hash; ?>">
+                <input type="hidden" name="hash" value="<?php echo $_getvar('hash'); ?>">
                 <input type="hidden" name="isAjax" value="1">
-                <input type="hidden" name="sk" value="">
             </fieldset>
 
             <div id="box-buttons">
diff --git a/app/modules/web/themes/material-blue/views/usersettings/general.inc b/app/modules/web/themes/material-blue/views/usersettings/general.inc
index 030f9e6b..2a5bb6d0 100644
--- a/app/modules/web/themes/material-blue/views/usersettings/general.inc
+++ b/app/modules/web/themes/material-blue/views/usersettings/general.inc
@@ -1,4 +1,14 @@
-<?php /** @var $icons \SP\Core\UI\ThemeIcons */ ?>
+<?php
+/**
+ * @var \SP\DataModel\UserPreferencesData $userPreferences
+ * @var \SP\Core\UI\ThemeIcons            $icons
+ * @var \SP\Config\ConfigData             $configData
+ * @var callable                          $_getvar
+ * @var \SP\Mvc\View\Template             $this
+ */
+
+$userPreferences = $_getvar('userPreferences');
+?>
 
 <div id="title" class="titleNormal">
     <i class="material-icons">home</i>
@@ -7,7 +17,7 @@
 
 <form method="post" name="frmPreferences" id="frmPreferences" class="form-action"
       data-onsubmit="user/saveSettings"
-      data-action-route="<?php echo $route; ?>"
+      data-action-route="<?php echo $_getvar('route'); ?>"
       data-reload="1"
       data-hash="">
 
@@ -18,8 +28,8 @@
                 <div class="lowres-title"><?php echo __('Idioma'); ?></div>
 
                 <select name="userlang" id="sel-userlang" size="1" class="select-box sel-chosen-ns">
-                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $langs */
-                    foreach ($langs as $langName => $lang): ?>
+                    <?php /** @var \SP\Mvc\View\Components\SelectItem $lang */
+                    foreach ($_getvar('langs') as $langName => $lang): ?>
                         <option
                                 value='<?php echo $lang->getId(); ?>' <?php echo $lang->isSelected() ? 'selected' : ""; ?>><?php echo $lang->getName(); ?></option>
                     <?php endforeach; ?>
@@ -33,8 +43,8 @@
 
                 <select name="usertheme" id="sel-usertheme" size="1"
                         class="select-box sel-chosen-ns">
-                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $themes */
-                    foreach ($themes as $theme): ?>
+                    <?php /** @var \SP\Mvc\View\Components\SelectItem $theme */
+                    foreach ($_getvar('themes') as $theme): ?>
                         <option
                                 value='<?php echo $theme->getId(); ?>' <?php echo $theme->isSelected() ? 'selected' : ""; ?>><?php echo $theme->getName(); ?></option>
                     <?php endforeach; ?>
@@ -57,7 +67,7 @@
                     <input id="resultsperpage" name="resultsperpage" type="number" step="6"
                            pattern="[0-9]{1,5}" class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="5"
-                           value="<?php echo $resultsPerPage; ?>" required/>
+                           value="<?php echo $userPreferences->getResultsPerPage(); ?>" required/>
                     <label class="mdl-textfield__label"
                            for="resultsperpage"><?php echo __('Número de resultados por página'); ?></label>
                 </div>
@@ -72,7 +82,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="account_link">
                                 <input type="checkbox" id="account_link"
                                        class="mdl-switch__input"
-                                       name="account_link" <?php echo $chkAccountLink ? 'checked' : ''; ?>/>
+                                       name="account_link" <?php echo $userPreferences->isAccountLink() ? 'checked' : ''; ?>/>
                             </label>
                         </div>
 
@@ -89,7 +99,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="sort_views">
                                 <input type="checkbox" id="sort_views"
                                        class="mdl-switch__input"
-                                       name="sort_views" <?php echo $chkSortViews ? 'checked' : ''; ?>/>
+                                       name="sort_views" <?php echo $userPreferences->isSortViews() ? 'checked' : ''; ?>/>
                             </label>
                         </div>
 
@@ -106,7 +116,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="top_navbar">
                                 <input type="checkbox" id="top_navbar"
                                        class="mdl-switch__input"
-                                       name="top_navbar" <?php echo $chkTopNavbar ? 'checked' : ''; ?>/>
+                                       name="top_navbar" <?php echo $userPreferences->isTopNavbar() ? 'checked' : ''; ?>/>
                             </label>
                         </div>
 
@@ -123,7 +133,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="optional_actions">
                                 <input type="checkbox" id="optional_actions"
                                        class="mdl-switch__input"
-                                       name="optional_actions" <?php echo $chkOptionalActions ? 'checked' : ''; ?>/>
+                                       name="optional_actions" <?php echo $userPreferences->isOptionalActions() ? 'checked' : ''; ?>/>
                             </label>
                         </div>
 
@@ -140,7 +150,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="resultsascards">
                                 <input type="checkbox" id="resultsascards"
                                        class="mdl-switch__input"
-                                       name="resultsascards" <?php echo $chkResultsAsCards ? 'checked' : ''; ?>/>
+                                       name="resultsascards" <?php echo $userPreferences->isResultsAsCards() ? 'checked' : ''; ?>/>
                             </label>
                         </div>
 
@@ -157,7 +167,7 @@
                             <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="check_notifications">
                                 <input type="checkbox" id="check_notifications"
                                        class="mdl-switch__input"
-                                       name="check_notifications" <?php echo $chkNotifications ? 'checked' : ''; ?>/>
+                                       name="check_notifications" <?php echo $userPreferences->isCheckNotifications() ? 'checked' : ''; ?>/>
                             </label>
                         </div>
 
@@ -174,7 +184,7 @@
     </table>
 
     <input type="hidden" name="isAjax" value="1"/>
-    <input type="hidden" name="sk" value="">
+    <input type="hidden" name="sk" value="<?php echo $sk; ?>">
 </form>
 <div class="tab-actions">
     <ul>
diff --git a/app/modules/web/themes/material-blue/views/wiki/wikipage.inc b/app/modules/web/themes/material-blue/views/wiki/wikipage.inc
index dccfd723..220065ed 100644
--- a/app/modules/web/themes/material-blue/views/wiki/wikipage.inc
+++ b/app/modules/web/themes/material-blue/views/wiki/wikipage.inc
@@ -1,16 +1,30 @@
+<?php
+/**
+ * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Config\ConfigData  $configData
+ * @var callable               $_getvar
+ * @var \SP\Mvc\View\Template  $this
+ */
+
+$header = $_getvar('header');
+$pageData = $_getvar('pageData');
+$pageSearch = $_getvar('pageSearch', []);
+$pageInfo = $_getvar('pageInfo');
+?>
+
 <div id="box-popup">
     <h2 class="center"><?php echo (is_array($header) && !empty($header[0])) ? $header[0] : __('Ver Wiki'); ?></h2>
 
     <div id="wikiPage">
         <?php if (is_array($pageData) && !empty($pageData[0])): ?>
             <?php echo $pageData[0]; ?>
-        <?php elseif (is_array($pageSearch) && count($pageSearch) > 0): ?>
+        <?php elseif (count($pageSearch) > 0): ?>
             <h1><?php echo __('Página no encontrada'); ?></h1>
             <hr>
-            <?php printf(__('Resultados de búsqueda de \'%s\''), $pageName); ?>
+            <?php printf(__('Resultados de búsqueda de \'%s\''), $_getvar('pageName')); ?>
             <ul>
                 <?php foreach ($pageSearch as $result): ?>
-                    <li><?php printf('%s: <a href="%s" target="_blank">%s</a>', __('Página'), $wikiUrlBase . '/' . $result['id'], $result['id']); ?></li>
+                    <li><?php printf('%s: <a href="%s" target="_blank">%s</a>', __('Página'), $_getvar('wikiUrlBase') . '/' . $result['id'], $result['id']); ?></li>
                 <?php endforeach; ?>
             </ul>
         <?php else: ?>
@@ -18,15 +32,12 @@
         <?php endif; ?>
     </div>
     <div id="wikiPageInfo">
-        <?php if (is_array($pageInfo)): ?>
+        <?php if ($pageInfo): ?>
             <ul>
-                <li><?php printf('%s: <a href="%s" target="_blank">%s</a>', __('Página'), $wikiUrlBase . $pageInfo['name'], $pageInfo['name']); ?></li>
+                <li><?php printf('%s: <a href="%s" target="_blank">%s</a>', __('Página'), $_getvar('wikiUrlBase') . $pageInfo['name'], $pageInfo['name']); ?></li>
                 <li><?php printf('%s: %s', __('Fecha'), $pageInfo['lastModified']); ?></li>
                 <li><?php printf('%s: %s', __('Autor'), $pageInfo['author']); ?></li>
             </ul>
         <?php endif; ?>
     </div>
 </div>
-<script>
-    sysPassApp.sk.set("<?php echo $sk; ?>");
-</script>
\ No newline at end of file
diff --git a/lib/SP/Html/DataGrid/Action/DataGridActionBase.php b/lib/SP/Html/DataGrid/Action/DataGridActionBase.php
index 8f7761d9..6e4eac4c 100644
--- a/lib/SP/Html/DataGrid/Action/DataGridActionBase.php
+++ b/lib/SP/Html/DataGrid/Action/DataGridActionBase.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -70,7 +70,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
      *
      * @var array
      */
-    protected $onClickArgs = [];
+    protected $onClickArgs;
     /**
      * El icono de la acción
      *
@@ -86,7 +86,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
     /**
      * La columna de origen de datos que condiciona esta acción
      *
-     * @var string
+     * @var array
      */
     protected $filterRowSource;
     /**
@@ -106,17 +106,21 @@ abstract class DataGridActionBase implements DataGridActionInterface
      *
      * @var array
      */
-    protected $data = [];
+    protected $data;
     /**
      * Atributos adicionales
      *
      * @var array
      */
-    protected $attributes = [];
+    protected $attributes;
     /**
      * @var array
      */
-    protected $classes = [];
+    protected $classes;
+    /**
+     * @var bool
+     */
+    protected $isSelection = false;
 
     /**
      * DataGridActionBase constructor.
@@ -240,6 +244,10 @@ abstract class DataGridActionBase implements DataGridActionInterface
      */
     public function setOnClickArgs($args)
     {
+        if ($this->onClickArgs === null) {
+            $this->onClickArgs = [];
+        }
+
         $this->onClickArgs[] = $args;
 
         return $this;
@@ -250,13 +258,17 @@ abstract class DataGridActionBase implements DataGridActionInterface
      */
     public function getOnClick()
     {
-        $args = [];
+        if ($this->onClickArgs !== null) {
 
-        foreach ($this->onClickArgs as $arg) {
-            $args[] = (!is_numeric($arg) && $arg !== 'this') ? '\'' . $arg . '\'' : $arg;
+            $args = array_map(function ($value) {
+                return (!is_numeric($value) && $value !== 'this') ? '\'' . $value . '\'' : $value;
+            }, $this->onClickArgs);
+
+            return count($args) > 0 ? $this->onClickFunction . '(' . implode(',', $args) . ')' : $this->onClickFunction;
         }
 
-        return count($args) > 0 ? $this->onClickFunction . '(' . implode(',', $args) . ')' : $this->onClickFunction;
+        return $this->onClickFunction;
+
     }
 
     /**
@@ -320,7 +332,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
     }
 
     /**
-     * @return string
+     * @return array
      */
     public function getFilterRowSource()
     {
@@ -337,6 +349,10 @@ abstract class DataGridActionBase implements DataGridActionInterface
      */
     public function setFilterRowSource($rowSource, $value = 1)
     {
+        if ($this->filterRowSource === null) {
+            $this->filterRowSource = [];
+        }
+
         $this->filterRowSource[] = ['field' => $rowSource, 'value' => $value];
 
         return $this;
@@ -367,7 +383,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
      */
     public function getData()
     {
-        return $this->data;
+        return (array)$this->data;
     }
 
     /**
@@ -392,6 +408,10 @@ abstract class DataGridActionBase implements DataGridActionInterface
      */
     public function addData($name, $data)
     {
+        if ($this->data === null) {
+            $this->data = [];
+        }
+
         $this->data[$name] = $data;
 
         return $this;
@@ -402,7 +422,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
      */
     public function getAttributes()
     {
-        return $this->attributes;
+        return (array)$this->attributes;
     }
 
     /**
@@ -429,6 +449,10 @@ abstract class DataGridActionBase implements DataGridActionInterface
      */
     public function addAttribute($name, $value)
     {
+        if ($this->attributes === null) {
+            $this->attributes = [];
+        }
+
         $this->attributes[$name] = $value;
 
         return $this;
@@ -437,10 +461,14 @@ abstract class DataGridActionBase implements DataGridActionInterface
     /**
      * Returns classes as a string
      *
-     * @return array
+     * @return string
      */
     public function getClassesAsString()
     {
+        if ($this->classes === null) {
+            return '';
+        }
+
         return implode(' ', $this->classes);
     }
 
@@ -451,7 +479,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
      */
     public function getClasses()
     {
-        return $this->classes;
+        return (array)$this->classes;
     }
 
     /**
@@ -473,8 +501,34 @@ abstract class DataGridActionBase implements DataGridActionInterface
      */
     public function addClass($value)
     {
+        if ($this->classes === null) {
+            $this->classes = [];
+        }
+
         $this->classes[] = $value;
 
         return $this;
     }
+
+    /**
+     * Returns if the action is used for selecting multiple items
+     *
+     * @return bool
+     */
+    public function isSelection(): bool
+    {
+        return $this->isSelection;
+    }
+
+    /**
+     * @param bool $isSelection
+     *
+     * @return DataGridActionBase
+     */
+    public function setIsSelection(bool $isSelection)
+    {
+        $this->isSelection = $isSelection;
+
+        return $this;
+    }
 }
diff --git a/lib/SP/Html/DataGrid/Action/DataGridActionInterface.php b/lib/SP/Html/DataGrid/Action/DataGridActionInterface.php
index 30ebbbfe..073dafe0 100644
--- a/lib/SP/Html/DataGrid/Action/DataGridActionInterface.php
+++ b/lib/SP/Html/DataGrid/Action/DataGridActionInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -111,15 +111,13 @@ interface DataGridActionInterface
     public function isHelper();
 
     /**
-     * @param       $rowSource string
-     * @param mixed $value     Valor a filtrar
-     *
-     * @return
+     * @param string $rowSource
+     * @param mixed  $value Valor a filtrar
      */
     public function setFilterRowSource($rowSource, $value = 1);
 
     /**
-     * @return string
+     * @return array
      */
     public function getFilterRowSource();
 
@@ -197,7 +195,7 @@ interface DataGridActionInterface
     /**
      * Returns classes as a string
      *
-     * @return array
+     * @return string
      */
     public function getClassesAsString();
 
@@ -223,4 +221,11 @@ interface DataGridActionInterface
      * @return $this
      */
     public function addClass($value);
+
+    /**
+     * Returns if the action is used for selecting multiple items
+     *
+     * @return bool
+     */
+    public function isSelection(): bool;
 }
\ No newline at end of file
diff --git a/lib/SP/Mvc/Controller/ControllerTrait.php b/lib/SP/Mvc/Controller/ControllerTrait.php
index 27ea2345..1dfa362e 100644
--- a/lib/SP/Mvc/Controller/ControllerTrait.php
+++ b/lib/SP/Mvc/Controller/ControllerTrait.php
@@ -24,7 +24,6 @@
 
 namespace SP\Mvc\Controller;
 
-use SP\Core\Context\ContextInterface;
 use SP\Core\Context\SessionContext;
 use SP\Core\Exceptions\SPException;
 use SP\Http\Json;
@@ -103,19 +102,16 @@ trait ControllerTrait
     }
 
     /**
-     * @param ContextInterface $context
-     * @param Request          $request
+     * @param string  $previousToken
+     * @param Request $request
      *
      * @throws SPException
      */
-    protected function checkSecurityToken(ContextInterface $context, Request $request)
+    protected function checkSecurityToken($previousToken, Request $request)
     {
         $sk = $request->analyzeString('sk');
-        $sessionKey = $context->getSecurityKey();
 
-        if (!$sk
-            || (null !== $sessionKey && $sessionKey !== $sk)
-        ) {
+        if (!$sk || $previousToken !== $sk) {
             throw new SPException(__u('Acción Inválida'));
         }
     }
diff --git a/lib/SP/Mvc/View/Template.php b/lib/SP/Mvc/View/Template.php
index e001a692..689ad79e 100644
--- a/lib/SP/Mvc/View/Template.php
+++ b/lib/SP/Mvc/View/Template.php
@@ -27,7 +27,6 @@ namespace SP\Mvc\View;
 defined('APP_ROOT') || die();
 
 use SP\Core\Exceptions\FileNotFoundException;
-use SP\Core\Exceptions\InvalidArgumentException;
 use SP\Core\UI\Theme;
 use SP\Core\UI\ThemeInterface;
 
@@ -51,15 +50,15 @@ final class Template
      */
     protected $theme;
     /**
-     * @var array Variable con los archivos de plantilla a cargar
+     * @var array List of templates to load into the view
      */
     private $templates = [];
     /**
-     * @var array Variable con las variables a incluir en la plantilla
+     * @var TemplateVarCollection Template's variables collection
      */
-    private $vars = [];
+    private $vars;
     /**
-     * @var string Directorio base para los archivos de plantillas
+     * @var string Base path for imcluding templates
      */
     private $base;
     /**
@@ -77,6 +76,7 @@ final class Template
     public function __construct(Theme $theme)
     {
         $this->theme = $theme;
+        $this->vars = new TemplateVarCollection();
     }
 
     /**
@@ -270,17 +270,10 @@ final class Template
      * @param string $name Nombre del atributo
      *
      * @return null
-     * @throws \SP\Core\Exceptions\InvalidArgumentException
      */
     public function __get($name)
     {
-        if (!array_key_exists($name, $this->vars)) {
-            logger(sprintf(__('No es posible obtener la variable "%s"'), $name));
-
-            throw new InvalidArgumentException(sprintf(__('No es posible obtener la variable "%s"'), $name));
-        }
-
-        return $this->vars[$name];
+        return $this->get($name);
     }
 
     /**
@@ -289,13 +282,29 @@ final class Template
      *
      * @param string $name  Nombre del atributo
      * @param string $value Valor del atributo
-     *
-     * @return null
      */
     public function __set($name, $value)
     {
-        $this->vars[$name] = $value;
-        return null;
+        $this->vars->set($name, $value);
+    }
+
+    /**
+     * Returns a variable value
+     *
+     * @param $name
+     *
+     * @return mixed
+     */
+    public function get($name)
+    {
+        if (!$this->vars->exists($name)) {
+            logger(sprintf(__('No es posible obtener la variable "%s"'), $name), 'ERROR');
+
+            return null;
+//            throw new InvalidArgumentException(sprintf(__('No es posible obtener la variable "%s"'), $name));
+        }
+
+        return $this->vars->get($name);
     }
 
     /**
@@ -308,7 +317,7 @@ final class Template
      */
     public function __isset($name)
     {
-        return array_key_exists($name, $this->vars);
+        return $this->vars->exists($name);
     }
 
     /**
@@ -318,17 +327,18 @@ final class Template
      * @param string $name Nombre del atributo
      *
      * @return $this
-     * @throws \SP\Core\Exceptions\InvalidArgumentException
      */
     public function __unset($name)
     {
-        if (!array_key_exists($name, $this->vars)) {
+        if (!$this->vars->exists($name)) {
             logger(sprintf(__('No es posible destruir la variable "%s"'), $name));
 
-            throw new InvalidArgumentException(sprintf(__('No es posible destruir la variable "%s"'), $name));
+//            throw new InvalidArgumentException(sprintf(__('No es posible destruir la variable "%s"'), $name));
+            return $this;
         }
 
-        unset($this->vars[$name]);
+        $this->vars->remove($name);
+
         return $this;
     }
 
@@ -345,7 +355,18 @@ final class Template
             throw new FileNotFoundException(__('La plantilla no contiene archivos'));
         }
 
-        extract($this->vars, EXTR_SKIP);
+        $icons = $this->vars->get('icons');
+        $configData = $this->vars->get('configData');
+        $sk = $this->vars->get('sk');
+
+        // An anonymous proxy function for handling views variables
+        $_getvar = function ($key, $default = null) {
+            if (DEBUG && !$this->vars->exists($key)) {
+                logger(sprintf(__('No es posible obtener la variable "%s"'), $key), 'WARN');
+            }
+
+            return $this->vars->get($key, $default);
+        };
 
         ob_start();
 
@@ -371,11 +392,15 @@ final class Template
             $name = $scope . '_' . $name;
         }
 
-        if (null !== $index) {
-            $this->vars[$name][$index] = $value;
+        $var = $this->vars->get($name, []);
+
+        if (null === $index) {
+            $var[] = $value;
         } else {
-            $this->vars[$name][] = $value;
+            $var[$index] = $value;
         }
+
+        $this->vars->set($name, $var);
     }
 
     /**
@@ -493,7 +518,7 @@ final class Template
             $name = $scope . '_' . $name;
         }
 
-        $this->vars[$name] = $value;
+        $this->vars->set($name, $value);
     }
 
     /**
@@ -503,16 +528,4 @@ final class Template
     {
         return $this->upgraded;
     }
-
-    /**
-     * Establecer los atributos de la clase a partir de un array.
-     *
-     * @param array $vars Con los atributos de la clase
-     */
-    private function setVars(&$vars)
-    {
-        foreach ($vars as $name => $value) {
-            $this->{$name} = $value;
-        }
-    }
 }
\ No newline at end of file
diff --git a/lib/SP/Mvc/View/TemplateVarCollection.php b/lib/SP/Mvc/View/TemplateVarCollection.php
new file mode 100644
index 00000000..9d4a14f6
--- /dev/null
+++ b/lib/SP/Mvc/View/TemplateVarCollection.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * sysPass
+ *
+ * @author nuxsmin
+ * @link https://syspass.org
+ * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\Mvc\View;
+
+use SP\Core\DataCollection;
+
+/**
+ * Class TemplateVarCollection
+ *
+ * @package SP\Mvc\View
+ */
+final class TemplateVarCollection extends DataCollection
+{
+
+}
\ No newline at end of file
diff --git a/lib/SP/Services/Account/AccountSearchItem.php b/lib/SP/Services/Account/AccountSearchItem.php
index f888bdbe..977a2673 100644
--- a/lib/SP/Services/Account/AccountSearchItem.php
+++ b/lib/SP/Services/Account/AccountSearchItem.php
@@ -416,4 +416,14 @@ final class AccountSearchItem
     {
         $this->tags = $tags;
     }
+
+    /**
+     * @param $wikiFilter
+     *
+     * @return bool
+     */
+    public function isWikiMatch($wikiFilter)
+    {
+        return preg_match('/^(' . $wikiFilter . ').*/i', $this->accountSearchVData->getName()) !== false;
+    }
 }
\ No newline at end of file
diff --git a/lib/SP/Services/Install/Installer.php b/lib/SP/Services/Install/Installer.php
index c802bfc0..c70b88d4 100644
--- a/lib/SP/Services/Install/Installer.php
+++ b/lib/SP/Services/Install/Installer.php
@@ -57,7 +57,7 @@ final class Installer extends Service
      */
     const VERSION = [3, 0, 0];
     const VERSION_TEXT = '3.0-beta';
-    const BUILD = 18101601;
+    const BUILD = 18102201;
 
     /**
      * @var DatabaseSetupInterface
diff --git a/public/js/app-actions.js b/public/js/app-actions.js
index 61f11ff5..c52a5ef3 100644
--- a/public/js/app-actions.js
+++ b/public/js/app-actions.js
@@ -37,47 +37,12 @@ sysPass.Actions = function (log) {
 
     Object.freeze(ajaxUrl);
 
-    // Función para cargar el contenido de la acción del menú seleccionada
-    const doAction = function (obj, view) {
-        const itemId = obj.itemId !== undefined ? "/" + obj.itemId : "";
-
-        const data = {
-            r: obj.r + itemId,
-            isAjax: 1
-        };
-
-        const opts = sysPassApp.requests.getRequestOpts();
-        opts.url = ajaxUrl.entrypoint;
-        opts.method = "get";
-        opts.type = "html";
-        opts.addHistory = true;
-        opts.data = data;
-
-        sysPassApp.requests.getActionCall(opts, function (response) {
-            const $content = $("#content");
-
-            $content.empty().html(response);
-
-            const views = sysPassApp.triggers.views;
-            views.common($content);
-
-            if (view !== undefined && typeof views[view] === "function") {
-                views[view]();
-            }
-
-            const $mdlContent = $(".mdl-layout__content");
-
-            if ($mdlContent.scrollTop() > 0) {
-                $mdlContent.animate({scrollTop: 0}, 1000);
-            }
-        });
-    };
-
     // Función para cargar el contenido de la acción del menú seleccionada
     const getContent = function (data, view) {
         log.info("getContent");
 
         data.isAjax = 1;
+        data.sk = sysPassApp.sk.get();
 
         const opts = sysPassApp.requests.getRequestOpts();
         opts.url = ajaxUrl.entrypoint;
@@ -243,6 +208,8 @@ sysPass.Actions = function (log) {
                         sysPassApp.requests.getActionCall(opts, function (json) {
                             sysPassApp.msg.out(json);
 
+                            sysPassApp.sk.set(json.csrf);
+
                             account.search($obj);
                         });
                     }
@@ -355,12 +322,16 @@ sysPass.Actions = function (log) {
 
             const opts = sysPassApp.requests.getRequestOpts();
             opts.url = ajaxUrl.entrypoint + "?r=" + $obj.data("action-route") + "/" + $obj.data("item-id");
-            opts.data = $obj.serialize();
+            opts.data = $obj.serialize() + "&sk=" + sysPassApp.sk.get();
 
             sysPassApp.requests.getActionCall(opts, function (json) {
                 sysPassApp.msg.out(json);
 
-                if (json.status === 0 && json.data['nextAction'] !== undefined) {
+                if (json.status === 0
+                    && json.data['nextAction'] !== undefined
+                ) {
+                    sysPassApp.sk.set(json.csrf);
+
                     getContent({r: json.data.nextAction['nextAction']}, "account");
                 }
             });
@@ -389,20 +360,29 @@ sysPass.Actions = function (log) {
             const parentId = $obj.data("parent-id");
             const itemId = parentId === undefined ? $obj.data("item-id") : parentId;
 
-            getContent(sysPassApp.requests.getRouteForQuery($obj.data("action-route"), itemId), "account");
+            const route = sysPassApp.requests.getRouteForQuery($obj.data("action-route"), itemId);
+
+            getContent(route, "account");
         },
         saveEditRestore: function ($obj) {
             log.info("account:restore");
 
             const opts = sysPassApp.requests.getRequestOpts();
-            opts.url = ajaxUrl.entrypoint + "?r=" + $obj.data("action-route") + "/" + $obj.data("history-id") + "/" + $obj.data("item-id");
-            opts.data = $obj.serialize();
+            opts.url = ajaxUrl.entrypoint;
+            opts.data = {
+                r: $obj.data("action-route") + "/" + $obj.data("history-id") + "/" + $obj.data("item-id"),
+                sk: sysPassApp.sk.get()
+            };
 
             sysPassApp.requests.getActionCall(opts, function (json) {
                 sysPassApp.msg.out(json);
 
-                if (json.data.itemId !== undefined && json.data.nextAction !== undefined) {
-                    getContent(sysPassApp.requests.getRouteForQuery(json.data.nextAction, json.data.itemId), "account");
+                if (json.data.itemId !== undefined
+                    && json.data.nextAction !== undefined
+                ) {
+                    const route = sysPassApp.requests.getRouteForQuery(json.data.nextAction, json.data.itemId);
+
+                    getContent(route, "account");
                 }
             });
         },
@@ -446,8 +426,6 @@ sysPass.Actions = function (log) {
                     sysPassApp.msg.out(json);
                 }
 
-                sysPassApp.sk.set(json.data.sk);
-
                 $("#res-content").empty().html(json.data.html);
             });
         },
@@ -466,8 +444,12 @@ sysPass.Actions = function (log) {
             sysPassApp.requests.getActionCall(opts, function (json) {
                 sysPassApp.msg.out(json);
 
-                if (json.data.itemId !== undefined && json.data.nextAction !== undefined) {
-                    getContent(sysPassApp.requests.getRouteForQuery(json.data.nextAction, json.data.itemId), "account");
+                if (json.data.itemId !== undefined
+                    && json.data.nextAction !== undefined
+                ) {
+                    const route = sysPassApp.requests.getRouteForQuery(json.data.nextAction, json.data.itemId);
+
+                    getContent(route, "account");
                 }
             });
         }
@@ -1009,7 +991,7 @@ sysPass.Actions = function (log) {
                     opts.url = ajaxUrl.entrypoint + "?r=" + $obj.data("action-route") + "/" + accountId + "/" + notify;
                 } else {
                     opts.url = ajaxUrl.entrypoint + "?r=" + $obj.data("action-route");
-                    opts.data = $obj.serialize();
+                    opts.data = $obj.serialize() + "&sk=" + sysPassApp.sk.get();
                 }
 
                 sysPassApp.requests.getActionCall(opts, function (json) {
@@ -1413,7 +1395,7 @@ sysPass.Actions = function (log) {
 
             const opts = sysPassApp.requests.getRequestOpts();
             opts.url = ajaxUrl.entrypoint + "?r=" + $obj.data("route");
-            opts.data = $obj.serialize();
+            opts.data = $obj.serialize() + "&sk=" + sysPassApp.sk.get();
 
             sysPassApp.requests.getActionCall(opts, function (json) {
                 sysPassApp.msg.out(json);
@@ -1453,8 +1435,6 @@ sysPass.Actions = function (log) {
                     getContent({r: $obj.data("action-next")});
                 }
 
-                sysPassApp.sk.set(json.csrf);
-
                 notification.getActive();
             });
         },
@@ -1473,7 +1453,7 @@ sysPass.Actions = function (log) {
 
             const opts = sysPassApp.requests.getRequestOpts();
             opts.url = ajaxUrl.entrypoint + "?r=" + $obj.data("route");
-            opts.data = $obj.serialize();
+            opts.data = $obj.serialize() + "&sk=" + sysPassApp.sk.get();
 
             sysPassApp.requests.getActionCall(opts, function (json) {
                 sysPassApp.msg.out(json);
@@ -1804,7 +1784,6 @@ sysPass.Actions = function (log) {
     };
 
     return {
-        doAction: doAction,
         getContent: getContent,
         showFloatingBox: showFloatingBox,
         closeFloatingBox: closeFloatingBox,
diff --git a/public/js/app-actions.min.js b/public/js/app-actions.min.js
index 1e6028a2..8a94c68d 100644
--- a/public/js/app-actions.min.js
+++ b/public/js/app-actions.min.js
@@ -1,22 +1,22 @@
 var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(d,l,e){d instanceof String&&(d=String(d));for(var f=d.length,h=0;h<f;h++){var p=d[h];if(l.call(e,p,h,d))return{i:h,v:p}}return{i:-1,v:void 0}};$jscomp.ASSUME_ES5=!1;$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(d,l,e){d!=Array.prototype&&d!=Object.prototype&&(d[l]=e.value)};
 $jscomp.getGlobal=function(d){return"undefined"!=typeof window&&window===d?d:"undefined"!=typeof global&&null!=global?global:d};$jscomp.global=$jscomp.getGlobal(this);$jscomp.polyfill=function(d,l,e,f){if(l){e=$jscomp.global;d=d.split(".");for(f=0;f<d.length-1;f++){var h=d[f];h in e||(e[h]={});e=e[h]}d=d[d.length-1];f=e[d];l=l(f);l!=f&&null!=l&&$jscomp.defineProperty(e,d,{configurable:!0,writable:!0,value:l})}};
 $jscomp.polyfill("Array.prototype.find",function(d){return d?d:function(d,e){return $jscomp.findInternal(this,d,e).v}},"es6","es3");
-sysPass.Actions=function(d){var l=0,e={entrypoint:"/index.php"};Object.freeze(e);var f=function(a,b){d.info("getContent");a.isAjax=1;var c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;c.method="get";c.type="html";c.addHistory=!0;c.data=a;return sysPassApp.requests.getActionCall(c,function(a){var c=$("#content");c.empty().html(a);a=sysPassApp.triggers.views;a.common(c);if(void 0!==b&&"function"===typeof a[b])a[b]();c=$(".mdl-layout__content");0<c.scrollTop()&&c.animate({scrollTop:0},1E3)})},
-h=function(a,b){$.magnificPopup.open({items:{src:a||"",type:"inline"},callbacks:{open:function(){var a=$("#box-popup");sysPassApp.triggers.views.common(a);void 0!==b&&"function"===typeof b.open&&b.open();a.find("form input:visible:first").focus()},close:function(){void 0!==b&&"function"===typeof b.close&&b.close()}},showCloseBtn:!1})},p=function(a,b){var c=$('<div id="box-popup" class="image">'+b+"</div>"),k=c.find("img");if(0===k.length)return h(b);k.hide();$.magnificPopup.open({items:{src:c,type:"inline"},
-callbacks:{open:function(){var a=this;k.on("click",function(){a.close()});setTimeout(function(){var a=sysPassApp.util.resizeImage(k);c.css({backgroundColor:"#fff",width:a.width,height:"auto"});k.show("slow")},500)}}})},q=function(){$.magnificPopup.close()},n={view:function(a){d.info("account:show");f(sysPassApp.requests.getRouteForQuery(a.data("action-route"),a.data("item-id")),"account")},viewHistory:function(a){d.info("account:showHistory");f(sysPassApp.requests.getRouteForQuery(a.data("action-route"),
+sysPass.Actions=function(d){var l=0,e={entrypoint:"/index.php"};Object.freeze(e);var f=function(a,b){d.info("getContent");a.isAjax=1;a.sk=sysPassApp.sk.get();var c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;c.method="get";c.type="html";c.addHistory=!0;c.data=a;return sysPassApp.requests.getActionCall(c,function(a){var c=$("#content");c.empty().html(a);a=sysPassApp.triggers.views;a.common(c);if(void 0!==b&&"function"===typeof a[b])a[b]();c=$(".mdl-layout__content");0<c.scrollTop()&&c.animate({scrollTop:0},
+1E3)})},h=function(a,b){$.magnificPopup.open({items:{src:a||"",type:"inline"},callbacks:{open:function(){var a=$("#box-popup");sysPassApp.triggers.views.common(a);void 0!==b&&"function"===typeof b.open&&b.open();a.find("form input:visible:first").focus()},close:function(){void 0!==b&&"function"===typeof b.close&&b.close()}},showCloseBtn:!1})},p=function(a,b){var c=$('<div id="box-popup" class="image">'+b+"</div>"),k=c.find("img");if(0===k.length)return h(b);k.hide();$.magnificPopup.open({items:{src:c,
+type:"inline"},callbacks:{open:function(){var a=this;k.on("click",function(){a.close()});setTimeout(function(){var a=sysPassApp.util.resizeImage(k);c.css({backgroundColor:"#fff",width:a.width,height:"auto"});k.show("slow")},500)}}})},q=function(){$.magnificPopup.close()},n={view:function(a){d.info("account:show");f(sysPassApp.requests.getRouteForQuery(a.data("action-route"),a.data("item-id")),"account")},viewHistory:function(a){d.info("account:showHistory");f(sysPassApp.requests.getRouteForQuery(a.data("action-route"),
 a.val()),"account")},edit:function(a){d.info("account:edit");f(sysPassApp.requests.getRouteForQuery(a.data("action-route"),a.data("item-id")),"account")},delete:function(a){d.info("account:delete");var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[3]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],onClick:function(c){c=
-sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;c.data={r:"account/saveDelete/"+a.data("item-id"),sk:sysPassApp.sk.get()};sysPassApp.requests.getActionCall(c,function(c){sysPassApp.msg.out(c);n.search(a)})}}})},viewPass:function(a){d.info("account:viewPass");var b=a.data("parent-id")||0,c=0===b?a.data("item-id"):b,k=sysPassApp.requests.getRequestOpts();k.url=e.entrypoint;k.method="get";k.data={r:a.data("action-route")+"/"+c+"/"+b,sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(k,
-function(a){0!==a.status?sysPassApp.msg.out(a):(a=$(a.data.html),h(a),l=setTimeout(function(){q()},3E4),a.on("mouseleave",function(){clearTimeout(l);l=setTimeout(function(){q()},3E4)}).on("mouseenter",function(){0!==l&&clearTimeout(l)}))})},viewPassHistory:function(a){d.info("account:viewPassHistory");n.viewPass(a)},copyPass:function(a){d.info("account:copyPass");var b=a.data("parent-id");b=0===b?a.data("item-id"):b;var c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;c.method="get";c.async=
-!1;c.data={r:a.data("action-route")+"/"+b,sk:sysPassApp.sk.get(),isAjax:1};return sysPassApp.requests.getActionCall(c)},copyPassHistory:function(a){d.info("account:copyPassHistory");n.copyPassHistory(a)},copy:function(a){d.info("account:copy");f(sysPassApp.requests.getRouteForQuery(a.data("action-route"),a.data("item-id")),"account")},saveFavorite:function(a,b){d.info("account:saveFavorite");var c="on"===a.data("status"),k=c?a.data("action-route-off"):a.data("action-route-on"),r=sysPassApp.requests.getRequestOpts();
-r.url=e.entrypoint;r.data={r:k+"/"+a.data("item-id"),sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(r,function(k){sysPassApp.msg.out(k);0===k.status&&(a.data("status",c?"off":"on"),"function"===typeof b&&b())})},request:function(a){d.info("account:request");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("action-route")+"/"+a.data("item-id");b.data=a.serialize();sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);0===a.status&&void 0!==
-a.data.nextAction&&f({r:a.data.nextAction.nextAction},"account")})},menu:function(a){a.hide();a.parent().children(".actions-optional").show(250)},sort:function(a){d.info("account:sort");var b=$("#frmSearch");b.find('input[name="skey"]').val(a.data("key"));b.find('input[name="sorder"]').val(a.data("dir"));b.find('input[name="start"]').val(a.data("start"));n.search()},editPass:function(a){d.info("account:editpass");var b=a.data("parent-id");b=void 0===b?a.data("item-id"):b;f(sysPassApp.requests.getRouteForQuery(a.data("action-route"),
-b),"account")},saveEditRestore:function(a){d.info("account:restore");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("action-route")+"/"+a.data("history-id")+"/"+a.data("item-id");b.data=a.serialize();sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);void 0!==a.data.itemId&&void 0!==a.data.nextAction&&f(sysPassApp.requests.getRouteForQuery(a.data.nextAction,a.data.itemId),"account")})},listFiles:function(a){d.info("account:getfiles");var b=sysPassApp.requests.getRequestOpts();
-b.method="get";b.type="html";b.url=e.entrypoint;b.data={r:a.data("action-route")+"/"+a.data("item-id"),del:a.data("delete"),sk:sysPassApp.sk.get()};sysPassApp.requests.getActionCall(b,function(c){a.html(c)})},search:function(a){d.info("account:search");var b=$("#frmSearch");b.find("input[name='sk']").val(sysPassApp.sk.get());b.find("input[name='skey']").val();b.find("input[name='sorder']").val();void 0!==a&&b.find("input[name='start']").val(0);a=sysPassApp.requests.getRequestOpts();a.url=e.entrypoint+
-"?r="+b.data("action-route");a.method="get";a.data=b.serialize();sysPassApp.requests.getActionCall(a,function(a){10===a.status&&sysPassApp.msg.out(a);sysPassApp.sk.set(a.data.sk);$("#res-content").empty().html(a.data.html)})},save:function(a){d.info("account:save");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("action-route")+"/"+a.data("item-id");b.data=a.serialize();$("select.select-box-tags[data-hash][data-updated=true]").each(function(a,k){b.data+="&"+k.getAttribute("id")+
-"_update=1"});sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);void 0!==a.data.itemId&&void 0!==a.data.nextAction&&f(sysPassApp.requests.getRouteForQuery(a.data.nextAction,a.data.itemId),"account")})}},w={logout:function(){sysPassApp.util.redirect("index.php?r=login/logout")},login:function(a){d.info("main:login");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("route");b.method="get";b.data=a.serialize();sysPassApp.requests.getActionCall(b,function(b){var c=
-$(".extra-hidden");switch(b.status){case 0:sysPassApp.util.redirect(b.data.url);break;case 2:sysPassApp.msg.out(b);a.find("input[type='text'],input[type='password']").val("");a.find("input:visible:first").focus();0<c.length&&c.hide();$("#mpass").prop("disabled",!1).val("");$("#smpass").show();break;case 5:sysPassApp.msg.out(b);a.find("input[type='text'],input[type='password']").val("");a.find("input:visible:first").focus();0<c.length&&c.hide();$("#oldpass").prop("disabled",!1).val("");$("#soldpass").show();
-break;default:sysPassApp.msg.out(b),a.find("input[type='text'],input[type='password']").val(""),a.find("input:visible:first").focus()}})},install:function(a){d.info("main:install");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("route");b.data=a.serialize();sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);0===a.status&&setTimeout(function(){sysPassApp.util.redirect("index.php?r=login/index")},1E3)})},upgrade:function(a){d.info("main:upgrade");var b=
-'<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[59]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],onClick:function(b){var c;(b=a.find("input[name='taskId']").val())&&(c=v(b));var d=sysPassApp.requests.getRequestOpts();d.url=e.entrypoint+"?r="+a.data("action-route");d.method="get";d.useFullLoading=!!b;d.data=a.serialize();
+sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;c.data={r:"account/saveDelete/"+a.data("item-id"),sk:sysPassApp.sk.get()};sysPassApp.requests.getActionCall(c,function(c){sysPassApp.msg.out(c);sysPassApp.sk.set(c.csrf);n.search(a)})}}})},viewPass:function(a){d.info("account:viewPass");var b=a.data("parent-id")||0,c=0===b?a.data("item-id"):b,k=sysPassApp.requests.getRequestOpts();k.url=e.entrypoint;k.method="get";k.data={r:a.data("action-route")+"/"+c+"/"+b,sk:sysPassApp.sk.get(),isAjax:1};
+sysPassApp.requests.getActionCall(k,function(a){0!==a.status?sysPassApp.msg.out(a):(a=$(a.data.html),h(a),l=setTimeout(function(){q()},3E4),a.on("mouseleave",function(){clearTimeout(l);l=setTimeout(function(){q()},3E4)}).on("mouseenter",function(){0!==l&&clearTimeout(l)}))})},viewPassHistory:function(a){d.info("account:viewPassHistory");n.viewPass(a)},copyPass:function(a){d.info("account:copyPass");var b=a.data("parent-id");b=0===b?a.data("item-id"):b;var c=sysPassApp.requests.getRequestOpts();c.url=
+e.entrypoint;c.method="get";c.async=!1;c.data={r:a.data("action-route")+"/"+b,sk:sysPassApp.sk.get(),isAjax:1};return sysPassApp.requests.getActionCall(c)},copyPassHistory:function(a){d.info("account:copyPassHistory");n.copyPassHistory(a)},copy:function(a){d.info("account:copy");f(sysPassApp.requests.getRouteForQuery(a.data("action-route"),a.data("item-id")),"account")},saveFavorite:function(a,b){d.info("account:saveFavorite");var c="on"===a.data("status"),k=c?a.data("action-route-off"):a.data("action-route-on"),
+r=sysPassApp.requests.getRequestOpts();r.url=e.entrypoint;r.data={r:k+"/"+a.data("item-id"),sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(r,function(k){sysPassApp.msg.out(k);0===k.status&&(a.data("status",c?"off":"on"),"function"===typeof b&&b())})},request:function(a){d.info("account:request");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("action-route")+"/"+a.data("item-id");b.data=a.serialize()+"&sk="+sysPassApp.sk.get();sysPassApp.requests.getActionCall(b,
+function(a){sysPassApp.msg.out(a);0===a.status&&void 0!==a.data.nextAction&&(sysPassApp.sk.set(a.csrf),f({r:a.data.nextAction.nextAction},"account"))})},menu:function(a){a.hide();a.parent().children(".actions-optional").show(250)},sort:function(a){d.info("account:sort");var b=$("#frmSearch");b.find('input[name="skey"]').val(a.data("key"));b.find('input[name="sorder"]').val(a.data("dir"));b.find('input[name="start"]').val(a.data("start"));n.search()},editPass:function(a){d.info("account:editpass");
+var b=a.data("parent-id");b=void 0===b?a.data("item-id"):b;a=sysPassApp.requests.getRouteForQuery(a.data("action-route"),b);f(a,"account")},saveEditRestore:function(a){d.info("account:restore");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint;b.data={r:a.data("action-route")+"/"+a.data("history-id")+"/"+a.data("item-id"),sk:sysPassApp.sk.get()};sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);void 0!==a.data.itemId&&void 0!==a.data.nextAction&&(a=sysPassApp.requests.getRouteForQuery(a.data.nextAction,
+a.data.itemId),f(a,"account"))})},listFiles:function(a){d.info("account:getfiles");var b=sysPassApp.requests.getRequestOpts();b.method="get";b.type="html";b.url=e.entrypoint;b.data={r:a.data("action-route")+"/"+a.data("item-id"),del:a.data("delete"),sk:sysPassApp.sk.get()};sysPassApp.requests.getActionCall(b,function(c){a.html(c)})},search:function(a){d.info("account:search");var b=$("#frmSearch");b.find("input[name='sk']").val(sysPassApp.sk.get());b.find("input[name='skey']").val();b.find("input[name='sorder']").val();
+void 0!==a&&b.find("input[name='start']").val(0);a=sysPassApp.requests.getRequestOpts();a.url=e.entrypoint+"?r="+b.data("action-route");a.method="get";a.data=b.serialize();sysPassApp.requests.getActionCall(a,function(a){10===a.status&&sysPassApp.msg.out(a);$("#res-content").empty().html(a.data.html)})},save:function(a){d.info("account:save");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("action-route")+"/"+a.data("item-id");b.data=a.serialize();$("select.select-box-tags[data-hash][data-updated=true]").each(function(a,
+k){b.data+="&"+k.getAttribute("id")+"_update=1"});sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);void 0!==a.data.itemId&&void 0!==a.data.nextAction&&(a=sysPassApp.requests.getRouteForQuery(a.data.nextAction,a.data.itemId),f(a,"account"))})}},w={logout:function(){sysPassApp.util.redirect("index.php?r=login/logout")},login:function(a){d.info("main:login");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("route");b.method="get";b.data=a.serialize();sysPassApp.requests.getActionCall(b,
+function(b){var c=$(".extra-hidden");switch(b.status){case 0:sysPassApp.util.redirect(b.data.url);break;case 2:sysPassApp.msg.out(b);a.find("input[type='text'],input[type='password']").val("");a.find("input:visible:first").focus();0<c.length&&c.hide();$("#mpass").prop("disabled",!1).val("");$("#smpass").show();break;case 5:sysPassApp.msg.out(b);a.find("input[type='text'],input[type='password']").val("");a.find("input:visible:first").focus();0<c.length&&c.hide();$("#oldpass").prop("disabled",!1).val("");
+$("#soldpass").show();break;default:sysPassApp.msg.out(b),a.find("input[type='text'],input[type='password']").val(""),a.find("input:visible:first").focus()}})},install:function(a){d.info("main:install");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("route");b.data=a.serialize();sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);0===a.status&&setTimeout(function(){sysPassApp.util.redirect("index.php?r=login/index")},1E3)})},upgrade:function(a){d.info("main:upgrade");
+var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[59]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],onClick:function(b){var c;(b=a.find("input[name='taskId']").val())&&(c=v(b));var d=sysPassApp.requests.getRequestOpts();d.url=e.entrypoint+"?r="+a.data("action-route");d.method="get";d.useFullLoading=!!b;d.data=a.serialize();
 sysPassApp.requests.getActionCall(d,function(b){sysPassApp.msg.out(b);0!==b.status?a.find(":input[name=key]").val(""):(void 0!==c&&c.close(),setTimeout(function(){sysPassApp.util.redirect("index.php")},5E3))})}}})},getUpdates:function(){d.info("main:getUpdates");var a=sysPassApp.requests.getRequestOpts();a.url=e.entrypoint+"?r=status/checkRelease";a.method="get";a.timeout=1E4;a.useLoading=!1;a.data={isAjax:1};var b=$("#updates");sysPassApp.requests.getActionCall(a,function(a){0===a.status?0<a.data.length?
 b.html('<a id="link-updates" href="'+a.data.url+'" target="_blank">'+a.data.title+'\n                            <div id="help-hasupdates" class="icon material-icons mdl-color-text--indigo-200">cloud_download</div>\n                            </a>\n                            <span for="link-updates" class="mdl-tooltip mdl-tooltip--top mdl-tooltip--large">'+a.data.description+"</span>"):b.html('<div id="updates-info" class="icon material-icons mdl-color-text--teal-200">check_circle</div>\n                            <span for="updates-info" class="mdl-tooltip mdl-tooltip--top mdl-tooltip--large">'+
 sysPassApp.config.LANG[68]+"</span>"):b.html('<div id="updates-info" class="icon material-icons mdl-color-text--amber-200">warning</div>\n                        <span for="updates-info" class="mdl-tooltip mdl-tooltip--top mdl-tooltip--large">'+sysPassApp.config.LANG[69]+"</span>");sysPassApp.theme.update()},function(){b.html('<div id="updates-info" class="icon material-icons mdl-color-text--amber-200">warning</div>\n                    <span for="updates-info" class="mdl-tooltip mdl-tooltip--top mdl-tooltip--large">'+
@@ -26,32 +26,31 @@ a.data.length+'">feedback</div>\n                            </a>\n
 "_update=1"});sysPassApp.requests.getActionCall(c,function(c){sysPassApp.msg.out(c);0===c.status&&("function"===typeof b&&b(),void 0!==a.data("reload")?(d.info("reload"),setTimeout(function(){sysPassApp.util.redirect("index.php")},2E3)):!0===g.state.tab.refresh&&(d.info("refresh"),f({r:g.state.tab.route,tabIndex:g.state.tab.index})))})},refresh:function(a){this.state.update(a);f({r:this.state.tab.route,tabIndex:this.state.tab.index})}},t={show:function(a){d.info("appMgmt:show");g.state.update(a);
 var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint;b.method="get";var c=m.getSelection(a);!1!==c&&(b.data={r:a.data("action-route")+(0===c.length?"/"+a.data("item-id"):""),items:c,sk:sysPassApp.sk.get(),isAjax:1},sysPassApp.requests.getActionCall(b,function(b){if(0!==b.status)sysPassApp.msg.out(b);else{var d=a.data("item-dst");h(b.data.html,{open:function(){d&&(g.state.tab.refresh=!1)},close:function(){d&&c.update(a)}})}}))},delete:function(a){d.info("appMgmt:delete");g.state.update(a);
 m.delete(a,function(b){var c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;c.method="get";c.data={r:a.data("action-route")+(0===b.length?"/"+a.data("item-id"):""),items:b,sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(c,function(a){sysPassApp.msg.out(a);f({r:g.state.tab.route,tabIndex:g.state.tab.index})})})},save:function(a){d.info("appMgmt:save");g.save(a,function(){q()})},search:function(a){d.info("appMgmt:search");m.search(a)},nav:function(a){d.info("appMgmt:nav");
-m.nav(a)}},u={check:function(a){d.info("notification:check");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint;b.method="get";b.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(b,function(b){0===b.status&&f({r:a.data("action-next")});sysPassApp.sk.set(b.csrf);u.getActive()})},search:function(a){d.info("notification:search");m.search(a)},show:function(a){d.info("notification:show");t.show(a)},save:function(a){d.info("notification:save");
-var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("route");b.data=a.serialize();sysPassApp.requests.getActionCall(b,function(b){sysPassApp.msg.out(b);0===b.status&&($.magnificPopup.close(),f({r:a.data("action-next")}).then(function(){u.getActive()}))})},delete:function(a){d.info("notification:delete");m.delete(a,function(b){var c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;c.method="get";c.data={r:a.data("action-route")+(0===b.length?"/"+a.data("item-id"):""),
-items:b,sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(c,function(b){sysPassApp.msg.out(b);f({r:a.data("action-next")})})})},getActive:function(){d.info("notification:getActive");var a=sysPassApp.requests.getRequestOpts();a.url=e.entrypoint;a.method="get";a.data={r:"items/notifications",sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(a,function(a){var b=$(".notifications-badge"),d=$(".notifications-tooltip");b.each(function(){var b=$(this);b.attr("data-badge",
+m.nav(a)}},u={check:function(a){d.info("notification:check");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint;b.method="get";b.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(b,function(b){0===b.status&&f({r:a.data("action-next")});u.getActive()})},search:function(a){d.info("notification:search");m.search(a)},show:function(a){d.info("notification:show");t.show(a)},save:function(a){d.info("notification:save");var b=
+sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("route");b.data=a.serialize()+"&sk="+sysPassApp.sk.get();sysPassApp.requests.getActionCall(b,function(b){sysPassApp.msg.out(b);0===b.status&&($.magnificPopup.close(),f({r:a.data("action-next")}).then(function(){u.getActive()}))})},delete:function(a){d.info("notification:delete");m.delete(a,function(b){var c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;c.method="get";c.data={r:a.data("action-route")+(0===b.length?"/"+a.data("item-id"):
+""),items:b,sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(c,function(b){sysPassApp.msg.out(b);f({r:a.data("action-next")})})})},getActive:function(){d.info("notification:getActive");var a=sysPassApp.requests.getRequestOpts();a.url=e.entrypoint;a.method="get";a.data={r:"items/notifications",sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(a,function(a){var b=$(".notifications-badge"),d=$(".notifications-tooltip");b.each(function(){var b=$(this);b.attr("data-badge",
 a.data.count);0===a.data.count?(b.removeClass(b.data("color-class")),d.empty().html(a.data.message)):(b.addClass(b.data("color-class")),d.empty().html(a.data.message_has))});0<a.data.count&&sysPassApp.util.sendNotification(a.data.message_has,a.data.notifications.join("\n"),a.data.hash)})},nav:function(a){d.info("eventlog:nav");m.nav(a)}},m={search:function(a){d.info("grid:search");var b=$(a.data("target")),c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint+"?r="+a.data("action-route");c.method=
 "get";c.data=a.serialize();sysPassApp.requests.getActionCall(c,function(a){0===a.status?b.html(a.data.html):b.html(sysPassApp.msg.html.error(a.description));sysPassApp.sk.set(a.csrf)})},nav:function(a,b){d.info("grid:nav");var c=$("#"+a.data("action-form"));c.find("[name='start']").val(a.data("start"));c.find("[name='count']").val(a.data("count"));c.find("[name='sk']").val(sysPassApp.sk.get());"function"===typeof b?b(c):m.search(c)},delete:function(a,b){var c='<div id="alert"><p id="alert-text">'+
 sysPassApp.config.LANG[12]+"</p></div>",d=m.getSelection(a);!1!==d&&mdlDialog().show({text:c,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],onClick:function(a){a.preventDefault();"function"===typeof b&&b(d)}}})},getSelection:function(a){a=a.data("selection");var b=[];return a&&($(a).find(".is-selected").each(function(){b.push($(this).data("item-id"))}),0===b.length)?!1:
-b}},v=function(a){var b=$("#taskStatus");b.empty().html(sysPassApp.config.LANG[62]);var c=sysPassApp.requests.getRequestOpts();c.method="get";c.url=e.entrypoint+"?r=task/runTask/"+a;return sysPassApp.requests.getActionEvent(c,function(a){a=a.task+" - "+a.message+" - "+a.time+" - "+a.progress+"%";a+="<br>"+sysPassApp.config.LANG[62];b.empty().html(a)})};return{doAction:function(a,b){a={r:a.r+(void 0!==a.itemId?"/"+a.itemId:""),isAjax:1};var c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;
-c.method="get";c.type="html";c.addHistory=!0;c.data=a;sysPassApp.requests.getActionCall(c,function(a){var c=$("#content");c.empty().html(a);a=sysPassApp.triggers.views;a.common(c);if(void 0!==b&&"function"===typeof a[b])a[b]();c=$(".mdl-layout__content");0<c.scrollTop()&&c.animate({scrollTop:0},1E3)})},getContent:f,showFloatingBox:h,closeFloatingBox:q,appMgmt:t,account:n,accountManager:{restore:function(a){d.info("accountManager:restore");g.state.update(a);var b=a.data("item-id"),c=sysPassApp.requests.getRequestOpts();
-c.url=e.entrypoint;c.method="get";c.data={r:a.data("action-route")+"/"+b,sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(c,function(c){sysPassApp.msg.out(c);0===c.status&&((c=a.data("action-next"))?f({r:c+"/"+b}):f({r:g.state.tab.route,tabIndex:g.state.tab.index}))})}},file:{view:function(a){d.info("file:view");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint;b.method="get";b.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:sysPassApp.sk.get()};sysPassApp.requests.getActionCall(b,
-function(b){if(0!==b.status)return sysPassApp.msg.out(b);p(a,b.data.html)})},download:function(a){d.info("file:download");a={r:a.data("action-route")+"/"+a.data("item-id"),sk:sysPassApp.sk.get()};$.fileDownload(e.entrypoint,{httpMethod:"GET",data:a})},delete:function(a){d.info("file:delete");var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[15]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},
-positive:{title:sysPassApp.config.LANG[43],onClick:function(b){b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint;b.method="get";b.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:sysPassApp.sk.get()};sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);0===a.status&&n.listFiles($("#list-account-files"))})}}})}},checks:{wiki:function(a){d.info("checks:wiki");a=$(a.data("src"));a.find("[name='sk']").val(sysPassApp.sk.get());var b=sysPassApp.requests.getRequestOpts();
-b.url=e.entrypoint;b.data=a.serialize();sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);0===a.status&&$("#dokuWikiResCheck").html(a.data)})}},config:{save:function(a){d.info("config:save");g.save(a)},masterpass:function(a){var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[59]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(b){b.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44]);a.find(":input[type=password]").val("")}},
-positive:{title:sysPassApp.config.LANG[43],onClick:function(b){var c;(b=a.find("input[name='taskId']").val())&&(c=v(b));var d=sysPassApp.requests.getRequestOpts();d.url=e.entrypoint;d.useFullLoading=!!b;d.data=a.serialize();sysPassApp.requests.getActionCall(d,function(b){sysPassApp.msg.out(b);a.find(":input[type=password]").val("");void 0!==c&&c.close()})}}})},backup:function(a){d.info("config:backup");g.state.update(a);var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("action-route");
-b.useFullLoading=!0;b.data=a.serialize()+"&sk="+sysPassApp.sk.get();sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);0===a.status&&f({r:g.state.tab.route,tabIndex:g.state.tab.index})})},export:function(a){d.info("config:export");g.save(a)},import:function(a){d.info("config:import");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("action-route");b.data=a.serialize()+"&sk="+sysPassApp.sk.get();sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a)})},
-refreshMpass:function(a){d.info("config:import");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("action-route");b.data={sk:a.data("sk"),isAjax:1};sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a)})},mailCheck:function(a){d.info("config:mailCheck");var b=$(a.data("src")),c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint+"?r="+a.data("action-route");c.data=b.serialize()+"&sk="+sysPassApp.sk.get();sysPassApp.requests.getActionCall(c,function(a){sysPassApp.msg.out(a)})}},
-main:w,user:{showSettings:function(a){d.info("user:showSettings");f({r:a.data("action-route")},"userSettings")},saveSettings:function(a){d.info("user:saveSettings");g.save(a)},password:function(a){d.info("user:password");var b=sysPassApp.requests.getRequestOpts();b.type="html";b.method="get";b.url=e.entrypoint;b.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(b,function(a){0===a.length?w.logout():h(a)})},passreset:function(a){d.info("user:passreset");
-var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"/?r="+a.data("action-route");b.data=a.serialize();sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);0===a.status&&setTimeout(function(){sysPassApp.util.redirect("index.php")},2E3)})}},link:{save:function(a){d.info("link:save");var b=function(b){var c=a.data("account-id"),d=sysPassApp.requests.getRequestOpts();c?d.url=e.entrypoint+"?r="+a.data("action-route")+"/"+c+"/"+b:(d.url=e.entrypoint+"?r="+a.data("action-route"),
-d.data=a.serialize());sysPassApp.requests.getActionCall(d,function(b){sysPassApp.msg.out(b);0===b.status&&f({r:a.data("action-next")+"/"+c})})},c='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[48]+"</p></div>";mdlDialog().show({text:c,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();b(0)}},positive:{title:sysPassApp.config.LANG[43],onClick:function(a){a.preventDefault();b(1)}}})},delete:function(a){d.info("link:delete");var b='<div id="alert"><p id="alert-text">'+
-sysPassApp.config.LANG[12]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],onClick:function(b){b.preventDefault();b=a.data("item-id");var c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint+"?r="+a.data("action-route")+"/"+b;sysPassApp.requests.getActionCall(c,function(b){sysPassApp.msg.out(b);0===b.status&&f({r:a.data("action-next")+
-"/"+a.data("account-id")})})}}})},refresh:function(a){d.info("link:refresh");g.state.update(a);var b=a.data("item-id"),c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;c.method="get";c.data={r:a.data("action-route")+"/"+b,sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(c,function(b){sysPassApp.msg.out(b);0===b.status&&((b=a.data("action-next"))?f({r:b+"/"+a.data("account-id")}):f({r:g.state.tab.route,tabIndex:g.state.tab.index}))})}},eventlog:{clear:function(a){var b='<div id="alert"><p id="alert-text">'+
-sysPassApp.config.LANG[20]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],onClick:function(b){b.preventDefault();g.save(a)}}})}},ajaxUrl:e,plugin:{toggle:function(a){d.info("plugin:enable");g.state.update(a);var b=a.data("item-id"),c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;c.method="get";c.data={r:a.data("action-route")+
-"/"+b,sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(c,function(a){sysPassApp.msg.out(a);0===a.status&&setTimeout(function(){sysPassApp.util.redirect("index.php")},2E3)})},reset:function(a){d.info("plugin:reset");var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[58]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],
-onClick:function(b){b.preventDefault();g.save(a)}}})},search:function(a){d.info("plugin:search");m.search(a)},show:function(a){d.info("plugin:show");t.show(a)},save:function(a){d.info("plugin:save");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("route");b.data=a.serialize();sysPassApp.requests.getActionCall(b,function(b){sysPassApp.msg.out(b);0===b.status&&(f({r:a.data("action-next")}),$.magnificPopup.close())})},nav:function(a){d.info("plugin:nav");m.nav(a)}},notification:u,
-wiki:{show:function(a){d.info("wiki:show");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint;b.method="get";b.data={pageName:a.data("pagename"),actionId:a.data("action-id"),sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(b,function(a){0!==a.status?sysPassApp.msg.out(a):h(a.data.html)})}},items:{get:function(a){d.info("items:get");var b=a[0].selectize;b.clearOptions();b.load(function(c){var d=sysPassApp.requests.getRequestOpts();d.url=e.entrypoint;d.method="get";d.data=
-{r:a.data("action-route")+"/"+a.data("item-id"),sk:a.data("sk")};sysPassApp.requests.getActionCall(d,function(d){c(d.data);b.setValue(a.data("selected-id"),!0);sysPassApp.triggers.updateFormHash()})})},update:function(a){d.info("items:update");var b=$("#"+a.data("item-dst"))[0].selectize,c=b.getValue();b.clearOptions();b.load(function(d){var f=sysPassApp.requests.getRequestOpts();f.url=e.entrypoint;f.method="get";f.data={r:a.data("item-route"),sk:sysPassApp.sk.get()};sysPassApp.requests.getActionCall(f,
-function(a){d(a);b.setValue(c,!0)})})}},ldap:{check:function(a){d.info("ldap:check");var b=$(a.data("src")),c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint+"?r="+a.data("action-route");c.data=b.serialize()+"&sk="+sysPassApp.sk.get();sysPassApp.requests.getActionCall(c,function(a){sysPassApp.msg.out(a);0===a.status&&void 0!==a.data.template&&void 0!==a.data.items&&h(a.data.template,{open:function(){var b=$("#ldap-results").find(".list-wrap").empty();a.data.items.forEach(function(a){b.append(sysPassApp.theme.html.getList(a.items,
-a.icon))})}})})},import:function(a){d.info("ldap:import");var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[57]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],onClick:function(b){b=$(a.data("src"));var c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint+"?r="+a.data("action-route");c.data=b.serialize()+"&sk="+
-sysPassApp.sk.get();sysPassApp.requests.getActionCall(c,function(a){sysPassApp.msg.out(a)})}}})}},track:{unlock:function(a){d.info("track:unlock");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint;b.method="get";b.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(b,function(b){sysPassApp.msg.out(b);g.refresh(a)})},clear:function(a){d.info("track:clear");var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[71]+
-"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],onClick:function(b){b.preventDefault();g.save(a)}}})}}}};
+b}},v=function(a){var b=$("#taskStatus");b.empty().html(sysPassApp.config.LANG[62]);var c=sysPassApp.requests.getRequestOpts();c.method="get";c.url=e.entrypoint+"?r=task/runTask/"+a;return sysPassApp.requests.getActionEvent(c,function(a){a=a.task+" - "+a.message+" - "+a.time+" - "+a.progress+"%";a+="<br>"+sysPassApp.config.LANG[62];b.empty().html(a)})};return{getContent:f,showFloatingBox:h,closeFloatingBox:q,appMgmt:t,account:n,accountManager:{restore:function(a){d.info("accountManager:restore");
+g.state.update(a);var b=a.data("item-id"),c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;c.method="get";c.data={r:a.data("action-route")+"/"+b,sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(c,function(c){sysPassApp.msg.out(c);0===c.status&&((c=a.data("action-next"))?f({r:c+"/"+b}):f({r:g.state.tab.route,tabIndex:g.state.tab.index}))})}},file:{view:function(a){d.info("file:view");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint;b.method="get";b.data={r:a.data("action-route")+
+"/"+a.data("item-id"),sk:sysPassApp.sk.get()};sysPassApp.requests.getActionCall(b,function(b){if(0!==b.status)return sysPassApp.msg.out(b);p(a,b.data.html)})},download:function(a){d.info("file:download");a={r:a.data("action-route")+"/"+a.data("item-id"),sk:sysPassApp.sk.get()};$.fileDownload(e.entrypoint,{httpMethod:"GET",data:a})},delete:function(a){d.info("file:delete");var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[15]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],
+onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],onClick:function(b){b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint;b.method="get";b.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:sysPassApp.sk.get()};sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);0===a.status&&n.listFiles($("#list-account-files"))})}}})}},checks:{wiki:function(a){d.info("checks:wiki");a=$(a.data("src"));
+a.find("[name='sk']").val(sysPassApp.sk.get());var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint;b.data=a.serialize();sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);0===a.status&&$("#dokuWikiResCheck").html(a.data)})}},config:{save:function(a){d.info("config:save");g.save(a)},masterpass:function(a){var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[59]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(b){b.preventDefault();
+sysPassApp.msg.error(sysPassApp.config.LANG[44]);a.find(":input[type=password]").val("")}},positive:{title:sysPassApp.config.LANG[43],onClick:function(b){var c;(b=a.find("input[name='taskId']").val())&&(c=v(b));var d=sysPassApp.requests.getRequestOpts();d.url=e.entrypoint;d.useFullLoading=!!b;d.data=a.serialize();sysPassApp.requests.getActionCall(d,function(b){sysPassApp.msg.out(b);a.find(":input[type=password]").val("");void 0!==c&&c.close()})}}})},backup:function(a){d.info("config:backup");g.state.update(a);
+var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("action-route");b.useFullLoading=!0;b.data=a.serialize()+"&sk="+sysPassApp.sk.get();sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);0===a.status&&f({r:g.state.tab.route,tabIndex:g.state.tab.index})})},export:function(a){d.info("config:export");g.save(a)},import:function(a){d.info("config:import");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("action-route");b.data=a.serialize()+
+"&sk="+sysPassApp.sk.get();sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a)})},refreshMpass:function(a){d.info("config:import");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("action-route");b.data={sk:a.data("sk"),isAjax:1};sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a)})},mailCheck:function(a){d.info("config:mailCheck");var b=$(a.data("src")),c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint+"?r="+a.data("action-route");
+c.data=b.serialize()+"&sk="+sysPassApp.sk.get();sysPassApp.requests.getActionCall(c,function(a){sysPassApp.msg.out(a)})}},main:w,user:{showSettings:function(a){d.info("user:showSettings");f({r:a.data("action-route")},"userSettings")},saveSettings:function(a){d.info("user:saveSettings");g.save(a)},password:function(a){d.info("user:password");var b=sysPassApp.requests.getRequestOpts();b.type="html";b.method="get";b.url=e.entrypoint;b.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:sysPassApp.sk.get(),
+isAjax:1};sysPassApp.requests.getActionCall(b,function(a){0===a.length?w.logout():h(a)})},passreset:function(a){d.info("user:passreset");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"/?r="+a.data("action-route");b.data=a.serialize();sysPassApp.requests.getActionCall(b,function(a){sysPassApp.msg.out(a);0===a.status&&setTimeout(function(){sysPassApp.util.redirect("index.php")},2E3)})}},link:{save:function(a){d.info("link:save");var b=function(b){var c=a.data("account-id"),d=sysPassApp.requests.getRequestOpts();
+c?d.url=e.entrypoint+"?r="+a.data("action-route")+"/"+c+"/"+b:(d.url=e.entrypoint+"?r="+a.data("action-route"),d.data=a.serialize()+"&sk="+sysPassApp.sk.get());sysPassApp.requests.getActionCall(d,function(b){sysPassApp.msg.out(b);0===b.status&&f({r:a.data("action-next")+"/"+c})})},c='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[48]+"</p></div>";mdlDialog().show({text:c,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();b(0)}},positive:{title:sysPassApp.config.LANG[43],
+onClick:function(a){a.preventDefault();b(1)}}})},delete:function(a){d.info("link:delete");var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[12]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],onClick:function(b){b.preventDefault();b=a.data("item-id");var c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint+"?r="+
+a.data("action-route")+"/"+b;sysPassApp.requests.getActionCall(c,function(b){sysPassApp.msg.out(b);0===b.status&&f({r:a.data("action-next")+"/"+a.data("account-id")})})}}})},refresh:function(a){d.info("link:refresh");g.state.update(a);var b=a.data("item-id"),c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;c.method="get";c.data={r:a.data("action-route")+"/"+b,sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(c,function(b){sysPassApp.msg.out(b);0===b.status&&((b=a.data("action-next"))?
+f({r:b+"/"+a.data("account-id")}):f({r:g.state.tab.route,tabIndex:g.state.tab.index}))})}},eventlog:{clear:function(a){var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[20]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],onClick:function(b){b.preventDefault();g.save(a)}}})}},ajaxUrl:e,plugin:{toggle:function(a){d.info("plugin:enable");
+g.state.update(a);var b=a.data("item-id"),c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint;c.method="get";c.data={r:a.data("action-route")+"/"+b,sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(c,function(a){sysPassApp.msg.out(a);0===a.status&&setTimeout(function(){sysPassApp.util.redirect("index.php")},2E3)})},reset:function(a){d.info("plugin:reset");var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[58]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],
+onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],onClick:function(b){b.preventDefault();g.save(a)}}})},search:function(a){d.info("plugin:search");m.search(a)},show:function(a){d.info("plugin:show");t.show(a)},save:function(a){d.info("plugin:save");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint+"?r="+a.data("route");b.data=a.serialize()+"&sk="+sysPassApp.sk.get();sysPassApp.requests.getActionCall(b,function(b){sysPassApp.msg.out(b);
+0===b.status&&(f({r:a.data("action-next")}),$.magnificPopup.close())})},nav:function(a){d.info("plugin:nav");m.nav(a)}},notification:u,wiki:{show:function(a){d.info("wiki:show");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint;b.method="get";b.data={pageName:a.data("pagename"),actionId:a.data("action-id"),sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(b,function(a){0!==a.status?sysPassApp.msg.out(a):h(a.data.html)})}},items:{get:function(a){d.info("items:get");var b=
+a[0].selectize;b.clearOptions();b.load(function(c){var d=sysPassApp.requests.getRequestOpts();d.url=e.entrypoint;d.method="get";d.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:a.data("sk")};sysPassApp.requests.getActionCall(d,function(d){c(d.data);b.setValue(a.data("selected-id"),!0);sysPassApp.triggers.updateFormHash()})})},update:function(a){d.info("items:update");var b=$("#"+a.data("item-dst"))[0].selectize,c=b.getValue();b.clearOptions();b.load(function(d){var f=sysPassApp.requests.getRequestOpts();
+f.url=e.entrypoint;f.method="get";f.data={r:a.data("item-route"),sk:sysPassApp.sk.get()};sysPassApp.requests.getActionCall(f,function(a){d(a);b.setValue(c,!0)})})}},ldap:{check:function(a){d.info("ldap:check");var b=$(a.data("src")),c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint+"?r="+a.data("action-route");c.data=b.serialize()+"&sk="+sysPassApp.sk.get();sysPassApp.requests.getActionCall(c,function(a){sysPassApp.msg.out(a);0===a.status&&void 0!==a.data.template&&void 0!==a.data.items&&
+h(a.data.template,{open:function(){var b=$("#ldap-results").find(".list-wrap").empty();a.data.items.forEach(function(a){b.append(sysPassApp.theme.html.getList(a.items,a.icon))})}})})},import:function(a){d.info("ldap:import");var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[57]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],
+onClick:function(b){b=$(a.data("src"));var c=sysPassApp.requests.getRequestOpts();c.url=e.entrypoint+"?r="+a.data("action-route");c.data=b.serialize()+"&sk="+sysPassApp.sk.get();sysPassApp.requests.getActionCall(c,function(a){sysPassApp.msg.out(a)})}}})}},track:{unlock:function(a){d.info("track:unlock");var b=sysPassApp.requests.getRequestOpts();b.url=e.entrypoint;b.method="get";b.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:sysPassApp.sk.get(),isAjax:1};sysPassApp.requests.getActionCall(b,
+function(b){sysPassApp.msg.out(b);g.refresh(a)})},clear:function(a){d.info("track:clear");var b='<div id="alert"><p id="alert-text">'+sysPassApp.config.LANG[71]+"</p></div>";mdlDialog().show({text:b,negative:{title:sysPassApp.config.LANG[44],onClick:function(a){a.preventDefault();sysPassApp.msg.error(sysPassApp.config.LANG[44])}},positive:{title:sysPassApp.config.LANG[43],onClick:function(b){b.preventDefault();g.save(a)}}})}}}};
diff --git a/public/js/app-requests.js b/public/js/app-requests.js
index 8251b59d..338710e5 100644
--- a/public/js/app-requests.js
+++ b/public/js/app-requests.js
@@ -152,6 +152,13 @@ sysPass.Requests = function (sysPassApp) {
                     history.add(opts);
                 }
 
+                if (opts.type === "json"
+                    && response['csrf'] !== undefined
+                    && response.csrf !== ""
+                ) {
+                    sysPassApp.sk.set(response.csrf);
+                }
+
                 callbackOk(response);
             },
             error: function (jqXHR, textStatus, errorThrown) {
@@ -182,14 +189,6 @@ sysPass.Requests = function (sysPassApp) {
                     sysPassApp.theme.loading.hide();
                 }
 
-                if (opts.type === "json"
-                    && response.responseJSON !== undefined
-                    && response.responseJSON.csrf !== undefined
-                    && response.responseJSON.csrf !== ""
-                ) {
-                    sysPassApp.sk.set(response.responseJSON.csrf);
-                }
-
                 if (sysPassApp.theme !== undefined) {
                     sysPassApp.theme.ajax.complete();
                 }
diff --git a/public/js/app-requests.min.js b/public/js/app-requests.min.js
index f782c35e..f1fd343e 100644
--- a/public/js/app-requests.min.js
+++ b/public/js/app-requests.min.js
@@ -1,5 +1,5 @@
-sysPass.Requests=function(c){var e=c.log,b=[],g={type:"json",url:"",method:"post",callback:"",async:!0,data:"",cache:!1,processData:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",timeout:0,addHistory:!1,hash:"",useLoading:!0,useFullLoading:!1};Object.seal(g);var h={get:function(){return b},add:function(a){var f=""===a.hash?c.util.hash.md5(JSON.stringify(a)):a.hash;if(0<b.length&&b[b.length-1].hash===f)return b;e.info("history:add");a.hash=f;b.push(a);15<=b.length&&b.splice(0,10);
-return b},del:function(){e.info("history:del");if("undefined"!==typeof b.pop())return b[b.length-1]},reset:function(){e.info("history:reset");b=[]},length:function(){return b.length}},k=function(a){return-1===a.indexOf("http")&&-1===a.indexOf("https")?c.config.APP_ROOT+a:a};return{getRequestOpts:function(){return Object.create(g)},getActionCall:function(a,b,l){e.info("getActionCall");return $.ajax({dataType:a.type,url:k(a.url),method:a.method,async:a.async,data:a.data,cache:a.cache,processData:a.processData,
-contentType:a.contentType,timeout:a.timeout,beforeSend:function(){!0===a.useLoading&&c.theme.loading.show(a.useFullLoading)},success:function(c){if("function"!==typeof b)return!0;!0===a.addHistory&&(a.callback=b,h.add(a));b(c)},error:function(b,d,f){"function"!==typeof l?(d=void 0!==c.config.LANG[1]?c.config.LANG[1]:"An error occurred",d+="<p>"+f+"</p><p>"+b.responseText+"</p>",e.error(d),"html"===a.type&&$("#content").html(c.msg.html.error(d)),c.msg.error(d)):l()},complete:function(b){!0===a.useLoading&&
-c.theme.loading.hide();"json"===a.type&&void 0!==b.responseJSON&&void 0!==b.responseJSON.csrf&&""!==b.responseJSON.csrf&&c.sk.set(b.responseJSON.csrf);void 0!==c.theme&&c.theme.ajax.complete()}})},getActionEvent:function(a,b,c){var f=k(a.url);f+="?"+$.param(a.data);var d=new EventSource(f);d.addEventListener("message",function(a){a=JSON.parse(a.data);e.debug(a);1===a.end?(e.info("getActionEvent:Ending"),d.close(),"function"===typeof c&&c(a)):"function"===typeof b&&b(a)});d.addEventListener("error",
-function(a){e.error("getActionEvent:Error occured");d.close()});return d},getRouteForQuery:function(a,b){return"object"===typeof b?{r:a+"/"+b.join("/")}:{r:a+"/"+b}},history:h}};
+sysPass.Requests=function(c){var e=c.log,b=[],h={type:"json",url:"",method:"post",callback:"",async:!0,data:"",cache:!1,processData:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",timeout:0,addHistory:!1,hash:"",useLoading:!0,useFullLoading:!1};Object.seal(h);var k={get:function(){return b},add:function(a){var f=""===a.hash?c.util.hash.md5(JSON.stringify(a)):a.hash;if(0<b.length&&b[b.length-1].hash===f)return b;e.info("history:add");a.hash=f;b.push(a);15<=b.length&&b.splice(0,10);
+return b},del:function(){e.info("history:del");if("undefined"!==typeof b.pop())return b[b.length-1]},reset:function(){e.info("history:reset");b=[]},length:function(){return b.length}},l=function(a){return-1===a.indexOf("http")&&-1===a.indexOf("https")?c.config.APP_ROOT+a:a};return{getRequestOpts:function(){return Object.create(h)},getActionCall:function(a,b,m){e.info("getActionCall");return $.ajax({dataType:a.type,url:l(a.url),method:a.method,async:a.async,data:a.data,cache:a.cache,processData:a.processData,
+contentType:a.contentType,timeout:a.timeout,beforeSend:function(){!0===a.useLoading&&c.theme.loading.show(a.useFullLoading)},success:function(g){if("function"!==typeof b)return!0;!0===a.addHistory&&(a.callback=b,k.add(a));"json"===a.type&&void 0!==g.csrf&&""!==g.csrf&&c.sk.set(g.csrf);b(g)},error:function(b,d,f){"function"!==typeof m?(d=void 0!==c.config.LANG[1]?c.config.LANG[1]:"An error occurred",d+="<p>"+f+"</p><p>"+b.responseText+"</p>",e.error(d),"html"===a.type&&$("#content").html(c.msg.html.error(d)),
+c.msg.error(d)):m()},complete:function(b){!0===a.useLoading&&c.theme.loading.hide();void 0!==c.theme&&c.theme.ajax.complete()}})},getActionEvent:function(a,b,c){var f=l(a.url);f+="?"+$.param(a.data);var d=new EventSource(f);d.addEventListener("message",function(a){a=JSON.parse(a.data);e.debug(a);1===a.end?(e.info("getActionEvent:Ending"),d.close(),"function"===typeof c&&c(a)):"function"===typeof b&&b(a)});d.addEventListener("error",function(a){e.error("getActionEvent:Error occured");d.close()});return d},
+getRouteForQuery:function(a,b){return"object"===typeof b?{r:a+"/"+b.join("/")}:{r:a+"/"+b}},history:k}};
diff --git a/public/js/app-triggers.js b/public/js/app-triggers.js
index 914d144b..259e32f4 100644
--- a/public/js/app-triggers.js
+++ b/public/js/app-triggers.js
@@ -178,6 +178,8 @@ sysPass.Triggers = function (log) {
 
                 const lastHistory = sysPassApp.requests.history.del();
 
+                lastHistory.data.sk = sysPassApp.sk.get();
+
                 sysPassApp.requests.getActionCall(lastHistory, lastHistory.callback);
             }
         }).on("submit", ".form-action", function (e) {
@@ -238,19 +240,20 @@ sysPass.Triggers = function (log) {
                     sysPassApp.requests.history.reset();
                 }
 
-                sysPassApp.actions.doAction({r: $this.data("route")}, $this.data("view"));
+                sysPassApp.actions.getContent({r: $this.data("route")}, $this.data("view"));
             });
 
-            if (sysPassApp.config.STATUS.CHECK_NOTIFICATIONS) {
-                sysPassApp.actions.notification.getActive();
 
+            sysPassApp.actions.notification.getActive();
+
+            if (sysPassApp.config.STATUS.CHECK_NOTIFICATIONS) {
                 setInterval(function () {
                     sysPassApp.actions.notification.getActive();
                 }, 120000);
             }
 
             if ($obj.data("upgraded") === 0) {
-                sysPassApp.actions.doAction({r: "account/index"}, "search");
+                sysPassApp.actions.getContent({r: "account/index"}, "search");
             } else {
                 const $content = $("#content");
                 const page = $content.data('page');
@@ -349,17 +352,17 @@ sysPass.Triggers = function (log) {
 
             selectDetect($container);
 
-            const $sk = $container.find(":input [name='sk']");
+            const $sk = $container.find(":input[name='sk']");
 
-            if ($sk.length > 0) {
-                sysPassApp.sk.set($sk.val());
+            if ($sk.length > 0 && $sk[0].value !== "") {
+                sysPassApp.sk.set($sk[0].value);
             }
 
             if (typeof sysPassApp.theme.viewsTriggers.common === "function") {
                 sysPassApp.theme.viewsTriggers.common($container);
             }
 
-            initializeTags();
+            initializeTags($container);
 
             sysPassApp.triggers.updateFormHash($container);
         },
@@ -455,10 +458,11 @@ sysPass.Triggers = function (log) {
         }
     };
 
-    const initializeTags = function () {
+    const initializeTags = function ($container) {
         log.info("initializeTags");
 
-        $(".select-box-tags").selectize({
+        $container
+            .find(".select-box-tags").selectize({
             persist: false,
             valueField: 'id',
             labelField: 'name',
@@ -467,8 +471,11 @@ sysPass.Triggers = function (log) {
             onInitialize: function () {
                 const $wrapper = $(this.$wrapper[0]);
                 const $input = $(this.$input[0]);
+                const value = this.getValue();
 
-                $input.attr("data-hash", sysPassApp.util.hash.md5(this.getValue().join()));
+                if (value !== "") {
+                    $input.attr("data-hash", sysPassApp.util.hash.md5(value.join()));
+                }
 
                 const currentItemId = $input.data("currentItemId");
 
diff --git a/public/js/app-triggers.min.js b/public/js/app-triggers.min.js
index 36d25299..84503527 100644
--- a/public/js/app-triggers.min.js
+++ b/public/js/app-triggers.min.js
@@ -1,19 +1,19 @@
-var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(c,f,e){c instanceof String&&(c=String(c));for(var g=c.length,a=0;a<g;a++){var b=c[a];if(f.call(e,b,a,c))return{i:a,v:b}}return{i:-1,v:void 0}};$jscomp.ASSUME_ES5=!1;$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(c,f,e){c!=Array.prototype&&c!=Object.prototype&&(c[f]=e.value)};
-$jscomp.getGlobal=function(c){return"undefined"!=typeof window&&window===c?c:"undefined"!=typeof global&&null!=global?global:c};$jscomp.global=$jscomp.getGlobal(this);$jscomp.polyfill=function(c,f,e,g){if(f){e=$jscomp.global;c=c.split(".");for(g=0;g<c.length-1;g++){var a=c[g];a in e||(e[a]={});e=e[a]}c=c[c.length-1];g=e[c];f=f(g);f!=g&&null!=f&&$jscomp.defineProperty(e,c,{configurable:!0,writable:!0,value:f})}};
-$jscomp.polyfill("Array.prototype.find",function(c){return c?c:function(c,e){return $jscomp.findInternal(this,c,e).v}},"es6","es3");
-sysPass.Triggers=function(c){var f=function(a){var b={valueField:"id",labelField:"name",searchField:["name"],onInitialize:function(){var a=$(this.$wrapper[0]),b=$(this.$input[0]).siblings(".btn-add-select");1===b.length&&a.append(b)}};a.find(".select-box").each(function(a){var c=$(this);a={};!0===c.data("create")&&(a.create=!0);b.plugins=c.hasClass("select-box-deselect")?{clear_selection:{title:sysPassApp.config.LANG[51]}}:{};if(c.data("onchange")){var d=c.data("onchange").split("/");b.onChange=function(a){if(0<
-a)if(2===d.length)sysPassApp.actions[d[0]][d[1]](c);else sysPassApp.actions[d[0]](c)}}c.selectize($.extend(a,b))});a.find("#allowed_exts").selectize({create:function(a){return{value:a.toUpperCase(),text:a.toUpperCase()}},createFilter:/^[a-z0-9]{1,4}$/i,plugins:["remove_button"]});a.find("#wikifilter").selectize({create:!0,createFilter:/^[a-z0-9:._-]+$/i,plugins:["remove_button"]});a.find(".select-items-tag").selectize({create:function(a){return{value:a.toLowerCase(),text:a.toLowerCase()}},createFilter:/^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/,
-plugins:["remove_button"]})},e={main:function(a){c.info("views:main");clipboard.isSupported()||sysPassApp.msg.info(sysPassApp.config.LANG[65]);$(".btn-menu").click(function(){var a=$(this);"1"===a.attr("data-history-reset")&&sysPassApp.requests.history.reset();sysPassApp.actions.doAction({r:a.data("route")},a.data("view"))});sysPassApp.config.STATUS.CHECK_NOTIFICATIONS&&(sysPassApp.actions.notification.getActive(),setInterval(function(){sysPassApp.actions.notification.getActive()},12E4));if(0===a.data("upgraded"))sysPassApp.actions.doAction({r:"account/index"},
-"search");else{a=$("#content");var b=a.data("page");e.common(a);if(""!==b&&"function"===typeof e[b])e[b]()}!0===sysPassApp.config.STATUS.CHECK_UPDATES&&sysPassApp.actions.main.getUpdates();!0===sysPassApp.config.STATUS.CHECK_NOTICES&&sysPassApp.actions.main.getNotices();"function"===typeof sysPassApp.theme.viewsTriggers.main&&sysPassApp.theme.viewsTriggers.main()},search:function(){c.info("views:search");var a=$("#frmSearch");0!==a.length&&(a.find("input[name='search']").on("keyup",function(b){b.preventDefault();
-13!==b.which&&13!==b.keyCode||a.submit()}),a.find("select, #rpp").on("change",function(){a.submit()}),a.find("button.btn-clear").on("click",function(b){b.preventDefault();a.find('input[name="searchfav"]').val(0);a[0].reset()}),a.find("input:text:visible:first").focus(),$("#globalSearch").click(function(){var b=1==$(this).prop("checked")?1:0;a.find("input[name='gsearch']").val(b);a.submit()}),"function"===typeof sysPassApp.theme.viewsTriggers.search&&sysPassApp.theme.viewsTriggers.search())},login:function(){c.info("views:login");
-var a=$("#frmLogin");sysPassApp.config.AUTH.AUTHBASIC_AUTOLOGIN&&"0"===a.find("input[name='loggedOut']").val()&&(c.info("views:login:autologin"),sysPassApp.msg.info(sysPassApp.config.LANG[66]),sysPassApp.actions.main.login(a));a.find("input:visible:first").focus()},userpassreset:function(){c.info("views:userpassreset");var a=$("#frmUserPassReset");sysPassApp.theme.passwordDetect(a)},footer:function(){c.info("views:footer")},common:function(a){c.info("views:common");f(a);var b=a.find(":input [name='sk']");
-0<b.length&&sysPassApp.sk.set(b.val());"function"===typeof sysPassApp.theme.viewsTriggers.common&&sysPassApp.theme.viewsTriggers.common(a);g();sysPassApp.triggers.updateFormHash(a)},datatabs:function(){c.info("views:datatabs");$(".datagrid-action-search>form").each(function(){var a=$(this);a.find("button.btn-clear").on("click",function(b){b.preventDefault();a.trigger("reset")})})},config:function(){c.info("views:config");var a=$("#drop-import-files");if(0<a.length){var b=sysPassApp.util.fileUpload(a);
-b.url=sysPassApp.actions.ajaxUrl.entrypoint+"?r="+a.data("action-route");b.allowedExts=sysPassApp.config.FILES.IMPORT_ALLOWED_EXTS;b.beforeSendAction=function(){b.setRequestData({sk:sysPassApp.sk.get(),csvDelimiter:$("#csvDelimiter").val(),importPwd:$("#importPwd").val(),importMasterPwd:$("#importMasterPwd").val(),import_defaultuser:$("#import_defaultuser").val(),import_defaultgroup:$("#import_defaultgroup").val()})}}},account:function(){c.info("views:account");var a=$("#list-account-files");0<a.length&&
-sysPassApp.actions.account.listFiles(a);var b=$("#drop-account-files");if(0<b.length){var d=sysPassApp.util.fileUpload(b);d.url=sysPassApp.actions.ajaxUrl.entrypoint+"?r="+b.data("action-route")+"/"+b.data("item-id");d.allowedExts=sysPassApp.config.FILES.ACCOUNT_ALLOWED_EXTS;d.requestDoneAction=function(){sysPassApp.actions.account.listFiles(a)}}b=$("#parent_account_id");0<b.length&&(b.on("change",function(){var a=$(this),b=$("#accountpass,#accountpassR");0<a[0].value?b.each(function(){$(this).prop("disabled",
-"true");$(this).prop("required","false")}):b.each(function(){$(this).prop("disabled","");$(this).prop("required","true")})}),sysPassApp.actions.items.get(b));$("input:text:visible:first").focus()},install:function(){c.info("views:install");var a=$("#frmInstall");sysPassApp.theme.passwordDetect(a);f(a)}},g=function(){c.info("initializeTags");$(".select-box-tags").selectize({persist:!1,valueField:"id",labelField:"name",searchField:["name"],plugins:["remove_button"],onInitialize:function(){var a=$(this.$wrapper[0]),
-b=$(this.$input[0]);b.attr("data-hash",sysPassApp.util.hash.md5(this.getValue().join()));var c=b.data("currentItemId");void 0!==c&&this.removeOption(c,!0);c=b.siblings(".btn-add-select");1===c.length&&a.append(c);b=b.siblings(".select-icon");1===b.length&&a.prepend(b)},onChange:function(){var a=$(this.$input[0]),b=sysPassApp.util.hash.md5(this.getValue().join())!==a.data("hash");a.attr("data-updated",b)}})};return{views:e,selectDetect:f,updateSk:function(){$("#content").find("[data-sk]").each(function(){c.info("updateSk");
-$(this).data("sk",sysPassApp.sk.get())})},updateFormHash:function(a){c.info("updateFormHash");a=void 0!==a?a.find(".form-action[data-hash]"):$(".form-action[data-hash]");0<a.length&&a.each(function(){var a=$(this);a.attr("data-hash",sysPassApp.util.hash.md5(a.serialize()))})},bodyHooks:function(){c.info("bodyHooks");$("body").on("click","button.btn-action[data-onclick][type='button'],li.btn-action[data-onclick],span.btn-action[data-onclick],i.btn-action[data-onclick],a.btn-action[data-onclick],.btn-action-pager[data-onclick]",
-function(){var a=$(this);c.info("handleActionButton: "+a.attr("id"));var b=a.data("onclick").split("/");var d=a.data("plugin");d=void 0!==d&&void 0!==sysPassApp.plugins[d]?sysPassApp.plugins[d]:sysPassApp.actions;if(2===b.length)d[b[0]][b[1]](a);else d[b[0]](a)}).on("click",".btn-back",function(){if(0<sysPassApp.requests.history.length()){c.info("back");var a=sysPassApp.requests.history.del();sysPassApp.requests.getActionCall(a,a.callback)}}).on("submit",".form-action",function(a){a.preventDefault();
-a=$(this);c.info("formAction");var b=a.attr("data-hash"),d=sysPassApp.util.hash.md5(a.serialize());if(b===d)sysPassApp.msg.ok(sysPassApp.config.LANG[55]);else if(b=a.data("plugin"),b=void 0!==b&&void 0!==sysPassApp.plugins[b]?sysPassApp.plugins[b]:sysPassApp.actions,d=a.data("onsubmit").split("/"),a.find("input[name='sk']").val(sysPassApp.sk.get()),2===d.length)b[d[0]][d[1]](a);else b[d[0]](a)}).on("click",".btn-help[data-help]",function(){var a=$(this);a=$.find("div[for='"+a.data("help")+"']");if(0<
-a.length){var b=sysPassApp.config.LANG[54]+" - "+a[0].getAttribute("title")||sysPassApp.config.LANG[54];mdlDialog().show({title:b,text:a[0].innerHTML,positive:{title:sysPassApp.config.LANG[43]}})}}).on("reset",".form-action",function(a){a.preventDefault();c.info("reset");a=$(this);a.find("input:text, input:password, input:file, textarea").val("").parent("div").removeClass("is-dirty");a.find("input:radio, input:checkbox").prop("checked",!1).prop("selected",!1);a.find("input[name='start'], input[name='skey'], input[name='sorder']").val(0);
+var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(b,e,d){b instanceof String&&(b=String(b));for(var f=b.length,a=0;a<f;a++){var c=b[a];if(e.call(d,c,a,b))return{i:a,v:c}}return{i:-1,v:void 0}};$jscomp.ASSUME_ES5=!1;$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(b,e,d){b!=Array.prototype&&b!=Object.prototype&&(b[e]=d.value)};
+$jscomp.getGlobal=function(b){return"undefined"!=typeof window&&window===b?b:"undefined"!=typeof global&&null!=global?global:b};$jscomp.global=$jscomp.getGlobal(this);$jscomp.polyfill=function(b,e,d,f){if(e){d=$jscomp.global;b=b.split(".");for(f=0;f<b.length-1;f++){var a=b[f];a in d||(d[a]={});d=d[a]}b=b[b.length-1];f=d[b];e=e(f);e!=f&&null!=e&&$jscomp.defineProperty(d,b,{configurable:!0,writable:!0,value:e})}};
+$jscomp.polyfill("Array.prototype.find",function(b){return b?b:function(b,d){return $jscomp.findInternal(this,b,d).v}},"es6","es3");
+sysPass.Triggers=function(b){var e=function(a){var c={valueField:"id",labelField:"name",searchField:["name"],onInitialize:function(){var a=$(this.$wrapper[0]),c=$(this.$input[0]).siblings(".btn-add-select");1===c.length&&a.append(c)}};a.find(".select-box").each(function(a){var b=$(this);a={};!0===b.data("create")&&(a.create=!0);c.plugins=b.hasClass("select-box-deselect")?{clear_selection:{title:sysPassApp.config.LANG[51]}}:{};if(b.data("onchange")){var g=b.data("onchange").split("/");c.onChange=function(a){if(0<
+a)if(2===g.length)sysPassApp.actions[g[0]][g[1]](b);else sysPassApp.actions[g[0]](b)}}b.selectize($.extend(a,c))});a.find("#allowed_exts").selectize({create:function(a){return{value:a.toUpperCase(),text:a.toUpperCase()}},createFilter:/^[a-z0-9]{1,4}$/i,plugins:["remove_button"]});a.find("#wikifilter").selectize({create:!0,createFilter:/^[a-z0-9:._-]+$/i,plugins:["remove_button"]});a.find(".select-items-tag").selectize({create:function(a){return{value:a.toLowerCase(),text:a.toLowerCase()}},createFilter:/^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/,
+plugins:["remove_button"]})},d={main:function(a){b.info("views:main");clipboard.isSupported()||sysPassApp.msg.info(sysPassApp.config.LANG[65]);$(".btn-menu").click(function(){var a=$(this);"1"===a.attr("data-history-reset")&&sysPassApp.requests.history.reset();sysPassApp.actions.getContent({r:a.data("route")},a.data("view"))});sysPassApp.actions.notification.getActive();sysPassApp.config.STATUS.CHECK_NOTIFICATIONS&&setInterval(function(){sysPassApp.actions.notification.getActive()},12E4);if(0===a.data("upgraded"))sysPassApp.actions.getContent({r:"account/index"},
+"search");else{a=$("#content");var c=a.data("page");d.common(a);if(""!==c&&"function"===typeof d[c])d[c]()}!0===sysPassApp.config.STATUS.CHECK_UPDATES&&sysPassApp.actions.main.getUpdates();!0===sysPassApp.config.STATUS.CHECK_NOTICES&&sysPassApp.actions.main.getNotices();"function"===typeof sysPassApp.theme.viewsTriggers.main&&sysPassApp.theme.viewsTriggers.main()},search:function(){b.info("views:search");var a=$("#frmSearch");0!==a.length&&(a.find("input[name='search']").on("keyup",function(c){c.preventDefault();
+13!==c.which&&13!==c.keyCode||a.submit()}),a.find("select, #rpp").on("change",function(){a.submit()}),a.find("button.btn-clear").on("click",function(c){c.preventDefault();a.find('input[name="searchfav"]').val(0);a[0].reset()}),a.find("input:text:visible:first").focus(),$("#globalSearch").click(function(){var c=1==$(this).prop("checked")?1:0;a.find("input[name='gsearch']").val(c);a.submit()}),"function"===typeof sysPassApp.theme.viewsTriggers.search&&sysPassApp.theme.viewsTriggers.search())},login:function(){b.info("views:login");
+var a=$("#frmLogin");sysPassApp.config.AUTH.AUTHBASIC_AUTOLOGIN&&"0"===a.find("input[name='loggedOut']").val()&&(b.info("views:login:autologin"),sysPassApp.msg.info(sysPassApp.config.LANG[66]),sysPassApp.actions.main.login(a));a.find("input:visible:first").focus()},userpassreset:function(){b.info("views:userpassreset");var a=$("#frmUserPassReset");sysPassApp.theme.passwordDetect(a)},footer:function(){b.info("views:footer")},common:function(a){b.info("views:common");e(a);var c=a.find(":input[name='sk']");
+0<c.length&&""!==c[0].value&&sysPassApp.sk.set(c[0].value);"function"===typeof sysPassApp.theme.viewsTriggers.common&&sysPassApp.theme.viewsTriggers.common(a);f(a);sysPassApp.triggers.updateFormHash(a)},datatabs:function(){b.info("views:datatabs");$(".datagrid-action-search>form").each(function(){var a=$(this);a.find("button.btn-clear").on("click",function(c){c.preventDefault();a.trigger("reset")})})},config:function(){b.info("views:config");var a=$("#drop-import-files");if(0<a.length){var c=sysPassApp.util.fileUpload(a);
+c.url=sysPassApp.actions.ajaxUrl.entrypoint+"?r="+a.data("action-route");c.allowedExts=sysPassApp.config.FILES.IMPORT_ALLOWED_EXTS;c.beforeSendAction=function(){c.setRequestData({sk:sysPassApp.sk.get(),csvDelimiter:$("#csvDelimiter").val(),importPwd:$("#importPwd").val(),importMasterPwd:$("#importMasterPwd").val(),import_defaultuser:$("#import_defaultuser").val(),import_defaultgroup:$("#import_defaultgroup").val()})}}},account:function(){b.info("views:account");var a=$("#list-account-files");0<a.length&&
+sysPassApp.actions.account.listFiles(a);var c=$("#drop-account-files");if(0<c.length){var g=sysPassApp.util.fileUpload(c);g.url=sysPassApp.actions.ajaxUrl.entrypoint+"?r="+c.data("action-route")+"/"+c.data("item-id");g.allowedExts=sysPassApp.config.FILES.ACCOUNT_ALLOWED_EXTS;g.requestDoneAction=function(){sysPassApp.actions.account.listFiles(a)}}c=$("#parent_account_id");0<c.length&&(c.on("change",function(){var a=$(this),c=$("#accountpass,#accountpassR");0<a[0].value?c.each(function(){$(this).prop("disabled",
+"true");$(this).prop("required","false")}):c.each(function(){$(this).prop("disabled","");$(this).prop("required","true")})}),sysPassApp.actions.items.get(c));$("input:text:visible:first").focus()},install:function(){b.info("views:install");var a=$("#frmInstall");sysPassApp.theme.passwordDetect(a);e(a)}},f=function(a){b.info("initializeTags");a.find(".select-box-tags").selectize({persist:!1,valueField:"id",labelField:"name",searchField:["name"],plugins:["remove_button"],onInitialize:function(){var a=
+$(this.$wrapper[0]),b=$(this.$input[0]),d=this.getValue();""!==d&&b.attr("data-hash",sysPassApp.util.hash.md5(d.join()));d=b.data("currentItemId");void 0!==d&&this.removeOption(d,!0);d=b.siblings(".btn-add-select");1===d.length&&a.append(d);b=b.siblings(".select-icon");1===b.length&&a.prepend(b)},onChange:function(){var a=$(this.$input[0]),b=sysPassApp.util.hash.md5(this.getValue().join())!==a.data("hash");a.attr("data-updated",b)}})};return{views:d,selectDetect:e,updateSk:function(){$("#content").find("[data-sk]").each(function(){b.info("updateSk");
+$(this).data("sk",sysPassApp.sk.get())})},updateFormHash:function(a){b.info("updateFormHash");a=void 0!==a?a.find(".form-action[data-hash]"):$(".form-action[data-hash]");0<a.length&&a.each(function(){var a=$(this);a.attr("data-hash",sysPassApp.util.hash.md5(a.serialize()))})},bodyHooks:function(){b.info("bodyHooks");$("body").on("click","button.btn-action[data-onclick][type='button'],li.btn-action[data-onclick],span.btn-action[data-onclick],i.btn-action[data-onclick],a.btn-action[data-onclick],.btn-action-pager[data-onclick]",
+function(){var a=$(this);b.info("handleActionButton: "+a.attr("id"));var c=a.data("onclick").split("/");var d=a.data("plugin");d=void 0!==d&&void 0!==sysPassApp.plugins[d]?sysPassApp.plugins[d]:sysPassApp.actions;if(2===c.length)d[c[0]][c[1]](a);else d[c[0]](a)}).on("click",".btn-back",function(){if(0<sysPassApp.requests.history.length()){b.info("back");var a=sysPassApp.requests.history.del();a.data.sk=sysPassApp.sk.get();sysPassApp.requests.getActionCall(a,a.callback)}}).on("submit",".form-action",
+function(a){a.preventDefault();a=$(this);b.info("formAction");var c=a.attr("data-hash"),d=sysPassApp.util.hash.md5(a.serialize());if(c===d)sysPassApp.msg.ok(sysPassApp.config.LANG[55]);else if(c=a.data("plugin"),c=void 0!==c&&void 0!==sysPassApp.plugins[c]?sysPassApp.plugins[c]:sysPassApp.actions,d=a.data("onsubmit").split("/"),a.find("input[name='sk']").val(sysPassApp.sk.get()),2===d.length)c[d[0]][d[1]](a);else c[d[0]](a)}).on("click",".btn-help[data-help]",function(){var a=$(this);a=$.find("div[for='"+
+a.data("help")+"']");if(0<a.length){var b=sysPassApp.config.LANG[54]+" - "+a[0].getAttribute("title")||sysPassApp.config.LANG[54];mdlDialog().show({title:b,text:a[0].innerHTML,positive:{title:sysPassApp.config.LANG[43]}})}}).on("reset",".form-action",function(a){a.preventDefault();b.info("reset");a=$(this);a.find("input:text, input:password, input:file, textarea").val("").parent("div").removeClass("is-dirty");a.find("input:radio, input:checkbox").prop("checked",!1).prop("selected",!1);a.find("input[name='start'], input[name='skey'], input[name='sorder']").val(0);
 a.find("select").each(function(){$(this)[0].selectize.clear(!0)});a.submit()}).on("click",".btn-popup-close",function(a){$.magnificPopup.close()})}}};