diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 9dbc7a9..5b0045e 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -47,7 +47,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/mail-dashboard');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);
 
         return $view;
     }
@@ -68,7 +68,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/mail-templates');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);
 
         $templates = EmailMapper::getAll()
             ->with('l11n')
@@ -77,7 +77,7 @@ final class BackendController extends Controller
             ->where('l11n/language', $response->header->l11n->language)
             ->execute();
 
-        $view->setData('templates', $templates);
+        $view->data['templates'] = $templates;
 
         return $view;
     }
@@ -98,7 +98,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/mail-out-view');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);
 
         return $view;
     }
@@ -119,7 +119,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/mail-trash-view');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);
 
         return $view;
     }
@@ -140,7 +140,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/mail-spam-view');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);
 
         return $view;
     }
@@ -161,8 +161,8 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/mail-view');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
-        $view->addData('id', (int) $request->getData('id'));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);
+        $view->data['id'] = (int) $request->getData('id');
 
         return $view;
     }
@@ -183,7 +183,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/mail-create');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);
 
         return $view;
     }
@@ -204,7 +204,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/message-settings');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);
 
         return $view;
     }
diff --git a/Theme/Backend/mail-create.tpl.php b/Theme/Backend/mail-create.tpl.php
index 350c1a7..4eb2f81 100755
--- a/Theme/Backend/mail-create.tpl.php
+++ b/Theme/Backend/mail-create.tpl.php
@@ -12,7 +12,7 @@
  */
 declare(strict_types=1);
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <section class="box w-100">
     <div class="inner">
diff --git a/Theme/Backend/mail-dashboard.tpl.php b/Theme/Backend/mail-dashboard.tpl.php
index 865d1d2..acdce41 100755
--- a/Theme/Backend/mail-dashboard.tpl.php
+++ b/Theme/Backend/mail-dashboard.tpl.php
@@ -22,12 +22,12 @@ $seen = $mail->getInboxSeen();
 $quota = $mail->getQuota();
 */
 
-$messages = $this->getData('messages') ?? [];
+$messages = $this->data['messages'] ?? [];
 
 $previous = empty($messages) ? 'messages/dashboard' : 'messages/dashboard?{?}&id=' . \reset($messages)->id . '&ptype=p';
 $next     = empty($messages) ? 'messages/dashboard' : 'messages/dashboard?{?}&id=' . \end($messages)->id . '&ptype=n';
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12 col-md-9">
diff --git a/Theme/Backend/mail-out-view.tpl.php b/Theme/Backend/mail-out-view.tpl.php
index ecc85ae..f8c0dc3 100755
--- a/Theme/Backend/mail-out-view.tpl.php
+++ b/Theme/Backend/mail-out-view.tpl.php
@@ -17,7 +17,7 @@ $mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.mana
 $sent  = $mail->getInboxAll();
 $quota = $mail->getQuota();
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php
index ecc85ae..f8c0dc3 100755
--- a/Theme/Backend/mail-spam-view.tpl.php
+++ b/Theme/Backend/mail-spam-view.tpl.php
@@ -17,7 +17,7 @@ $mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.mana
 $sent  = $mail->getInboxAll();
 $quota = $mail->getQuota();
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
diff --git a/Theme/Backend/mail-templates.tpl.php b/Theme/Backend/mail-templates.tpl.php
index 644511b..3131f24 100755
--- a/Theme/Backend/mail-templates.tpl.php
+++ b/Theme/Backend/mail-templates.tpl.php
@@ -22,12 +22,12 @@ $seen = $mail->getInboxSeen();
 $quota = $mail->getQuota();
 */
 
-$messages = $this->getData('templates') ?? [];
+$messages = $this->data['templates'] ?? [];
 
 $previous = empty($messages) ? 'messages/dashboard' : 'messages/dashboard?{?}&id=' . \reset($messages)->id . '&ptype=p';
 $next     = empty($messages) ? 'messages/dashboard' : 'messages/dashboard?{?}&id=' . \end($messages)->id . '&ptype=n';
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12 col-md-9">
diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php
index ecc85ae..f8c0dc3 100755
--- a/Theme/Backend/mail-trash-view.tpl.php
+++ b/Theme/Backend/mail-trash-view.tpl.php
@@ -17,7 +17,7 @@ $mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.mana
 $sent  = $mail->getInboxAll();
 $quota = $mail->getQuota();
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
diff --git a/Theme/Backend/mail-view.tpl.php b/Theme/Backend/mail-view.tpl.php
index 2574035..ea2ed84 100755
--- a/Theme/Backend/mail-view.tpl.php
+++ b/Theme/Backend/mail-view.tpl.php
@@ -16,7 +16,7 @@ $mail = new \phpOMS\Message\Mail\Imap();
 $mail->connect('{imap.gmail.com:993/imap/ssl}INBOX', 'dev.orange.management@gmail.com', 'DEV_PASSWORD');
 $mails = $mail->getEmail($this->getData('id'));
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <section class="box w-100">
     <header><h1><?= $this->printHtml(\str_replace('_',' ', \mb_decode_mimeheader($mails['overview'][0]->subject))); ?></h1></header>
diff --git a/Theme/Backend/message-settings.tpl.php b/Theme/Backend/message-settings.tpl.php
index 2829ae8..d80c514 100755
--- a/Theme/Backend/message-settings.tpl.php
+++ b/Theme/Backend/message-settings.tpl.php
@@ -16,7 +16,7 @@ $mail = new \phpOMS\Message\Mail\Imap();
 $mail->connect('{imap.gmail.com:993/imap/ssl}', 'dev.orange.management@gmail.com', 'DEV_PASSWORD');
 $boxes = $mail->getBoxes();
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <section class="box w-33">
     <header><h1><?= $this->getHtml('Mailboxes'); ?></h1></header>