diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 8721a13..d5909c5 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -49,7 +49,7 @@ final class BackendController extends Controller
      */
     public function viewUnitList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
-        $view = new View($this->app, $request, $response);
+        $view = new View($this->app->l11nManager, $request, $response);
 
         $view->setTemplate('/Modules/Organization/Theme/Backend/unit-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004703001, $request, $response));
@@ -73,16 +73,16 @@ final class BackendController extends Controller
      */
     public function viewUnitProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
-        $view = new View($this->app, $request, $response);
+        $view = new View($this->app->l11nManager, $request, $response);
 
         $view->setTemplate('/Modules/Organization/Theme/Backend/unit-profile');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004703001, $request, $response));
 
-        $selectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app, $request, $response);
+        $selectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response);
         $view->addData('unit-selector', $selectorView);
         $view->addData('unit', UnitMapper::get((int) $request->getData('id')));
 
-        $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response);
+        $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
         $view->addData('editor', $editor);
 
         return $view;
@@ -102,7 +102,7 @@ final class BackendController extends Controller
      */
     public function viewOrganigram(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
-        $view = new View($this->app, $request, $response);
+        $view = new View($this->app->l11nManager, $request, $response);
 
         $view->setTemplate('/Modules/Organization/Theme/Backend/organigram');
 
@@ -176,18 +176,18 @@ final class BackendController extends Controller
      */
     public function viewUnitCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
-        $view = new View($this->app, $request, $response);
+        $view = new View($this->app->l11nManager, $request, $response);
 
         $view->setTemplate('/Modules/Organization/Theme/Backend/unit-create');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004703001, $request, $response));
 
-        $uploadView = new \Modules\Media\Theme\Backend\Components\InlinePreview\BaseView($this->app, $request, $response);
+        $uploadView = new \Modules\Media\Theme\Backend\Components\InlinePreview\BaseView($this->app->l11nManager, $request, $response);
         $view->addData('media-preview-upload', $uploadView);
 
-        $selectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app, $request, $response);
+        $selectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response);
         $view->addData('unit-selector', $selectorView);
 
-        $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response);
+        $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
         $view->addData('editor', $editor);
 
         return $view;
@@ -207,7 +207,7 @@ final class BackendController extends Controller
      */
     public function viewDepartmentList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
-        $view = new View($this->app, $request, $response);
+        $view = new View($this->app->l11nManager, $request, $response);
 
         $view->setTemplate('/Modules/Organization/Theme/Backend/department-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004704001, $request, $response));
@@ -231,20 +231,20 @@ final class BackendController extends Controller
      */
     public function viewDepartmentProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
-        $view = new View($this->app, $request, $response);
+        $view = new View($this->app->l11nManager, $request, $response);
 
         $view->setTemplate('/Modules/Organization/Theme/Backend/department-profile');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004704001, $request, $response));
 
-        $selectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app, $request, $response);
+        $selectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app->l11nManager, $request, $response);
         $view->addData('department-selector', $selectorView);
 
-        $unitSelectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app, $request, $response);
+        $unitSelectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response);
         $view->addData('unit-selector', $unitSelectorView);
 
         $view->addData('department', DepartmentMapper::get((int) $request->getData('id')));
 
-        $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response);
+        $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
         $view->addData('editor', $editor);
 
         return $view;
@@ -264,18 +264,18 @@ final class BackendController extends Controller
      */
     public function viewDepartmentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
-        $view = new View($this->app, $request, $response);
+        $view = new View($this->app->l11nManager, $request, $response);
 
         $view->setTemplate('/Modules/Organization/Theme/Backend/department-create');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004704001, $request, $response));
 
-        $selectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app, $request, $response);
+        $selectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app->l11nManager, $request, $response);
         $view->addData('department-selector', $selectorView);
 
-        $unitSelectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app, $request, $response);
+        $unitSelectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response);
         $view->addData('unit-selector', $unitSelectorView);
 
-        $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response);
+        $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
         $view->addData('editor', $editor);
 
         return $view;
@@ -295,7 +295,7 @@ final class BackendController extends Controller
      */
     public function viewPositionList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
-        $view = new View($this->app, $request, $response);
+        $view = new View($this->app->l11nManager, $request, $response);
 
         $view->setTemplate('/Modules/Organization/Theme/Backend/position-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004705001, $request, $response));
@@ -319,20 +319,20 @@ final class BackendController extends Controller
      */
     public function viewPositionProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
-        $view = new View($this->app, $request, $response);
+        $view = new View($this->app->l11nManager, $request, $response);
 
         $view->setTemplate('/Modules/Organization/Theme/Backend/position-profile');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004705001, $request, $response));
 
-        $selectorView = new \Modules\Organization\Theme\Backend\Components\PositionTagSelector\PositionTagSelectorView($this->app, $request, $response);
+        $selectorView = new \Modules\Organization\Theme\Backend\Components\PositionTagSelector\PositionTagSelectorView($this->app->l11nManager, $request, $response);
         $view->addData('position-selector', $selectorView);
 
-        $departmentSelectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app, $request, $response);
+        $departmentSelectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app->l11nManager, $request, $response);
         $view->addData('department-selector', $departmentSelectorView);
 
         $view->addData('position', PositionMapper::get((int) $request->getData('id')));
 
-        $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response);
+        $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
         $view->addData('editor', $editor);
 
         return $view;
@@ -352,18 +352,18 @@ final class BackendController extends Controller
      */
     public function viewPositionCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
-        $view = new View($this->app, $request, $response);
+        $view = new View($this->app->l11nManager, $request, $response);
 
         $view->setTemplate('/Modules/Organization/Theme/Backend/position-create');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004705001, $request, $response));
 
-        $selectorView = new \Modules\Organization\Theme\Backend\Components\PositionTagSelector\PositionTagSelectorView($this->app, $request, $response);
+        $selectorView = new \Modules\Organization\Theme\Backend\Components\PositionTagSelector\PositionTagSelectorView($this->app->l11nManager, $request, $response);
         $view->addData('position-selector', $selectorView);
 
-        $departmentSelectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app, $request, $response);
+        $departmentSelectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app->l11nManager, $request, $response);
         $view->addData('department-selector', $departmentSelectorView);
 
-        $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response);
+        $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
         $view->addData('editor', $editor);
 
         return $view;
diff --git a/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorPopupView.php b/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorPopupView.php
index ca4550b..8c2bc14 100644
--- a/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorPopupView.php
+++ b/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorPopupView.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Organization\Theme\Backend\Components\DepartmentTagSelector;
 
-use phpOMS\ApplicationAbstract;
+use phpOMS\Localization\L11nManager;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Views\View;
@@ -35,9 +35,9 @@ class DepartmentTagSelectorPopupView extends View
     /**
      * {@inheritdoc}
      */
-    public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
+    public function __construct(L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response)
     {
-        parent::__construct($app, $request, $response);
+        parent::__construct($l11n, $request, $response);
         $this->setTemplate('/Modules/Organization/Theme/Backend/Components/DepartmentTagSelector/department-selector-popup');
     }
 
diff --git a/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php b/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php
index 719949c..486522a 100644
--- a/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php
+++ b/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Organization\Theme\Backend\Components\DepartmentTagSelector;
 
-use phpOMS\ApplicationAbstract;
+use phpOMS\Localization\L11nManager;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Views\View;
@@ -36,12 +36,12 @@ class DepartmentTagSelectorView extends View
     /**
      * {@inheritdoc}
      */
-    public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
+    public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response)
     {
-        parent::__construct($app, $request, $response);
+        parent::__construct($l11n, $request, $response);
         $this->setTemplate('/Modules/Organization/Theme/Backend/Components/DepartmentTagSelector/department-selector');
 
-        $view = new DepartmentTagSelectorPopupView($app, $request, $response);
+        $view = new DepartmentTagSelectorPopupView($l11n, $request, $response);
         $this->addData('department-selector-popup', $view);
     }
 
diff --git a/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php b/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php
index f3db843..6fcbdc7 100644
--- a/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php
+++ b/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Organization\Theme\Backend\Components\PositionTagSelector;
 
-use phpOMS\ApplicationAbstract;
+use phpOMS\Localization\L11nManager;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Views\View;
@@ -35,9 +35,9 @@ class PositionTagSelectorPopupView extends View
     /**
      * {@inheritdoc}
      */
-    public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
+    public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response)
     {
-        parent::__construct($app, $request, $response);
+        parent::__construct($l11n, $request, $response);
         $this->setTemplate('/Modules/Organization/Theme/Backend/Components/PositionTagSelector/position-selector-popup');
     }
 
diff --git a/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php b/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php
index c695632..8824631 100644
--- a/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php
+++ b/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Organization\Theme\Backend\Components\PositionTagSelector;
 
-use phpOMS\ApplicationAbstract;
+use phpOMS\Localization\L11nManager;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Views\View;
@@ -36,12 +36,12 @@ class PositionTagSelectorView extends View
     /**
      * {@inheritdoc}
      */
-    public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
+    public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response)
     {
-        parent::__construct($app, $request, $response);
+        parent::__construct($l11n, $request, $response);
         $this->setTemplate('/Modules/Organization/Theme/Backend/Components/PositionTagSelector/position-selector');
 
-        $view = new PositionTagSelectorPopupView($app, $request, $response);
+        $view = new PositionTagSelectorPopupView($l11n, $request, $response);
         $this->addData('position-selector-popup', $view);
     }
 
diff --git a/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorPopupView.php b/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorPopupView.php
index cd89209..34bc9ce 100644
--- a/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorPopupView.php
+++ b/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorPopupView.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Organization\Theme\Backend\Components\UnitTagSelector;
 
-use phpOMS\ApplicationAbstract;
+use phpOMS\Localization\L11nManager;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Views\View;
@@ -35,9 +35,9 @@ class UnitTagSelectorPopupView extends View
     /**
      * {@inheritdoc}
      */
-    public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
+    public function __construct(L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response)
     {
-        parent::__construct($app, $request, $response);
+        parent::__construct($l11n, $request, $response);
         $this->setTemplate('/Modules/Organization/Theme/Backend/Components/UnitTagSelector/unit-selector-popup');
     }
 
diff --git a/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php b/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php
index ed55d34..b3c6023 100644
--- a/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php
+++ b/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Organization\Theme\Backend\Components\UnitTagSelector;
 
-use phpOMS\ApplicationAbstract;
+use phpOMS\Localization\L11nManager;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Views\View;
@@ -36,12 +36,12 @@ class UnitTagSelectorView extends View
     /**
      * {@inheritdoc}
      */
-    public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
+    public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response)
     {
-        parent::__construct($app, $request, $response);
+        parent::__construct($l11n, $request, $response);
         $this->setTemplate('/Modules/Organization/Theme/Backend/Components/UnitTagSelector/unit-selector');
 
-        $view = new UnitTagSelectorPopupView($app, $request, $response);
+        $view = new UnitTagSelectorPopupView($l11n, $request, $response);
         $this->addData('unit-selector-popup', $view);
     }