diff --git a/Animation/Canvas/ParticleAnimation.js b/Animation/Canvas/ParticleAnimation.js
index d3f54a9..2f4f0d0 100644
--- a/Animation/Canvas/ParticleAnimation.js
+++ b/Animation/Canvas/ParticleAnimation.js
@@ -65,7 +65,7 @@
         self = typeof self !== 'undefined' ? self : this;
         self.invalidate();
 
-        let length = self.particles.length;
+        const length = self.particles.length;
 
         for (let i = 0; i < length; i++) {
             self.particles[i].draw(self.ctx);
@@ -106,11 +106,12 @@
     jsOMS.Animation.Canvas.ParticleAnimation.prototype.updateParticles = function ()
     {
         let particle,
-            length = this.particles.length,
             pos,
             vel,
             radius;
 
+        const length = this.particles.length;
+
         for (let i = 0; i < length; i++) {
             particle = this.particles[i];
             pos      = particle.getPosition();
@@ -157,12 +158,13 @@
      */
     jsOMS.Animation.Canvas.ParticleAnimation.prototype.updateDistance = function (p1, p2)
     {
-        let pos1 = p1.getPosition(),
+        const pos1 = p1.getPosition(),
             pos2 = p2.getPosition(),
             dx   = pos1.x - pos2.x,
             dy   = pos1.y - pos2.y,
-            dist = Math.sqrt(dx * dx + dy * dy),
-            vel1 = p1.getVelocity(),
+            dist = Math.sqrt(dx * dx + dy * dy);
+
+        let vel1 = p1.getVelocity(),
             vel2 = p2.getVelocity();
 
         // Draw line if particles are close
diff --git a/Autoloader.js b/Autoloader.js
index 9ae8960..d1a58d5 100644
--- a/Autoloader.js
+++ b/Autoloader.js
@@ -30,8 +30,8 @@
             let paths = namespace.split('.');
             paths.splice(0, 1);
 
-            let length  = paths.length,
-                current = jsOMS;
+            const length  = paths.length;
+            let current = jsOMS;
 
             for (let i = 0; i < length; i++) {
                 if (typeof current[paths[i]] === 'undefined') {
@@ -53,7 +53,7 @@
      */
     jsOMS.Autoloader.initPreloaded = function ()
     {
-        let scripts = document.getElementsByTagName('script'),
+        const scripts = document.getElementsByTagName('script'),
             length  = scripts.length;
 
         for (let i = 0; i < length; i++) {
@@ -93,7 +93,7 @@
      */
     jsOMS.Autoloader.include = function (file, callback)
     {
-        let length = file.length;
+        const length = file.length;
 
         for (let i = 0; i < length; i++) {
             if (jsOMS.Autoloader.loaded.indexOf(file) === -1) {
diff --git a/DataStorage/CookieJar.js b/DataStorage/CookieJar.js
index 1a83e88..43bd0e4 100644
--- a/DataStorage/CookieJar.js
+++ b/DataStorage/CookieJar.js
@@ -41,9 +41,9 @@
      */
     jsOMS.DataStorage.CookieJar.prototype.setCookie = function (cName, value, exdays, domain, path)
     {
-        var exdate = new Date();
+        const exdate = new Date();
         exdate.setDate(exdate.getDate() + exdays);
-        var cValue = encodeURI(value) + ((exdays === null) ? "" : "; expires=" + exdate.toUTCString()) + ";domain=" + domain + ";path=" + path;
+        const cValue = encodeURI(value) + ((exdays === null) ? "" : "; expires=" + exdate.toUTCString()) + ";domain=" + domain + ";path=" + path;
         document.cookie = cName + "=" + cValue;
     };
 
@@ -61,8 +61,8 @@
      */
     jsOMS.DataStorage.CookieJar.prototype.getCookie = function (cName)
     {
-        var cValue = document.cookie;
-        var cStart = cValue.indexOf(" " + cName + "=");
+        let cValue = document.cookie,
+            cStart = cValue.indexOf(" " + cName + "=");
 
         if (cStart === -1) {
             cStart = cValue.indexOf(cName + "=");
@@ -72,7 +72,7 @@
             cValue = null;
         } else {
             cStart = cValue.indexOf("=", cStart) + 1;
-            var cEnd = cValue.indexOf(";", cStart);
+            let cEnd = cValue.indexOf(";", cStart);
 
             if (cEnd === -1) {
                 cEnd = cValue.length;
diff --git a/Message/Request/Request.js b/Message/Request/Request.js
index 900c52e..5972943 100644
--- a/Message/Request/Request.js
+++ b/Message/Request/Request.js
@@ -326,12 +326,13 @@
      */
     jsOMS.Message.Request.Request.prototype.queryfy = function (obj)
     {
-        let str = [];
+        const str = [];
         for (let p in obj) {
             if (obj.hasOwnProperty(p)) {
                 str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
             }
         }
+        
         return str.join("&");
     };
 
@@ -347,7 +348,7 @@
      */
     jsOMS.Message.Request.Request.prototype.send = function ()
     {
-        let self = this;
+        const self = this;
 
         if (self.xhr.readyState !== 1) {
             self.xhr.open(this.method, jsOMS.Uri.UriFactory.build(this.uri));
diff --git a/UI/ActionManager.js b/UI/ActionManager.js
index 341392e..5e5d873 100644
--- a/UI/ActionManager.js
+++ b/UI/ActionManager.js
@@ -42,7 +42,7 @@
      */
     jsOMS.UI.ActionManager.prototype.bind = function (id)
     {
-        let uiElements = typeof e === 'undefined' ? document.querySelectorAll('input, select, textarea, button, data') : [e],
+        const uiElements = typeof e === 'undefined' ? document.querySelectorAll('input, select, textarea, button, data') : [e],
             length     = uiElements.length;
 
         for (let i = 0; i < length; i++) {
@@ -64,11 +64,12 @@
      */
     jsOMS.UI.ActionManager.prototype.bindElement = function (e)
     {
-        let listeners      = JSON.parse(e.getAttribute('data-action')),
+        const listeners      = JSON.parse(e.getAttribute('data-action')),
             listenerLength = listeners.length,
-            actionLength   = 0,
             self           = this;
 
+        let actionLength   = 0;
+
         // For everey action an event is registered
         for (let i = 0; i < listenerLength; i++) {
             actionLength = listeners[i].action.length;
@@ -105,7 +106,7 @@
      */
     jsOMS.UI.ActionManager.prototype.runAction = function (e, action)
     {
-        let self = this;
+        const self = this;
 
         console.log(action.type);
         console.log(this.actions);
diff --git a/UI/DragNDrop.js b/UI/DragNDrop.js
index 3195fc8..8bc44dc 100644
--- a/UI/DragNDrop.js
+++ b/UI/DragNDrop.js
@@ -51,7 +51,7 @@
          if (typeof id !== 'undefined') {
             this.bindElement(id);
         } else {
-            let elements = document.querySelectorAll('[draggable]'),
+            const elements = document.querySelectorAll('[draggable]'),
                 length = elements.length;
 
             for (var i = 0; i < length; i++) {
@@ -72,7 +72,7 @@
      */
     jsOMS.UI.DragNDrop.prototype.bindElement = function (id)
     {
-        let element = document.getElementById(id);
+        const element = document.getElementById(id);
         console.log(id);
 
         element.addEventListener('dragstart', function(event) {
diff --git a/UI/FormManager.js b/UI/FormManager.js
index e7bc56e..d4fbf75 100644
--- a/UI/FormManager.js
+++ b/UI/FormManager.js
@@ -79,7 +79,7 @@
         if (typeof id !== 'undefined' && typeof this.ignore[id] === 'undefined') {
             this.bindForm(id);
         } else {
-            let forms  = document.getElementsByTagName('form'),
+            const forms  = document.getElementsByTagName('form'),
                 length = forms.length;
 
             for (var i = 0; i < length; i++) {
@@ -105,12 +105,12 @@
             return;
         }
 
-        let self       = this;
+        const self       = this;
         this.forms[id] = new jsOMS.Views.FormView(id);
 
         this.unbind(id);
 
-        let submits = this.forms[id].getSubmit(),
+        const submits = this.forms[id].getSubmit(),
             length = submits.length;
 
         for(let i = 0; i < length; i++) {
@@ -158,9 +158,9 @@
     jsOMS.UI.FormManager.prototype.submit = function (form)
     {
         /* Handle injects */
-        let self    = this,
-            injects = form.getSubmitInjects(),
-            counter = 0;
+        const self    = this,
+            injects = form.getSubmitInjects();
+        let counter = 0;
 
         // todo: test if attach necessary (maybe already attached in event manager)
         // Register normal form behavior
@@ -203,7 +203,7 @@
         }
 
         /* Handle default submit */
-        let request = new jsOMS.Message.Request.Request(),
+        const request = new jsOMS.Message.Request.Request(),
             self    = this;
 
         request.setData(form.getData());
@@ -214,10 +214,10 @@
         request.setSuccess(function (xhr)
         {
             try {
-                let o              = JSON.parse(xhr.response),
+                const o              = JSON.parse(xhr.response),
                     response       = new jsOMS.Message.Response.Response(o),
-                    responseLength = response.count(),
-                    tempResponse   = null,
+                    responseLength = response.count();
+                let tempResponse   = null,
                     success        = null;
 
                 /* Handle responses (can be multiple response object) */
diff --git a/UI/Input.js b/UI/Input.js
index 8e79345..ba606b3 100644
--- a/UI/Input.js
+++ b/UI/Input.js
@@ -42,7 +42,7 @@
             throw 'Input element required'
         }
 
-        let self = this;
+        const self = this;
 
         input.addEventListener('change', function changeBind(event)
         {
@@ -96,7 +96,7 @@
     {
         this.clearDatalistOptions(datalist);
 
-        let request = new jsOMS.Message.Request();
+        const request = new jsOMS.Message.Request();
         request.setData(input.value);
         request.setType(jsOMS.Message.Response.ResponseType.JSON);
         request.setUri(datalist.getAttribute('data-list-src'));
@@ -105,10 +105,10 @@
         request.setSuccess(function (xhr)
         {
             try {
-                let o              = JSON.parse(xhr.response),
+                const o              = JSON.parse(xhr.response),
                     response       = new jsOMS.Message.Response(o),
-                    responseLength = response.count(),
-                    tempResponse   = null,
+                    responseLength = response.count();
+                let tempResponse   = null,
                     success        = null;
 
                 for (let k = 0; k < responseLength; k++) {
@@ -146,7 +146,7 @@
      */
     jsOMS.UI.Input.clearDatalistOptions = function (datalist)
     {
-        let length = datalist.options.length;
+        const length = datalist.options.length;
 
         for (let i = 0; i < length; i++) {
             datalist.remove(0);
diff --git a/UI/Input/Keyboard/KeyboardManager.js b/UI/Input/Keyboard/KeyboardManager.js
index 2a01abb..928a95e 100644
--- a/UI/Input/Keyboard/KeyboardManager.js
+++ b/UI/Input/Keyboard/KeyboardManager.js
@@ -57,7 +57,7 @@
      */
     jsOMS.UI.Input.Keyboard.KeyboardManager.prototype.bind = function (element)
     {
-        let self = this;
+        const self = this;
 
         // todo: implement keyboard for selected elements right now only global hotkeys possible
         document.addEventListener('keydown', function keyBind(event)
@@ -89,10 +89,10 @@
             throw 'Unexpected elmenet!';
         }
 
-        let actions   = this.elements[element],
+        const actions   = this.elements[element],
             length    = actions.length,
-            keyLength = this.down.length,
-            match     = false;
+            keyLength = this.down.length;
+        let match     = false;
 
         for (let i = 0; i < length; i++) {
             for (let j = 0; j < keyLength; j++) {
diff --git a/UI/Input/Mouse/MouseManager.js b/UI/Input/Mouse/MouseManager.js
index acf806c..ee0db6a 100644
--- a/UI/Input/Mouse/MouseManager.js
+++ b/UI/Input/Mouse/MouseManager.js
@@ -59,7 +59,7 @@
      */
     jsOMS.UI.Input.Mouse.MouseManager.prototype.bind = function (element, type)
     {
-        let self = this,
+        const self = this,
             e    = document.getElementById(element);
 
         if (e === null) {
@@ -79,7 +79,7 @@
 
             e.addEventListener('mouseup', function (event)
             {
-                let duration = new Date().getTime() - self.click.time;
+                const duration = new Date().getTime() - self.click.time;
 
                 if (duration > 650) {
                     self.run(element, event);
@@ -110,7 +110,7 @@
             throw 'Unexpected elmenet!';
         }
 
-        let actions = this.elements[element],
+        const actions = this.elements[element],
             length  = actions.length;
 
         for (let i = 0; i < length; i++) {
diff --git a/UI/Input/Touch/TouchManager.js b/UI/Input/Touch/TouchManager.js
index 5eb848b..aa695ed 100644
--- a/UI/Input/Touch/TouchManager.js
+++ b/UI/Input/Touch/TouchManager.js
@@ -52,12 +52,12 @@
      */
     jsOMS.UI.Input.Touch.TouchManager.prototype.add = function (surface)
     {
-        let e    = document.getElementById(surface),
+        const e    = document.getElementById(surface),
             self = this;
 
         e.addEventListener('touchstart', function (event)
         {
-            let touch = this.changedTouches[0];
+            const touch = this.changedTouches[0];
 
             self.activeSwipe.startX = touch.pageX;
             self.activeSwipe.startY = touch.pageY;
@@ -73,7 +73,7 @@
 
         e.addEventListener('touchend', function (event)
         {
-            let touch       = this.changedTouches[0],
+            const touch       = this.changedTouches[0],
                 distX       = touch.pageX - self.activeSwipe.startX,
                 distY       = touch.pageY - self.activeSwipe.startY,
                 elapsedTime = new Date().getTime() - self.activeSwipe.time;
@@ -105,7 +105,7 @@
                 
                 document.dispatchEvent(rightClick);
             } else if (elapsedTime < 500) {
-                let e = new Event('keyup');
+                const e = new Event('keyup');
 
                 if (distY > 100) {
                     e.keyCode = 38;
diff --git a/UI/TabManager.js b/UI/TabManager.js
index c65ab99..dd541b9 100644
--- a/UI/TabManager.js
+++ b/UI/TabManager.js
@@ -59,12 +59,12 @@
      */
     jsOMS.UI.TabManager.prototype.bindElement = function (e)
     {
-        var nodes = e.querySelectorAll('.tab-links a');
+        const nodes = e.querySelectorAll('.tab-links a');
 
         nodes.addEventListener('click', function (evt)
         {
             /* Change Tab */
-            var attr = this.getAttribute('href').substring(1),
+            const attr = this.getAttribute('href').substring(1),
                 cont = this.parentNode.parentNode.parentNode.children[1];
 
             jsOMS.removeClass(jsOMS.getByClass(this.parentNode.parentNode, 'active'), 'active');
diff --git a/UI/TableManager.js b/UI/TableManager.js
index 45a3c42..f056e73 100644
--- a/UI/TableManager.js
+++ b/UI/TableManager.js
@@ -39,7 +39,7 @@
         if (typeof id !== 'undefined') {
             this.bindElement(document.getElementById(id));
         } else {
-            var tables = document.querySelectorAll('.tables');
+            const tables = document.querySelectorAll('.tables');
 
             for (var i = 0; i < tables.length; i++) {
                 this.bindElement(tables[i]);
diff --git a/UI/UIManager.js b/UI/UIManager.js
index 17e3d7f..7d8bfcc 100644
--- a/UI/UIManager.js
+++ b/UI/UIManager.js
@@ -51,7 +51,7 @@
             this.actionManager.bind();
             this.dragNDrop.bind();
         } else {
-            let tag = document.getElementById(id);
+            const tag = document.getElementById(id);
 
             switch (tag.tagName) {
                 case 'form':
diff --git a/Uri/Http.js b/Uri/Http.js
index 5427334..de12179 100644
--- a/Uri/Http.js
+++ b/Uri/Http.js
@@ -55,7 +55,7 @@
     {
         mode = typeof mode === 'undefined' ? 'php' : mode;
 
-        let query, key = ['source', 'scheme', 'authority', 'userInfo', 'user', 'pass', 'host', 'port',
+        const key = ['source', 'scheme', 'authority', 'userInfo', 'user', 'pass', 'host', 'port',
                 'relative', 'path', 'directory', 'file', 'query', 'fragment'
             ],
             parser     = {
@@ -68,9 +68,9 @@
             throw new Error('Unexpected parsing mode.', 'UriFactory', 52);
         }
 
-        let m   = parser[mode].exec(str),
-            uri = {},
-            i   = 14;
+        const m   = parser[mode].exec(str),
+            uri = {};
+        let i   = 14;
 
         while (i--) {
             if (m[i]) {
@@ -100,7 +100,7 @@
     {
         name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
 
-        let regex   = new RegExp("[\\?&]*" + name + "=([^&#]*)"),
+        const regex   = new RegExp("[\\?&]*" + name + "=([^&#]*)"),
             results = regex.exec(query);
 
         return results === null ? '' : decodeURIComponent(results[1].replace(/\+/g, ' '));
@@ -108,15 +108,15 @@
 
     jsOMS.Uri.Http.getAllUriQueryParameters = function (query)
     {
-        let keyValPairs = [],
-            params      = {},
-            pairNum     = null;
+        const keyValPairs = [],
+            params      = {};
+        let pairNum     = null;
 
         if (query.length) {
             keyValPairs = query.split('&');
 
             for (pairNum in keyValPairs) {
-                let key = keyValPairs[pairNum].split('=')[0];
+                const key = keyValPairs[pairNum].split('=')[0];
 
                 if (!key.length) {
                     continue;
@@ -137,7 +137,7 @@
     {
         this.uri = uri;
 
-        let parsed = jsOMS.Uri.Http.parseUrl(this.uri, 'php');
+        const parsed = jsOMS.Uri.Http.parseUrl(this.uri, 'php');
 
         this.scheme = parsed['scheme'];
         this.host   = parsed['host'];
diff --git a/Uri/UriFactory.js b/Uri/UriFactory.js
index df354ad..ee0eb04 100644
--- a/Uri/UriFactory.js
+++ b/Uri/UriFactory.js
@@ -69,8 +69,8 @@
 
     jsOMS.Uri.UriFactory.clearLike = function(pattern) 
     {
-        let success = false,
-            regexp = new Regexp(pattern);
+        let success = false;
+        const regexp = new Regexp(pattern);
 
         for(let key in jsOMS.Uri.UriFactory.uri) {
             if(jsOMS.Uri.UriFactory.uri.hasOwnProperty(key) && regexp.test(key)) {
@@ -98,7 +98,7 @@
      */
     jsOMS.Uri.UriFactory.unique = function (url)
     {
-        let parts = url.split('?');
+        const parts = url.split('?');
 
         if (parts.length >= 2) {
             let full = parts[1],
@@ -146,7 +146,7 @@
      */
     jsOMS.Uri.UriFactory.build = function (uri, toMatch)
     {
-        let current = jsOMS.Uri.Http.parseUrl(window.location.href);
+        const current = jsOMS.Uri.Http.parseUrl(window.location.href);
         let parsed  = uri.replace(new RegExp('\{[\/#\?%@\.\$][a-zA-Z0-9\-]*\}', 'g'), function (match)
             {
                 match = match.substr(1, match.length - 2);
diff --git a/Utils/oLib.js b/Utils/oLib.js
index 7cc6904..464ed42 100644
--- a/Utils/oLib.js
+++ b/Utils/oLib.js
@@ -268,7 +268,7 @@
      */
     jsOMS.addEventListenerToAll = function (e, event, callback)
     {
-        let length = e.length;
+        const length = e.length;
 
         for (let i = 0; i < length; i++) {
             e[i].addEventListener(event, callback);
@@ -290,7 +290,7 @@
      */
     jsOMS.merge = function (target, source)
     {
-        let out = jsOMS.clone(target);
+        const out = jsOMS.clone(target);
 
         for (let p in source) {
             if (source.hasOwnProperty(p)) {
diff --git a/Views/FormView.js b/Views/FormView.js
index c0e7d2b..09bff8f 100644
--- a/Views/FormView.js
+++ b/Views/FormView.js
@@ -133,7 +133,7 @@
      */
     jsOMS.Views.FormView.prototype.getFormElements = function ()
     {
-        let form      = document.getElementById(this.id),
+        const form      = document.getElementById(this.id),
             selects   = form.getElementsByTagName('select'),
             textareas = form.getElementsByTagName('textarea'),
             inputs    = form.getElementsByTagName('input'),
@@ -152,10 +152,11 @@
      */
     jsOMS.Views.FormView.prototype.getData = function ()
     {
-        let data     = {},
+        const data     = {},
             elements = this.getFormElements(),
-            length   = elements.length,
-            value = null;
+            length   = elements.length;
+
+        let value = null;
 
         for (let i = 0; i < length; i++) {
             if(elements[i].tagName.toLowerCase() === 'canvas') {
@@ -193,7 +194,7 @@
      */
     jsOMS.Views.FormView.prototype.isValid = function ()
     {
-        let elements = this.getFormElements(),
+        const elements = this.getFormElements(),
             length   = elements.length;
 
         try {
@@ -275,7 +276,7 @@
         this.method = document.getElementById(this.id).attributes['method'].value;
         this.action = document.getElementById(this.id).action;
 
-        let elements = this.getFormElements(),
+        const elements = this.getFormElements(),
             length   = elements.length;
 
         for (let i = 0; i < length; i++) {
@@ -304,7 +305,7 @@
      */
     jsOMS.Views.FormView.prototype.unbind = function ()
     {
-        let elements = this.getFormElements(),
+        const elements = this.getFormElements(),
             length   = elements.length;
 
         for (let i = 0; i < length; i++) {