diff --git a/Admin/Install/Media.php b/Admin/Install/Media.php
index 365d788..a6d4c64 100755
--- a/Admin/Install/Media.php
+++ b/Admin/Install/Media.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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\Knowledgebase\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 ffee70a..0648a90 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Wiki",
-        "uri": "{/lang}/{/app}/wiki/dashboard?{?}",
+        "uri": "{/base}/wiki/dashboard?{?}",
         "target": "self",
         "icon": null,
         "order": 50,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Dashboard",
-                "uri": "{/lang}/{/app}/wiki/dashboard?{?}",
+                "uri": "{/base}/wiki/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Categories",
-                "uri": "{/lang}/{/app}/wiki/category/list",
+                "uri": "{/base}/wiki/category/list",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -49,7 +49,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/lang}/{/app}/wiki/doc/create?{?}",
+                "uri": "{/base}/wiki/doc/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 10,
@@ -64,7 +64,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/lang}/{/app}/wiki/list",
+                "uri": "{/base}/wiki/list",
                 "target": "self",
                 "icon": null,
                 "order": 15,
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index cc85d03..3c8b78b 100755
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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\Knowledgebase\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 eb7ae85..c80e909 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -28,7 +28,7 @@ use phpOMS\Module\ModuleInfo;
  * Installer class.
  *
  * @package Modules\Knowledgebase\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -52,10 +52,10 @@ final class Installer extends InstallerAbstract
         $app       = new WikiApp();
         $app->name = 'Default';
 
-        $id = WikiAppMapper::create()->execute($app);
+        WikiAppMapper::create()->execute($app);
 
         $category      = new WikiCategory();
-        $category->app = new NullWikiApp($id);
+        $category->app = new NullWikiApp($app->getId());
         $category->setL11n('Default');
 
         WikiCategoryMapper::create()->execute($category);
diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index ee79591..9b313d0 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 3e9df81..698ce29 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 e860563..69a3937 100755
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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\Knowledgebase\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 d4d086b..befebbc 100755
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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\Knowledgebase\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 7ea966d..9aef3e1 100755
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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\Knowledgebase\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 d68af3c..410f996 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -48,7 +48,7 @@ use phpOMS\Utils\Parser\Markdown\Markdown;
  * Knowledgebase class.
  *
  * @package Modules\Knowledgebase
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -241,14 +241,14 @@ final class ApiController extends Controller
         $doc              = new WikiDoc();
         $doc->createdBy   = new NullAccount($request->header->account);
         $doc->name        = (string) $request->getData('title');
-        $doc->doc         = Markdown::parse((string) ($request->getData('plain') ?? ''));
-        $doc->docRaw      = (string) ($request->getData('plain') ?? '');
-        $doc->isVersioned = (bool) ($request->getData('versioned') ?? false);
-        $doc->category    = new NullWikiCategory((int) ($request->getData('category') ?? 1));
-        $doc->app         = new NullWikiApp((int) ($request->getData('app') ?? 1));
-        $doc->version     = (string) ($request->getData('version') ?? '');
-        $doc->setLanguage((string) ($request->getData('language') ?? $request->getLanguage()));
-        $doc->setStatus((int) ($request->getData('status') ?? WikiStatus::INACTIVE));
+        $doc->doc         = Markdown::parse($request->getDataString('plain') ?? '');
+        $doc->docRaw      = $request->getDataString('plain') ?? '';
+        $doc->isVersioned = $request->getDataBool('versioned') ?? false;
+        $doc->category    = new NullWikiCategory($request->getDataInt('category') ?? 1);
+        $doc->app         = new NullWikiApp($request->getDataInt('app') ?? 1);
+        $doc->version     = $request->getDataString('version') ?? '';
+        $doc->setLanguage((string) ($request->getDataString('language') ?? $request->getLanguage()));
+        $doc->setStatus($request->getDataInt('status') ?? WikiStatus::INACTIVE);
 
         if (!empty($tags = $request->getDataJson('tags'))) {
             foreach ($tags as $tag) {
@@ -306,7 +306,7 @@ final class ApiController extends Controller
         if (($val['title'] = empty($request->getData('title')))
             || ($val['plain'] = empty($request->getData('plain')))
             || ($val['status'] = (
-                $request->getData('status') !== null
+                $request->hasData('status')
                 && !WikiStatus::isValidValue((int) $request->getData('status'))
             ))
         ) {
@@ -377,11 +377,11 @@ final class ApiController extends Controller
     private function createWikiCategoryL11nFromRequest(RequestAbstract $request) : BaseStringL11n
     {
         $l11nWikiCategory      = new BaseStringL11n();
-        $l11nWikiCategory->ref = (int) ($request->getData('category') ?? 0);
-        $l11nWikiCategory->setLanguage((string) (
-            $request->getData('language') ?? $request->getLanguage()
-        ));
-        $l11nWikiCategory->content = (string) ($request->getData('name') ?? '');
+        $l11nWikiCategory->ref = $request->getDataInt('category') ?? 0;
+        $l11nWikiCategory->setLanguage(
+            $request->getDataString('language') ?? $request->getLanguage()
+        );
+        $l11nWikiCategory->content = $request->getDataString('name') ?? '';
 
         return $l11nWikiCategory;
     }
@@ -524,10 +524,13 @@ final class ApiController extends Controller
     public function createWikiCategoryFromRequest(RequestAbstract $request) : WikiCategory
     {
         $category      = new WikiCategory();
-        $category->app = new NullWikiApp((int) ($request->getData('app') ?? 1));
-        $category->setL11n($request->getData('name'), $request->getData('language') ?? $request->getLanguage());
+        $category->app = new NullWikiApp($request->getDataInt('app') ?? 1);
+        $category->setL11n(
+            $request->getDataString('name') ?? '',
+            $request->getDataString('language') ?? $request->getLanguage()
+        );
 
-        if ($request->getData('parent') !== null) {
+        if ($request->hasData('parent')) {
             $category->parent = new NullWikiCategory((int) $request->getData('parent'));
         }
 
@@ -615,7 +618,10 @@ final class ApiController extends Controller
         /** @var \Modules\Knowledgebase\Models\WikiCategory $category */
         $category = WikiCategoryMapper::get()->where('id', (int) $request->getData('id'))->execute();
 
-        $category->setL11n($request->getData('name') ?? $category->getL11n(), $request->getData('language') ?? $request->getLanguage());
+        $category->setL11n(
+            $request->getDataString('name') ?? $category->getL11n(),
+            $request->getDataString('language') ?? $request->getLanguage()
+        );
 
         return $category;
     }
@@ -682,7 +688,7 @@ final class ApiController extends Controller
     {
         $app       = new WikiApp();
         $app->name = (string) $request->getData('name');
-        $app->unit = $request->getData('unit', 'int');
+        $app->unit = $request->getDataInt('unit');
 
         return $app;
     }
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 75cb351..fe04aea 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -34,7 +34,7 @@ use phpOMS\Views\View;
  * Knowledgebase class.
  *
  * @package Modules\Knowledgebase
- * @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
         $view = new View($this->app->l11nManager, $request, $response);
 
         // @todo: assign default org app to wiki app and default flag, load the wiki app based on org id and with a default flag set. Use this app in the following line instead of the hardcoded "1"
-        $app = (int) ($request->getData('app') ?? 1);
+        $app = $request->getDataInt('app') ?? 1;
 
         $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-dashboard');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response));
@@ -84,7 +84,7 @@ final class BackendController extends Controller
         /** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */
         $categories = WikiCategoryMapper::getAll()
             ->with('name')
-            ->where('parent', $request->getData('category', 'int'))
+            ->where('parent', $request->getDataInt('category'))
             ->where('app', $app)
             ->where('name/language', $response->getLanguage())
             ->execute();
@@ -201,7 +201,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
 
-        $app = (int) ($request->getData('app') ?? $this->app->unitId);
+        $app = $request->getDataInt('app') ?? $this->app->unitId;
 
         $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-category-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response));
@@ -304,7 +304,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
 
-        $app = (int) ($request->getData('app') ?? $this->app->unitId);
+        $app = $request->getDataInt('app') ?? $this->app->unitId;
 
         /** @var \Modules\Knowledgebase\Models\WikiDoc $document */
         $document = WikiDocMapper::get()
@@ -332,7 +332,7 @@ final class BackendController extends Controller
         /** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */
         $categories = WikiCategoryMapper::getAll()
             ->with('name')
-            ->where('parent', $request->getData('category', 'int'))
+            ->where('parent', $request->getDataInt('category'))
             ->where('app', $app)
             ->where('name/language', $response->getLanguage())
             ->execute();
@@ -404,7 +404,7 @@ final class BackendController extends Controller
         $tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response);
         $view->addData('tagSelector', $tagSelector);
 
-        $view->addData('doc', WikiDocMapper::get()->where('id', (int) ($request->getData('id') ?? 0))->execute());
+        $view->addData('doc', WikiDocMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute());
 
         return $view;
     }
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 519ffbb..cbd1cd4 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase
  * @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;
  * Knowledgebase controller class.
  *
  * @package Modules\Knowledgebase
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullWikiApp.php b/Models/NullWikiApp.php
index ac76d74..074bff0 100755
--- a/Models/NullWikiApp.php
+++ b/Models/NullWikiApp.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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\Knowledgebase\Models;
  * Null model class.
  *
  * @package Modules\Knowledgebase\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullWikiCategory.php b/Models/NullWikiCategory.php
index 4c2537b..4bbf493 100755
--- a/Models/NullWikiCategory.php
+++ b/Models/NullWikiCategory.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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\Knowledgebase\Models;
  * Null model class.
  *
  * @package Modules\Knowledgebase\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullWikiDoc.php b/Models/NullWikiDoc.php
index 988176c..9eb7bc2 100755
--- a/Models/NullWikiDoc.php
+++ b/Models/NullWikiDoc.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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\Knowledgebase\Models;
  * Null model class.
  *
  * @package Modules\Knowledgebase\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullWikiDocHistory.php b/Models/NullWikiDocHistory.php
index 3ad2d16..437c019 100755
--- a/Models/NullWikiDocHistory.php
+++ b/Models/NullWikiDocHistory.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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\Knowledgebase\Models;
  * Null model class.
  *
  * @package Modules\Knowledgebase\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 df758c1..07a7804 100755
--- a/Models/PermissionCategory.php
+++ b/Models/PermissionCategory.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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\Knowledgebase\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/WikiApp.php b/Models/WikiApp.php
index 704b484..4bb025c 100755
--- a/Models/WikiApp.php
+++ b/Models/WikiApp.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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\Knowledgebase\Models;
  * Wiki app class.
  *
  * @package Modules\Knowledgebase\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/WikiAppMapper.php b/Models/WikiAppMapper.php
index 4d3af7d..5ee6130 100755
--- a/Models/WikiAppMapper.php
+++ b/Models/WikiAppMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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;
  * Mapper class.
  *
  * @package Modules\Knowledgebase\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/WikiCategory.php b/Models/WikiCategory.php
index d26546d..e4f1540 100755
--- a/Models/WikiCategory.php
+++ b/Models/WikiCategory.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -21,7 +21,7 @@ use phpOMS\Localization\ISO639x1Enum;
  * Wiki category class.
  *
  * @package Modules\Knowledgebase\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/WikiCategoryL11nMapper.php b/Models/WikiCategoryL11nMapper.php
index 993841e..7333956 100755
--- a/Models/WikiCategoryL11nMapper.php
+++ b/Models/WikiCategoryL11nMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11n;
  * Category mapper class.
  *
  * @package Modules\Knowledgebase\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/WikiCategoryMapper.php b/Models/WikiCategoryMapper.php
index 8c24407..13221c3 100755
--- a/Models/WikiCategoryMapper.php
+++ b/Models/WikiCategoryMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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;
  * Mapper class.
  *
  * @package Modules\Knowledgebase\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/WikiDoc.php b/Models/WikiDoc.php
index 39a00a3..132b172 100755
--- a/Models/WikiDoc.php
+++ b/Models/WikiDoc.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\Models
  * @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\Localization\ISO639x1Enum;
  * Wiki document class.
  *
  * @package Modules\Knowledgebase\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/WikiDocHistory.php b/Models/WikiDocHistory.php
index 0d7ba64..dbc138e 100755
--- a/Models/WikiDocHistory.php
+++ b/Models/WikiDocHistory.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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\Localization\ISO639x1Enum;
  * Wiki document class.
  *
  * @package Modules\Knowledgebase\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/WikiDocHistoryMapper.php b/Models/WikiDocHistoryMapper.php
index a4f9fdf..7f77e9b 100755
--- a/Models/WikiDocHistoryMapper.php
+++ b/Models/WikiDocHistoryMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Mapper class.
  *
  * @package Modules\Knowledgebase\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/WikiDocMapper.php b/Models/WikiDocMapper.php
index 26717dd..4caa78c 100755
--- a/Models/WikiDocMapper.php
+++ b/Models/WikiDocMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\Models
  * @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\DataStorage\Database\Mapper\DataMapperFactory;
  * Mapper class.
  *
  * @package Modules\Knowledgebase\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/WikiStatus.php b/Models/WikiStatus.php
index a5a4527..0dfe30f 100755
--- a/Models/WikiStatus.php
+++ b/Models/WikiStatus.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase\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;
  * Wiki status enum.
  *
  * @package Modules\Knowledgebase\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/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php
index bd16a45..405565f 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 d35cb22..b36e1e2 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 2850fa0..9b70e7d 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 a4337c0..0a8d476 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 cb3993a..46cbfdf 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 77b8137..72abe2c 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 d5593c8..50024fc 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 78f20c7..b19a387 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 d52da9d..d4107a2 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 7be5298..19d92a1 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 42b4828..6c3ad61 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 cb6e305..322323c 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 03164de..b71a621 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 2850fa0..9b70e7d 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 ce52ccd..9a89f02 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 ec2c4b6..9d43db8 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 6f1d7d0..2184b6b 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 fefd37d..1081359 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 c789a83..64db589 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 46d7619..9adc655 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 5dc2a89..cc7c45b 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 f121bcc..e5ccda7 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 9dd46a2..ec6a25b 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 12133a1..08a9a1c 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 43e4ff0..76427b7 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 2391f58..4f16dba 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 7b59081..1c4d6f3 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 a6df9d6..654f6e5 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 ca36c6f..f59b644 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 367bfdc..07e0db9 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 962ff7e..ef9a369 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 140c3b8..3f38774 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 c1f8ff0..cb90a9a 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 887c0cb..6e3eb6c 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 b614ef8..d2ab89e 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 68ce338..a6055cf 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 b159786..4500fdf 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 b7a6f3c..e85a154 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 8600577..201608c 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 1683d34..55d4aef 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 a3c76d6..9b790e0 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 8b0b7dd..7c82ae5 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 b5f6be9..0abcdc2 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 d68cd50..3cc2aff 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/wiki-app-create.tpl.php b/Theme/Backend/wiki-app-create.tpl.php
index 0cdee70..11ac90c 100755
--- a/Theme/Backend/wiki-app-create.tpl.php
+++ b/Theme/Backend/wiki-app-create.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase
  * @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/wiki-app-list.tpl.php b/Theme/Backend/wiki-app-list.tpl.php
index ecbea60..b7a216f 100755
--- a/Theme/Backend/wiki-app-list.tpl.php
+++ b/Theme/Backend/wiki-app-list.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase
  * @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/wiki-app-single.tpl.php b/Theme/Backend/wiki-app-single.tpl.php
index 0cdee70..11ac90c 100755
--- a/Theme/Backend/wiki-app-single.tpl.php
+++ b/Theme/Backend/wiki-app-single.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase
  * @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/wiki-category-list.tpl.php b/Theme/Backend/wiki-category-list.tpl.php
index 8be5d6f..41bf849 100755
--- a/Theme/Backend/wiki-category-list.tpl.php
+++ b/Theme/Backend/wiki-category-list.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -34,7 +34,7 @@ echo $this->getData('nav')->render();
                     <td><?= $this->getHtml('Parent'); ?>
                 <tbody>
                 <?php foreach ($categories as $key => $value) :
-                        $url = UriFactory::build('{/lang}/{/app}/admin/account/settings?{?}&id=' . $value->getId()); ?>
+                        $url = UriFactory::build('{/base}/admin/account/settings?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
                     <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getL11n()); ?></a>
diff --git a/Theme/Backend/wiki-dashboard.tpl.php b/Theme/Backend/wiki-dashboard.tpl.php
index 0b8dac0..b288931 100755
--- a/Theme/Backend/wiki-dashboard.tpl.php
+++ b/Theme/Backend/wiki-dashboard.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase
  * @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 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12 col-md-8 col-lg-9">
         <div class="row">
-            <?php foreach ($documents as $doc) : $url = UriFactory::build('{/lang}/{/app}/wiki/doc/single?id=' . $doc->getId()); ?>
+            <?php foreach ($documents as $doc) : $url = UriFactory::build('{/base}/wiki/doc/single?id=' . $doc->getId()); ?>
             <div class="col-xs-12 plain-grid">
                 <div class="portlet">
                     <div class="portlet-head"><a href="<?= $url; ?>"><?= $this->printHtml($doc->name); ?></a></div>
@@ -74,7 +74,7 @@ echo $this->getData('nav')->render(); ?>
             <div class="portlet-body">
                 <ul>
                     <?php foreach ($categories as $category) : ?>
-                        <li><a href="<?= UriFactory::build('{/lang}/{/app}/wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getL11n()); ?></a>
+                        <li><a href="<?= UriFactory::build('{/base}/wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getL11n()); ?></a>
                     <?php endforeach; ?>
                 </ul>
             </div>
diff --git a/Theme/Backend/wiki-doc-create.tpl.php b/Theme/Backend/wiki-doc-create.tpl.php
index efbbba4..48cea3e 100755
--- a/Theme/Backend/wiki-doc-create.tpl.php
+++ b/Theme/Backend/wiki-doc-create.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -70,7 +70,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr>
                             <td>
                                 <?php if ($isNewDoc) : ?>
-                                    <a href="<?= UriFactory::build('{/lang}/{/app}//wiki/dashboard'); ?>" class="button"><?= $this->getHtml('Delete', '0', '0'); ?></a>
+                                    <a href="<?= UriFactory::build('{/base}//wiki/dashboard'); ?>" class="button"><?= $this->getHtml('Delete', '0', '0'); ?></a>
                                 <?php else : ?>
                                     <input type="submit" name="deleteButton" id="iDeleteButton" value="<?= $this->getHtml('Delete', '0', '0'); ?>">
                                 <?php endif; ?>
diff --git a/Theme/Backend/wiki-doc-single.tpl.php b/Theme/Backend/wiki-doc-single.tpl.php
index 3aa079c..7746bc7 100755
--- a/Theme/Backend/wiki-doc-single.tpl.php
+++ b/Theme/Backend/wiki-doc-single.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Knowledgebase
  * @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 @@ echo $this->getData('nav')->render();
                         <?php endforeach; ?>
 
                         <?php $files = $doc->getMedia(); foreach ($files as $file) : ?>
-                             <span><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span>
+                             <span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span>
                         <?php endforeach; ?>
                     </div>
                     <?php if ($editable) : ?>
@@ -70,7 +70,7 @@ echo $this->getData('nav')->render();
             <div class="portlet-body">
                 <ul>
                     <?php foreach ($categories as $category) : ?>
-                        <li><a href="<?= UriFactory::build('{/lang}/{/app}/wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getL11n()); ?></a>
+                        <li><a href="<?= UriFactory::build('{/base}/wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getL11n()); ?></a>
                     <?php endforeach; ?>
                 </ul>
             </div>
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
index a6b2241..19fb768 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 6b335f0..fe2fa8a 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/NullWikiAppTest.php b/tests/Models/NullWikiAppTest.php
index 38e8d23..e06c23b 100755
--- a/tests/Models/NullWikiAppTest.php
+++ b/tests/Models/NullWikiAppTest.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/NullWikiCategoryTest.php b/tests/Models/NullWikiCategoryTest.php
index 71f5569..938caee 100755
--- a/tests/Models/NullWikiCategoryTest.php
+++ b/tests/Models/NullWikiCategoryTest.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/NullWikiDocTest.php b/tests/Models/NullWikiDocTest.php
index 36f7f30..9082e2f 100755
--- a/tests/Models/NullWikiDocTest.php
+++ b/tests/Models/NullWikiDocTest.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/WikiAppMapperTest.php b/tests/Models/WikiAppMapperTest.php
index fc73705..aec1996 100755
--- a/tests/Models/WikiAppMapperTest.php
+++ b/tests/Models/WikiAppMapperTest.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/WikiAppTest.php b/tests/Models/WikiAppTest.php
index 31397e7..6944564 100755
--- a/tests/Models/WikiAppTest.php
+++ b/tests/Models/WikiAppTest.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/WikiCategoryMapperTest.php b/tests/Models/WikiCategoryMapperTest.php
index 79d7279..af6c84f 100755
--- a/tests/Models/WikiCategoryMapperTest.php
+++ b/tests/Models/WikiCategoryMapperTest.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/WikiCategoryTest.php b/tests/Models/WikiCategoryTest.php
index b8b6ff2..185b506 100755
--- a/tests/Models/WikiCategoryTest.php
+++ b/tests/Models/WikiCategoryTest.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/WikiDocMapperTest.php b/tests/Models/WikiDocMapperTest.php
index f61b663..6fdcba6 100755
--- a/tests/Models/WikiDocMapperTest.php
+++ b/tests/Models/WikiDocMapperTest.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/WikiDocTest.php b/tests/Models/WikiDocTest.php
index ce61c13..e0e7b76 100755
--- a/tests/Models/WikiDocTest.php
+++ b/tests/Models/WikiDocTest.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
  */