diff --git a/Admin/Activate.php b/Admin/Activate.php
index 11b60aa..7ba7680 100644
--- a/Admin/Activate.php
+++ b/Admin/Activate.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\Messages\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\ActivateAbstract;
 use phpOMS\Module\InfoManager;
 
@@ -37,7 +37,7 @@ class Activate extends ActivateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function activate(Pool $dbPool, InfoManager $info)
+    public static function activate(DatabasePool $dbPool, InfoManager $info)
     {
         parent::activate($dbPool, $info);
     }
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
index 66cbb24..0781995 100644
--- a/Admin/Deactivate.php
+++ b/Admin/Deactivate.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\Messages\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\DeactivateAbstract;
 use phpOMS\Module\InfoManager;
 
@@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function deactivate(Pool $dbPool, InfoManager $info)
+    public static function deactivate(DatabasePool $dbPool, InfoManager $info)
     {
         parent::deactivate($dbPool, $info);
     }
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 38e180b..f19993a 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -14,7 +14,7 @@
  * @link       http://orange-management.com
  */
 namespace Modules\Messages\Admin\Install;
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 
 /**
  * Navigation class.
@@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool;
  */
 class Navigation
 {
-    public static function install(Pool $dbPool)
+    public static function install(string $path, DatabasePool $dbPool)
     {
         $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
 
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 994f1fd..efe88d7 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\Messages\Admin;
 
 use phpOMS\DataStorage\Database\DatabaseType;
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\InfoManager;
 use phpOMS\Module\InstallerAbstract;
 
@@ -37,9 +37,9 @@ class Installer extends InstallerAbstract
     /**
      * {@inheritdoc}
      */
-    public static function install(Pool $dbPool, InfoManager $info)
+    public static function install(string $path, DatabasePool $dbPool, InfoManager $info)
     {
-        parent::install($dbPool, $info);
+        parent::install($path, $dbPool, $info);
 
         switch ($dbPool->get('core')->getType()) {
             case DatabaseType::MYSQL:
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index bb1fecf..51cd1c2 100644
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -49,8 +49,6 @@ return [
         [
             'dest' => '\Modules\Messages\Controller:viewMessageView', 
             'verb' => RouteVerb::GET,
-            'result' => ViewType::JSON,
-            'layout' => ViewLayout::MAIN,
         ],
     ],
 ];
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index b8062c5..d8461d5 100644
--- a/Admin/Uninstall.php
+++ b/Admin/Uninstall.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\Messages\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\DataStorage\Database\Schema\Builder;
 use phpOMS\Module\UninstallAbstract;
 
@@ -37,7 +37,7 @@ class Uninstall extends UninstallAbstract
     /**
      * {@inheritdoc}
      */
-    public static function uninstall(Pool $dbPool, InfoManager $info)
+    public static function uninstall(DatabasePool $dbPool, InfoManager $info)
     {
         parent::uninstall($dbPool, $info);
 
diff --git a/Admin/Update.php b/Admin/Update.php
index 97cdfc8..c93aef0 100644
--- a/Admin/Update.php
+++ b/Admin/Update.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\Messages\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\UpdateAbstract;
 use phpOMS\System\File\Directory;
 
@@ -37,7 +37,7 @@ class Update extends UpdateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function update(Pool $dbPool, array $info)
+    public static function update(DatabasePool $dbPool, array $info)
     {
         Directory::deletePath(__DIR__ . '/Update');
         mkdir('Update');
diff --git a/Controller.php b/Controller.php
index 68951c3..de2a4e7 100644
--- a/Controller.php
+++ b/Controller.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -45,7 +45,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_PATH = __DIR__;
+    /* public */ const MODULE_PATH = __DIR__;
 
     /**
      * Module version.
@@ -53,7 +53,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_VERSION = '1.0.0';
+    /* public */ const MODULE_VERSION = '1.0.0';
 
     /**
      * Module name.
@@ -61,7 +61,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_NAME = 'Messages';
+    /* public */ const MODULE_NAME = 'Messages';
 
     /**
      * Providing.
diff --git a/Models/Email.php b/Models/Email.php
index 0bb24f3..a505aaa 100644
--- a/Models/Email.php
+++ b/Models/Email.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Models/IMAP.php b/Models/IMAP.php
index 39dc9e8..4dbad17 100644
--- a/Models/IMAP.php
+++ b/Models/IMAP.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/Lang/api.en.lang.php b/Theme/Backend/Lang/api.en.lang.php
index 4f9f946..afe845f 100644
--- a/Theme/Backend/Lang/api.en.lang.php
+++ b/Theme/Backend/Lang/api.en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 6571ea4..fb98bd3 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/mail-create.tpl.php b/Theme/Backend/mail-create.tpl.php
index 72f57ca..64ab5c9 100644
--- a/Theme/Backend/mail-create.tpl.php
+++ b/Theme/Backend/mail-create.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -25,7 +25,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><td><input type="text" placeholder="&#xf040; <?= $this->getText('Subject'); ?>" name="subject">
                 <tr><td><td><input type="file" name="files" multiple>
                 <tr><td><td><div class="textarea" contenteditable="true" style="height: 400px;"></div><textarea placeholder="&#xf040;" style="display: none" name="mail"></textarea>
-                <tr><td><td><input type="submit" value="<?= $this->getText(0]['Send']; ?>"> <input type="submit" value="<?= $this->l11n->lang[0, 'Backend', 'Save'); ?>">
+                <tr><td><td><input type="submit" value="<?= $this->getText('Send', 0); ?>"> <input type="submit" value="<?= $this->getText('Save', 0); ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/mail-out-view.tpl.php b/Theme/Backend/mail-out-view.tpl.php
index 5e6db92..7a139dc 100644
--- a/Theme/Backend/mail-out-view.tpl.php
+++ b/Theme/Backend/mail-out-view.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php
index 5e6db92..7a139dc 100644
--- a/Theme/Backend/mail-spam-view.tpl.php
+++ b/Theme/Backend/mail-spam-view.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php
index 5e6db92..7a139dc 100644
--- a/Theme/Backend/mail-trash-view.tpl.php
+++ b/Theme/Backend/mail-trash-view.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/mail-view.tpl.php b/Theme/Backend/mail-view.tpl.php
index ffb41cc..16c9cdc 100644
--- a/Theme/Backend/mail-view.tpl.php
+++ b/Theme/Backend/mail-view.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/message-settings.tpl.php b/Theme/Backend/message-settings.tpl.php
index f1a6a1b..d2aad1c 100644
--- a/Theme/Backend/message-settings.tpl.php
+++ b/Theme/Backend/message-settings.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php
index f2abf2a..7cd3ebd 100644
--- a/Theme/backend/Lang/Navigation.en.lang.php
+++ b/Theme/backend/Lang/Navigation.en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/dashboard.tpl.php b/Theme/backend/dashboard.tpl.php
index 06a18ce..9fcd835 100644
--- a/Theme/backend/dashboard.tpl.php
+++ b/Theme/backend/dashboard.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/mail-create.tpl.php b/Theme/backend/mail-create.tpl.php
index 72f57ca..64ab5c9 100644
--- a/Theme/backend/mail-create.tpl.php
+++ b/Theme/backend/mail-create.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -25,7 +25,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><td><input type="text" placeholder="&#xf040; <?= $this->getText('Subject'); ?>" name="subject">
                 <tr><td><td><input type="file" name="files" multiple>
                 <tr><td><td><div class="textarea" contenteditable="true" style="height: 400px;"></div><textarea placeholder="&#xf040;" style="display: none" name="mail"></textarea>
-                <tr><td><td><input type="submit" value="<?= $this->getText(0]['Send']; ?>"> <input type="submit" value="<?= $this->l11n->lang[0, 'Backend', 'Save'); ?>">
+                <tr><td><td><input type="submit" value="<?= $this->getText('Send', 0); ?>"> <input type="submit" value="<?= $this->getText('Save', 0); ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/mail-out-view.tpl.php b/Theme/backend/mail-out-view.tpl.php
index 5e6db92..7a139dc 100644
--- a/Theme/backend/mail-out-view.tpl.php
+++ b/Theme/backend/mail-out-view.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/mail-spam-view.tpl.php b/Theme/backend/mail-spam-view.tpl.php
index 5e6db92..7a139dc 100644
--- a/Theme/backend/mail-spam-view.tpl.php
+++ b/Theme/backend/mail-spam-view.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/mail-trash-view.tpl.php b/Theme/backend/mail-trash-view.tpl.php
index 5e6db92..7a139dc 100644
--- a/Theme/backend/mail-trash-view.tpl.php
+++ b/Theme/backend/mail-trash-view.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD