diff --git a/Admin/Install/Media.php b/Admin/Install/Media.php
index ab0fd6d..f3bb58a 100755
--- a/Admin/Install/Media.php
+++ b/Admin/Install/Media.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Admin\Install
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -23,7 +23,7 @@ use phpOMS\Application\ApplicationAbstract;
  * Media class.
  *
  * @package Modules\Profile\Admin\Install
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index a80bf00..5432cff 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Profiles",
-        "uri": "{/lang}/{/app}/profile/list",
+        "uri": "{/base}/profile/list",
         "target": "self",
         "icon": null,
         "order": 10,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/lang}/{/app}/profile/list",
+                "uri": "{/base}/profile/list",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 5,
                 "subtype": 1,
                 "name": "Profile",
-                "uri": "{/lang}/{/app}/profile/single/front?{?}",
+                "uri": "{/base}/profile/single/front?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 3,
@@ -49,7 +49,7 @@
                 "type": 5,
                 "subtype": 1,
                 "name": "Settings",
-                "uri": "{/lang}/{/app}/profile/single/settings?{?}",
+                "uri": "{/base}/profile/single/settings?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 999,
@@ -66,7 +66,7 @@
         "type": 3,
         "subtype": 1,
         "name": "Overview",
-        "uri": "{/lang}/{/app}/admin/module/settings?{?}",
+        "uri": "{/base}/admin/module/settings?{?}",
         "target": "self",
         "icon": null,
         "order": 1,
@@ -81,7 +81,7 @@
         "type": 3,
         "subtype": 1,
         "name": "Settings",
-        "uri": "{/lang}/{/app}/admin/module/settings/profile/settings?{?}",
+        "uri": "{/base}/admin/module/settings/profile/settings?{?}",
         "target": "self",
         "icon": null,
         "order": 1,
@@ -96,7 +96,7 @@
         "type": 3,
         "subtype": 1,
         "name": "Create",
-        "uri": "{/lang}/{/app}/admin/module/settings/profile/create?{?}",
+        "uri": "{/base}/admin/module/settings/profile/create?{?}",
         "target": "self",
         "icon": null,
         "order": 2,
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 7218cfd..e68815d 100755
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Admin\Install
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract;
  * Navigation class.
  *
  * @package Modules\Profile\Admin\Install
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Installer.php b/Admin/Installer.php
index b97d61a..99fc500 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -26,7 +26,7 @@ use phpOMS\Module\ModuleInfo;
  * Installer class.
  *
  * @package Modules\Profile\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -59,7 +59,9 @@ final class Installer extends InstallerAbstract
      */
     private static function createProfiles() : void
     {
-        $profile = new Profile(AccountMapper::get()->where('id', 1)->execute());
+        /** @var \Modules\Admin\Models\Account $account */
+        $account = AccountMapper::get()->where('id', 1)->execute();
+        $profile = new Profile($account);
         ProfileMapper::create()->execute($profile);
     }
 }
diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index 37f0bf5..d729712 100755
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 98d5fc5..aba17f2 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index 7410719..c8157bb 100755
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Template
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Admin/Status.php b/Admin/Status.php
index 9ec563c..f111914 100755
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\StatusAbstract;
  * Status class.
  *
  * @package Modules\Profile\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php
index ecb2b1a..6441a6d 100755
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\UninstallerAbstract;
  * Uninstaller class.
  *
  * @package Modules\Profile\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Updater.php b/Admin/Updater.php
index c28ede0..a003889 100755
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\UpdaterAbstract;
  * Updater class.
  *
  * @package Modules\Profile\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index a8e99ed..4b66c65 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,6 +18,7 @@ use Modules\Admin\Models\AccountMapper;
 use Modules\Admin\Models\Address;
 use Modules\Admin\Models\AddressMapper;
 use Modules\Media\Models\NullMedia;
+use Modules\Media\Models\MediaMapper;
 use Modules\Media\Models\PathSettings;
 use Modules\Profile\Models\ContactElement;
 use Modules\Profile\Models\ContactElementMapper;
@@ -33,7 +34,7 @@ use phpOMS\Model\Message\FormValidation;
  * Profile class.
  *
  * @package Modules\Profile
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -148,7 +149,9 @@ final class ApiController extends Controller
                 continue;
             }
 
-            $profiles[] = new Profile(AccountMapper::get()->where('id', $account)->execute());
+            /** @var \Modules\Admin\Models\Account $dbAccount */
+            $dbAccount  = AccountMapper::get()->where('id', $account)->execute();
+            $profiles[] = new Profile($dbAccount);
         }
 
         return $profiles;
@@ -197,7 +200,7 @@ final class ApiController extends Controller
                 $this->createModelRelation(
                     $request->header->account,
                     $file->getId(),
-                    $request->getData('type', 'int'),
+                    $request->getDataInt('type'),
                     MediaMapper::class,
                     'types',
                     '',
@@ -239,11 +242,11 @@ final class ApiController extends Controller
 
         $profile = 0;
         if ($request->hasData('profile')) {
-            $profile = (int) ($request->getData('profile') ?? 0);
+            $profile = $request->getDataInt('profile') ?? 0;
         } else {
             /** @var \Modules\Profile\Models\Profile $profileObj */
             $profileObj = ProfileMapper::get()
-                ->where('account', (int) ($request->getData('account') ?? 0))
+                ->where('account', $request->getDataInt('account') ?? 0)
                 ->execute();
 
             $profile = $profileObj->getId();
@@ -292,10 +295,10 @@ final class ApiController extends Controller
     {
         /** @var ContactElement $element */
         $element = new ContactElement();
-        $element->setType((int) ($request->getData('type') ?? 0));
-        $element->setSubtype((int) ($request->getData('subtype') ?? 0));
-        $element->content = (string) ($request->getData('content') ?? '');
-        $element->contact = (int) ($request->getData('contact') ?? 0);
+        $element->setType($request->getDataInt('type') ?? 0);
+        $element->setSubtype($request->getDataInt('subtype') ?? 0);
+        $element->content = $request->getDataString('content') ?? '';
+        $element->contact = $request->getDataInt('contact') ?? 0;
 
         return $element;
     }
@@ -324,11 +327,11 @@ final class ApiController extends Controller
 
         $profile = 0;
         if ($request->hasData('profile')) {
-            $profile = (int) ($request->getData('profile') ?? 0);
+            $profile = $request->getDataInt('profile') ?? 0;
         } else {
             /** @var \Modules\Profile\Models\Profile $profileObj */
             $profileObj = ProfileMapper::get()
-                ->where('account', (int) ($request->getData('account') ?? 0))
+                ->where('account', $request->getDataInt('account') ?? 0)
                 ->execute();
 
             $profile = $profileObj->getId();
@@ -378,14 +381,14 @@ final class ApiController extends Controller
     {
         /** @var Address $element */
         $element           = new Address();
-        $element->name     = (string) ($request->getData('name') ?? '');
-        $element->addition = (string) ($request->getData('addition') ?? '');
-        $element->postal   = (string) ($request->getData('postal') ?? '');
-        $element->city     = (string) ($request->getData('city') ?? '');
-        $element->address  = (string) ($request->getData('address') ?? '');
-        $element->state    = (string) ($request->getData('state') ?? '');
-        $element->setCountry((string) ($request->getData('country') ?? ''));
-        $element->setType((int) ($request->getData('type') ?? 0));
+        $element->name     = $request->getDataString('name') ?? '';
+        $element->addition = $request->getDataString('addition') ?? '';
+        $element->postal   = $request->getDataString('postal') ?? '';
+        $element->city     = $request->getDataString('city') ?? '';
+        $element->address  = $request->getDataString('address') ?? '';
+        $element->state    = $request->getDataString('state') ?? '';
+        $element->setCountry($request->getDataString('country') ?? '');
+        $element->setType($request->getDataInt('type') ?? 0);
 
         return $element;
     }
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 920451b..b8e1465 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -29,7 +29,7 @@ use phpOMS\Views\View;
  * Profile class.
  *
  * @package Modules\Profile
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  * @codeCoverageIgnore
@@ -76,7 +76,7 @@ final class BackendController extends Controller
                 ProfileMapper::getAll()
                     ->with('account')
                     ->with('image')
-                    ->where('id', (int) ($request->getData('id') ?? 0), '<')
+                    ->where('id', $request->getDataInt('id') ?? 0, '<')
                     ->limit(25)->execute()
                 );
         } elseif ($request->getData('ptype') === 'n') {
@@ -84,7 +84,7 @@ final class BackendController extends Controller
                 ProfileMapper::getAll()
                     ->with('account')
                     ->with('image')
-                    ->where('id', (int) ($request->getData('id') ?? 0), '>')
+                    ->where('id', $request->getDataInt('id') ?? 0, '>')
                     ->limit(25)->execute()
                 );
         } else {
@@ -146,7 +146,7 @@ final class BackendController extends Controller
             ->with('image');
 
         /** @var \Modules\Profile\Models\Profile $profile */
-        $profile = $request->getData('for') !== null
+        $profile = $request->hasData('for')
             ? $mapperQuery->where('account', (int) $request->getData('for'))->execute()
             : $mapperQuery->where('id', (int) $request->getData('id'))->execute();
 
diff --git a/Controller/Controller.php b/Controller/Controller.php
index eacc693..4e02153 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\ModuleAbstract;
  * Profile class.
  *
  * @package Modules\Profile
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/Contact.php b/Models/Contact.php
index a6a59b3..5212eb2 100755
--- a/Models/Contact.php
+++ b/Models/Contact.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Location;
  * Contact element class.
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/ContactElement.php b/Models/ContactElement.php
index a6349de..72c7969 100755
--- a/Models/ContactElement.php
+++ b/Models/ContactElement.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ namespace Modules\Profile\Models;
  * Information such as phone number, email, ...
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/ContactElementMapper.php b/Models/ContactElementMapper.php
index 9836755..79d1b9b 100755
--- a/Models/ContactElementMapper.php
+++ b/Models/ContactElementMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Contact mapper class.
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/ContactMapper.php b/Models/ContactMapper.php
index ef8fd7f..fcf7eea 100755
--- a/Models/ContactMapper.php
+++ b/Models/ContactMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -22,7 +22,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Contact mapper class.
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/ContactType.php b/Models/ContactType.php
index 52b8e1c..e9b6e76 100755
--- a/Models/ContactType.php
+++ b/Models/ContactType.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * Contact type enum.
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/GenderType.php b/Models/GenderType.php
index 542bd7f..137a0c2 100755
--- a/Models/GenderType.php
+++ b/Models/GenderType.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * Gender type enum.
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullContact.php b/Models/NullContact.php
index 13102da..726bc71 100755
--- a/Models/NullContact.php
+++ b/Models/NullContact.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\Profile\Models;
  * Contact element class.
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullContactElement.php b/Models/NullContactElement.php
index 6a0d2c3..1404ff2 100755
--- a/Models/NullContactElement.php
+++ b/Models/NullContactElement.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\Profile\Models;
  * Contact element class.
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullProfile.php b/Models/NullProfile.php
index c8314ee..2ced31b 100755
--- a/Models/NullProfile.php
+++ b/Models/NullProfile.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\Profile\Models;
  * Account class.
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php
index 410adcd..ee21266 100755
--- a/Models/PermissionCategory.php
+++ b/Models/PermissionCategory.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * Permision state enum.
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/Profile.php b/Models/Profile.php
index 5d1acec..dd5e66a 100755
--- a/Models/Profile.php
+++ b/Models/Profile.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -25,7 +25,7 @@ use phpOMS\Stdlib\Base\Location;
  * Profile class.
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/ProfileMapper.php b/Models/ProfileMapper.php
index c122e72..bdafa60 100755
--- a/Models/ProfileMapper.php
+++ b/Models/ProfileMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -22,7 +22,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Profile mapper.
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/SettingsEnum.php b/Models/SettingsEnum.php
index 2c7b5e1..ff5056a 100755
--- a/Models/SettingsEnum.php
+++ b/Models/SettingsEnum.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * Default settings enum.
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/SexType.php b/Models/SexType.php
index f014008..aec353c 100755
--- a/Models/SexType.php
+++ b/Models/SexType.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * Sex type enum.
  *
  * @package Modules\Profile\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Theme/Backend/Components/AccountGroupSelector/BaseView.php b/Theme/Backend/Components/AccountGroupSelector/BaseView.php
index 8dde5e2..036c452 100755
--- a/Theme/Backend/Components/AccountGroupSelector/BaseView.php
+++ b/Theme/Backend/Components/AccountGroupSelector/BaseView.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -23,7 +23,7 @@ use phpOMS\Views\View;
  * Component view.
  *
  * @package Modules\Profile
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  * @codeCoverageIgnore
diff --git a/Theme/Backend/Components/AccountGroupSelector/PopupView.php b/Theme/Backend/Components/AccountGroupSelector/PopupView.php
index f749d57..eca44d8 100755
--- a/Theme/Backend/Components/AccountGroupSelector/PopupView.php
+++ b/Theme/Backend/Components/AccountGroupSelector/PopupView.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -23,7 +23,7 @@ use phpOMS\Views\View;
  * Component view.
  *
  * @package Modules\Profile
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  * @codeCoverageIgnore
diff --git a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
index b2efb5e..7dcf5b2 100755
--- a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
@@ -6,9 +6,9 @@
                     {
                         "key": 1, "listener": "click", "action": [
                             {"key": 1, "type": "dom.popup", "selector": "#acc-grp-tpl", "aniIn": "fadeIn", "id": "<?= $this->getId(); ?>"},
-                            {"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/lang}/{/app}/admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
+                            {"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/base}/admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
                             {"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1},
-                            {"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/lang}/{/app}/admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
+                            {"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/base}/admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
                             {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
                         ]
                     }
diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php
index 2d31deb..d01944d 100755
--- a/Theme/Backend/Lang/Navigation.ar.lang.php
+++ b/Theme/Backend/Lang/Navigation.ar.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php
index 70c1cb5..7f37122 100755
--- a/Theme/Backend/Lang/Navigation.cs.lang.php
+++ b/Theme/Backend/Lang/Navigation.cs.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php
index f649743..92f8bca 100755
--- a/Theme/Backend/Lang/Navigation.da.lang.php
+++ b/Theme/Backend/Lang/Navigation.da.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php
index fc53cba..4309ad1 100755
--- a/Theme/Backend/Lang/Navigation.de.lang.php
+++ b/Theme/Backend/Lang/Navigation.de.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php
index 494bd61..2adae61 100755
--- a/Theme/Backend/Lang/Navigation.el.lang.php
+++ b/Theme/Backend/Lang/Navigation.el.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index 3394dc2..5b0477b 100755
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php
index ab25447..b05464d 100755
--- a/Theme/Backend/Lang/Navigation.es.lang.php
+++ b/Theme/Backend/Lang/Navigation.es.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php
index def2ad3..456f3fb 100755
--- a/Theme/Backend/Lang/Navigation.fi.lang.php
+++ b/Theme/Backend/Lang/Navigation.fi.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php
index e151a34..07e6c3d 100755
--- a/Theme/Backend/Lang/Navigation.fr.lang.php
+++ b/Theme/Backend/Lang/Navigation.fr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php
index b974a0b..c7f3155 100755
--- a/Theme/Backend/Lang/Navigation.hu.lang.php
+++ b/Theme/Backend/Lang/Navigation.hu.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php
index c04d64a..4b2d730 100755
--- a/Theme/Backend/Lang/Navigation.it.lang.php
+++ b/Theme/Backend/Lang/Navigation.it.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php
index b307c2a..c2626aa 100755
--- a/Theme/Backend/Lang/Navigation.ja.lang.php
+++ b/Theme/Backend/Lang/Navigation.ja.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php
index 232dcf7..1cdee51 100755
--- a/Theme/Backend/Lang/Navigation.ko.lang.php
+++ b/Theme/Backend/Lang/Navigation.ko.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php
index 1062870..461f2e9 100755
--- a/Theme/Backend/Lang/Navigation.no.lang.php
+++ b/Theme/Backend/Lang/Navigation.no.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php
index d01e3a3..5867eb2 100755
--- a/Theme/Backend/Lang/Navigation.pl.lang.php
+++ b/Theme/Backend/Lang/Navigation.pl.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php
index 45cfa57..fb6b49e 100755
--- a/Theme/Backend/Lang/Navigation.pt.lang.php
+++ b/Theme/Backend/Lang/Navigation.pt.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php
index 6a071ef..668907d 100755
--- a/Theme/Backend/Lang/Navigation.ru.lang.php
+++ b/Theme/Backend/Lang/Navigation.ru.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php
index b2fe147..960aff4 100755
--- a/Theme/Backend/Lang/Navigation.sv.lang.php
+++ b/Theme/Backend/Lang/Navigation.sv.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php
index 55febf7..fcfd2aa 100755
--- a/Theme/Backend/Lang/Navigation.th.lang.php
+++ b/Theme/Backend/Lang/Navigation.th.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php
index db3ce22..63d5482 100755
--- a/Theme/Backend/Lang/Navigation.tr.lang.php
+++ b/Theme/Backend/Lang/Navigation.tr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php
index b86eea0..4cba1af 100755
--- a/Theme/Backend/Lang/Navigation.uk.lang.php
+++ b/Theme/Backend/Lang/Navigation.uk.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php
index ae3a53b..a15be40 100755
--- a/Theme/Backend/Lang/Navigation.zh.lang.php
+++ b/Theme/Backend/Lang/Navigation.zh.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
index c03a52b..578a022 100755
--- a/Theme/Backend/Lang/ar.lang.php
+++ b/Theme/Backend/Lang/ar.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php
index b83517c..a951aba 100755
--- a/Theme/Backend/Lang/cs.lang.php
+++ b/Theme/Backend/Lang/cs.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php
index 3cf8388..5ea2a1e 100755
--- a/Theme/Backend/Lang/da.lang.php
+++ b/Theme/Backend/Lang/da.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index e199f7f..1c31b45 100755
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php
index 9170bad..a10980e 100755
--- a/Theme/Backend/Lang/el.lang.php
+++ b/Theme/Backend/Lang/el.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index f2fc96c..02d024e 100755
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php
index 684ca3c..c33de97 100755
--- a/Theme/Backend/Lang/es.lang.php
+++ b/Theme/Backend/Lang/es.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php
index 00719fd..fe8e167 100755
--- a/Theme/Backend/Lang/fi.lang.php
+++ b/Theme/Backend/Lang/fi.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php
index 82d2e44..78e37b3 100755
--- a/Theme/Backend/Lang/fr.lang.php
+++ b/Theme/Backend/Lang/fr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php
index e2bd4e7..dda9d89 100755
--- a/Theme/Backend/Lang/hu.lang.php
+++ b/Theme/Backend/Lang/hu.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php
index a16b63e..1e64d9f 100755
--- a/Theme/Backend/Lang/it.lang.php
+++ b/Theme/Backend/Lang/it.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php
index f160f41..3f57577 100755
--- a/Theme/Backend/Lang/ja.lang.php
+++ b/Theme/Backend/Lang/ja.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php
index b6422f1..78c0085 100755
--- a/Theme/Backend/Lang/ko.lang.php
+++ b/Theme/Backend/Lang/ko.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php
index ee368ec..d112312 100755
--- a/Theme/Backend/Lang/no.lang.php
+++ b/Theme/Backend/Lang/no.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php
index c3ba68d..6bf70ac 100755
--- a/Theme/Backend/Lang/pl.lang.php
+++ b/Theme/Backend/Lang/pl.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php
index 99415f4..0d5dd5a 100755
--- a/Theme/Backend/Lang/pt.lang.php
+++ b/Theme/Backend/Lang/pt.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php
index bfcfd29..53da15b 100755
--- a/Theme/Backend/Lang/ru.lang.php
+++ b/Theme/Backend/Lang/ru.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php
index ce2f2bf..38b5f4e 100755
--- a/Theme/Backend/Lang/sv.lang.php
+++ b/Theme/Backend/Lang/sv.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php
index 42e5c9a..706798a 100755
--- a/Theme/Backend/Lang/th.lang.php
+++ b/Theme/Backend/Lang/th.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php
index 52efc51..076b5ac 100755
--- a/Theme/Backend/Lang/tr.lang.php
+++ b/Theme/Backend/Lang/tr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php
index fd41579..1265c29 100755
--- a/Theme/Backend/Lang/uk.lang.php
+++ b/Theme/Backend/Lang/uk.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php
index 70d4030..13b52c6 100755
--- a/Theme/Backend/Lang/zh.lang.php
+++ b/Theme/Backend/Lang/zh.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/modules-create.tpl.php b/Theme/Backend/modules-create.tpl.php
index 91841b3..60aeb11 100755
--- a/Theme/Backend/modules-create.tpl.php
+++ b/Theme/Backend/modules-create.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Template
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/modules-settings.tpl.php b/Theme/Backend/modules-settings.tpl.php
index 5509e4a..589de34 100755
--- a/Theme/Backend/modules-settings.tpl.php
+++ b/Theme/Backend/modules-settings.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Template
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/profile-list.tpl.php b/Theme/Backend/profile-list.tpl.php
index aa3c1a7..96ff33a 100755
--- a/Theme/Backend/profile-list.tpl.php
+++ b/Theme/Backend/profile-list.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -21,8 +21,8 @@ use phpOMS\Uri\UriFactory;
  */
 $accounts = $this->getData('accounts') ?? [];
 
-$previous = empty($accounts) ? '{/lang}/{/app}profile/list' : '{/lang}/{/app}/profile/list?{?}&id=' . \reset($accounts)->getId() . '&ptype=p';
-$next     = empty($accounts) ? '{/lang}/{/app}profile/list' : '{/lang}/{/app}/profile/list?{?}&id=' . \end($accounts)->getId() . '&ptype=n';
+$previous = empty($accounts) ? '{/base}profile/list' : '{/base}/profile/list?{?}&id=' . \reset($accounts)->getId() . '&ptype=p';
+$next     = empty($accounts) ? '{/base}profile/list' : '{/base}/profile/list?{?}&id=' . \end($accounts)->getId() . '&ptype=n';
 ?>
 <div class="row">
     <div class="col-xs-12">
@@ -60,7 +60,7 @@ $next     = empty($accounts) ? '{/lang}/{/app}profile/list' : '{/lang}/{/app}/pr
                 <tbody>
                 <?php $count = 0;
                     foreach ($accounts as $key => $account) : ++$count;
-                        $url = UriFactory::build('{/lang}/{/app}/profile/single?{?}&id=' . $account->getId());
+                        $url = UriFactory::build('{/base}/profile/single?{?}&id=' . $account->getId());
                 ?>
                     <tr tabindex="0" data-href="<?= $url; ?>">
                         <td><a href="<?= $url; ?>"><img alt="<?= $this->getHtml('IMG_alt_user'); ?>" width="30" loading="lazy" class="profile-image"
diff --git a/Theme/Backend/profile-single.tpl.php b/Theme/Backend/profile-single.tpl.php
index 0b5b0f6..7d4bd05 100755
--- a/Theme/Backend/profile-single.tpl.php
+++ b/Theme/Backend/profile-single.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Profile
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
index c5cd847..60abdea 100755
--- a/tests/Admin/AdminTest.php
+++ b/tests/Admin/AdminTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Autoloader.php b/tests/Autoloader.php
index d032623..d08f1b7 100755
--- a/tests/Autoloader.php
+++ b/tests/Autoloader.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules/tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ namespace tests;
  * Autoloader class.
  *
  * @package tests
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index d71c6b8..1faa19f 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/ContactElementTest.php b/tests/Models/ContactElementTest.php
index c412663..9f6cf54 100755
--- a/tests/Models/ContactElementTest.php
+++ b/tests/Models/ContactElementTest.php
@@ -6,7 +6,7 @@
  *
  * @package    tests
  * @copyright  2013 Dennis Eichhorn
- * @license    OMS License 1.0
+ * @license    OMS License 2.0
  * @version    1.0.0
  * @link       https://jingga.app
  */
diff --git a/tests/Models/ContactTest.php b/tests/Models/ContactTest.php
index 71f479c..7e20e29 100755
--- a/tests/Models/ContactTest.php
+++ b/tests/Models/ContactTest.php
@@ -6,7 +6,7 @@
  *
  * @package    tests
  * @copyright  2013 Dennis Eichhorn
- * @license    OMS License 1.0
+ * @license    OMS License 2.0
  * @version    1.0.0
  * @link       https://jingga.app
  */
diff --git a/tests/Models/NullContactElementTest.php b/tests/Models/NullContactElementTest.php
index 9b191e6..8e796fc 100755
--- a/tests/Models/NullContactElementTest.php
+++ b/tests/Models/NullContactElementTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/NullContactTest.php b/tests/Models/NullContactTest.php
index ca6ba1f..e190a1b 100755
--- a/tests/Models/NullContactTest.php
+++ b/tests/Models/NullContactTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/NullProfileTest.php b/tests/Models/NullProfileTest.php
index 3a7652e..3f6ac9c 100755
--- a/tests/Models/NullProfileTest.php
+++ b/tests/Models/NullProfileTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/ProfileMapperTest.php b/tests/Models/ProfileMapperTest.php
index dfb6359..073884f 100755
--- a/tests/Models/ProfileMapperTest.php
+++ b/tests/Models/ProfileMapperTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/ProfileTest.php b/tests/Models/ProfileTest.php
index dfa27c0..1f23b7b 100755
--- a/tests/Models/ProfileTest.php
+++ b/tests/Models/ProfileTest.php
@@ -6,7 +6,7 @@
  *
  * @package    tests
  * @copyright  2013 Dennis Eichhorn
- * @license    OMS License 1.0
+ * @license    OMS License 2.0
  * @version    1.0.0
  * @link       https://jingga.app
  */