diff --git a/3D/Loader/ObjLoader.js b/3D/Loader/ObjLoader.js
index a0fdc73..68bf610 100755
--- a/3D/Loader/ObjLoader.js
+++ b/3D/Loader/ObjLoader.js
@@ -2,7 +2,7 @@
  * Form manager class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Account/Account.js b/Account/Account.js
index fa83d4e..9d4b0c5 100755
--- a/Account/Account.js
+++ b/Account/Account.js
@@ -2,7 +2,7 @@
  * Account.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Account/AccountManager.js b/Account/AccountManager.js
index 5510fa0..b0b0033 100755
--- a/Account/AccountManager.js
+++ b/Account/AccountManager.js
@@ -6,7 +6,7 @@
  * Account Manager.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Account/AccountType.js b/Account/AccountType.js
index 198d808..56669c9 100755
--- a/Account/AccountType.js
+++ b/Account/AccountType.js
@@ -2,7 +2,7 @@
  * Account type.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Animation/Animation.js b/Animation/Animation.js
index fcb14cb..0760fb1 100755
--- a/Animation/Animation.js
+++ b/Animation/Animation.js
@@ -2,7 +2,7 @@
  * Particle class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Animation/Canvas/Particle.js b/Animation/Canvas/Particle.js
index 151847e..874be6e 100755
--- a/Animation/Canvas/Particle.js
+++ b/Animation/Canvas/Particle.js
@@ -2,7 +2,7 @@
  * Particle class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Animation/Canvas/ParticleAnimation.js b/Animation/Canvas/ParticleAnimation.js
index 2b4b7d4..1ebd027 100755
--- a/Animation/Canvas/ParticleAnimation.js
+++ b/Animation/Canvas/ParticleAnimation.js
@@ -2,7 +2,7 @@
  * Particle animation class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Asset/AssetManager.js b/Asset/AssetManager.js
index fb0076a..36798c6 100755
--- a/Asset/AssetManager.js
+++ b/Asset/AssetManager.js
@@ -2,7 +2,7 @@
  * Asset manager.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Auth/Auth.js b/Auth/Auth.js
index c05b0e4..f90af35 100755
--- a/Auth/Auth.js
+++ b/Auth/Auth.js
@@ -10,7 +10,7 @@ import { RequestType }   from '../Message/Request/RequestType.js';
  * Auth class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Autoloader.js b/Autoloader.js
index e8d896c..2704881 100755
--- a/Autoloader.js
+++ b/Autoloader.js
@@ -9,7 +9,7 @@ import { AssetManager } from './Asset/AssetManager.js';
  * referenced classes.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Config/Options.js b/Config/Options.js
index cfdbc09..74c53fe 100755
--- a/Config/Options.js
+++ b/Config/Options.js
@@ -5,7 +5,7 @@
  * without redefining the same behaviour multiple times.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/DataStorage/LocalStorage.js b/DataStorage/LocalStorage.js
index c32bc28..cef6943 100755
--- a/DataStorage/LocalStorage.js
+++ b/DataStorage/LocalStorage.js
@@ -2,7 +2,7 @@
  * LocalStorage class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Event/EventManager.js b/Event/EventManager.js
index 2c5e4e1..e599809 100755
--- a/Event/EventManager.js
+++ b/Event/EventManager.js
@@ -6,7 +6,7 @@ import { Logger } from '../Log/Logger.js';
  * Used for pooling requests.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Log/LogLevel.js b/Log/LogLevel.js
index ba16fcc..7e9f155 100755
--- a/Log/LogLevel.js
+++ b/Log/LogLevel.js
@@ -2,7 +2,7 @@
  * Log Level enum.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Log/Logger.js b/Log/Logger.js
index 5300147..2f8ffa0 100755
--- a/Log/Logger.js
+++ b/Log/Logger.js
@@ -6,7 +6,7 @@ import { SystemUtils } from '../System/SystemUtils.js';
  * Logger class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Math/MathProcessor.js b/Math/MathProcessor.js
index 6fa80ef..20f32f5 100755
--- a/Math/MathProcessor.js
+++ b/Math/MathProcessor.js
@@ -2,7 +2,7 @@
  * Math formula evaluator
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Message/Notification/App/AppNotification.js b/Message/Notification/App/AppNotification.js
index d4a1b65..bf809dc 100755
--- a/Message/Notification/App/AppNotification.js
+++ b/Message/Notification/App/AppNotification.js
@@ -1,3 +1,4 @@
+import { NotificationLevel }  from '../NotificationLevel.js';
 /**
  * @typedef {import('../NotificationMessage.js').NotificationMessage} NotificationMessage
  */
@@ -6,7 +7,7 @@
  * App notification.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Message/Notification/Browser/BrowserNotification.js b/Message/Notification/Browser/BrowserNotification.js
index 427b3bd..6daf76e 100755
--- a/Message/Notification/Browser/BrowserNotification.js
+++ b/Message/Notification/Browser/BrowserNotification.js
@@ -6,7 +6,7 @@
  * Browser notification.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Message/Notification/NotificationLevel.js b/Message/Notification/NotificationLevel.js
index 55fdf46..d56469c 100755
--- a/Message/Notification/NotificationLevel.js
+++ b/Message/Notification/NotificationLevel.js
@@ -2,7 +2,7 @@
  * Notification data enum.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Message/Notification/NotificationManager.js b/Message/Notification/NotificationManager.js
index dadd198..c527c04 100755
--- a/Message/Notification/NotificationManager.js
+++ b/Message/Notification/NotificationManager.js
@@ -6,7 +6,7 @@ import { NotificationType }    from '../../Message/Notification/NotificationType
  * Notification manager.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Message/Notification/NotificationMessage.js b/Message/Notification/NotificationMessage.js
index 5511a42..8ace5ec 100755
--- a/Message/Notification/NotificationMessage.js
+++ b/Message/Notification/NotificationMessage.js
@@ -2,7 +2,7 @@
  * App notification message.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Message/Notification/NotificationType.js b/Message/Notification/NotificationType.js
index dc3ec18..c46f590 100755
--- a/Message/Notification/NotificationType.js
+++ b/Message/Notification/NotificationType.js
@@ -2,7 +2,7 @@
  * Notification data enum.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Message/Request/Request.js b/Message/Request/Request.js
index b1a806d..d5b7d80 100755
--- a/Message/Request/Request.js
+++ b/Message/Request/Request.js
@@ -7,7 +7,7 @@ import { RequestType }   from './RequestType.js';
  * Request class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Message/Request/RequestMethod.js b/Message/Request/RequestMethod.js
index 32501eb..10a59e3 100755
--- a/Message/Request/RequestMethod.js
+++ b/Message/Request/RequestMethod.js
@@ -2,7 +2,7 @@
  * Http request method.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Message/Request/RequestType.js b/Message/Request/RequestType.js
index 7528430..647979f 100755
--- a/Message/Request/RequestType.js
+++ b/Message/Request/RequestType.js
@@ -2,7 +2,7 @@
  * Request type enum.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Message/Response/Response.js b/Message/Response/Response.js
index 94fe8cc..1ceb5e4 100755
--- a/Message/Response/Response.js
+++ b/Message/Response/Response.js
@@ -4,7 +4,7 @@
  * Used for auto handling different responses.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Message/Response/ResponseManager.js b/Message/Response/ResponseManager.js
index 08ce10c..c3f255c 100755
--- a/Message/Response/ResponseManager.js
+++ b/Message/Response/ResponseManager.js
@@ -8,7 +8,7 @@
  * Used for auto handling different responses.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Message/Response/ResponseType.js b/Message/Response/ResponseType.js
index 2d24e54..9c63dc3 100755
--- a/Message/Response/ResponseType.js
+++ b/Message/Response/ResponseType.js
@@ -2,7 +2,7 @@
  * Response type enum.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Model/Message/DomActionType.js b/Model/Message/DomActionType.js
index 7e3b65b..5437f41 100755
--- a/Model/Message/DomActionType.js
+++ b/Model/Message/DomActionType.js
@@ -2,7 +2,7 @@
  * DOM action type.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Model/Message/Notify.js b/Model/Message/Notify.js
index e1e9562..6611f87 100755
--- a/Model/Message/Notify.js
+++ b/Model/Message/Notify.js
@@ -10,7 +10,7 @@ import { NotificationType }    from '../../Message/Notification/NotificationType
  */
 export function notifyMessage (data)
 {
-    const msg = new NotificationMessage(data.level, data.title, data.msg);
+    const msg    = new NotificationMessage(data.level, data.title, data.msg);
     msg.duration = 5000;
 
     window.omsApp.notifyManager.send(
diff --git a/Model/Message/NotifyType.js b/Model/Message/NotifyType.js
index fd8fde6..05321f9 100755
--- a/Model/Message/NotifyType.js
+++ b/Model/Message/NotifyType.js
@@ -2,7 +2,7 @@
  * Notification type.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Module/ModuleFactory.js b/Module/ModuleFactory.js
index 2590fd0..3983800 100755
--- a/Module/ModuleFactory.js
+++ b/Module/ModuleFactory.js
@@ -2,7 +2,7 @@
  * Module factory.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Module/ModuleManager.js b/Module/ModuleManager.js
index 48583e4..e08761a 100755
--- a/Module/ModuleManager.js
+++ b/Module/ModuleManager.js
@@ -3,7 +3,7 @@ import { ModuleFactory } from './ModuleFactory.js';
  * Module manager.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/System/BrowserType.js b/System/BrowserType.js
index e0f4a57..1ff726c 100755
--- a/System/BrowserType.js
+++ b/System/BrowserType.js
@@ -2,7 +2,7 @@
  * Request data enum.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/System/OSType.js b/System/OSType.js
index 54c2b5f..ab3055a 100755
--- a/System/OSType.js
+++ b/System/OSType.js
@@ -2,7 +2,7 @@
  * Request data enum.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/System/SystemUtils.js b/System/SystemUtils.js
index 09304e9..6428e69 100755
--- a/System/SystemUtils.js
+++ b/System/SystemUtils.js
@@ -5,7 +5,7 @@ import { OSType }        from './OSType.js';
  * System utils class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/ActionManager.js b/UI/ActionManager.js
index 5efeb7d..7aa953e 100755
--- a/UI/ActionManager.js
+++ b/UI/ActionManager.js
@@ -4,7 +4,7 @@ import { Logger } from '../Log/Logger.js';
  * Action manager class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  *
diff --git a/UI/Component/AdvancedInput.js b/UI/Component/AdvancedInput.js
index d45e3d2..67051d7 100755
--- a/UI/Component/AdvancedInput.js
+++ b/UI/Component/AdvancedInput.js
@@ -8,7 +8,7 @@ import { Request } from '../../Message/Request/Request.js';
  * Advanced input class.
  *
  * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
+ * @license    OMS License 2.0
  * @version    1.0.0
  * @since      1.0.0
  */
diff --git a/UI/Component/AdvancedSelect.js b/UI/Component/AdvancedSelect.js
index 9bedf65..aa4900b 100755
--- a/UI/Component/AdvancedSelect.js
+++ b/UI/Component/AdvancedSelect.js
@@ -11,7 +11,7 @@ import { Request } from '../../Message/Request/Request.js';
  * Advanced input class.
  *
  * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
+ * @license    OMS License 2.0
  * @version    1.0.0
  * @since      1.0.0
  */
diff --git a/UI/Component/Form.js b/UI/Component/Form.js
index 4449b85..17b3610 100755
--- a/UI/Component/Form.js
+++ b/UI/Component/Form.js
@@ -14,7 +14,7 @@ import { UriFactory }          from '../../Uri/UriFactory.js';
  * Form manager class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
@@ -1001,6 +1001,8 @@ export class Form
         const request = new Request();
         const self    = this;
 
+        const redirect = form.getFormElement().getAttribute('data-redirect');
+
         request.setData(data);
         request.setType(RequestType.FORM_DATA); // @todo: consider to allow different request type
         request.setUri(action !== null ? action : form.getAction());
@@ -1050,8 +1052,32 @@ export class Form
                     const response    = new Response(o);
                     let successInject = null;
 
+
+
                     if ((successInject = form.getSuccess()) !== null) {
                         successInject(response);
+                    } else if (redirect !== null) {
+                        fetch(UriFactory.build(redirect))
+                        .then((response) => response.text())
+                        .then((html) => {
+                            document.documentElement.innerHTML = html;
+
+                            if (window.omsApp.state) {
+                                window.omsApp.state.hasChanges = false;
+                            }
+
+                            history.pushState({}, null, UriFactory.build(redirect));
+                            /* This is not working as it reloads the page ?!
+                            document.open();
+                            document.write(html);
+                            document.close();
+                            */
+                            // @todo: fix memory leak which most likely exists because of continous binding without removing binds
+                            window.omsApp.reInit();
+                        })
+                        .catch((error) => {
+                            console.warn(error);
+                        });
                     } else if (typeof response.get('type') !== 'undefined') {
                         self.app.responseManager.run(response.get('type'), response.get(), null);
                     } else if (typeof o.status !== 'undefined' && o.status !== NotificationLevel.HIDDEN) {
diff --git a/UI/Component/Input.js b/UI/Component/Input.js
index babf44b..cf684e2 100755
--- a/UI/Component/Input.js
+++ b/UI/Component/Input.js
@@ -7,7 +7,7 @@ import { ResponseType } from '../../Message/Response/ResponseType.js';
  * Form manager class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/Component/Tab.js b/UI/Component/Tab.js
index 828bec5..b016fa1 100755
--- a/UI/Component/Tab.js
+++ b/UI/Component/Tab.js
@@ -5,7 +5,7 @@ import { UriFactory } from '../../Uri/UriFactory.js';
  * Tab manager class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/Component/Table.js b/UI/Component/Table.js
index 074d158..e922bff 100755
--- a/UI/Component/Table.js
+++ b/UI/Component/Table.js
@@ -6,7 +6,7 @@ import { ResponseType } from '../../Message/Response/ResponseType.js';
  * Table manager class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  *
diff --git a/UI/DragNDrop.js b/UI/DragNDrop.js
index a949324..2490ed7 100755
--- a/UI/DragNDrop.js
+++ b/UI/DragNDrop.js
@@ -2,7 +2,7 @@
  * Drag and drop class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/GeneralUI.js b/UI/GeneralUI.js
index 5eaa3e7..0849f2f 100755
--- a/UI/GeneralUI.js
+++ b/UI/GeneralUI.js
@@ -9,7 +9,7 @@ import { NotificationType }    from '../Message/Notification/NotificationType.js
  * UI manager for handling basic ui elements.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
@@ -159,7 +159,6 @@ export class GeneralUI
                                 window.omsApp.state.hasChanges = false;
                             }
 
-                            this.parentNode.remove();
                             history.pushState({}, null, UriFactory.build(uri));
                             /* This is not working as it reloads the page ?!
                             document.open();
diff --git a/UI/Input/InputManager.js b/UI/Input/InputManager.js
index 0163318..68b0fa7 100755
--- a/UI/Input/InputManager.js
+++ b/UI/Input/InputManager.js
@@ -6,7 +6,7 @@ import { VoiceManager }    from '../../../jsOMS/UI/Input/Voice/VoiceManager.js';
  * UI manager class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/Input/Keyboard/KeyboardManager.js b/UI/Input/Keyboard/KeyboardManager.js
index 3505339..b8888d8 100755
--- a/UI/Input/Keyboard/KeyboardManager.js
+++ b/UI/Input/Keyboard/KeyboardManager.js
@@ -2,7 +2,7 @@
  * Keyboard manager class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/Input/Mouse/ClickType.js b/UI/Input/Mouse/ClickType.js
index bc1fbd7..2af23a8 100755
--- a/UI/Input/Mouse/ClickType.js
+++ b/UI/Input/Mouse/ClickType.js
@@ -2,7 +2,7 @@
  * Click type.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/Input/Mouse/EventType.js b/UI/Input/Mouse/EventType.js
index 25f7c5c..ca2244d 100755
--- a/UI/Input/Mouse/EventType.js
+++ b/UI/Input/Mouse/EventType.js
@@ -2,7 +2,7 @@
  * Event type.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/Input/Mouse/MouseManager.js b/UI/Input/Mouse/MouseManager.js
index 004750e..047f767 100755
--- a/UI/Input/Mouse/MouseManager.js
+++ b/UI/Input/Mouse/MouseManager.js
@@ -4,7 +4,7 @@ import { EventType } from '../../../../jsOMS/UI/Input/Mouse/EventType.js';
  * Mouse manager class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/Input/Touch/TouchManager.js b/UI/Input/Touch/TouchManager.js
index d2e42d3..0ddfb94 100755
--- a/UI/Input/Touch/TouchManager.js
+++ b/UI/Input/Touch/TouchManager.js
@@ -2,7 +2,7 @@
  * Touch manager class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/Input/Voice/ReadManager.js b/UI/Input/Voice/ReadManager.js
index c1f34d8..a0cf6f1 100755
--- a/UI/Input/Voice/ReadManager.js
+++ b/UI/Input/Voice/ReadManager.js
@@ -2,7 +2,7 @@
  * Form manager class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/Input/Voice/VoiceManager.js b/UI/Input/Voice/VoiceManager.js
index 5e426c4..96948cc 100755
--- a/UI/Input/Voice/VoiceManager.js
+++ b/UI/Input/Voice/VoiceManager.js
@@ -4,7 +4,7 @@ import { Logger } from '../../../Log/Logger.js';
  * Voice manager class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/Order.js b/UI/Order.js
index d923934..e3b3684 100755
--- a/UI/Order.js
+++ b/UI/Order.js
@@ -2,7 +2,7 @@
  * Manual order class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/RemoteData.js b/UI/RemoteData.js
index 8d67bf8..b1319ea 100755
--- a/UI/RemoteData.js
+++ b/UI/RemoteData.js
@@ -7,7 +7,7 @@ import { GeneralUI }           from './GeneralUI.js';
  * Remote data class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/UIManager.js b/UI/UIManager.js
index b0cecfe..ca70c7d 100755
--- a/UI/UIManager.js
+++ b/UI/UIManager.js
@@ -12,7 +12,7 @@ import { UIStateManager } from './UIStateManager.js';
  * UI manager for handling basic ui elements.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UI/UIStateManager.js b/UI/UIStateManager.js
index 433ec16..ef3bc5f 100755
--- a/UI/UIStateManager.js
+++ b/UI/UIStateManager.js
@@ -2,7 +2,7 @@
  * UI state manager class.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/UnhandledException.js b/UnhandledException.js
index 76467db..d0a9cff 100755
--- a/UnhandledException.js
+++ b/UnhandledException.js
@@ -4,7 +4,7 @@
  * This class handles all unhandled exceptions depending on the configuration.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Uri/HttpUri.js b/Uri/HttpUri.js
index 34460ec..be28c66 100755
--- a/Uri/HttpUri.js
+++ b/Uri/HttpUri.js
@@ -4,7 +4,7 @@
  * This class is for creating, modifying and analyzing http uris.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Uri/UriFactory.js b/Uri/UriFactory.js
index 8425143..de2f141 100755
--- a/Uri/UriFactory.js
+++ b/Uri/UriFactory.js
@@ -5,7 +5,7 @@ import { FormView } from './../Views/FormView.js';
  * Uri factory.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  *
diff --git a/Utils/ArrayUtils.js b/Utils/ArrayUtils.js
index 5e4ddde..4abdcfb 100755
--- a/Utils/ArrayUtils.js
+++ b/Utils/ArrayUtils.js
@@ -4,7 +4,7 @@
  * This library provides useful functionalities for the DOM and other manipulations.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Utils/GeneralUtils.js b/Utils/GeneralUtils.js
index 885f045..86e412b 100755
--- a/Utils/GeneralUtils.js
+++ b/Utils/GeneralUtils.js
@@ -4,7 +4,7 @@
  * This library provides useful functionalities for the DOM and other manipulations.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Utils/StringUtils.js b/Utils/StringUtils.js
index 9644a63..ccd8193 100755
--- a/Utils/StringUtils.js
+++ b/Utils/StringUtils.js
@@ -4,7 +4,7 @@
  * This library provides useful functionalities for the DOM and other manipulations.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Utils/UiUtils.js b/Utils/UiUtils.js
index c090eee..46ffcd5 100755
--- a/Utils/UiUtils.js
+++ b/Utils/UiUtils.js
@@ -4,7 +4,7 @@
  * This library provides useful functionalities for the DOM and other manipulations.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Utils/oLib.js b/Utils/oLib.js
index 000a92a..8354e02 100755
--- a/Utils/oLib.js
+++ b/Utils/oLib.js
@@ -4,7 +4,7 @@
  * This library provides useful functionalities for the DOM and other manipulations.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  */
diff --git a/Views/FormView.js b/Views/FormView.js
index fd41246..fb26865 100755
--- a/Views/FormView.js
+++ b/Views/FormView.js
@@ -8,7 +8,7 @@ import { Input } from '../UI/Component/Input.js';
  * form elements such as canvas etc.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  *
diff --git a/Views/TableView.js b/Views/TableView.js
index 7a2960e..681862d 100755
--- a/Views/TableView.js
+++ b/Views/TableView.js
@@ -2,7 +2,7 @@
  * Table view.
  *
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @since     1.0.0
  *