diff --git a/Classes/Cache/PermissionCache.php b/Classes/Cache/PermissionCache.php
index f7d734e..cae378e 100644
--- a/Classes/Cache/PermissionCache.php
+++ b/Classes/Cache/PermissionCache.php
@@ -212,7 +212,9 @@ protected function getCacheIdentifier($requestedPermissions = '')
             throw new \JBartels\BeAcl\Exception\RuntimeException('The Backend user needs to be initializes before the cache identifier can be generated.');
         }
 
-        $identifier = $this->backendUser->user['uid'] . ';' . $this->backendUser->user['usergroup_cached_list'] . ';' . $this->backendUser->user['workspace_id'];
+        $identifier = ($this->backendUser->user['uid'] ?? '') . ';' .
+            ($this->backendUser->user['usergroup_cached_list'] ?? '') . ';' .
+            ($this->backendUser->user['workspace_id'] ?? '');
 
         $requestedPermissions = trim($requestedPermissions);
         if ($requestedPermissions !== '') {
diff --git a/Classes/Controller/PermissionAjaxController.php b/Classes/Controller/PermissionAjaxController.php
deleted file mode 100644
index ddba50c..0000000
--- a/Classes/Controller/PermissionAjaxController.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-namespace JBartels\BeAcl\Controller;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use TYPO3\CMS\Core\DataHandling\DataHandler;
-use TYPO3\CMS\Core\Http\HtmlResponse;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\View\StandaloneView;
-use TYPO3\CMS\Core\Utility\MathUtility;
-
-/**
- * This class extends the permissions module in the TYPO3 Backend to provide
- * convenient methods of editing of page permissions (including page ownership
- * (user and group)) via new AjaxRequestHandler facility
- */
-class PermissionAjaxController extends \TYPO3\CMS\Beuser\Controller\PermissionAjaxController
-{
-
-    /**
-     * View object
-     * @var view \TYPO3\CMS\Fluid\View\StandaloneView
-     */
-    protected $view;
-
-    /**
-     * Extension path
-     * @var string
-     */
-    protected $extPath;
-
-    /**
-     * ACL table
-     * @var string
-     */
-    protected $table = 'tx_beacl_acl';
-
-    /**
-     * Set the extension path
-     * @param string $extPath
-     */
-    protected function setExtPath($extPath = null)
-    {
-        $this->extPath = empty($extPath) ? ExtensionManagementUtility::extPath('be_acl') : $extPath;
-    }
-
-    /**
-     * Initialize the viewz
-     */
-    protected function initializeView()
-    {
-        $this->view = GeneralUtility::makeInstance(StandaloneView::class);
-        $this->view->setPartialRootPaths(array('default' => $this->extPath . 'Resources/Private/Partials'));
-        $this->view->assign('pageId', $this->conf['page']);
-    }
-
-    /**
-     * The main dispatcher function. Collect data and prepare HTML output.
-     *
-     * @param ServerRequestInterface $request
-     *
-     * @return ResponseInterface
-     */
-    public function dispatch(ServerRequestInterface $request): ResponseInterface
-    {
-        // Actions handled by this class
-        $handledActions = ['delete_acl'];
-        $response = new HtmlResponse('');
-
-        $requestBody = $request->getParsedBody();
-        $action = $requestBody['action'] ?? null;
-        $page = $requestBody['page'] ?? null;
-
-        if ($page > 0 && in_array($action, $handledActions)) {
-            return $this->handleAction($request, $response, $action);
-        }
-
-        return parent::dispatch($request);
-    }
-
-    protected function handleAction(ServerRequestInterface $request, ResponseInterface $response, $action)
-    {
-        $methodName = GeneralUtility::underscoredToLowerCamelCase($action);
-
-        if (method_exists($this, $methodName)) {
-            return call_user_func_array(array($this, $methodName), [$request, $response]);
-        }
-
-        $response->getBody()->write('Action method not found');
-
-        return $response->withStatus(400);
-    }
-
-    protected function deleteAcl(ServerRequestInterface $request, ResponseInterface $response)
-    {
-        $GLOBALS['LANG']->includeLLFile('EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf');
-        $GLOBALS['LANG']->getLL('aclUsers');
-
-        $postData = $request->getParsedBody();
-        $aclUid = !empty($postData['acl']) ? $postData['acl'] : null;
-
-        if (!MathUtility::canBeInterpretedAsInteger($aclUid)) {
-            return $this->errorResponse($response, $GLOBALS['LANG']->getLL('noAclId'), 400);
-        }
-        $aclUid = (int)$aclUid;
-        // Prepare command map
-        $cmdMap = [
-            $this->table => [
-                $aclUid => ['delete' => 1]
-            ]
-        ];
-
-        try {
-            // Process command map
-            $tce = GeneralUtility::makeInstance(DataHandler::class);
-            $tce->stripslashes_values = 0;
-            $tce->start(array(), $cmdMap);
-            $this->checkModifyAccess($this->table, $aclUid, $tce);
-            $tce->process_cmdmap();
-        } catch (\Exception $ex) {
-            return $this->errorResponse($response, $ex->getMessage(), 403);
-        }
-
-        $body = [
-            'title' => $GLOBALS['LANG']->getLL('aclSuccess'),
-            'message' => $GLOBALS['LANG']->getLL('aclDeleted')
-        ];
-        // Return result
-        $response->getBody()->write(json_encode($body));
-        return $response;
-    }
-
-    protected function checkModifyAccess($table, $id, DataHandler $tcemainObj)
-    {
-        // Check modify access
-        $modifyAccessList = $tcemainObj->checkModifyAccessList($table);
-        // Check basic permissions and circumstances:
-        if (!isset($GLOBALS['TCA'][$table]) || $tcemainObj->tableReadOnly($table) || !is_array($tcemainObj->cmdmap[$table]) || !$modifyAccessList) {
-            throw new \JBartels\BeAcl\Exception\RuntimeException($GLOBALS['LANG']->getLL('noPermissionToModifyAcl'));
-        }
-
-        // Check table / id
-        if (!$GLOBALS['TCA'][$table] || !$id) {
-            throw new \JBartels\BeAcl\Exception\RuntimeException(sprintf($GLOBALS['LANG']->getLL('noEditAccessToAclRecord'), $id, $table));
-        }
-
-        // Check edit access
-        $hasEditAccess = $tcemainObj->BE_USER->recordEditAccessInternals($table, $id, false, false, true);
-        if (!$hasEditAccess) {
-            throw new \JBartels\BeAcl\Exception\RuntimeException(sprintf($GLOBALS['LANG']->getLL('noEditAccessToAclRecord'), $id, $table));
-        }
-    }
-
-    protected function errorResponse(ResponseInterface $response, $reason, $status = 500)
-    {
-        return $response->withStatus($status, $reason);
-    }
-}
diff --git a/Classes/Controller/PermissionController.php b/Classes/Controller/PermissionController.php
index 2c6f3fa..1b45033 100644
--- a/Classes/Controller/PermissionController.php
+++ b/Classes/Controller/PermissionController.php
@@ -24,18 +24,22 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use JBartels\BeAcl\Exception\RuntimeException;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Backend\Utility\IconUtility;
+use TYPO3\CMS\Beuser\Controller\PermissionController as BasePermissionController;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
+use TYPO3\CMS\Core\DataHandling\DataHandler;
+use TYPO3\CMS\Core\Http\ApplicationType;
+use TYPO3\CMS\Core\Http\HtmlResponse;
+use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\ArrayUtility;
-use TYPO3\CMS\Backend\Tree\View\PageTreeView;
-use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Core\Utility\MathUtility;
+use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
-use JBartels\BeAcl\View\BackendTemplateView;
 use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
+use TYPO3\CMS\Fluid\View\StandaloneView;
 
 /**
  * Backend ACL - Replacement for "web->Access"
@@ -45,16 +49,11 @@
  * Bugfixes applied:
  * #25942, #25835, #13019, #13176, #13175 Jan Bartels
  */
-class PermissionController extends \TYPO3\CMS\Beuser\Controller\PermissionController
+class PermissionController extends BasePermissionController
 {
-
-    protected $defaultViewObjectName = BackendTemplateView::class;
-
-    protected $aclList = [];
-
-    protected $currentAction;
-
-    protected $aclTypes = [0, 1];
+    protected string $table = 'tx_beacl_acl';
+    protected array $aclList = [];
+    protected array $aclTypes = [0, 1];
 
     /*****************************
      *
@@ -63,55 +62,80 @@ class PermissionController extends \TYPO3\CMS\Beuser\Controller\PermissionContro
      *****************************/
 
     /**
-     * Initialize action
-     *
-     * @return void
+     * @param string $template
      */
-    protected function initializeAction()
+    protected function initializeView(string $template = ''): void
     {
-        parent::initializeAction();
+        $this->view = GeneralUtility::makeInstance(StandaloneView::class);
+        $this->view->setTemplateRootPaths(
+            ['EXT:beuser/Resources/Private/Templates/Permission', 'EXT:be_acl/Resources/Private/Templates/Permission']
+        );
+        $this->view->setPartialRootPaths(
+            ['EXT:beuser/Resources/Private/Partials', 'EXT:be_acl/Resources/Private/Partials']
+        );
+        $this->view->setLayoutRootPaths(
+            ['EXT:beuser/Resources/Private/Layouts', 'EXT:be_acl/Resources/Private/Layouts']
+        );
+
+        if ($template !== '') {
+            $this->view->setTemplatePathAndFilename(
+                GeneralUtility::getFileAbsFileName('EXT:be_acl/Resources/Private/Templates/Permission/' . $template . '.html')
+            );
+            $this->pageRenderer->loadRequireJsModule('TYPO3/CMS/Beuser/Permissions');
+            $this->pageRenderer->loadRequireJsModule('TYPO3/CMS/Backend/Tooltip');
+        }
 
         if(empty($this->returnUrl)) {
-            $this->returnUrl = $this->uriBuilder->reset()->setArguments([
+            $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
+            // @extensionScannerIgnoreLine
+            $this->returnUrl = $uriBuilder->reset()->setArguments([
                 'action' => 'index',
                 'id' => $this->id
-                ])->buildBackendUri();
+            ])->buildBackendUri();
+        }
+
+        // Add custom JS for Acl permissions
+        if ($this->isBackendMode()) {
+            $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+            $pageRenderer->loadRequireJsModule('TYPO3/CMS/BeAcl/AclPermissions');
         }
     }
 
     /**
-     * Initializes view
-     *
-     * @param ViewInterface $view The view to be initialized
-     * @return void
+     * @return bool
      */
-    protected function initializeView(ViewInterface $view)
+    protected function isBackendMode(): bool
     {
-        parent::initializeView($view);
-        // Add custom JS for Acl permissions
-        if ($view instanceof BackendTemplateView) {
-            $view->getModuleTemplate()->getPageRenderer()->loadRequireJsModule('TYPO3/CMS/BeAcl/AclPermissions');
+        return ($GLOBALS['TYPO3_REQUEST'] ?? null) instanceof ServerRequestInterface
+            && ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend();
+    }
+
+    public function handleAjaxRequest(ServerRequestInterface $request): ResponseInterface
+    {
+        $response = new HtmlResponse('');
+        $parsedBody = $request->getParsedBody();
+        $action = $parsedBody['action'] ?? null;
+
+        if ($action === 'delete_acl') {
+            return $this->deleteAcl($request, $response);
         }
+
+        return parent::handleAjaxRequest($request);
+
     }
 
     /**
-     * Index action
+     * @param ServerRequestInterface $request
      *
-     * @return void
+     * @return ResponseInterface
      */
-    public function indexAction()
+    public function indexAction(ServerRequestInterface $request): ResponseInterface
     {
-        parent::indexAction();
-
         // Get ACL configuration
         $beAclConfig = $this->getExtConf();
 
         $disableOldPermissionSystem = $beAclConfig['disableOldPermissionSystem'] ? 1 : 0;
         $enableFilterSelector = $beAclConfig['enableFilterSelector'] ? 1 : 0;
-
-        $this->view->assign('disableOldPermissionSystem', $disableOldPermissionSystem);
-        $this->view->assign('enableFilterSelector', $enableFilterSelector);
-
         $GLOBALS['LANG']->includeLLFile('EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf');
 
         /*
@@ -128,14 +152,6 @@ public function indexAction()
         else {
             $usersSelected = $userAcls;
         }
-        $this->view->assign('userSelectedAcls', $usersSelected);
-
-        // Options for user filter
-        $this->view->assign('userFilterOptions', [
-            'options' => $userAcls,
-            'title' => $GLOBALS['LANG']->getLL('aclUsers'),
-            'id' => 'userAclFilter'
-        ]);
 
         /*
          *  Group ACLs
@@ -151,31 +167,40 @@ public function indexAction()
         else {
             $groupsSelected = $groupAcls;
         }
-        $this->view->assign('groupSelectedAcls', $groupsSelected);
-
-        // Options for group filter
-        $this->view->assign('groupFilterOptions', [
-            'options' => $groupAcls,
-            'title' => $GLOBALS['LANG']->getLL('aclGroups'),
-            'id' => 'groupAclFilter'
-        ]);
 
         /*
          *  ACL Tree
          */
         $this->buildACLtree(array_keys($userAcls), array_keys($groupAcls));
-        $this->view->assign('aclList', $this->aclList);
+
+        $this->view->assignMultiple([
+            'disableOldPermissionSystem' => $disableOldPermissionSystem,
+            'enableFilterSelector' => $enableFilterSelector,
+            'userSelectedAcls' => $usersSelected,
+            'userFilterOptions' => [
+                'options' => $userAcls,
+                'title' => $GLOBALS['LANG']->getLL('aclUsers'),
+                'id' => 'userAclFilter'
+            ],
+            'groupSelectedAcls' => $groupsSelected,
+            'groupFilterOptions' => [
+                'options' => $groupAcls,
+                'title' => $GLOBALS['LANG']->getLL('aclGroups'),
+                'id' => 'groupAclFilter'
+            ],
+            'aclList' => $this->aclList
+        ]);
+
+        return parent::indexAction($request);
     }
 
     /**
-     * Edit action
+     * @param ServerRequestInterface $request
      *
-     * @return void
+     * @return ResponseInterface
      */
-    public function editAction()
+    public function editAction(ServerRequestInterface $request): ResponseInterface
     {
-        parent::editAction();
-
         // Get ACL configuration
         $beAclConfig = $this->getExtConf();
 
@@ -187,6 +212,7 @@ public function editAction()
 
         // ACL CODE
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tx_beacl_acl');
+        // @extensionScannerIgnoreLine
         $statement = $queryBuilder
             ->select('*')
             ->from('tx_beacl_acl')
@@ -194,12 +220,14 @@ public function editAction()
                 $queryBuilder->expr()->eq('pid', $queryBuilder->createNamedParameter( $this->id, \PDO::PARAM_INT ) )
             )
             ->execute();
-        $pageAcls = array();
+        $pageAcls = [];
+
         while ($result = $statement->fetch()) {
             $pageAcls[] = $result;
         }
 
-        $userGroupSelectorOptions = array();
+        $userGroupSelectorOptions = [];
+
         foreach (array(1 => 'Group', 0 => 'User') as $type => $label) {
             $option = new \stdClass();
             $option->key = $type;
@@ -207,26 +235,29 @@ public function editAction()
                 'be_acl');
             $userGroupSelectorOptions[] = $option;
         }
+
         $this->view->assign('userGroupSelectorOptions', $userGroupSelectorOptions);
         $this->view->assign('pageAcls', $pageAcls);
+
+        return parent::editAction($request);
     }
 
     /**
-     * Update action
+     * @param ServerRequestInterface $request
      *
-     * @param array $data
-     * @param array $mirror
-     * @return void
+     * @return ResponseInterface
      */
-    protected function updateAction(array $data, array $mirror)
+    protected function updateAction(ServerRequestInterface $request): ResponseInterface
     {
+        $data = (array)($request->getParsedBody()['data'] ?? []);
+
         // Process data map
         $tce = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\DataHandling\\DataHandler');
         $tce->stripslashes_values = 0;
         $tce->start($data, array());
         $tce->process_datamap();
 
-        parent::updateAction($data, $mirror);
+        return parent::updateAction($request);
     }
 
     /*****************************
@@ -235,22 +266,13 @@ protected function updateAction(array $data, array $mirror)
      *
      *****************************/
 
-    protected function getCurrentAction()
-    {
-        if (is_null($this->currentAction)) {
-            $this->currentAction = $this->request->getControllerActionName();
-        }
-        return $this->currentAction;
-    }
-
     /**
-     *
      * @global array $BE_USER
      * @param int $type
      * @param array $conf
      * @return array
      */
-    protected function aclObjects($type, $conf)
+    protected function aclObjects(int $type, array $conf)
     {
         global $BE_USER;
         $aclObjects = [];
@@ -281,7 +303,7 @@ protected function aclObjects($type, $conf)
 
             $currentSelectionOverride_raw = GeneralUtility::_GP('tx_beacl_objsel');
             $currentSelectionOverride = array();
-            if (is_array($currentSelectionOverride_raw[$type])) {
+            if (isset($currentSelectionOverride_raw[$type])) {
                 foreach ($currentSelectionOverride_raw[$type] as $tmp) {
                     $currentSelectionOverride[$tmp] = $tmp;
                 }
@@ -291,7 +313,7 @@ protected function aclObjects($type, $conf)
             }
 
             $BE_USER->uc['moduleData']['txbeacl_aclSelector'][$type] = $currentSelection;
-            $BE_USER->writeUC($BE_USER->uc);
+            $BE_USER->writeUC();
         }
 
         // create option data
@@ -314,7 +336,7 @@ protected function aclObjects($type, $conf)
      * @param array $users - user ID list
      * @param array $groups - group ID list
      */
-    protected function buildACLtree($users, $groups)
+    protected function buildACLtree(array $users, array $groups)
     {
         $startPerms = [
             0 => [],
@@ -322,6 +344,7 @@ protected function buildACLtree($users, $groups)
         ];
 
         // get permissions in the starting point for users and groups
+        // @extensionScannerIgnoreLine
         $rootLine = BackendUtility::BEgetRootLine($this->id);
         $currentPage = array_shift($rootLine); // needed as a starting point
 
@@ -367,7 +390,10 @@ protected function buildACLtree($users, $groups)
         $this->traversePageTree_acl($startPerms, $currentPage['uid']);
     }
 
-    protected function getDefaultAclMetaData()
+    /**
+     * @return array
+     */
+    protected function getDefaultAclMetaData(): array
     {
         return array_fill_keys($this->aclTypes, [
             'acls' => 0,
@@ -379,7 +405,7 @@ protected function getDefaultAclMetaData()
      * Adds count meta data to the page ACL list
      * @param array $pageData
      */
-    protected function addAclMetaData(&$pageData)
+    protected function addAclMetaData(array &$pageData)
     {
         if (!array_key_exists('meta', $pageData)) {
             $pageData['meta'] = $this->getDefaultAclMetaData();
@@ -396,7 +422,7 @@ protected function addAclMetaData(&$pageData)
      * @param array $parentACLs
      * @param int $pageId
      */
-    protected function traversePageTree_acl($parentACLs, $pageId)
+    protected function traversePageTree_acl(array $parentACLs, int $pageId)
     {
         // Fetch ACLs aasigned to given page
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tx_beacl_acl');
@@ -432,7 +458,7 @@ protected function traversePageTree_acl($parentACLs, $pageId)
                 $parentACLs[$result['type']][$result['object_id']] = $aclData;
                 // If there also is a non-recursive ACL for this object_id, that takes precedence
                 // for this page. Otherwise, add it to the ACL list.
-                if (is_array($hasNoRecursive[$pageId][$result['type']][$result['object_id']])) {
+                if (isset($hasNoRecursive[$pageId][$result['type']][$result['object_id']])) {
                     $this->aclList[$pageId][$result['type']][$result['object_id']] = $hasNoRecursive[$pageId][$result['type']][$result['object_id']];
                 } else {
                     $this->aclList[$pageId][$result['type']][$result['object_id']] = $aclData;
@@ -461,5 +487,80 @@ protected function getExtConf()
     {
         return GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('be_acl');
 	}
-}
 
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface      $response
+     *
+     * @return ResponseInterface
+     */
+    protected function deleteAcl(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
+    {
+        $GLOBALS['LANG']->includeLLFile('EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf');
+        $GLOBALS['LANG']->getLL('aclUsers');
+
+        $postData = $request->getParsedBody();
+        $aclUid = !empty($postData['acl']) ? $postData['acl'] : null;
+
+        if (!MathUtility::canBeInterpretedAsInteger($aclUid)) {
+            return $response->withStatus(400, $GLOBALS['LANG']->getLL('noAclId'));
+        }
+
+        $aclUid = (int)$aclUid;
+
+        // Prepare command map
+        $cmdMap = [
+            $this->table => [
+                $aclUid => ['delete' => 1]
+            ]
+        ];
+
+        try {
+            // Process command map
+            $tce = GeneralUtility::makeInstance(DataHandler::class);
+            $tce->stripslashes_values = 0;
+            $tce->start(array(), $cmdMap);
+            $this->checkModifyAccess($this->table, $aclUid, $tce);
+            $tce->process_cmdmap();
+        } catch (\Exception $ex) {
+            return $response->withStatus(403, $ex->getMessage());
+        }
+
+        $body = [
+            'title' => $GLOBALS['LANG']->getLL('aclSuccess'),
+            'message' => $GLOBALS['LANG']->getLL('aclDeleted')
+        ];
+
+        // Return result
+        $response->getBody()->write(json_encode($body));
+
+        return $response;
+    }
+
+    /**
+     * @param string      $table
+     * @param             $id
+     * @param DataHandler $tcemainObj
+     */
+    protected function checkModifyAccess(string $table, $id, DataHandler $tcemainObj)
+    {
+        // Check modify access
+        $modifyAccessList = $tcemainObj->checkModifyAccessList($table);
+
+        // Check basic permissions and circumstances:
+        if (!isset($GLOBALS['TCA'][$table]) || $tcemainObj->tableReadOnly($table) || !is_array($tcemainObj->cmdmap[$table]) || !$modifyAccessList) {
+            throw new RuntimeException($GLOBALS['LANG']->getLL('noPermissionToModifyAcl'));
+        }
+
+        // Check table / id
+        if (!$GLOBALS['TCA'][$table] || !$id) {
+            throw new RuntimeException(sprintf($GLOBALS['LANG']->getLL('noEditAccessToAclRecord'), $id, $table));
+        }
+
+        // Check edit access
+        $hasEditAccess = $tcemainObj->BE_USER->recordEditAccessInternals($table, $id, false, false, true);
+        if (!$hasEditAccess) {
+            throw new RuntimeException(sprintf($GLOBALS['LANG']->getLL('noEditAccessToAclRecord'), $id, $table));
+        }
+    }
+}
diff --git a/Classes/Hook/DataHandlerHook.php b/Classes/Hook/DataHandlerHook.php
index be006a7..1756dd0 100644
--- a/Classes/Hook/DataHandlerHook.php
+++ b/Classes/Hook/DataHandlerHook.php
@@ -138,7 +138,7 @@ public function checkRecordUpdateAccess($table, $id, $data, &$res, DataHandler $
             /**
              * Case #2 - We are editing the page in default language, so translation gets updated too
              */
-            $currentRecordUid = (integer)$dataHandler->checkValue_currentRecord['uid'];
+            $currentRecordUid = (int) ($dataHandler->checkValue_currentRecord['uid'] ?? 0);
             if ($currentRecordUid != 0 && $currentRecordUid != $id) {
                 return true;
             }
diff --git a/Classes/Utility/ObjectSelection.php b/Classes/Utility/ObjectSelection.php
index a50a68f..cdb0bec 100644
--- a/Classes/Utility/ObjectSelection.php
+++ b/Classes/Utility/ObjectSelection.php
@@ -25,6 +25,7 @@
  ***************************************************************/
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 
 /**
  * Class for building the item array for the Backend forms.
@@ -51,13 +52,15 @@ function select($PA, $fobj)
             return;
         }
 
-        // Resetting the SELECT field items
-        $PA['items'] = array(
-            0 => array(
-                0 => '',
-                1 => '',
-            ),
-        );
+        $PA['items'] = [
+            0 =>[
+                0 => LocalizationUtility::translate(
+                    'LLL:EXT:be_acl/Resources/Private/Languages/locallang_db.xlf:tx_beacl_acl.object_id.select',
+                    'be_acl'
+                ),
+                1 => 0,
+            ],
+        ];
         $type = isset($PA['row']['type'][0]) ? $PA['row']['type'][0] : null;
         // Get users or groups - The function copies functionality of the method acl_objectSelector()
         // of ux_SC_mod_web_perm_index class as for non-admins it returns only:
diff --git a/Classes/Utility/UserAuthGroup.php b/Classes/Utility/UserAuthGroup.php
index 47329bb..1c65535 100644
--- a/Classes/Utility/UserAuthGroup.php
+++ b/Classes/Utility/UserAuthGroup.php
@@ -137,7 +137,6 @@ public function calcPerms($params, $that)
      */
     public function getPagePermsClause($params, $that)
     {
-
         /** @var \JBartels\BeAcl\Cache\PermissionCache $permissionCache */
         $permissionCache = GeneralUtility::makeInstance('JBartels\\BeAcl\\Cache\\PermissionCache');
         $permissionCache->setBackendUser($that);
@@ -162,14 +161,13 @@ public function getPagePermsClause($params, $that)
         $this->getPagePermsClause_single(0, $that->user['uid'], $perms);
 
         // get allowed IDs for every single group
-        if ($that->groupList) {
-            $groupList = explode(',', $that->groupList);
-            foreach ($groupList as $singleGroup) {
+        if ($that->userGroupsUID) {
+            foreach ($that->userGroupsUID as $singleGroup) {
                 $this->getPagePermsClause_single(1, $singleGroup, $perms);
             }
         }
-        if (!empty($this->aclPageList)) {
 
+        if (!empty($this->aclPageList)) {
             // put all page IDs together to the final SQL string
             $str = '( ' . $str . ' ) OR ( `pages`.`uid` IN (' . implode(',', $this->aclPageList) . ') )';
 
@@ -221,7 +219,9 @@ protected function getPagePermsClause_single($type, $object_id, $perms)
                 )
             )
             ->execute();
-//        $aclAllowed[] = $statement->fetchAll();
+
+        $aclAllowed = [];
+
         while ($result = $statement->fetch()) {
             $aclAllowed[] = $result;
         }
diff --git a/Classes/View/BackendTemplateView.php b/Classes/View/BackendTemplateView.php
deleted file mode 100644
index 450fe79..0000000
--- a/Classes/View/BackendTemplateView.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-namespace JBartels\BeAcl\View;
-
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 2016 Todd Hossack (todd@tiraki.com)
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project 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 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script 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.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
-/**
- * @see \TYPO3\CMS\Backend\View\BackendTemplateView
- */
-class BackendTemplateView extends \TYPO3\CMS\Backend\View\BackendTemplateView
-{
-
-    /**
-     * Resolves the template root to be used inside other paths. Defaults to template view.
-     * @see \TYPO3\CMS\Fluid\View\TemplateView::getTemplateRootPaths()
-     *
-     * @return array Path(s) to template root directory
-     */
-    public function getTemplateRootPaths()
-    {
-        return $this->templateView->getTemplateRootPaths();
-    }
-
-    /**
-     * Set the root path(s) to the templates.
-     * If set, overrides the one determined from $this->templateRootPathPattern
-     * @see \TYPO3\CMS\Fluid\View\TemplateView::setTemplateRootPaths()
-     *
-     * @return void
-     */
-    public function setTemplateRootPaths(array $templateRootPaths)
-    {
-        $this->templateView->setTemplateRootPaths($templateRootPaths);
-    }
-
-    /**
-     * Resolves the partial root to be used inside other paths.
-     * @see \TYPO3\CMS\Fluid\View\TemplateView::getPartialRootPaths()
-     *
-     * @return array Path(s) to partial root directory
-     */
-    protected function getPartialRootPaths()
-    {
-        return $this->templateView->getPartialRootPaths();
-    }
-
-    /**
-     * Set the root path(s) to the partials.
-     * If set, overrides the one determined from $this->partialRootPathPattern
-     * @see \TYPO3\CMS\Fluid\View\TemplateView::setPartialRootPaths()
-     *
-     * @return void
-     */
-    public function setPartialRootPaths(array $partialRootPaths)
-    {
-        $this->templateView->setPartialRootPaths($partialRootPaths);
-    }
-
-}
diff --git a/Configuration/Backend/AjaxRoutes.php b/Configuration/Backend/AjaxRoutes.php
deleted file mode 100644
index 571a6f6..0000000
--- a/Configuration/Backend/AjaxRoutes.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Definitions for routes provided by EXT:be_acl
- */
-return [
-    // Dispatch the permissions actions
-    'user_access_permissions' => [
-        'path' => '/users/access/permissions',
-        'target' => \JBartels\BeAcl\Controller\PermissionAjaxController::class . '::dispatch'
-    ]
-];
diff --git a/Configuration/Service.yaml b/Configuration/Service.yaml
new file mode 100644
index 0000000..aca962d
--- /dev/null
+++ b/Configuration/Service.yaml
@@ -0,0 +1,12 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  JBartels\BeAcl\:
+    resource: '../Classes/*'
+
+  TYPO3\CMS\Beuser\Controller\PermissionController:
+    class: JBartels\BeAcl\Controller\PermissionController
+    tags: ['backend.controller']
diff --git a/Resources/Private/Languages/locallang_db.xlf b/Resources/Private/Languages/locallang_db.xlf
index d3a8c03..63e7c8d 100644
--- a/Resources/Private/Languages/locallang_db.xlf
+++ b/Resources/Private/Languages/locallang_db.xlf
@@ -18,6 +18,9 @@
       <trans-unit id="tx_beacl_acl.object_id" xml:space="preserve">
         <source>ID of User/Group</source>
       </trans-unit>
+		<trans-unit id="tx_beacl_acl.object_id.select">
+			<source>Select ID of User/Group</source>
+		</trans-unit>
       <trans-unit id="tx_beacl_acl.permissions.I.0" xml:space="preserve">
         <source>Show page</source>
       </trans-unit>
diff --git a/Resources/Private/Partials/Permission/EditAclRow.html b/Resources/Private/Partials/Permission/EditAclRow.html
index b3d424a..4aacdfc 100644
--- a/Resources/Private/Partials/Permission/EditAclRow.html
+++ b/Resources/Private/Partials/Permission/EditAclRow.html
@@ -1,6 +1,6 @@
 {namespace core = TYPO3\CMS\Core\ViewHelpers}
 
-<tr class="tx_beacl-edit-acl-row" data-acluid="{pageAcl.uid}">
+<tr data-acluid="{pageAcl.uid}">
 	<td>
 		<div class="row">
 			<div class="col-xs-12 col-md-6">
@@ -37,17 +37,24 @@
 			</div>
 		</div>
 	</td>
-	<td><input type="checkbox" name="check[perms_acl_{pageAcl.uid}][1]" onclick="TYPO3.Permissions.checkChange('check[perms_acl_{pageAcl.uid}]', 'tx_beuser_system_beusertxpermission[data][tx_beacl_acl][{pageAcl.uid}][permissions]')" /></td>
-	<td><input type="checkbox" name="check[perms_acl_{pageAcl.uid}][5]" onclick="TYPO3.Permissions.checkChange('check[perms_acl_{pageAcl.uid}]', 'tx_beuser_system_beusertxpermission[data][tx_beacl_acl][{pageAcl.uid}][permissions]')" /></td>
-	<td><input type="checkbox" name="check[perms_acl_{pageAcl.uid}][2]" onclick="TYPO3.Permissions.checkChange('check[perms_acl_{pageAcl.uid}]', 'tx_beuser_system_beusertxpermission[data][tx_beacl_acl][{pageAcl.uid}][permissions]')" /></td>
-	<td><input type="checkbox" name="check[perms_acl_{pageAcl.uid}][3]" onclick="TYPO3.Permissions.checkChange('check[perms_acl_{pageAcl.uid}]', 'tx_beuser_system_beusertxpermission[data][tx_beacl_acl][{pageAcl.uid}][permissions]')" /></td>
-	<td><input type="checkbox" name="check[perms_acl_{pageAcl.uid}][4]" onclick="TYPO3.Permissions.checkChange('check[perms_acl_{pageAcl.uid}]', 'tx_beuser_system_beusertxpermission[data][tx_beacl_acl][{pageAcl.uid}][permissions]')" />
-	<input type="hidden" name="tx_beuser_system_beusertxpermission[data][tx_beacl_acl][{pageAcl.uid}][permissions]" value="{pageAcl.permissions}" />
-	<input type="hidden" name="tx_beuser_system_beusertxpermission[data][tx_beacl_acl][{pageAcl.uid}][pid]" value="{pageAcl.pid}" />
-	</td>
+	<td><input type="checkbox" name="data[tx_beacl_acl][{pageAcl.uid}][permissions][]" value="{base ^ 0}" data-check-change-permissions="data[tx_beacl_acl][{pageAcl.uid}][permissions],data[tx_beacl_acl][{pageAcl.uid}][permissions]" /></td>
+	<td><input type="checkbox" name="data[tx_beacl_acl][{pageAcl.uid}][permissions][]" value="{base ^ 4}" data-check-change-permissions="data[tx_beacl_acl][{pageAcl.uid}][permissions],data[tx_beacl_acl][{pageAcl.uid}][permissions]" /></td>
+	<td><input type="checkbox" name="data[tx_beacl_acl][{pageAcl.uid}][permissions][]" value="{base ^ 1}" data-check-change-permissions="data[tx_beacl_acl][{pageAcl.uid}][permissions],data[tx_beacl_acl][{pageAcl.uid}][permissions]" /></td>
+	<td><input type="checkbox" name="data[tx_beacl_acl][{pageAcl.uid}][permissions][]" value="{base ^ 2}" data-check-change-permissions="data[tx_beacl_acl][{pageAcl.uid}][permissions],data[tx_beacl_acl][{pageAcl.uid}][permissions]" /></td>
+	<td><input type="checkbox" name="data[tx_beacl_acl][{pageAcl.uid}][permissions][]" value="{base ^ 3}" data-check-change-permissions="data[tx_beacl_acl][{pageAcl.uid}][permissions],data[tx_beacl_acl][{pageAcl.uid}][permissions]" /></td>
 	<td>
-		<input type="hidden" name="tx_beuser_system_beusertxpermission[data][tx_beacl_acl][{pageAcl.uid}][recursive]" value="0" />
-		<input type="checkbox" name="tx_beuser_system_beusertxpermission[data][tx_beacl_acl][{pageAcl.uid}][recursive]" value="1" {f:if(condition:'{pageAcl.recursive}==1', then: 'checked="checked"')} />
+		<input type="hidden" name="data[tx_beacl_acl][{pageAcl.uid}][recursive]" value="0" />
+		<input type="checkbox" name="data[tx_beacl_acl][{pageAcl.uid}][recursive]" value="1" {f:if(condition:'{pageAcl.recursive}==1', then: 'checked="checked"')} />
 	</td>
-	<td><a href="#" class="tx_beacl-edit-delete" data-acluid="{pageAcl.uid}" data-toggle="tooltip" data-placement="top" title="{f:translate(key: 'LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:delAcl')}"><core:icon identifier="actions-delete" /></a></td>
-</tr>
\ No newline at end of file
+	<td>
+        <a href="#"
+           class="tx_beacl-edit-delete"
+           data-acluid="{pageAcl.uid}"
+           data-toggle="tooltip"
+           data-placement="top"
+           title="{f:translate(key: 'LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:delAcl')}">
+            <core:icon identifier="actions-delete" />
+        </a>
+    </td>
+    <input type="hidden" name="data[tx_beacl_acl][{pageAcl.uid}][pid]" value="{pageAcl.pid}" />
+</tr>
diff --git a/Resources/Private/Partials/Permission/EditTypeSelector.html b/Resources/Private/Partials/Permission/EditTypeSelector.html
index 71ea241..4f0d6c9 100644
--- a/Resources/Private/Partials/Permission/EditTypeSelector.html
+++ b/Resources/Private/Partials/Permission/EditTypeSelector.html
@@ -1,7 +1,7 @@
-<f:comment><f:form.select class="form-control form-inline tx_beacl-edit-type-selector" name="tx_beuser_system_beusertxpermission[data][tx_beacl_acl][{aclId}][type]" options="{options}"  value="{aclType}" optionValueField="key" optionLabelField="value" data="{acluid:aclId}"/></f:comment>
+<f:comment><f:form.select class="form-control form-inline tx_beacl-edit-type-selector" name="data[tx_beacl_acl][{aclId}][type]" options="{options}"  value="{aclType}" optionValueField="key" optionLabelField="value" data="{acluid:aclId}"/></f:comment>
 
-<select class="form-control form-inline tx_beacl-edit-type-selector" name="tx_beuser_system_beusertxpermission[data][tx_beacl_acl][{aclId}][type]" value="{aclType}" data-acluid="{aclId}">
+<select class="form-control form-inline tx_beacl-edit-type-selector" name="data[tx_beacl_acl][{aclId}][type]" value="{aclType}" data-acluid="{aclId}">
 	<f:for each="{options}" as="option">
 		<option value="{option.key}" {f:if(condition: '{option.key}=={aclType}', then: 'selected="selected"')} >{option.value}</option>
 	</f:for>
-</select>
\ No newline at end of file
+</select>
diff --git a/Resources/Private/Partials/Permission/EditUserGroupSelectors.html b/Resources/Private/Partials/Permission/EditUserGroupSelectors.html
index 3e9adb9..65c4dbc 100644
--- a/Resources/Private/Partials/Permission/EditUserGroupSelectors.html
+++ b/Resources/Private/Partials/Permission/EditUserGroupSelectors.html
@@ -1,9 +1,7 @@
-<select class="form-control" name="tx_beuser_system_beusertxpermission[data][tx_beacl_acl][{acl.uid}][object_id]" value="{acl.object_id}" data-acluid="{acl.uid}">
+<select class="form-control" name="data[tx_beacl_acl][{acl.uid}][object_id]" value="{acl.object_id}" data-acluid="{acl.uid}">
 	<f:for each="{options}" as="label" key="uid">
 		<f:if condition="{uid} > 0">
 			<option value="{uid}" {f:if(condition: '{uid}=={acl.object_id}', then: 'selected="selected"')} >{label}</option>
 		</f:if>
 	</f:for>
 </select>
-
-
diff --git a/Resources/Private/Partials/Permission/GroupAclName.html b/Resources/Private/Partials/Permission/GroupAclName.html
index 9c1248b..5c29973 100644
--- a/Resources/Private/Partials/Permission/GroupAclName.html
+++ b/Resources/Private/Partials/Permission/GroupAclName.html
@@ -17,4 +17,3 @@
 		</span>
 	</f:else>
 </f:if>
-
diff --git a/Resources/Private/Templates/Permission/Edit.html b/Resources/Private/Templates/Permission/Edit.html
index 4ed9c1d..c15c16f 100644
--- a/Resources/Private/Templates/Permission/Edit.html
+++ b/Resources/Private/Templates/Permission/Edit.html
@@ -1,167 +1,161 @@
-{namespace be = TYPO3\CMS\Backend\ViewHelpers}
-{namespace core = TYPO3\CMS\Core\ViewHelpers}
+{namespace be=TYPO3\CMS\Backend\ViewHelpers}
 
 <f:layout name="Permission" />
 
 <f:section name="headline">
-	<h1>
-		<f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:permissions" />:
-		<f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Edit" />
-	</h1>
+    <h1>
+        <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:permissions" />:
+        <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Edit" />
+    </h1>
 </f:section>
 
 <f:section name="content">
-	<f:form action="update" name="editform" id="PermissionControllerEdit" data="{pageid: id}">
+    <f:comment><!-- {base} is defined as it's *required* for mathematical operations in Fluid --></f:comment>
+    <f:variable name="base" value="2" />
+    <form action="{formAction}" method="post" name="editform" id="PermissionControllerEdit">
 
-		<div {f:if(condition:'{disableOldPermissionSystem}==1', then: 'style="display:none;"')}>
-			<div class="form-group">
-				<label><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></label>
-				<f:if condition="{disableOldPermissionSystem}==1">
-					<f:then>
-						<f:form.select name="data[pages][{id}][perms_userid]" options="{beUserData}" value="{currentBeUser}" class="form-control" disabled="disabled"/></f:then>
-					<f:else>
-						<f:form.select name="data[pages][{id}][perms_userid]" options="{beUserData}" value="{currentBeUser}" class="form-control"/>
-					</f:else>
-				</f:if>
-			</div>
-			<div class="form-group">
-				<label><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></label>
-				<f:if condition="{disableOldPermissionSystem}==1">
-					<f:then>
-						<f:form.select name="data[pages][{id}][perms_groupid]" options="{beGroupData}" value="{currentBeGroup}" class="form-control" disabled="disabled"/></f:then>
-					<f:else>
-						<f:form.select name="data[pages][{id}][perms_groupid]" options="{beGroupData}" value="{currentBeGroup}" class="form-control"/>
-					</f:else>
-				</f:if>
-			</div>
-				<f:if condition="{f:count(subject:beGroupData)} < 1">
-				<div class="alert alert-notice"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:noGroups" /></div>
-				</f:if>
-			</div
-		</div>
-		<div class="panel panel-default panel-space">
-			<div class="table-fit">
-				<table class="table table-striped table-hover" id="typo3-permissionMatrix">
-					<thead>
-						<tr>
-							<th></th>
-							<th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></th>
-							<th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></th>
-							<th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></th>
-							<th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></th>
-							<th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></th>
-							<th><f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:recursiveAcl' /></th>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<f:if condition="{disableOldPermissionSystem}==0">
-						<tr>
-							<td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></strong></td>
-							<td><input type="checkbox" name="check[perms_user][1]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
-							<td><input type="checkbox" name="check[perms_user][5]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
-							<td><input type="checkbox" name="check[perms_user][2]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
-							<td><input type="checkbox" name="check[perms_user][3]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
-							<td><input type="checkbox" name="check[perms_user][4]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
-							<td></td>
-							<td></td>
-						</tr>
-						<tr>
-							<td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></strong></td>
-							<td><input type="checkbox" name="check[perms_group][1]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
-							<td><input type="checkbox" name="check[perms_group][5]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
-							<td><input type="checkbox" name="check[perms_group][2]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
-							<td><input type="checkbox" name="check[perms_group][3]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
-							<td><input type="checkbox" name="check[perms_group][4]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
-							<td></td>
-							<td></td>
-						</tr>
-						<tr>
-							<td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Everybody" /></strong></td>
-							<td><input type="checkbox" name="check[perms_everybody][1]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
-							<td><input type="checkbox" name="check[perms_everybody][5]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
-							<td><input type="checkbox" name="check[perms_everybody][2]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
-							<td><input type="checkbox" name="check[perms_everybody][3]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
-							<td><input type="checkbox" name="check[perms_everybody][4]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
-							<td></td>
-							<td></td>
-						</tr>
-					</f:if>
-					<f:if condition="{pageAcls->f:count()} > 0">
-							<f:then>
-								<f:for each="{pageAcls}" as="pageAcl" key="oid">
-								<f:render
-									partial="Permission/EditAclRow"
-									arguments="{
-										pageAcl: pageAcl,
-										typeOptions: userGroupSelectorOptions,
-										groupOptions: beGroupData,
-										userOptions: beUserData
-									}"
-								/>
-								</f:for>
-							</f:then>
-							<f:else>
-								<tr>
-									<td colspan="6">
-										<f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:noPageAcls' />
-									</td>
-								</tr>
-							</f:else>
-						</f:if>
-					</tbody>
-				</table>
-			</div>
-		</div>
-		<div class="form-group">
-			<span id="insertHiddenFields"></span>
-			<a
-				class="tx_beacl-addacl btn btn-default"
-				title="{f:translate(key: 'LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:addAcl')}"
-			>
-				<core:icon identifier="actions-add" /><f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:addAcl' />
-			</a>
-		</div>
-		<div style="display: none;">
+        <div class="row row-cols-auto align-items-end g-3">
+            <div class="col">
+                <label for="selectOwner"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></label>
+                <select class="form-select" name="data[pages][{id}][perms_userid]" id="selectOwner">
+                    <f:for each="{beUserData}" key="userId" as="user">
+                        <option value="{userId}" {f:if(condition: '{userId} == {currentBeUser}', then: 'selected')}>{user}</option>
+                    </f:for>
+                </select>
+            </div>
+            <div class="col">
+                <label for="selectGroup"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></label>
+                <f:if condition="{f:count(subject:beGroupData)} > 1">
+                    <f:then>
+                        <select class="form-select" name="data[pages][{id}][perms_groupid]" id="selectGroup">
+                            <f:for each="{beGroupData}" key="groupId" as="group">
+                                <option value="{groupId}" {f:if(condition: '{groupId} == {currentBeGroup}', then: 'selected')}>{group}</option>
+                            </f:for>
+                        </select>
+                    </f:then>
+                    <f:else>
+                        <div class="alert alert-notice"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:noGroups" /></div>
+                    </f:else>
+                </f:if>
+            </div>
+            <div class="col">
+                <label for="recursionLevel"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Depth" /></label>
+                <select class="form-select" name="mirror[pages][{id}]" id="recursionLevel">
+                    <f:for each="{recursiveSelectOptions}" key="depth" as="depthLabel">
+                        <option value="{depth}" {f:if(condition: '{depth} == {currentBeUser}', then: 'selected')}>{depthLabel}</option>
+                    </f:for>
+                </select>
+            </div>
+        </div>
 
-		</div>
-		<f:if condition="disableOldPermissionSystem==0">
-		<div class="form-group">
-			<label for="recursionLevel"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Depth" /></label>
-			<f:form.select id="recursionLevel" name="mirror[pages][{id}]" options="{recursiveSelectOptions}" class="form-control" />
-		</div>
-		</f:if>
-		<f:form.hidden name="data[pages][{id}][perms_user]" value="{pageInfo.perms_user}" />
-		<f:form.hidden name="data[pages][{id}][perms_group]" value="{pageInfo.perms_group}" />
-		<f:form.hidden name="data[pages][{id}][perms_everybody]" value="{pageInfo.perms_everybody}" />
-		<f:form.hidden name="depth" value="{depth}" />
-		<f:form.hidden name="returnUrl" value="{returnUrl}" />
+        <div class="panel panel-default mt-3">
+            <div class="table-fit">
+                <table class="table table-striped table-hover" id="typo3-permissionMatrix">
+                    <thead>
+                    <tr>
+                        <th></th>
+                        <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></th>
+                        <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></th>
+                        <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></th>
+                        <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></th>
+                        <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></th>
+                        <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:recursive" /></th>
+                        <th><f:format.case mode="capital"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:deleted" /></f:format.case></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <f:if condition="{disableOldPermissionSystem}==0">
+                        <tr>
+                            <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></strong></td>
+                            <td><input type="checkbox" name="check[perms_user][]" value="{base ^ 0}" data-check-change-permissions="check[perms_user],data[pages][{id}][perms_user]" /></td>
+                            <td><input type="checkbox" name="check[perms_user][]" value="{base ^ 4}" data-check-change-permissions="check[perms_user],data[pages][{id}][perms_user]" /></td>
+                            <td><input type="checkbox" name="check[perms_user][]" value="{base ^ 1}" data-check-change-permissions="check[perms_user],data[pages][{id}][perms_user]" /></td>
+                            <td><input type="checkbox" name="check[perms_user][]" value="{base ^ 2}" data-check-change-permissions="check[perms_user],data[pages][{id}][perms_user]" /></td>
+                            <td><input type="checkbox" name="check[perms_user][]" value="{base ^ 3}" data-check-change-permissions="check[perms_user],data[pages][{id}][perms_user]" /></td>
+                        </tr>
+                        <tr>
+                            <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></strong></td>
+                            <td><input type="checkbox" name="check[perms_group][]" value="{base ^ 0}" data-check-change-permissions="check[perms_group],data[pages][{id}][perms_group]" /></td>
+                            <td><input type="checkbox" name="check[perms_group][]" value="{base ^ 4}" data-check-change-permissions="check[perms_group],data[pages][{id}][perms_group]" /></td>
+                            <td><input type="checkbox" name="check[perms_group][]" value="{base ^ 1}" data-check-change-permissions="check[perms_group],data[pages][{id}][perms_group]" /></td>
+                            <td><input type="checkbox" name="check[perms_group][]" value="{base ^ 2}" data-check-change-permissions="check[perms_group],data[pages][{id}][perms_group]" /></td>
+                            <td><input type="checkbox" name="check[perms_group][]" value="{base ^ 3}" data-check-change-permissions="check[perms_group],data[pages][{id}][perms_group]" /></td>
+                        </tr>
+                        <tr>
+                            <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Everybody" /></strong></td>
+                            <td><input type="checkbox" name="check[perms_everybody][]" value="{base ^ 0}" data-check-change-permissions="check[perms_everybody],data[pages][{id}][perms_everybody]" /></td>
+                            <td><input type="checkbox" name="check[perms_everybody][]" value="{base ^ 4}" data-check-change-permissions="check[perms_everybody],data[pages][{id}][perms_everybody]" /></td>
+                            <td><input type="checkbox" name="check[perms_everybody][]" value="{base ^ 1}" data-check-change-permissions="check[perms_everybody],data[pages][{id}][perms_everybody]" /></td>
+                            <td><input type="checkbox" name="check[perms_everybody][]" value="{base ^ 2}" data-check-change-permissions="check[perms_everybody],data[pages][{id}][perms_everybody]" /></td>
+                            <td><input type="checkbox" name="check[perms_everybody][]" value="{base ^ 3}" data-check-change-permissions="check[perms_everybody],data[pages][{id}][perms_everybody]" /></td>
+                        </tr>
+                    </f:if>
+                    <f:if condition="{pageAcls->f:count()} > 0">
+                        <f:then>
+                            <f:for each="{pageAcls}" as="pageAcl" key="oid">
+                                <f:render
+                                    partial="Permission/EditAclRow"
+                                    arguments="{
+                                        pageAcl: pageAcl,
+                                        typeOptions: userGroupSelectorOptions,
+                                        groupOptions: beGroupData,
+                                        userOptions: beUserData,
+                                        base: base
+                                    }"
+                                />
+                            </f:for>
+                        </f:then>
+                        <f:else>
+                            <tr>
+                                <td colspan="6">
+                                    <f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:noPageAcls' />
+                                </td>
+                            </tr>
+                        </f:else>
+                    </f:if>
+                    </tbody>
+                </table>
+            </div>
+        </div>
 
-	</f:form>
+        <div class="form-group">
+            <span id="insertHiddenFields"></span>
+            <a
+                class="tx_beacl-addacl btn btn-default"
+                title="{f:translate(key: 'LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:addAcl')}"
+            >
+                <core:icon identifier="actions-add" /><f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:addAcl' />
+            </a>
+        </div>
 
-	<hr>
-	<h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" /></h3>
-	<p>
-		<strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /> <br />
-		<strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16_t" /> <br />
-		<strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2_t" /> <br />
-		<strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /> <br />
-		<strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" />
-	</p>
-	<p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p>
+        <input type="hidden" name="data[pages][{id}][perms_user]" value="{pageInfo.perms_user}" data-checkbox-group="check[perms_user]" />
+        <input type="hidden" name="data[pages][{id}][perms_group]" value="{pageInfo.perms_group}" data-checkbox-group="check[perms_group]" />
+        <input type="hidden" name="data[pages][{id}][perms_everybody]" value="{pageInfo.perms_everybody}" data-checkbox-group="check[perms_everybody]" />
+        <f:if condition="{pageAcls->f:count()} > 0">
+            <f:then>
+                <f:for each="{pageAcls}" as="pageAcl">
+                    <input type="hidden" name="data[tx_beacl_acl][{pageAcl.uid}][permissions]" value="{pageAcl.permissions}" data-checkbox-group="data[tx_beacl_acl][{pageAcl.uid}][permissions]" />
+                </f:for>
+            </f:then>
+        </f:if>
+        <input type="hidden" name="depth" value="{depth}" />
+        <input type="hidden" name="returnUrl" value="{returnUrl}" />
+    </form>
 
-	<script type="text/javascript">
-		require(["jquery", "TYPO3/CMS/Beuser/Permissions"], function($, Permissions) {
-			Permissions.setCheck("check[perms_user]", "tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]");
-			Permissions.setCheck("check[perms_group]", "tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]");
-			Permissions.setCheck("check[perms_everybody]", "tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]");
-		});
-	</script>
+    <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" /></h3>
+    <p>
+        <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /> <br />
+        <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16_t" /> <br />
+        <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2_t" /> <br />
+        <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /> <br />
+        <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" />
+    </p>
+    <p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p>
 
-	<script id="tx_beacl-edit-acl-row-template" type="text/template">
-		<f:render
-			partial="Permission/EditAclRow"
-			arguments="{
+    <script id="tx_beacl-edit-acl-row-template" type="text/template">
+        <f:render
+            partial="Permission/EditAclRow"
+            arguments="{
 				pageAcl: {
 					uid: '###uid###',
 					pid: '{id}',
@@ -171,9 +165,9 @@ <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_pe
 				},
 				typeOptions: userGroupSelectorOptions,
 				groupOptions: beGroupData,
-				userOptions: beUserData
+				userOptions: beUserData,
+				base: base
 			}"
-		/>
-	</script>
-
+        />
+    </script>
 </f:section>
diff --git a/Resources/Private/Templates/Permission/Index.html b/Resources/Private/Templates/Permission/Index.html
index f1347f9..8ac356c 100644
--- a/Resources/Private/Templates/Permission/Index.html
+++ b/Resources/Private/Templates/Permission/Index.html
@@ -2,272 +2,271 @@
 {namespace bu = TYPO3\CMS\Beuser\ViewHelpers}
 {namespace core = TYPO3\CMS\Core\ViewHelpers}
 {namespace ba = JBartels\BeAcl\ViewHelpers}
-
 <f:layout name="Permission" />
 
 <f:section name="headline">
-	<h1><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:permissions" /></h1>
+    <h1><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:permissions" /></h1>
 </f:section>
 
 <f:section name="content">
-	<div class="form-group">
-		<label for="depth"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Depth" />:</label>
-		<f:form.select class="form-control" id="depth" value="{depth}" options="{depthOptions}" additionalAttributes="{onchange: 'jumpToUrl(\'{depthBaseUrl}\'.replace(\'__DEPTH__\', this.options[this.selectedIndex].value), this);'}" />
-	</div>
-	<f:if condition="{enableFilterSelector}==1">
-	<form action="" name="aclfilterform" method="POST">
-		<div class="row">
-		<f:if condition="{userFilterOptions.options -> f:count()} > 0">
-			<f:then>
-			<div class="col-xs-12 col-sm-6"><f:render partial="Permission/UserFilter" arguments="{filter:userFilterOptions, users:beUsers}" /></div>
-			</f:then>
-		</f:if>
-		<f:if condition="{groupFilterOptions.options -> f:count()} > 0">
-			<f:then>
-			<div class="col-xs-12 col-sm-6"><f:render partial="Permission/GroupFilter" arguments="{filter:groupFilterOptions, groups:beGroups}" /></div>
-			</f:then>
-		</f:if>
-		</div>
-	</form>
-	</f:if>
+    <div class="form-group">
+        <label for="depth"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Depth" />:</label>
+        <f:form.select class="form-control" id="depth" value="{depth}" options="{depthOptions}" additionalAttributes="{onchange: 'jumpToUrl(\'{depthBaseUrl}\'.replace(\'__DEPTH__\', this.options[this.selectedIndex].value), this);'}" />
+    </div>
+    <f:if condition="{enableFilterSelector}==1">
+        <form action="" name="aclfilterform" method="POST">
+            <div class="row">
+                <f:if condition="{userFilterOptions.options -> f:count()} > 0">
+                    <f:then>
+                        <div class="col-xs-12 col-sm-6"><f:render partial="Permission/UserFilter" arguments="{filter:userFilterOptions, users:beUsers}" /></div>
+                    </f:then>
+                </f:if>
+                <f:if condition="{groupFilterOptions.options -> f:count()} > 0">
+                    <f:then>
+                        <div class="col-xs-12 col-sm-6"><f:render partial="Permission/GroupFilter" arguments="{filter:groupFilterOptions, groups:beGroups}" /></div>
+                    </f:then>
+                </f:if>
+            </div>
+        </form>
+    </f:if>
 
-	<div class="panel panel-default panel-space">
-		<div class="table-fit">
-			<table class="table table-striped table-hover" id="typo3-permissionList">
-				<thead>
-				<tr>
-					<th colspan="2">&nbsp;</th>
-					<f:if condition="{disableOldPermissionSystem}==0">
-					<th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></th>
-					<th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></th>
-					<th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Everybody" /></th>
-					</f:if>
-					<th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock" /></th>
-					<th align="center"><f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:aclUsers' /></th>
-					<f:for each="{userSelectedAcls}" as="userAcl" key="oid">
-					<th align="center" scope="col">
-						<f:render
-							partial="Permission/OwnerAclName"
-							arguments="{
+    <div class="panel panel-default panel-space">
+        <div class="table-fit">
+            <table class="table table-striped table-hover" id="typo3-permissionList">
+                <thead>
+                <tr>
+                    <th colspan="2">&nbsp;</th>
+                    <f:if condition="{disableOldPermissionSystem}==0">
+                        <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></th>
+                        <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></th>
+                        <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Everybody" /></th>
+                    </f:if>
+                    <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock" /></th>
+                    <th align="center"><f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:aclUsers' /></th>
+                    <f:for each="{userSelectedAcls}" as="userAcl" key="oid">
+                        <th align="center" scope="col">
+                            <f:render
+                                partial="Permission/OwnerAclName"
+                                arguments="{
 								pageId: '{data.row.uid}',
 								userId: '{oid}',
 								username: '{bu:arrayElement(array:beUsers, key:oid, subKey:\'username\')}'
 							}"
-						/>
-					</th>
-					</f:for>
-					<th align="center"><f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:aclGroups' /></th>
-					<f:for each="{groupSelectedAcls}" as="groupAcl" key="oid">
-					<th align="center" scope="col">
-						<f:render
-							partial="Permission/GroupAclName"
-							arguments="{
+                            />
+                        </th>
+                    </f:for>
+                    <th align="center"><f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:aclGroups' /></th>
+                    <f:for each="{groupSelectedAcls}" as="groupAcl" key="oid">
+                        <th align="center" scope="col">
+                            <f:render
+                                partial="Permission/GroupAclName"
+                                arguments="{
 								pageId: '{data.row.uid}',
 								groupId: '{oid}',
 								groupname: '{bu:arrayElement(array:beGroups, key:oid, subKey:\'title\')}'
 							}"
-						/>
-					</th>
-					</f:for>
-				</tr>
-				</thead>
-				<f:for each="{viewTree}" as="data">
-					<tr>
-						<f:if condition="{data.row.uid}">
-							<f:then>
-								<f:comment>
-									A "normal" page row is rendered, not the root page
-								</f:comment>
+                            />
+                        </th>
+                    </f:for>
+                </tr>
+                </thead>
+                <f:for each="{viewTree}" as="data">
+                    <tr>
+                        <f:if condition="{data.row.uid}">
+                            <f:then>
+                                <f:variable name="editUrl">
+                                    <be:moduleLink route="system_BeuserTxPermission" arguments="{id: '{f:if(condition: data.row._ORIG_uid, then: data.row._ORIG_uid, else: data.row.uid)}', action: 'edit', depth: depth, returnUrl: returnUrl}" />
+                                </f:variable>
+                                <f:comment>
+                                    A "normal" page row is rendered, not the root page
+                                </f:comment>
 
-								<td align="left" nowrap="nowrap">
-									<f:link.action
-										action="edit"
-										arguments="{id: '{f:if(condition: data.row._ORIG_uid, then: data.row._ORIG_uid, else: data.row.uid)}', depth: depth, returnUrl: '{f:uri.action(action: \'index\', arguments: {id: currentId, depth: depth})}'}"
-										title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}"
-									>
-										<f:format.raw>{data.depthData}{data.HTML}</f:format.raw>
-										{data.row.title -> f:format.crop(maxCharacters:20)}
-									</f:link.action>
-								</td>
+                                <td align="left" nowrap="nowrap">
+                                    <f:link.action
+                                        action="edit"
+                                        arguments="{id: '{f:if(condition: data.row._ORIG_uid, then: data.row._ORIG_uid, else: data.row.uid)}', depth: depth, returnUrl: '{f:uri.action(action: \'index\', arguments: {id: currentId, depth: depth})}'}"
+                                        title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}"
+                                    >
+                                        <f:format.raw>{data.depthData}{data.HTML}</f:format.raw>
+                                        {data.row.title -> f:format.crop(maxCharacters:20)}
+                                    </f:link.action>
+                                </td>
 
-								<td>
-									<f:comment>
-										Edit link is workspace aware: If in ws, link to edit the ws overlay record is rendered
-									</f:comment>
-									<f:link.action
-										action="edit"
-										arguments="{id: '{f:if(condition: data.row._ORIG_uid, then: data.row._ORIG_uid, else: data.row.uid)}', depth: depth, returnUrl: '{f:uri.action(action: \'index\', arguments: {id: currentId, depth: depth})}'}"
-										class="btn btn-default"
-										title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}"
-									>
-										<core:icon identifier="actions-document-open" />
-									</f:link.action>
-								</td>
-								<f:if condition="{disableOldPermissionSystem}==0">
-								<td nowrap="nowrap">
-									<bu:permissions permission="{data.row.perms_user}" scope="user" pageId="{data.row.uid}" />
-									<f:render
-										partial="Permission/Ownername"
-										arguments="{
+                                <td>
+                                    <f:comment>
+                                        Edit link is workspace aware: If in ws, link to edit the ws overlay record is rendered
+                                    </f:comment>
+                                    <a href="{editUrl}"
+                                       class="btn btn-default"
+                                       title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}">
+                                        <core:icon identifier="actions-open" />
+                                    </a>
+                                </td>
+                                <f:if condition="{disableOldPermissionSystem}==0">
+                                    <td nowrap="nowrap">
+                                        <bu:permissions permission="{data.row.perms_user}" scope="user" pageId="{data.row.uid}" />
+                                        <f:render
+                                            partial="Permission/Ownername"
+                                            arguments="{
 											pageId: '{data.row.uid}',
 											userId: '{data.row.perms_userid}',
 											username: '{bu:arrayElement(array:beUsers, key:data.row.perms_userid, subKey:\'username\')}'
 										}"
-									/>
-								</td>
+                                        />
+                                    </td>
 
-								<td nowrap="nowrap">
-									<bu:permissions permission="{data.row.perms_group}" scope="group" pageId="{data.row.uid}" />
-									<f:render
-										partial="Permission/Groupname"
-										arguments="{
+                                    <td nowrap="nowrap">
+                                        <bu:permissions permission="{data.row.perms_group}" scope="group" pageId="{data.row.uid}" />
+                                        <f:render
+                                            partial="Permission/Groupname"
+                                            arguments="{
 											pageId: '{data.row.uid}',
 											groupId: '{data.row.perms_groupid}',
 											groupname: '{bu:arrayElement(array:beGroups, key:data.row.perms_groupid, subKey:\'title\')}'
 										}"
-									/>
-								</td>
+                                        />
+                                    </td>
 
-								<td nowrap="nowrap">
-									<bu:permissions permission="{data.row.perms_everybody}" scope="everybody" pageId="{data.row.uid}" />
-								</td>
-								</f:if>
-								<td nowrap="nowrap">
+                                    <td nowrap="nowrap">
+                                        <bu:permissions permission="{data.row.perms_everybody}" scope="everybody" pageId="{data.row.uid}" />
+                                    </td>
+                                </f:if>
+                                <td nowrap="nowrap">
 									<span id="el_{data.row.uid}">
 										<f:if condition="{data.row.editlock}">
 											<f:then>
 												<a
-													class="editlock btn btn-default"
-													data-page="{data.row.uid}"
-													data-lockstate="1"
-													title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr')}"
-												>
+                                                    class="editlock btn btn-default"
+                                                    data-page="{data.row.uid}"
+                                                    data-lockstate="1"
+                                                    title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr')}"
+                                                >
 													<core:icon identifier="actions-lock" />
 												</a>
 											</f:then>
 											<f:else>
 												<a
-													class="editlock btn btn-default"
-													data-page="{data.row.uid}"
-													data-lockstate="0"
-													title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr2')}"
-												>
+                                                    class="editlock btn btn-default"
+                                                    data-page="{data.row.uid}"
+                                                    data-lockstate="0"
+                                                    title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr2')}"
+                                                >
 													<core:icon identifier="actions-unlock" />
 												</a>
 											</f:else>
 										</f:if>
 									</span>
-								</td>
+                                </td>
 
-								<td nowrap="nowrap"><small><strong><ba:arrayElement array="{aclList}" key="{data.row.uid}" subKey="meta.0.acls" /></strong> <f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:acls' /><br />
-									<strong><ba:arrayElement array="{aclList}" key="{data.row.uid}" subKey="meta.0.inherited" /></strong> <f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:aclsInherited' /></small>
-								</td>
-								<f:if condition="{userSelectedAcls->f:count()} > 0">
-									<f:for each="{userSelectedAcls}" as="userAcl" key="oid">
-									<td nowrap="nowrap">
-										<ba:permissions permission="{ba:arrayElement(array:aclList, key:data.row.uid, subKey:'0.{oid}.permissions')}" scope="useracl" pageId="{data.row.uid}" />
-										<f:alias map="{appliedAclPid: '{ba:arrayElement(array:aclList, key:data.row.uid, subKey:\'0.{oid}.pid\')}'}">
-											<f:if condition="{appliedAclPid}"><span class="fa fa-info-circle" data-toggle="tooltip" data-placement="top" title="<f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:recursiveAclPage' />{appliedAclPid}"></span></f:if>
-										</f:alias>
-									</td>
-									</f:for>
-								</f:if>
+                                <td nowrap="nowrap"><small><strong><ba:arrayElement array="{aclList}" key="{data.row.uid}" subKey="meta.0.acls" /></strong> <f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:acls' /><br />
+                                    <strong><ba:arrayElement array="{aclList}" key="{data.row.uid}" subKey="meta.0.inherited" /></strong> <f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:aclsInherited' /></small>
+                                </td>
+                                <f:if condition="{userSelectedAcls->f:count()} > 0">
+                                    <f:for each="{userSelectedAcls}" as="userAcl" key="oid">
+                                        <td nowrap="nowrap">
+                                            <ba:permissions permission="{ba:arrayElement(array:aclList, key:data.row.uid, subKey:'0.{oid}.permissions')}" scope="useracl" pageId="{data.row.uid}" />
+                                            <f:alias map="{appliedAclPid: '{ba:arrayElement(array:aclList, key:data.row.uid, subKey:\'0.{oid}.pid\')}'}">
+                                                <f:if condition="{appliedAclPid}"><span class="fa fa-info-circle" data-toggle="tooltip" data-placement="top" title="<f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:recursiveAclPage' />{appliedAclPid}"></span></f:if>
+                                            </f:alias>
+                                        </td>
+                                    </f:for>
+                                </f:if>
 
 
-								<td nowrap="nowrap"><small><strong><ba:arrayElement array="{aclList}" key="{data.row.uid}" subKey="meta.1.acls" /></strong> <f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:acls' /><br />
-									<strong><ba:arrayElement array="{aclList}" key="{data.row.uid}" subKey="meta.1.inherited" /></strong> <f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:aclsInherited' /></small>
-								</td>
-								<f:if condition="{groupSelectedAcls->f:count()} > 0">
-									<f:for each="{groupSelectedAcls}" as="groupAcl" key="oid">
-										<td nowrap="nowrap">
-										<ba:permissions permission="{ba:arrayElement(array:aclList, key:data.row.uid, subKey:'1.{oid}.permissions')}" scope="groupacl" pageId="{data.row.uid}" />
-										<f:alias map="{appliedAclPid: '{ba:arrayElement(array:aclList, key:data.row.uid, subKey:\'1.{oid}.pid\')}'}">
-											<f:if condition="{appliedAclPid}"><span class="fa fa-info-circle" data-toggle="tooltip" data-placement="top" title="<f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:recursiveAclPage' />{appliedAclPid}"></span></f:if>
-										</f:alias>
-										</td>
-									</f:for>
-								</f:if>
+                                <td nowrap="nowrap"><small><strong><ba:arrayElement array="{aclList}" key="{data.row.uid}" subKey="meta.1.acls" /></strong> <f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:acls' /><br />
+                                    <strong><ba:arrayElement array="{aclList}" key="{data.row.uid}" subKey="meta.1.inherited" /></strong> <f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:aclsInherited' /></small>
+                                </td>
+                                <f:if condition="{groupSelectedAcls->f:count()} > 0">
+                                    <f:for each="{groupSelectedAcls}" as="groupAcl" key="oid">
+                                        <td nowrap="nowrap">
+                                            <ba:permissions permission="{ba:arrayElement(array:aclList, key:data.row.uid, subKey:'1.{oid}.permissions')}" scope="groupacl" pageId="{data.row.uid}" />
+                                            <f:alias map="{appliedAclPid: '{ba:arrayElement(array:aclList, key:data.row.uid, subKey:\'1.{oid}.pid\')}'}">
+                                                <f:if condition="{appliedAclPid}"><span class="fa fa-info-circle" data-toggle="tooltip" data-placement="top" title="<f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:recursiveAclPage' />{appliedAclPid}"></span></f:if>
+                                            </f:alias>
+                                        </td>
+                                    </f:for>
+                                </f:if>
 
-							</f:then>
+                            </f:then>
 
-							<f:else>
-								<f:comment>
-									Root page row is rendered
-								</f:comment>
-								<td align="left" nowrap="nowrap">
-									<f:format.raw>{data.HTML}</f:format.raw>
-									{data.row.title -> f:format.crop(maxCharacters:20)}
-								</td>
-								<td></td>
-								<f:if condition="{disableOldPermissionSystem}==0">
-								<td nowrap="nowrap"></td>
-								<td nowrap="nowrap"></td>
-								<td nowrap="nowrap"></td>
-								</f:if>
-								<td nowrap="nowrap"></td>
-							</f:else>
-						</f:if>
-					</tr>
-				</f:for>
-			</table>
-		</div>
-	</div>
+                            <f:else>
+                                <f:comment>
+                                    Root page row is rendered
+                                </f:comment>
+                                <td align="left" nowrap="nowrap">
+                                    <f:format.raw>{data.HTML}</f:format.raw>
+                                    {data.row.title -> f:format.crop(maxCharacters:20)}
+                                </td>
+                                <td></td>
+                                <f:if condition="{disableOldPermissionSystem}==0">
+                                    <td nowrap="nowrap"></td>
+                                    <td nowrap="nowrap"></td>
+                                    <td nowrap="nowrap"></td>
+                                </f:if>
+                                <td nowrap="nowrap"></td>
+                            </f:else>
+                        </f:if>
+                    </tr>
+                </f:for>
+            </table>
+        </div>
+    </div>
 
-	<f:format.raw>{cshItem}</f:format.raw>
+    <f:format.raw>{cshItem}</f:format.raw>
 
-	<h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" />:</h3>
-	<div class="beuser-legend">
-		<table>
-			<tr>
-				<td nowrap="nowrap" class="edge"><span><span></span></span></td>
-				<td nowrap="nowrap" class="hr"><span></span></td>
-				<td nowrap="nowrap" class="hr"><span></span></td>
-				<td nowrap="nowrap" class="hr"><span></span></td>
-				<td nowrap="nowrap" class="hr"><span></span></td>
-				<td nowrap="nowrap"><span class="number">1</span></td>
-				<td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /></td>
-			</tr>
-			<tr>
-				<td nowrap="nowrap" class="vr"><span></span></td>
-				<td nowrap="nowrap" class="edge"><span><span></span></span></td>
-				<td nowrap="nowrap" class="hr"><span></span></td>
-				<td nowrap="nowrap" class="hr"><span></span></td>
-				<td nowrap="nowrap" class="hr"><span></span></td>
-				<td nowrap="nowrap"><span class="number">2</span></td>
-				<td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16_t" /></td>
-			</tr>
-			<tr>
-				<td nowrap="nowrap" class="vr"><span></span></td>
-				<td nowrap="nowrap" class="vr"><span></span></td>
-				<td nowrap="nowrap" class="edge"><span><span></span></span></td>
-				<td nowrap="nowrap" class="hr"><span></span></td>
-				<td nowrap="nowrap" class="hr"><span></span></td>
-				<td nowrap="nowrap"><span class="number">3</span></td>
-				<td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2_t" /></td>
-			</tr>
-			<tr>
-				<td nowrap="nowrap" class="vr"><span></span></td>
-				<td nowrap="nowrap" class="vr"><span></span></td>
-				<td nowrap="nowrap" class="vr"><span></span></td>
-				<td nowrap="nowrap" class="edge"><span><span></span></span></td>
-				<td nowrap="nowrap" class="hr"><span></span></td>
-				<td nowrap="nowrap"><span class="number">4</span></td>
-				<td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /></td>
-			</tr>
-			<tr>
-				<td nowrap="nowrap"><core:icon identifier="status-status-permission-granted" /></td>
-				<td nowrap="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
-				<td nowrap="nowrap"><core:icon identifier="status-status-permission-granted" /></td>
-				<td nowrap="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
-				<td nowrap="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
-				<td nowrap="nowrap"><span class="number">5</span></td>
-				<td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" /></td>
-			</tr>
-		</table>
-	</div>
-	<p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p>
-	<p>
-		<core:icon identifier="status-status-permission-granted" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Granted" /><br/>
-		<core:icon identifier="status-status-permission-denied" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Denied" />
-	</p>
+    <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" />:</h3>
+    <div class="beuser-legend">
+        <table>
+            <tr>
+                <td nowrap="nowrap" class="edge"><span><span></span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap"><span class="number">1</span></td>
+                <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /></td>
+            </tr>
+            <tr>
+                <td nowrap="nowrap" class="vr"><span></span></td>
+                <td nowrap="nowrap" class="edge"><span><span></span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap"><span class="number">2</span></td>
+                <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16_t" /></td>
+            </tr>
+            <tr>
+                <td nowrap="nowrap" class="vr"><span></span></td>
+                <td nowrap="nowrap" class="vr"><span></span></td>
+                <td nowrap="nowrap" class="edge"><span><span></span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap"><span class="number">3</span></td>
+                <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2_t" /></td>
+            </tr>
+            <tr>
+                <td nowrap="nowrap" class="vr"><span></span></td>
+                <td nowrap="nowrap" class="vr"><span></span></td>
+                <td nowrap="nowrap" class="vr"><span></span></td>
+                <td nowrap="nowrap" class="edge"><span><span></span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap"><span class="number">4</span></td>
+                <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /></td>
+            </tr>
+            <tr>
+                <td nowrap="nowrap"><core:icon identifier="status-status-permission-granted" /></td>
+                <td nowrap="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
+                <td nowrap="nowrap"><core:icon identifier="status-status-permission-granted" /></td>
+                <td nowrap="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
+                <td nowrap="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
+                <td nowrap="nowrap"><span class="number">5</span></td>
+                <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" /></td>
+            </tr>
+        </table>
+    </div>
+    <p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p>
+    <p>
+        <core:icon identifier="status-status-permission-granted" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Granted" /><br/>
+        <core:icon identifier="status-status-permission-denied" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Denied" />
+    </p>
 </f:section>
diff --git a/Resources/Private/Templates/Permission/IndexA.html b/Resources/Private/Templates/Permission/IndexA.html
new file mode 100644
index 0000000..b7d157d
--- /dev/null
+++ b/Resources/Private/Templates/Permission/IndexA.html
@@ -0,0 +1,272 @@
+{namespace be = TYPO3\CMS\Backend\ViewHelpers}
+{namespace bu = TYPO3\CMS\Beuser\ViewHelpers}
+{namespace core = TYPO3\CMS\Core\ViewHelpers}
+{namespace ba = JBartels\BeAcl\ViewHelpers}
+<f:layout name="Permission" />
+
+<f:section name="headline">
+    <h1><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:permissions" /></h1>
+</f:section>
+
+<f:section name="content">
+    <div class="form-group">
+        <label for="depth"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Depth" />:</label>
+        <f:form.select class="form-control" id="depth" value="{depth}" options="{depthOptions}" additionalAttributes="{onchange: 'jumpToUrl(\'{depthBaseUrl}\'.replace(\'__DEPTH__\', this.options[this.selectedIndex].value), this);'}" />
+    </div>
+    <f:if condition="{enableFilterSelector}==1">
+        <form action="" name="aclfilterform" method="POST">
+            <div class="row">
+                <f:if condition="{userFilterOptions.options -> f:count()} > 0">
+                    <f:then>
+                        <div class="col-xs-12 col-sm-6"><f:render partial="Permission/UserFilter" arguments="{filter:userFilterOptions, users:beUsers}" /></div>
+                    </f:then>
+                </f:if>
+                <f:if condition="{groupFilterOptions.options -> f:count()} > 0">
+                    <f:then>
+                        <div class="col-xs-12 col-sm-6"><f:render partial="Permission/GroupFilter" arguments="{filter:groupFilterOptions, groups:beGroups}" /></div>
+                    </f:then>
+                </f:if>
+            </div>
+        </form>
+    </f:if>
+
+    <div class="panel panel-default panel-space">
+        <div class="table-fit">
+            <table class="table table-striped table-hover" id="typo3-permissionList">
+                <thead>
+                <tr>
+                    <th colspan="2">&nbsp;</th>
+                    <f:if condition="{disableOldPermissionSystem}==0">
+                        <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></th>
+                        <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></th>
+                        <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Everybody" /></th>
+                    </f:if>
+                    <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock" /></th>
+                    <th align="center"><f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:aclUsers' /></th>
+                    <f:for each="{userSelectedAcls}" as="userAcl" key="oid">
+                        <th align="center" scope="col">
+                            <f:render
+                                partial="Permission/OwnerAclName"
+                                arguments="{
+								pageId: '{data.row.uid}',
+								userId: '{oid}',
+								username: '{bu:arrayElement(array:beUsers, key:oid, subKey:\'username\')}'
+							}"
+                            />
+                        </th>
+                    </f:for>
+                    <th align="center"><f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:aclGroups' /></th>
+                    <f:for each="{groupSelectedAcls}" as="groupAcl" key="oid">
+                        <th align="center" scope="col">
+                            <f:render
+                                partial="Permission/GroupAclName"
+                                arguments="{
+								pageId: '{data.row.uid}',
+								groupId: '{oid}',
+								groupname: '{bu:arrayElement(array:beGroups, key:oid, subKey:\'title\')}'
+							}"
+                            />
+                        </th>
+                    </f:for>
+                </tr>
+                </thead>
+                <f:for each="{viewTree}" as="data">
+                    <tr>
+                        <f:if condition="{data.row.uid}">
+                            <f:then>
+                                <f:comment>
+                                    A "normal" page row is rendered, not the root page
+                                </f:comment>
+
+                                <td align="left" nowrap="nowrap">
+                                    <f:link.action
+                                        action="edit"
+                                        arguments="{id: '{f:if(condition: data.row._ORIG_uid, then: data.row._ORIG_uid, else: data.row.uid)}', depth: depth, returnUrl: '{f:uri.action(action: \'index\', arguments: {id: currentId, depth: depth})}'}"
+                                        title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}"
+                                    >
+                                        <f:format.raw>{data.depthData}{data.HTML}</f:format.raw>
+                                        {data.row.title -> f:format.crop(maxCharacters:20)}
+                                    </f:link.action>
+                                </td>
+
+                                <td>
+                                    <f:comment>
+                                        Edit link is workspace aware: If in ws, link to edit the ws overlay record is rendered
+                                    </f:comment>
+                                    <f:link.action
+                                        action="edit"
+                                        arguments="{id: '{f:if(condition: data.row._ORIG_uid, then: data.row._ORIG_uid, else: data.row.uid)}', depth: depth, returnUrl: '{f:uri.action(action: \'index\', arguments: {id: currentId, depth: depth})}'}"
+                                        class="btn btn-default"
+                                        title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}"
+                                    >
+                                        <core:icon identifier="actions-document-open" />
+                                    </f:link.action>
+                                </td>
+                                <f:if condition="{disableOldPermissionSystem}==0">
+                                    <td nowrap="nowrap">
+                                        <bu:permissions permission="{data.row.perms_user}" scope="user" pageId="{data.row.uid}" />
+                                        <f:render
+                                            partial="Permission/Ownername"
+                                            arguments="{
+											pageId: '{data.row.uid}',
+											userId: '{data.row.perms_userid}',
+											username: '{bu:arrayElement(array:beUsers, key:data.row.perms_userid, subKey:\'username\')}'
+										}"
+                                        />
+                                    </td>
+
+                                    <td nowrap="nowrap">
+                                        <bu:permissions permission="{data.row.perms_group}" scope="group" pageId="{data.row.uid}" />
+                                        <f:render
+                                            partial="Permission/Groupname"
+                                            arguments="{
+											pageId: '{data.row.uid}',
+											groupId: '{data.row.perms_groupid}',
+											groupname: '{bu:arrayElement(array:beGroups, key:data.row.perms_groupid, subKey:\'title\')}'
+										}"
+                                        />
+                                    </td>
+
+                                    <td nowrap="nowrap">
+                                        <bu:permissions permission="{data.row.perms_everybody}" scope="everybody" pageId="{data.row.uid}" />
+                                    </td>
+                                </f:if>
+                                <td nowrap="nowrap">
+									<span id="el_{data.row.uid}">
+										<f:if condition="{data.row.editlock}">
+											<f:then>
+												<a
+                                                    class="editlock btn btn-default"
+                                                    data-page="{data.row.uid}"
+                                                    data-lockstate="1"
+                                                    title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr')}"
+                                                >
+													<core:icon identifier="actions-lock" />
+												</a>
+											</f:then>
+											<f:else>
+												<a
+                                                    class="editlock btn btn-default"
+                                                    data-page="{data.row.uid}"
+                                                    data-lockstate="0"
+                                                    title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr2')}"
+                                                >
+													<core:icon identifier="actions-unlock" />
+												</a>
+											</f:else>
+										</f:if>
+									</span>
+                                </td>
+
+                                <td nowrap="nowrap"><small><strong><ba:arrayElement array="{aclList}" key="{data.row.uid}" subKey="meta.0.acls" /></strong> <f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:acls' /><br />
+                                    <strong><ba:arrayElement array="{aclList}" key="{data.row.uid}" subKey="meta.0.inherited" /></strong> <f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:aclsInherited' /></small>
+                                </td>
+                                <f:if condition="{userSelectedAcls->f:count()} > 0">
+                                    <f:for each="{userSelectedAcls}" as="userAcl" key="oid">
+                                        <td nowrap="nowrap">
+                                            <ba:permissions permission="{ba:arrayElement(array:aclList, key:data.row.uid, subKey:'0.{oid}.permissions')}" scope="useracl" pageId="{data.row.uid}" />
+                                            <f:alias map="{appliedAclPid: '{ba:arrayElement(array:aclList, key:data.row.uid, subKey:\'0.{oid}.pid\')}'}">
+                                                <f:if condition="{appliedAclPid}"><span class="fa fa-info-circle" data-toggle="tooltip" data-placement="top" title="<f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:recursiveAclPage' />{appliedAclPid}"></span></f:if>
+                                            </f:alias>
+                                        </td>
+                                    </f:for>
+                                </f:if>
+
+
+                                <td nowrap="nowrap"><small><strong><ba:arrayElement array="{aclList}" key="{data.row.uid}" subKey="meta.1.acls" /></strong> <f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:acls' /><br />
+                                    <strong><ba:arrayElement array="{aclList}" key="{data.row.uid}" subKey="meta.1.inherited" /></strong> <f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:aclsInherited' /></small>
+                                </td>
+                                <f:if condition="{groupSelectedAcls->f:count()} > 0">
+                                    <f:for each="{groupSelectedAcls}" as="groupAcl" key="oid">
+                                        <td nowrap="nowrap">
+                                            <ba:permissions permission="{ba:arrayElement(array:aclList, key:data.row.uid, subKey:'1.{oid}.permissions')}" scope="groupacl" pageId="{data.row.uid}" />
+                                            <f:alias map="{appliedAclPid: '{ba:arrayElement(array:aclList, key:data.row.uid, subKey:\'1.{oid}.pid\')}'}">
+                                                <f:if condition="{appliedAclPid}"><span class="fa fa-info-circle" data-toggle="tooltip" data-placement="top" title="<f:translate key='LLL:EXT:be_acl/Resources/Private/Languages/locallang_perm.xlf:recursiveAclPage' />{appliedAclPid}"></span></f:if>
+                                            </f:alias>
+                                        </td>
+                                    </f:for>
+                                </f:if>
+
+                            </f:then>
+
+                            <f:else>
+                                <f:comment>
+                                    Root page row is rendered
+                                </f:comment>
+                                <td align="left" nowrap="nowrap">
+                                    <f:format.raw>{data.HTML}</f:format.raw>
+                                    {data.row.title -> f:format.crop(maxCharacters:20)}
+                                </td>
+                                <td></td>
+                                <f:if condition="{disableOldPermissionSystem}==0">
+                                    <td nowrap="nowrap"></td>
+                                    <td nowrap="nowrap"></td>
+                                    <td nowrap="nowrap"></td>
+                                </f:if>
+                                <td nowrap="nowrap"></td>
+                            </f:else>
+                        </f:if>
+                    </tr>
+                </f:for>
+            </table>
+        </div>
+    </div>
+
+    <f:format.raw>{cshItem}</f:format.raw>
+
+    <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" />:</h3>
+    <div class="beuser-legend">
+        <table>
+            <tr>
+                <td nowrap="nowrap" class="edge"><span><span></span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap"><span class="number">1</span></td>
+                <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /></td>
+            </tr>
+            <tr>
+                <td nowrap="nowrap" class="vr"><span></span></td>
+                <td nowrap="nowrap" class="edge"><span><span></span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap"><span class="number">2</span></td>
+                <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16_t" /></td>
+            </tr>
+            <tr>
+                <td nowrap="nowrap" class="vr"><span></span></td>
+                <td nowrap="nowrap" class="vr"><span></span></td>
+                <td nowrap="nowrap" class="edge"><span><span></span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap"><span class="number">3</span></td>
+                <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2_t" /></td>
+            </tr>
+            <tr>
+                <td nowrap="nowrap" class="vr"><span></span></td>
+                <td nowrap="nowrap" class="vr"><span></span></td>
+                <td nowrap="nowrap" class="vr"><span></span></td>
+                <td nowrap="nowrap" class="edge"><span><span></span></span></td>
+                <td nowrap="nowrap" class="hr"><span></span></td>
+                <td nowrap="nowrap"><span class="number">4</span></td>
+                <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /></td>
+            </tr>
+            <tr>
+                <td nowrap="nowrap"><core:icon identifier="status-status-permission-granted" /></td>
+                <td nowrap="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
+                <td nowrap="nowrap"><core:icon identifier="status-status-permission-granted" /></td>
+                <td nowrap="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
+                <td nowrap="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
+                <td nowrap="nowrap"><span class="number">5</span></td>
+                <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" /></td>
+            </tr>
+        </table>
+    </div>
+    <p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p>
+    <p>
+        <core:icon identifier="status-status-permission-granted" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Granted" /><br/>
+        <core:icon identifier="status-status-permission-denied" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Denied" />
+    </p>
+</f:section>
diff --git a/Resources/Public/JavaScript/AclPermissions.js b/Resources/Public/JavaScript/AclPermissions.js
index 8e8a96c..2b38fcb 100644
--- a/Resources/Public/JavaScript/AclPermissions.js
+++ b/Resources/Public/JavaScript/AclPermissions.js
@@ -18,17 +18,17 @@
 define(['jquery','TYPO3/CMS/Beuser/Permissions','TYPO3/CMS/Backend/Notification'], function($,Permissions,Notification) {
 
 	var ajaxUrl = TYPO3.settings.ajaxUrls['user_access_permissions'];
-	
+
 	var AclPermissions = {
 		options: {
 			containerSelector: '#PermissionControllerEdit'
 		}
 	};
-	
+
 	var newACLs = new Array();
 	var currentACLs = new Array();
 	var editAclRowTpl;
-	
+
 	AclPermissions.getEditAclRowTpl = function() {
 		if(!editAclRowTpl) {
 			editAclRowTpl = $('#tx_beacl-edit-acl-row-template').html();
@@ -49,14 +49,14 @@ define(['jquery','TYPO3/CMS/Beuser/Permissions','TYPO3/CMS/Backend/Notification'
 		hiddenStore.setAttribute('name', name);
 		hiddenFields.appendChild(hiddenStore);
 	}
-	
+
 	/**
 	* create new ACL ID
 	*/
    AclPermissions.getNewId = function() {
 	   return 'NEW' + Math.round(Math.random()*10000000);
    }
-	
+
 	/**
 	* add ACL
 	*/
@@ -66,16 +66,26 @@ define(['jquery','TYPO3/CMS/Beuser/Permissions','TYPO3/CMS/Backend/Notification'
 		var ACLid = AclPermissions.getNewId();
 		// save ACL ID in the new ACLs array
 		newACLs.push(ACLid);
-		// Create table row 
+		// Create table row
 		var tableRow = AclPermissions.getEditAclRowTpl().replace(/###uid###/g,ACLid);
 		// append line to table
 		$('#typo3-permissionMatrix tbody').append(tableRow);
+		$('#PermissionControllerEdit').append(AclPermissions.addHiddenInput(ACLid));
 	};
-	
+
+  AclPermissions.addHiddenInput = function (ACLid) {
+    return '<input data-acluid="' + ACLid + '" type="hidden" name="data[tx_beacl_acl][' + ACLid + '][permissions]" value="" data-checkbox-group="data[tx_beacl_acl][' + ACLid + '][permissions]" />';
+  };
+
+  AclPermissions.removeHiddenInput = function (ACLid) {
+    let $hiddenInput = $('#PermissionControllerEdit').find('input[data-acluid="'+ ACLid +'"]');
+    if($hiddenInput.length) $hiddenInput.remove();
+  };
+
 	AclPermissions.removeACL = function(id) {
 		var $tableRow = $('#typo3-permissionMatrix tbody').find('tr[data-acluid="'+ id +'"]');
 		if($tableRow.length) $tableRow.remove();
-	}
+  }
 /**
 	 * Group-related: Set the new group by executing an ajax call
 	 *
@@ -85,12 +95,13 @@ define(['jquery','TYPO3/CMS/Beuser/Permissions','TYPO3/CMS/Backend/Notification'
 		var $container = $(AclPermissions.options.containerSelector),
 			pageID = $container.data('pageid'),
 			id = $element.data('acluid');
-		
+
 		// New ACL - simply remove ACL from table
 		if(isNaN(id)) {
 			AclPermissions.removeACL(id);
+      AclPermissions.removeHiddenInput(id);
 			return;
-		} 
+		}
 		// Existing ACL - send delete request
 		$.ajax({
 			url: ajaxUrl,
@@ -105,6 +116,7 @@ define(['jquery','TYPO3/CMS/Beuser/Permissions','TYPO3/CMS/Backend/Notification'
 		}).done(function(data) {
 			// Remove from table
 			AclPermissions.removeACL(id);
+      AclPermissions.removeHiddenInput(id);
 			// Show notification
 			var title = data.title || 'Success';
 			var msg = data.message || 'ACL deleted';
@@ -113,7 +125,7 @@ define(['jquery','TYPO3/CMS/Beuser/Permissions','TYPO3/CMS/Backend/Notification'
 			Notification.error(null,error);
 		});
 	};
-	
+
 	/**
 	* update user and group information
 	*
@@ -125,7 +137,7 @@ define(['jquery','TYPO3/CMS/Beuser/Permissions','TYPO3/CMS/Backend/Notification'
 		var $container = $(AclPermissions.options.containerSelector),
 			pageID = $container.data('pageid'),
 			type = (typeVal == 1) ? 'group' : 'user';
-	   
+
 		// get child nodes of user/group selector
 		var $selector = $('select[name=tx_beuser_system_beusertxpermission\\[data\\]\\[pages\\]\\['+pageID+'\\]\\[perms_'+type+'id\\]]');
 
diff --git a/composer.json b/composer.json
index 9ea866a..92773d7 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         "docs": "https://docs.typo3.org/typo3cms/extensions/be_acl/"
     },
     "require": {
-        "typo3/cms-core": "^10.4"
+        "typo3/cms-core": "^11.5"
     },
     "autoload": {
         "psr-4": {
diff --git a/ext_emconf.php b/ext_emconf.php
index b1c4e16..571b915 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -12,7 +12,7 @@
 	'author_company' => '',
 	'constraints' => [
 		'depends' => [
-			'typo3' => '10.4.0-10.4.99',
+			'typo3' => '11.5.0-11.99.99',
 		],
 		'conflicts' => [
 		],
diff --git a/ext_localconf.php b/ext_localconf.php
index 7be7deb..d07cfbb 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -1,72 +1,72 @@
 <?php
 if (! defined('TYPO3_MODE')) {
-	die ('Access denied.');
+    die ('Access denied.');
 }
 
 call_user_func(function () {
 
-	$extensionConfiguration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-		\TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
-	)->get('be_acl');
+    $extensionConfiguration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+        \TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
+    )->get('be_acl');
 
-	$isRedisEnabled = extension_loaded('redis') && $extensionConfiguration['enableRedis'];
+    $isRedisEnabled = extension_loaded('redis') && $extensionConfiguration['enableRedis'];
 
-	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('
 		options.saveDocNew.tx_beacl_acl=1
 	');
 
-	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['calcPerms'][] =
-		\JBartels\BeAcl\Utility\UserAuthGroup::class .'->calcPerms'
-	;
-	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['getPagePermsClause'][] =
-		\JBartels\BeAcl\Utility\UserAuthGroup::class .'->getPagePermsClause'
-	;
+    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['calcPerms'][] =
+        \JBartels\BeAcl\Utility\UserAuthGroup::class .'->calcPerms'
+    ;
+    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['getPagePermsClause'][] =
+        \JBartels\BeAcl\Utility\UserAuthGroup::class .'->getPagePermsClause'
+    ;
 
-	$GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'][\TYPO3\CMS\Beuser\Controller\PermissionController::class] = [
-		'className' => \JBartels\BeAcl\Controller\PermissionController::class,
-	];
+    $GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'][\TYPO3\CMS\Beuser\Controller\PermissionController::class] = [
+        'className' => \JBartels\BeAcl\Controller\PermissionController::class,
+    ];
 
-	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] =
-		\JBartels\BeAcl\Hook\DataHandlerHook::class
-	;
-	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][] =
-		\JBartels\BeAcl\Hook\DataHandlerHook::class
-	;
+    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] =
+        \JBartels\BeAcl\Hook\DataHandlerHook::class
+    ;
+    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][] =
+        \JBartels\BeAcl\Hook\DataHandlerHook::class
+    ;
 
 
-	// set tx_be_acl_timestamp-cache
-	if (! isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_timestamp']['frontend'])) {
-		$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_timestamp']['frontend'] =
-			'TYPO3\\CMS\\Core\\Cache\\Frontend\\VariableFrontend'
-		;
-	}
-	if (! isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_timestamp']['backend'])) {
-		$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_timestamp']['backend'] = $isRedisEnabled
-			? \TYPO3\CMS\Core\Cache\Backend\RedisBackend::class
-			: \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend::class
-		;
-	}
+    // set tx_be_acl_timestamp-cache
+    if (! isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_timestamp']['frontend'])) {
+        $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_timestamp']['frontend'] =
+            'TYPO3\\CMS\\Core\\Cache\\Frontend\\VariableFrontend'
+        ;
+    }
+    if (! isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_timestamp']['backend'])) {
+        $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_timestamp']['backend'] = $isRedisEnabled
+            ? \TYPO3\CMS\Core\Cache\Backend\RedisBackend::class
+            : \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend::class
+        ;
+    }
 
-	// set tx_be_acl_permissions-cache
-	if (! isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_permissions']['frontend'])) {
-		$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_permissions']['frontend'] =
-			'TYPO3\\CMS\\Core\\Cache\\Frontend\\VariableFrontend'
-		;
-	}
-	if (! isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_permissions']['backend'])) {
-		$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_permissions']['backend'] = $isRedisEnabled
-			? \TYPO3\CMS\Core\Cache\Backend\RedisBackend::class
-			: \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend::class
-		;
-	}
+    // set tx_be_acl_permissions-cache
+    if (! isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_permissions']['frontend'])) {
+        $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_permissions']['frontend'] =
+            'TYPO3\\CMS\\Core\\Cache\\Frontend\\VariableFrontend'
+        ;
+    }
+    if (! isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_permissions']['backend'])) {
+        $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_be_acl_permissions']['backend'] = $isRedisEnabled
+            ? \TYPO3\CMS\Core\Cache\Backend\RedisBackend::class
+            : \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend::class
+        ;
+    }
 
-	$iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
-	$iconRegistry->registerIcon(
-		'tx_beacl-object-info',
-		\TYPO3\CMS\Core\Imaging\IconProvider\FontawesomeIconProvider::class,
-		[
-			'name' => 'info'
-		]
-	);
+    $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
+    $iconRegistry->registerIcon(
+        'tx_beacl-object-info',
+        \TYPO3\CMS\Core\Imaging\IconProvider\FontawesomeIconProvider::class,
+        [
+            'name' => 'info'
+        ]
+    );
 
 });