diff --git a/.eslintrc.js b/.eslintrc.js
index 4345e085e..f6ff8208d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -14,6 +14,10 @@ module.exports = {
     'globals': {
         '$': 'readonly',
         'app': 'readonly',
+        'define': 'readonly',
+        'exports': 'readonly',
+        'jQuery': 'readonly',
+        'module': 'readonly',
         'w2ui': 'readonly',
         'w2obj': 'readonly',
         'w2utils': 'readonly',
@@ -50,6 +54,7 @@ module.exports = {
         'func-name-matching': 'warn',
         // "func-names": ["warn", "always"],
         'no-inner-declarations': 'off',
+        'no-undef': 'error',
         'no-unreachable': 'off',
         // PLUGIN rules
         'align-assignments/align-assignments' : [ 2, { requiresOnly : false } ],
diff --git a/docs/details/w2utils.parseColor.html b/docs/details/w2utils.parseColor.html
index 9a6cbe582..5077cc7f4 100644
--- a/docs/details/w2utils.parseColor.html
+++ b/docs/details/w2utils.parseColor.html
@@ -16,7 +16,12 @@
 Returns object.
 
 <h4>Description</h4>
-The <span class="argument">color</span> argument is a web color, for example:
+The <span class="argument">color</span> argument is a web color.
+
+Valid notations include 3, 6 or 8 hex digits with an optional leading hash symbol,
+as well as rgb() or rgba() notations.
+
+Example:
 
 <textarea class="javascript">
 w2utils.parseColor('49A4DF01')
diff --git a/src/w2compat.js b/src/w2compat.js
index e2ead5846..20b3a8aa5 100644
--- a/src/w2compat.js
+++ b/src/w2compat.js
@@ -1404,7 +1404,7 @@ import { w2toolbar } from './w2toolbar'
             if (index[1] < 0) index[1] = 0
             if (index[1] > pal[0].length - 1) index[1] = pal[0].length - 1
 
-            color = pal[index[0]][index[1]]
+            let color = pal[index[0]][index[1]]
             $(el).data('_color', color)
             return color
         }
diff --git a/src/w2form.js b/src/w2form.js
index 0c74334f6..94885a1f1 100644
--- a/src/w2form.js
+++ b/src/w2form.js
@@ -348,7 +348,6 @@ class w2form extends w2event {
         // let the management of the error outside of the grid
         let edata = this.trigger({ target: this.name, type: 'error', message: msg , xhr: this.last.xhr })
         if (edata.isCancelled === true) {
-            if (typeof callBack === 'function') callBack()
             return
         }
         // need a time out because message might be already up)
diff --git a/src/w2grid.js b/src/w2grid.js
index c7db163d4..52c76b2e6 100644
--- a/src/w2grid.js
+++ b/src/w2grid.js
@@ -1188,7 +1188,7 @@ class w2grid extends w2event {
                         break
                     case 'ends':
                     case 'ends with': // need for back compatibility
-                        lastIndex = val1.lastIndexOf(val2)
+                        let lastIndex = val1.lastIndexOf(val2)
                         if (lastIndex !== -1 && lastIndex == val1.length - val2.length) fl++ // do not hide record
                         break
                 }
@@ -2698,7 +2698,6 @@ class w2grid extends w2event {
         // let the management of the error outside of the grid
         let edata = this.trigger({ target: this.name, type: 'error', message: msg , xhr: this.last.xhr })
         if (edata.isCancelled === true) {
-            if (typeof callBack == 'function') callBack({ status: 'error', message: 'Request aborted.' })
             return
         }
         this.message(msg)
@@ -7655,7 +7654,7 @@ class w2grid extends w2event {
         }
         if ($.isPlainObject(data) /*&& col.editable*/) { //It can be an object btw
             if (col.options && col.options.items) {
-                val = col.options.items.find((item) => { return item.id == data.id })
+                let val = col.options.items.find((item) => { return item.id == data.id })
                 if (val) data = val.text
                 else data = data.id
             } else {
@@ -7759,7 +7758,9 @@ class w2grid extends w2event {
         if (returnOnly !== true) {
             // event before
             let edata = this.trigger({ phase: 'before', type: 'stateSave', target: this.name, state: state })
-            if (edata.isCancelled === true) { if (typeof callBack == 'function') callBack({ status: 'error', message: 'Request aborted.' }); return }
+            if (edata.isCancelled === true) {
+                return
+            }
             try {
                 let savedState = $.parseJSON(localStorage.w2ui || '{}')
                 if (!savedState) savedState = {}
@@ -7793,7 +7794,9 @@ class w2grid extends w2event {
         }
         // event before
         let edata = this.trigger({ phase: 'before', type: 'stateRestore', target: this.name, state: newState })
-        if (edata.isCancelled === true) { if (typeof callBack == 'function') callBack({ status: 'error', message: 'Request aborted.' }); return }
+        if (edata.isCancelled === true) {
+            return
+        }
         // default behavior
         if ($.isPlainObject(newState)) {
             $.extend(this.show, newState.show)
diff --git a/src/w2toolbar.js b/src/w2toolbar.js
index b27e73278..5bc4d6371 100644
--- a/src/w2toolbar.js
+++ b/src/w2toolbar.js
@@ -111,7 +111,7 @@ class w2toolbar extends w2event {
                 this.items.push(newItem)
             } else {
                 let middle = this.get(id, true)
-                this.items = this.items.slice(0, middle).concat([netItem], this.items.slice(middle))
+                this.items = this.items.slice(0, middle).concat([newItem], this.items.slice(middle))
             }
             this.refresh(newItem.id)
         })
@@ -236,6 +236,7 @@ class w2toolbar extends w2event {
     }
 
     uncheck() {
+        let obj      = this
         let effected = []
         Array.from(arguments).forEach(item => {
             let it = this.get(item)