diff --git a/Admin/Install/Application/Shop/Application.php b/Admin/Install/Application/Shop/Application.php
index fd9d452..896cf49 100755
--- a/Admin/Install/Application/Shop/Application.php
+++ b/Admin/Install/Application/Shop/Application.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -50,7 +50,7 @@ use Web\{APPNAME}\ShopView;
  * Application class.
  *
  * @package Web\{APPNAME}
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  * @codeCoverageIgnore
@@ -101,7 +101,7 @@ final class Application
      */
     public function run(HttpRequest $request, HttpResponse $response) : void
     {
-        $this->app->l11nManager    = new L11nManager($this->app->appName);
+        $this->app->l11nManager    = new L11nManager();
         $this->app->dbPool         = new DatabasePool();
         $this->app->sessionManager = new HttpSession(36000);
         $this->app->cookieJar      = new CookieJar();
@@ -126,8 +126,8 @@ final class Application
         );
 
         /* CSRF token OK? */
-        if ($request->getData('CSRF') !== null
-            && !\hash_equals($this->app->sessionManager->get('CSRF'), $request->getData('CSRF'))
+        if ($request->hasData('CSRF')
+            && !\hash_equals($this->app->sessionManager->get('CSRF'), $request->getDataString('CSRF'))
         ) {
             $response->header->status = RequestStatusCode::R_403;
 
@@ -210,7 +210,7 @@ final class Application
         $dispatched = $this->app->dispatcher->dispatch(
             $this->app->router->route(
                 $request->uri->getRoute(),
-                $request->getData('CSRF'),
+                $request->getDataString('CSRF'),
                 $request->getRouteVerb(),
                 $this->app->appName,
                 $this->app->unitId,
diff --git a/Admin/Install/Application/Shop/Controller/AppController.php b/Admin/Install/Application/Shop/Controller/AppController.php
index 07bc67a..11a6e23 100755
--- a/Admin/Install/Application/Shop/Controller/AppController.php
+++ b/Admin/Install/Application/Shop/Controller/AppController.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -24,7 +24,7 @@ use phpOMS\Views\View;
  * App controller class.
  *
  * @package Web\{APPNAME}
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Install/Application/Shop/ShopView.php b/Admin/Install/Application/Shop/ShopView.php
index 5b19e83..5761713 100755
--- a/Admin/Install/Application/Shop/ShopView.php
+++ b/Admin/Install/Application/Shop/ShopView.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @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;
  * List view.
  *
  * @package Web\{APPNAME}
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php
index c537444..66e6d47 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/footer.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
  */
@@ -19,9 +19,9 @@ use phpOMS\Uri\UriFactory;
     <div class="floater">
         <hr>
         <ul>
-            <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/terms'); ?>">Terms</a>
-            <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/privacy'); ?>">Data Protection</a>
-            <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/imprint'); ?>">Imprint</a>
+            <li><a href="<?= UriFactory::build('{/base}/{/app}/terms'); ?>">Terms</a>
+            <li><a href="<?= UriFactory::build('{/base}/{/app}/privacy'); ?>">Data Protection</a>
+            <li><a href="<?= UriFactory::build('{/base}/{/app}/imprint'); ?>">Imprint</a>
         </ul>
     </div>
 </footer>
\ No newline at end of file
diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php
index 3a8c873..6d10c1d 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @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/Install/Application/Shop/Themes/Default/tpl/header.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php
index 8cde0da..c9b02c7 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,8 +18,8 @@ use phpOMS\Uri\UriFactory;
 <header>
     <nav>
        <ul>
-          <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}'); ?>">Website</a>
-          <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/components'); ?>">Profile</a>
+          <li><a href="<?= UriFactory::build('{/base}/{/app}'); ?>">Website</a>
+          <li><a href="<?= UriFactory::build('{/base}/{/app}/components'); ?>">Profile</a>
        </ul>
     </nav>
     <div id="search">
diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/imprint.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/imprint.tpl.php
index a91d924..196d2ca 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/imprint.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/imprint.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @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/Install/Application/Shop/Themes/Default/tpl/privacy.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/privacy.tpl.php
index eb14b99..b40c121 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/privacy.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/privacy.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @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/Install/Application/Shop/Themes/Default/tpl/terms.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/terms.tpl.php
index a6e6d06..08b545a 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/terms.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/terms.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @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/Install/Application/Shop/index.tpl.php b/Admin/Install/Application/Shop/index.tpl.php
index bda9bae..6e064d3 100755
--- a/Admin/Install/Application/Shop/index.tpl.php
+++ b/Admin/Install/Application/Shop/index.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  *
  * @link      https://jingga.app
@@ -32,7 +32,7 @@ $dispatch = $this->getData('dispatch') ?? [];
     <meta name="description" content="<?= $this->getHtml(':meta', '0', '0'); ?>">
     <?= $head->render(); ?>
 
-    <base href="<?= UriFactory::build('{/base}'); ?>/">
+    <base href="/">
 
     <link rel="manifest" href="<?= UriFactory::build('Web/{APPNAME}/manifest.json'); ?>">
     <link rel="shortcut icon" href="<?= UriFactory::build('Web/{APPNAME}/img/favicon.ico'); ?>" type="image/x-icon">
diff --git a/Admin/Install/Application/Shop/lang/en.lang.php b/Admin/Install/Application/Shop/lang/en.lang.php
index ae6af8b..8b8c6f1 100755
--- a/Admin/Install/Application/Shop/lang/en.lang.php
+++ b/Admin/Install/Application/Shop/lang/en.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  *
  * @version   1.0.0
  *
diff --git a/Admin/Install/CMS.php b/Admin/Install/CMS.php
index 524db57..428413b 100755
--- a/Admin/Install/CMS.php
+++ b/Admin/Install/CMS.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Shop\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;
  * CMS class.
  *
  * @package Modules\Shop\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/Media.php b/Admin/Install/Media.php
index 85b219b..ce94956 100755
--- a/Admin/Install/Media.php
+++ b/Admin/Install/Media.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Shop\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;
  * Media class.
  *
  * @package Modules\Shop\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.php b/Admin/Install/Navigation.php
index f0760d8..c9e2a3a 100755
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Shop\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\Shop\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 78df653..d7f1d16 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Shop\Admin
  * @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\System\File\Local\Directory;
  * Installer class.
  *
  * @package Modules\Shop\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index 9672f46..3f30777 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 a55c0ab..42f6f02 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/Status.php b/Admin/Status.php
index 851ddb5..c049fc4 100755
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Shop\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;
  * Shop class.
  *
  * @package Modules\Shop\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 6c377f0..57a5162 100755
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Shop\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\Shop\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 5f40564..48b0041 100755
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Shop\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\Shop\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 3a04f85..0b31842 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Shop
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -33,7 +33,7 @@ use phpOMS\Uri\HttpUri;
  * Api controller
  *
  * @package Modules\Shop
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -169,7 +169,7 @@ final class ApiController extends Controller
 
         // \Stripe\Stripe::setApiKey($stripeSecretKey);
 
-        $api_key = $_SERVER['OMS_STRIPE_SECRET'] ?? '';
+        $api_key         = $_SERVER['OMS_STRIPE_SECRET'] ?? '';
         $endpoint_secret = $_SERVER['OMS_STRIPE_PUBLIC'] ?? '';
 
         $include = \realpath(__DIR__ . '/../../../Resources/');
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 24020e8..8c5aad8 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Shop
  * @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\Shop\Controller;
  * Backend controller.
  *
  * @package Modules\Shop
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  * @codeCoverageIgnore
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 6b759b0..ba9cb1e 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Shop
  * @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\Module\WebInterface;
  * Shop class.
  *
  * @package Modules\Shop
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index a1aba6f..1267a09 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Shop
  * @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\Shop\Controller;
  * Shop controller.
  *
  * @package Modules\Shop
- * @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 d9dcc36..c0e3c47 100755
--- a/Models/PermissionCategory.php
+++ b/Models/PermissionCategory.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Shop\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\Shop\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index d48c785..cbae332 100644
--- 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
  */
@@ -18,4 +18,4 @@ return ['Shop' => [
     'Website'              => 'Website',
     'Demo'              => 'Demo',
     'Download'              => 'Download',
-]];
\ No newline at end of file
+]];
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
index 579b786..24e03ab 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
  */