diff --git a/package.json b/package.json
index 04f9bce1d..ba2ceef5e 100644
--- a/package.json
+++ b/package.json
@@ -55,12 +55,18 @@
     "postsass-build-task:scss-compile:material": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-material.css dist/styles/css/slickgrid-theme-material.css --output-style compressed",
     "sass-build-task:scss-compile:material-bare": "node-sass src/aurelia-slickgrid/styles/slickgrid-theme-material.bare.scss -o dist/styles/css --output-style compressed",
     "postsass-build-task:scss-compile:material-bare": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-material.bare.css dist/styles/css/slickgrid-theme-material.bare.css --output-style compressed",
+    "sass-build-task:scss-compile:material-lite": "node-sass src/aurelia-slickgrid/styles/slickgrid-theme-material.lite.scss -o dist/styles/css --output-style compressed",
+    "postsass-build-task:scss-compile:material-lite": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-material.lite.css dist/styles/css/slickgrid-theme-material.lite.css --output-style compressed",
     "sass-build-task:scss-compile:salesforce": "node-sass src/aurelia-slickgrid/styles/slickgrid-theme-salesforce.scss -o dist/styles/css --output-style compressed",
     "postsass-build-task:scss-compile:salesforce": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-salesforce.css dist/styles/css/slickgrid-theme-salesforce.css --output-style compressed",
     "sass-build-task:scss-compile:salesforce-bare": "node-sass src/aurelia-slickgrid/styles/slickgrid-theme-salesforce.bare.scss -o dist/styles/css --output-style compressed",
     "postsass-build-task:scss-compile:salesforce-bare": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-salesforce.bare.css dist/styles/css/slickgrid-theme-salesforce.bare.css --output-style compressed",
+    "sass-build-task:scss-compile:salesforce-lite": "node-sass src/aurelia-slickgrid/styles/slickgrid-theme-salesforce.lite.scss -o dist/styles/css --output-style compressed",
+    "postsass-build-task:scss-compile:salesforce-lite": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-salesforce.lite.css dist/styles/css/slickgrid-theme-salesforce.lite.css --output-style compressed",
     "sass:build": "run-p sass-build-task:scss-compile:*",
+    "presass:copy": "cross-env copyfiles -f src/aurelia-slickgrid/styles/*.png dist/styles/css",
     "sass:copy": "cross-env copyfiles -f src/aurelia-slickgrid/styles/*.scss dist/styles/sass",
+    "postsass:copy": "cross-env copyfiles -f src/aurelia-slickgrid/styles/*.png dist/styles/sass",
     "presass:watch:bootstrap": "cross-env npm run sass-build-task:scss-compile:bootstrap",
     "sass:watch:bootstrap": "cross-env npm run sass-build-task:scss-compile:bootstrap -- -watch",
     "presass:watch:material": "cross-env npm run sass-build-task:scss-compile:material",
diff --git a/src/aurelia-slickgrid/editors/dualInputEditor.ts b/src/aurelia-slickgrid/editors/dualInputEditor.ts
index 0615bf8eb..1c95b1c3f 100644
--- a/src/aurelia-slickgrid/editors/dualInputEditor.ts
+++ b/src/aurelia-slickgrid/editors/dualInputEditor.ts
@@ -148,7 +148,7 @@ export class DualInputEditor implements Editor {
     const idPropName = this.gridOptions.datasetIdPropertyName || 'id';
     const itemId = this.args && this.args.item && this.args.item[idPropName] || 0;
 
-    let fieldType = editorSideParams.type || 'text';
+    let fieldType: string = editorSideParams.type || 'text';
     if (fieldType === 'float' || fieldType === 'integer') {
       fieldType = 'number';
     }
diff --git a/src/aurelia-slickgrid/styles/_variables.scss b/src/aurelia-slickgrid/styles/_variables.scss
index bf91b8527..7bd9fbffd 100644
--- a/src/aurelia-slickgrid/styles/_variables.scss
+++ b/src/aurelia-slickgrid/styles/_variables.scss
@@ -3,11 +3,14 @@
  * Lib Website (https://github.com/ghiscoding/aurelia-slickgrid)
  * Licensed under MIT (https://github.com/ghiscoding/aurelia-slickgrid/blob/master/LICENSE)
  */
+
  $border-color:                                  #dddddd !default;
  $font-size-base-value:                          14 !default;
- $font-size-base:          			                $font-size-base-value + 0px !default;
+ $font-size-base:          			                  $font-size-base-value + 0px !default;
  $font-family:                                   -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default;
  $primary-color:                                 #31708F !default;
+ $button-primary-bg-color:                       $primary-color !default;
+ $button-primary-color:                          inherit !default;
  $flatpickr-bgcolor:                             #ffffff !default;
  $filter-placeholder-font-family:                'Segoe UI Symbol' !default;
  $focus-color:                                   rgb(115, 179, 229) !default;
@@ -36,7 +39,7 @@
  $cell-border-right:                             1px transparent !default;
  $cell-border-bottom:                            1px transparent !default;
  $cell-border-left:                              1px transparent !default;
- $cell-even-background-color: 			              #ffffff !default;
+ $cell-even-background-color: 			             #ffffff !default;
  $cell-odd-background-color:                     darken($grid-cell-color, 3%) !default; // for striping every second row
  $cell-odd-active-background-color:              darken($grid-cell-color, 5%) !default;
  $cell-padding-top-bottom:                       5px !default;
@@ -129,34 +132,34 @@
  $icon-group-height:                             20px !default;
  $icon-group-width:                              14px !default;
  $table-background:                              transparent !default;
- $link-color:        				                    #08c !default;
+ $link-color:        				                     #08c !default;
  $link-color-hover:                              darker($link-color, 15%) !default;
- $gray-dark:              			                  #333 !default;
- $text-color:             			                  $gray-dark !default;
- $navbar-default-link-hover-color:	              $gray-dark !default;
+ $gray-dark:              			                 #333 !default;
+ $text-color:             			                 $gray-dark !default;
+ $navbar-default-link-hover-color:	             $gray-dark !default;
 
  /* AutoComplete */
- $autocomplete-bg-color:	                        #ffffff !default;
- $autocomplete-border:	                          1px solid rgba(0, 0, 0, 0.15) !default;
- $autocomplete-border-radius:	                  4px !default;
- $autocomplete-box-shadow:	                      0 6px 12px rgba(0, 0, 0, 0.175) !default;
- $autocomplete-hover-color:	                    #262626 !default;
- $autocomplete-hover-bg-color:	                  darken($row-mouse-hover-color, 3%) !default;
+ $autocomplete-bg-color:	                       #ffffff !default;
+ $autocomplete-border:	                         1px solid rgba(0, 0, 0, 0.15) !default;
+ $autocomplete-border-radius:	                   4px !default;
+ $autocomplete-box-shadow:	                     0 6px 12px rgba(0, 0, 0, 0.175) !default;
+ $autocomplete-hover-color:	                     #262626 !default;
+ $autocomplete-hover-bg-color:	                 darken($row-mouse-hover-color, 3%) !default;
  $autocomplete-loading-icon:                     "\f021" !default;
  $autocomplete-loading-icon-color:               $icon-color !default;
  $autocomplete-loading-icon-width:               inherit !default;
  $autocomplete-loading-icon-margin-left:         -16px !default;
  $autocomplete-loading-icon-line-height:         0px !default;
  $autocomplete-loading-icon-vertical-align:      inherit !default;
- $autocomplete-max-height:	                      25vh !default;
- $autocomplete-min-height:	                      75px !default;
- $autocomplete-min-width:	                      50px !default;
- $autocomplete-overflow-x:	                      hidden !default;
- $autocomplete-overflow-y:	                      auto !default;
- $autocomplete-text-color:	                      #333333 !default;
- $autocomplete-text-overflow:	                  ellipsis !default;
- $autocomplete-text-padding:	                    3px 15px !default;
- $autocomplete-z-index:	                        9999 !default;
+ $autocomplete-max-height:	                     25vh !default;
+ $autocomplete-min-height:	                     75px !default;
+ $autocomplete-min-width:	                       50px !default;
+ $autocomplete-overflow-x:	                     hidden !default;
+ $autocomplete-overflow-y:	                     auto !default;
+ $autocomplete-text-color:	                     #333333 !default;
+ $autocomplete-text-overflow:	                   ellipsis !default;
+ $autocomplete-text-padding:	                   3px 15px !default;
+ $autocomplete-z-index:	                         9999 !default;
 
  /** AutoComplte with Custom Styling (2 rows) */
  $autocomplete-tpl2-font-size:                   12px !default;
diff --git a/src/aurelia-slickgrid/styles/flatpickr.min.scss b/src/aurelia-slickgrid/styles/flatpickr.min.scss
new file mode 100644
index 000000000..d76d187cf
--- /dev/null
+++ b/src/aurelia-slickgrid/styles/flatpickr.min.scss
@@ -0,0 +1,13 @@
+.flatpickr-calendar{background:transparent;opacity:0;display:none;text-align:center;visibility:hidden;padding:0;-webkit-animation:none;animation:none;direction:ltr;border:0;font-size:14px;line-height:24px;border-radius:5px;position:absolute;width:307.875px;-webkit-box-sizing:border-box;box-sizing:border-box;-ms-touch-action:manipulation;touch-action:manipulation;background:#fff;-webkit-box-shadow:1px 0 0 #e6e6e6,-1px 0 0 #e6e6e6,0 1px 0 #e6e6e6,0 -1px 0 #e6e6e6,0 3px 13px rgba(0,0,0,0.08);box-shadow:1px 0 0 #e6e6e6,-1px 0 0 #e6e6e6,0 1px 0 #e6e6e6,0 -1px 0 #e6e6e6,0 3px 13px rgba(0,0,0,0.08);}.flatpickr-calendar.open,.flatpickr-calendar.inline{opacity:1;max-height:640px;visibility:visible}.flatpickr-calendar.open{display:inline-block;z-index:99999}.flatpickr-calendar.animate.open{-webkit-animation:fpFadeInDown 300ms cubic-bezier(.23,1,.32,1);animation:fpFadeInDown 300ms cubic-bezier(.23,1,.32,1)}.flatpickr-calendar.inline{display:block;position:relative;top:2px}.flatpickr-calendar.static{position:absolute;top:calc(100% + 2px);}.flatpickr-calendar.static.open{z-index:999;display:block}.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+1) .flatpickr-day.inRange:nth-child(7n+7){-webkit-box-shadow:none !important;box-shadow:none !important}.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+2) .flatpickr-day.inRange:nth-child(7n+1){-webkit-box-shadow:-2px 0 0 #e6e6e6,5px 0 0 #e6e6e6;box-shadow:-2px 0 0 #e6e6e6,5px 0 0 #e6e6e6}.flatpickr-calendar .hasWeeks .dayContainer,.flatpickr-calendar .hasTime .dayContainer{border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.flatpickr-calendar .hasWeeks .dayContainer{border-left:0}.flatpickr-calendar.showTimeInput.hasTime .flatpickr-time{height:40px;border-top:1px solid #e6e6e6}.flatpickr-calendar.noCalendar.hasTime .flatpickr-time{height:auto}.flatpickr-calendar:before,.flatpickr-calendar:after{position:absolute;display:block;pointer-events:none;border:solid transparent;content:'';height:0;width:0;left:22px}.flatpickr-calendar.rightMost:before,.flatpickr-calendar.rightMost:after{left:auto;right:22px}.flatpickr-calendar:before{border-width:5px;margin:0 -5px}.flatpickr-calendar:after{border-width:4px;margin:0 -4px}.flatpickr-calendar.arrowTop:before,.flatpickr-calendar.arrowTop:after{bottom:100%}.flatpickr-calendar.arrowTop:before{border-bottom-color:#e6e6e6}.flatpickr-calendar.arrowTop:after{border-bottom-color:#fff}.flatpickr-calendar.arrowBottom:before,.flatpickr-calendar.arrowBottom:after{top:100%}.flatpickr-calendar.arrowBottom:before{border-top-color:#e6e6e6}.flatpickr-calendar.arrowBottom:after{border-top-color:#fff}.flatpickr-calendar:focus{outline:0}.flatpickr-wrapper{position:relative;display:inline-block}.flatpickr-months{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;}.flatpickr-months .flatpickr-month{background:transparent;color:rgba(0,0,0,0.9);fill:rgba(0,0,0,0.9);height:34px;line-height:1;text-align:center;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;overflow:hidden;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.flatpickr-months .flatpickr-prev-month,.flatpickr-months .flatpickr-next-month{text-decoration:none;cursor:pointer;position:absolute;top:0;height:34px;padding:10px;z-index:3;color:rgba(0,0,0,0.9);fill:rgba(0,0,0,0.9);}.flatpickr-months .flatpickr-prev-month.flatpickr-disabled,.flatpickr-months .flatpickr-next-month.flatpickr-disabled{display:none}.flatpickr-months .flatpickr-prev-month i,.flatpickr-months .flatpickr-next-month i{position:relative}.flatpickr-months .flatpickr-prev-month.flatpickr-prev-month,.flatpickr-months .flatpickr-next-month.flatpickr-prev-month{/*
+      /*rtl:begin:ignore*/left:0;/*
+      /*rtl:end:ignore*/}/*
+      /*rtl:begin:ignore*/
+/*
+      /*rtl:end:ignore*/
+.flatpickr-months .flatpickr-prev-month.flatpickr-next-month,.flatpickr-months .flatpickr-next-month.flatpickr-next-month{/*
+      /*rtl:begin:ignore*/right:0;/*
+      /*rtl:end:ignore*/}/*
+      /*rtl:begin:ignore*/
+/*
+      /*rtl:end:ignore*/
+.flatpickr-months .flatpickr-prev-month:hover,.flatpickr-months .flatpickr-next-month:hover{color:#959ea9;}.flatpickr-months .flatpickr-prev-month:hover svg,.flatpickr-months .flatpickr-next-month:hover svg{fill:#f64747}.flatpickr-months .flatpickr-prev-month svg,.flatpickr-months .flatpickr-next-month svg{width:14px;height:14px;}.flatpickr-months .flatpickr-prev-month svg path,.flatpickr-months .flatpickr-next-month svg path{-webkit-transition:fill .1s;transition:fill .1s;fill:inherit}.numInputWrapper{position:relative;height:auto;}.numInputWrapper input,.numInputWrapper span{display:inline-block}.numInputWrapper input{width:100%;}.numInputWrapper input::-ms-clear{display:none}.numInputWrapper input::-webkit-outer-spin-button,.numInputWrapper input::-webkit-inner-spin-button{margin:0;-webkit-appearance:none}.numInputWrapper span{position:absolute;right:0;width:14px;padding:0 4px 0 2px;height:50%;line-height:50%;opacity:0;cursor:pointer;border:1px solid rgba(57,57,57,0.15);-webkit-box-sizing:border-box;box-sizing:border-box;}.numInputWrapper span:hover{background:rgba(0,0,0,0.1)}.numInputWrapper span:active{background:rgba(0,0,0,0.2)}.numInputWrapper span:after{display:block;content:"";position:absolute}.numInputWrapper span.arrowUp{top:0;border-bottom:0;}.numInputWrapper span.arrowUp:after{border-left:4px solid transparent;border-right:4px solid transparent;border-bottom:4px solid rgba(57,57,57,0.6);top:26%}.numInputWrapper span.arrowDown{top:50%;}.numInputWrapper span.arrowDown:after{border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid rgba(57,57,57,0.6);top:40%}.numInputWrapper span svg{width:inherit;height:auto;}.numInputWrapper span svg path{fill:rgba(0,0,0,0.5)}.numInputWrapper:hover{background:rgba(0,0,0,0.05);}.numInputWrapper:hover span{opacity:1}.flatpickr-current-month{font-size:135%;line-height:inherit;font-weight:300;color:inherit;position:absolute;width:75%;left:12.5%;padding:7.48px 0 0 0;line-height:1;height:34px;display:inline-block;text-align:center;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);}.flatpickr-current-month span.cur-month{font-family:inherit;font-weight:700;color:inherit;display:inline-block;margin-left:.5ch;padding:0;}.flatpickr-current-month span.cur-month:hover{background:rgba(0,0,0,0.05)}.flatpickr-current-month .numInputWrapper{width:6ch;width:7ch\0;display:inline-block;}.flatpickr-current-month .numInputWrapper span.arrowUp:after{border-bottom-color:rgba(0,0,0,0.9)}.flatpickr-current-month .numInputWrapper span.arrowDown:after{border-top-color:rgba(0,0,0,0.9)}.flatpickr-current-month input.cur-year{background:transparent;-webkit-box-sizing:border-box;box-sizing:border-box;color:inherit;cursor:text;padding:0 0 0 .5ch;margin:0;display:inline-block;font-size:inherit;font-family:inherit;font-weight:300;line-height:inherit;height:auto;border:0;border-radius:0;vertical-align:initial;-webkit-appearance:textfield;-moz-appearance:textfield;appearance:textfield;}.flatpickr-current-month input.cur-year:focus{outline:0}.flatpickr-current-month input.cur-year[disabled],.flatpickr-current-month input.cur-year[disabled]:hover{font-size:100%;color:rgba(0,0,0,0.5);background:transparent;pointer-events:none}.flatpickr-current-month .flatpickr-monthDropdown-months{appearance:menulist;background:transparent;border:none;border-radius:0;box-sizing:border-box;color:inherit;cursor:pointer;font-size:inherit;font-family:inherit;font-weight:300;height:auto;line-height:inherit;margin:-1px 0 0 0;outline:none;padding:0 0 0 .5ch;position:relative;vertical-align:initial;-webkit-box-sizing:border-box;-webkit-appearance:menulist;-moz-appearance:menulist;width:auto;}.flatpickr-current-month .flatpickr-monthDropdown-months:focus,.flatpickr-current-month .flatpickr-monthDropdown-months:active{outline:none}.flatpickr-current-month .flatpickr-monthDropdown-months:hover{background:rgba(0,0,0,0.05)}.flatpickr-current-month .flatpickr-monthDropdown-months .flatpickr-monthDropdown-month{background-color:transparent;outline:none;padding:0}.flatpickr-weekdays{background:transparent;text-align:center;overflow:hidden;width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:28px;}.flatpickr-weekdays .flatpickr-weekdaycontainer{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}span.flatpickr-weekday{cursor:default;font-size:90%;background:transparent;color:rgba(0,0,0,0.54);line-height:1;margin:0;text-align:center;display:block;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;font-weight:bolder}.dayContainer,.flatpickr-weeks{padding:1px 0 0 0}.flatpickr-days{position:relative;overflow:hidden;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;width:307.875px;}.flatpickr-days:focus{outline:0}.dayContainer{padding:0;outline:0;text-align:left;width:307.875px;min-width:307.875px;max-width:307.875px;-webkit-box-sizing:border-box;box-sizing:border-box;display:inline-block;display:-ms-flexbox;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-wrap:wrap;-ms-flex-pack:justify;-webkit-justify-content:space-around;justify-content:space-around;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);opacity:1;}.dayContainer + .dayContainer{-webkit-box-shadow:-1px 0 0 #e6e6e6;box-shadow:-1px 0 0 #e6e6e6}.flatpickr-day{background:none;border:1px solid transparent;border-radius:150px;-webkit-box-sizing:border-box;box-sizing:border-box;color:#393939;cursor:pointer;font-weight:400;width:14.2857143%;-webkit-flex-basis:14.2857143%;-ms-flex-preferred-size:14.2857143%;flex-basis:14.2857143%;max-width:39px;height:39px;line-height:39px;margin:0;display:inline-block;position:relative;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;text-align:center;}.flatpickr-day.inRange,.flatpickr-day.prevMonthDay.inRange,.flatpickr-day.nextMonthDay.inRange,.flatpickr-day.today.inRange,.flatpickr-day.prevMonthDay.today.inRange,.flatpickr-day.nextMonthDay.today.inRange,.flatpickr-day:hover,.flatpickr-day.prevMonthDay:hover,.flatpickr-day.nextMonthDay:hover,.flatpickr-day:focus,.flatpickr-day.prevMonthDay:focus,.flatpickr-day.nextMonthDay:focus{cursor:pointer;outline:0;background:#e6e6e6;border-color:#e6e6e6}.flatpickr-day.today{border-color:#959ea9;}.flatpickr-day.today:hover,.flatpickr-day.today:focus{border-color:#959ea9;background:#959ea9;color:#fff}.flatpickr-day.selected,.flatpickr-day.startRange,.flatpickr-day.endRange,.flatpickr-day.selected.inRange,.flatpickr-day.startRange.inRange,.flatpickr-day.endRange.inRange,.flatpickr-day.selected:focus,.flatpickr-day.startRange:focus,.flatpickr-day.endRange:focus,.flatpickr-day.selected:hover,.flatpickr-day.startRange:hover,.flatpickr-day.endRange:hover,.flatpickr-day.selected.prevMonthDay,.flatpickr-day.startRange.prevMonthDay,.flatpickr-day.endRange.prevMonthDay,.flatpickr-day.selected.nextMonthDay,.flatpickr-day.startRange.nextMonthDay,.flatpickr-day.endRange.nextMonthDay{background:#569ff7;-webkit-box-shadow:none;box-shadow:none;color:#fff;border-color:#569ff7}.flatpickr-day.selected.startRange,.flatpickr-day.startRange.startRange,.flatpickr-day.endRange.startRange{border-radius:50px 0 0 50px}.flatpickr-day.selected.endRange,.flatpickr-day.startRange.endRange,.flatpickr-day.endRange.endRange{border-radius:0 50px 50px 0}.flatpickr-day.selected.startRange + .endRange:not(:nth-child(7n+1)),.flatpickr-day.startRange.startRange + .endRange:not(:nth-child(7n+1)),.flatpickr-day.endRange.startRange + .endRange:not(:nth-child(7n+1)){-webkit-box-shadow:-10px 0 0 #569ff7;box-shadow:-10px 0 0 #569ff7}.flatpickr-day.selected.startRange.endRange,.flatpickr-day.startRange.startRange.endRange,.flatpickr-day.endRange.startRange.endRange{border-radius:50px}.flatpickr-day.inRange{border-radius:0;-webkit-box-shadow:-5px 0 0 #e6e6e6,5px 0 0 #e6e6e6;box-shadow:-5px 0 0 #e6e6e6,5px 0 0 #e6e6e6}.flatpickr-day.flatpickr-disabled,.flatpickr-day.flatpickr-disabled:hover,.flatpickr-day.prevMonthDay,.flatpickr-day.nextMonthDay,.flatpickr-day.notAllowed,.flatpickr-day.notAllowed.prevMonthDay,.flatpickr-day.notAllowed.nextMonthDay{color:rgba(57,57,57,0.3);background:transparent;border-color:transparent;cursor:default}.flatpickr-day.flatpickr-disabled,.flatpickr-day.flatpickr-disabled:hover{cursor:not-allowed;color:rgba(57,57,57,0.1)}.flatpickr-day.week.selected{border-radius:0;-webkit-box-shadow:-5px 0 0 #569ff7,5px 0 0 #569ff7;box-shadow:-5px 0 0 #569ff7,5px 0 0 #569ff7}.flatpickr-day.hidden{visibility:hidden}.rangeMode .flatpickr-day{margin-top:1px}.flatpickr-weekwrapper{float:left;}.flatpickr-weekwrapper .flatpickr-weeks{padding:0 12px;-webkit-box-shadow:1px 0 0 #e6e6e6;box-shadow:1px 0 0 #e6e6e6}.flatpickr-weekwrapper .flatpickr-weekday{float:none;width:100%;line-height:28px}.flatpickr-weekwrapper span.flatpickr-day,.flatpickr-weekwrapper span.flatpickr-day:hover{display:block;width:100%;max-width:none;color:rgba(57,57,57,0.3);background:transparent;cursor:default;border:none}.flatpickr-innerContainer{display:block;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden;}.flatpickr-rContainer{display:inline-block;padding:0;-webkit-box-sizing:border-box;box-sizing:border-box}.flatpickr-time{text-align:center;outline:0;display:block;height:0;line-height:40px;max-height:40px;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;}.flatpickr-time:after{content:"";display:table;clear:both}.flatpickr-time .numInputWrapper{-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;width:40%;height:40px;float:left;}.flatpickr-time .numInputWrapper span.arrowUp:after{border-bottom-color:#393939}.flatpickr-time .numInputWrapper span.arrowDown:after{border-top-color:#393939}.flatpickr-time.hasSeconds .numInputWrapper{width:26%}.flatpickr-time.time24hr .numInputWrapper{width:49%}.flatpickr-time input{background:transparent;-webkit-box-shadow:none;box-shadow:none;border:0;border-radius:0;text-align:center;margin:0;padding:0;height:inherit;line-height:inherit;color:#393939;font-size:14px;position:relative;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:textfield;-moz-appearance:textfield;appearance:textfield;}.flatpickr-time input.flatpickr-hour{font-weight:bold}.flatpickr-time input.flatpickr-minute,.flatpickr-time input.flatpickr-second{font-weight:400}.flatpickr-time input:focus{outline:0;border:0}.flatpickr-time .flatpickr-time-separator,.flatpickr-time .flatpickr-am-pm{height:inherit;float:left;line-height:inherit;color:#393939;font-weight:bold;width:2%;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.flatpickr-time .flatpickr-am-pm{outline:0;width:18%;cursor:pointer;text-align:center;font-weight:400}.flatpickr-time input:hover,.flatpickr-time .flatpickr-am-pm:hover,.flatpickr-time input:focus,.flatpickr-time .flatpickr-am-pm:focus{background:#eee}.flatpickr-input[readonly]{cursor:pointer}@-webkit-keyframes fpFadeInDown{from{opacity:0;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}to{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}@keyframes fpFadeInDown{from{opacity:0;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}to{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}
diff --git a/src/aurelia-slickgrid/styles/multiple-select.png b/src/aurelia-slickgrid/styles/multiple-select.png
new file mode 100644
index 000000000..b1282ce42
Binary files /dev/null and b/src/aurelia-slickgrid/styles/multiple-select.png differ
diff --git a/src/aurelia-slickgrid/styles/multiple-select.scss b/src/aurelia-slickgrid/styles/multiple-select.scss
new file mode 100644
index 000000000..1327cbe4b
--- /dev/null
+++ b/src/aurelia-slickgrid/styles/multiple-select.scss
@@ -0,0 +1,191 @@
+/**
+ * @author zhixin wen <wenzhixin2010@gmail.com>
+ */
+
+ .ms-parent {
+  display: inline-block;
+  position: relative;
+  vertical-align: middle;
+}
+
+.ms-choice {
+  display: block;
+  width: 100%;
+  height: 26px;
+  padding: 0;
+  overflow: hidden;
+  cursor: pointer;
+  border: 1px solid #aaa;
+  text-align: left;
+  white-space: nowrap;
+  line-height: 26px;
+  color: #444;
+  text-decoration: none;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  background-color: #fff;
+}
+
+.ms-choice.disabled {
+  background-color: #f4f4f4;
+  background-image: none;
+  border: 1px solid #ddd;
+  cursor: default;
+}
+
+.ms-choice > span {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 20px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: block;
+  padding-left: 8px;
+}
+
+.ms-choice > span.placeholder {
+  color: #999;
+}
+
+.ms-choice > div {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 20px;
+  height: 25px;
+  background: url('~/multiple-select.png') left top no-repeat;
+}
+
+.ms-choice > div.open {
+background: url('~/multiple-select.png') right top no-repeat;
+}
+
+.ms-drop {
+  width: 100%;
+  overflow: hidden;
+  display: none;
+  margin-top: -1px;
+  padding: 0;
+  position: absolute;
+  z-index: 1000;
+  background: #fff;
+  color: #000;
+  border: 1px solid #aaa;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+
+.ms-drop.bottom {
+  top: 100%;
+  -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+  -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+  box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+}
+
+.ms-drop.top {
+  bottom: 100%;
+  -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+  -moz-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+  box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+}
+
+.ms-search {
+  display: inline-block;
+  margin: 0;
+  min-height: 26px;
+  padding: 4px;
+  position: relative;
+  white-space: nowrap;
+  width: 100%;
+  z-index: 10000;
+}
+
+.ms-search input {
+  width: 100%;
+  height: auto !important;
+  min-height: 24px;
+  padding: 0 20px 0 5px;
+  margin: 0;
+  outline: 0;
+  font-family: sans-serif;
+  font-size: 1em;
+  border: 1px solid #aaa;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  background: #fff url('~/multiple-select.png') no-repeat 100% -22px;
+  background: url('~/multiple-select.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+  background: url('~/multiple-select.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('~/multiple-select.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('~/multiple-select.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+  background: url('~/multiple-select.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+  background: url('~/multiple-select.png') no-repeat 100% -22px, linear-gradient(to top, #ffffff 85%, #eeeeee 99%);
+}
+
+.ms-search, .ms-search input {
+  -webkit-box-sizing: border-box;
+  -khtml-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+.ms-drop ul {
+  overflow: auto;
+  margin: 0;
+  padding: 5px 8px;
+}
+
+.ms-drop ul > li {
+  list-style: none;
+  display: list-item;
+  background-image: none;
+  position: static;
+}
+
+.ms-drop ul > li .disabled {
+  opacity: .35;
+  filter: Alpha(Opacity=35);
+}
+
+.ms-drop ul > li.multiple {
+  display: block;
+  float: left;
+}
+
+.ms-drop ul > li.group {
+  clear: both;
+}
+
+.ms-drop ul > li.multiple label {
+  width: 100%;
+  display: block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.ms-drop ul > li label {
+  font-weight: normal;
+  display: block;
+  white-space: nowrap;
+}
+
+.ms-drop ul > li label.optgroup {
+  font-weight: bold;
+}
+
+.ms-drop input[type="checkbox"] {
+  vertical-align: middle;
+}
+
+.ms-drop .ms-no-results {
+  display: none;
+}
diff --git a/src/aurelia-slickgrid/styles/slick-plugins.scss b/src/aurelia-slickgrid/styles/slick-plugins.scss
index ea7840ef6..8fd897e36 100644
--- a/src/aurelia-slickgrid/styles/slick-plugins.scss
+++ b/src/aurelia-slickgrid/styles/slick-plugins.scss
@@ -946,8 +946,12 @@ input.slider-filter-input[type=range] {
   }
 }
 .search-filter {
+  height: $header-input-height;
+
   .slider-value {
     padding: 0;
+    height: 100%;
+
     .input-group-text {
       padding: $slider-filter-number-padding;
       font-size: $slider-filter-number-font-size;
diff --git a/src/aurelia-slickgrid/styles/slick-without-bootstrap-min-styling.scss b/src/aurelia-slickgrid/styles/slick-without-bootstrap-min-styling.scss
index 2dc164f4f..3ab69a7f4 100644
--- a/src/aurelia-slickgrid/styles/slick-without-bootstrap-min-styling.scss
+++ b/src/aurelia-slickgrid/styles/slick-without-bootstrap-min-styling.scss
@@ -1,45 +1,52 @@
 @import './variables';
 
 /** Bootstrap buttons styling copied and changed slightly for Material Design */
-.btn {
-  cursor: pointer;
-  font-family:  $font-family;
-  display: inline-block;
-  margin-bottom: 0;
-  font-weight: 500;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: middle;
-  border: 1px solid transparent;
-  border-radius: 4px;
-}
+.slick-editor-modal, .slick-large-editor-text {
+  .btn {
+    cursor: pointer;
+    font-family:  $font-family;
+    display: inline-block;
+    margin-bottom: 0;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: middle;
+    border: 1px solid transparent;
+    border-radius: 4px;
+  }
 
-.btn-default {
-  color: #333;
-  background-color: #fff;
-  border-color: #ccc;
-}
+  .btn-default {
+    color: $button-primary-color;
+    background-color: #fff;
+    border-color: #ccc;
+  }
 
-.btn-primary {
-  color: #fff;
-  background-color: $primary-color;
-}
+  .btn-primary {
+    color: #fff;
+    background-color: $button-primary-bg-color;
+  }
 
-.btn-xs,
-.btn-group-xs>.btn {
-  padding: 1px 5px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
+  .btn-xs,
+  .btn-group-xs>.btn {
+    padding: 1px 5px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 3px;
+  }
+  .btn-sm {
+    padding: 5px 10px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 3px;
+  }
 }
 
-.slick-pane {
+.gridPane, .grid-pane, .slick-editor-modal {
   font-family:  $font-family;
 
   .form-control {
     display: block;
     width: 100%;
-    font-size: 14px;
+    font-size: $font-size-base;
     line-height: 1.42857143;
     color: #555;
     background-color: #fff;
@@ -126,4 +133,24 @@
     border-color: lighten($primary-color, 10%);
     box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px rgba(lighten($primary-color, 3%), .3);
   }
+
+  .slick-pagination {
+    .slick-pagination-nav {
+      .pagination > li {
+        a, span {
+          position: relative;
+          float: left;
+          margin-left: -1px;
+        }
+      }
+      .pagination > .disabled > a,
+      .pagination > .disabled > a:focus,
+      .pagination > .disabled > a:hover,
+      .pagination > .disabled > span,
+      .pagination > .disabled > span:focus,
+      .pagination > .disabled > span:hover {
+        cursor: not-allowed;
+      }
+    }
+  }
 }
diff --git a/src/aurelia-slickgrid/styles/slickgrid-theme-material.lite.scss b/src/aurelia-slickgrid/styles/slickgrid-theme-material.lite.scss
new file mode 100644
index 000000000..5c0645eae
--- /dev/null
+++ b/src/aurelia-slickgrid/styles/slickgrid-theme-material.lite.scss
@@ -0,0 +1,25 @@
+/*!
+ * SlickGrid custom styling for Material (https://github.com/ghiscoding/aurelia-slickgrid)
+ * Licensed under MIT (https://github.com/ghiscoding/aurelia-slickgrid/blob/master/LICENSE)
+ * @author: Ghislain B. (ghiscoding)
+ *//*!
+
+/** SlickGrid Material Theme */
+@import './variables-theme-material';
+@import './roboto-font';
+@import './slick-default-theme';
+@import './slick-grid';
+@import './slick-controls';
+@import './slick-editors';
+@import './slick-plugins';
+@import './slick-pagination';
+@import './slick-footer';
+@import './slickgrid-examples';
+@import './slick-bootstrap';
+@import './ui-autocomplete';
+@import './material-svg-icons';
+@import './material-svg-utilities';
+
+$link-color: $primary-color !default;
+@import './colors.scss';
+@import './extra-styling.scss';
diff --git a/src/aurelia-slickgrid/styles/slickgrid-theme-material.scss b/src/aurelia-slickgrid/styles/slickgrid-theme-material.scss
index f87a5b4c1..8f428cb3a 100644
--- a/src/aurelia-slickgrid/styles/slickgrid-theme-material.scss
+++ b/src/aurelia-slickgrid/styles/slickgrid-theme-material.scss
@@ -5,8 +5,8 @@
  *//*!
 
 /** SlickGrid Material Theme */
-@import './variables-theme-material';
 @import './roboto-font';
+@import './variables-theme-material';
 @import './slick-default-theme';
 @import './slick-without-bootstrap-min-styling';
 @import './slick-grid';
diff --git a/src/aurelia-slickgrid/styles/slickgrid-theme-salesforce.lite.scss b/src/aurelia-slickgrid/styles/slickgrid-theme-salesforce.lite.scss
new file mode 100644
index 000000000..dbb6d12e6
--- /dev/null
+++ b/src/aurelia-slickgrid/styles/slickgrid-theme-salesforce.lite.scss
@@ -0,0 +1,30 @@
+/*!
+ * SlickGrid custom styling for Salesforce (https://github.com/ghiscoding/aurelia-slickgrid)
+ * Licensed under MIT (https://github.com/ghiscoding/aurelia-slickgrid/blob/master/LICENSE)
+ * @author: Ghislain B. (ghiscoding)
+ *//*!
+
+/**
+ * SlickGrid Salesforce Theme
+ * (sames as `slickgrid-theme-salesforce.scss` but without Flatpickr & Multiple-Select styling)
+ */
+
+ @import './sass-utilities';
+
+ @import './variables-theme-salesforce';
+ @import './slick-default-theme';
+ @import './slick-grid';
+ @import './slick-controls';
+ @import './slick-editors';
+ @import './slick-plugins';
+ @import './slick-pagination';
+ @import './slick-footer';
+ @import './slickgrid-examples';
+ @import './slick-bootstrap';
+ @import './ui-autocomplete';
+ @import './material-svg-icons';
+ @import './material-svg-utilities';
+
+ $link-color: $primary-color !default;
+ @import './colors.scss';
+ @import './extra-styling';
diff --git a/src/aurelia-slickgrid/styles/slickgrid-theme-salesforce.scss b/src/aurelia-slickgrid/styles/slickgrid-theme-salesforce.scss
index 943d57668..52820ccde 100644
--- a/src/aurelia-slickgrid/styles/slickgrid-theme-salesforce.scss
+++ b/src/aurelia-slickgrid/styles/slickgrid-theme-salesforce.scss
@@ -6,7 +6,7 @@
 
 /**
  * SlickGrid Salesforce Theme
- * (sames as `slickgrid-theme-salesforce.scss` but without Flatpickr & Multiple-Select styling)
+ * (sames as `slickgrid-theme-salesforce.lite.scss` but includes all external 3rd party lib styling that is Flatpickr & Multiple-Select)
  */
 
  @import './sass-utilities';
diff --git a/src/examples/slickgrid/example27.scss b/src/examples/slickgrid/example27.scss
index ef123f11b..c7a194063 100644
--- a/src/examples/slickgrid/example27.scss
+++ b/src/examples/slickgrid/example27.scss
@@ -1,5 +1,5 @@
 /* make sure to add the @import the SlickGrid Theme AFTER the variables changes */
-@import '../../aurelia-slickgrid/styles/slickgrid-theme-material.scss';
+@import '../../aurelia-slickgrid/styles/slickgrid-theme-material.lite.scss';
 
 .icon {
     align-items: center;
diff --git a/src/examples/slickgrid/example28.scss b/src/examples/slickgrid/example28.scss
index eed09d23a..32f77fd95 100644
--- a/src/examples/slickgrid/example28.scss
+++ b/src/examples/slickgrid/example28.scss
@@ -1,5 +1,5 @@
 /* make sure to add the @import the SlickGrid Theme AFTER the variables changes */
-@import '../../aurelia-slickgrid/styles/slickgrid-theme-salesforce.scss';
+@import '../../aurelia-slickgrid/styles/slickgrid-theme-salesforce.lite.scss';
 
 /*
   www.OnlineWebFonts.Com