diff --git a/Gruntfile.js b/Gruntfile.js
index d660b8e8..2a497fd9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -18,35 +18,35 @@ var jsCompatibilty = [
 ]
 
 var jsCoreInclude = [
-	'build/js/include/core/appender.js',
-	'build/js/include/core/cache.js',
-	'build/js/include/core/handlebars.js',
-	'build/js/include/core/lang.js',
+'build/js/include/core/appender.js',
+//	'build/js/include/core/cache.js',
+//	'build/js/include/core/handlebars.js',
+//	'build/js/include/core/lang.js',
 	'build/js/include/core/objectLength.js',
-	'build/js/include/core/session.js',
-	'build/js/include/core/url.js',
-	'build/js/include/core/user.js',
-	'build/js/include/form/check_fields.js',
-	'build/js/include/form/checkbox.js',
-	'build/js/include/form/datetime.js',
-	'build/js/include/form/multi-select.js',
-	'build/js/include/form/radio.js',
-	'build/js/include/form/select.js',
+//	'build/js/include/core/session.js',
+//	'build/js/include/core/url.js',
+//	'build/js/include/core/user.js',
+//	'build/js/include/form/check_fields.js',
+//	'build/js/include/form/checkbox.js',
+//	'build/js/include/form/datetime.js',
+//	'build/js/include/form/multi-select.js',
+//	'build/js/include/form/radio.js',
+//	'build/js/include/form/select.js',
 	'build/js/include/form/upload.js',
-	'build/js/include/form/validator.js',
+//	'build/js/include/form/validator.js',
 	'build/js/include/layout/animate.js',
-	'build/js/include/layout/message.js',
-	'build/js/include/layout/modal.js',
+//	'build/js/include/layout/message.js',
+//	'build/js/include/layout/modal.js',
 	'build/js/include/layout/scroll.js',
-	'build/js/include/layout/tooltip.js',
-	'build/js/include/datatable.js',
+//	'build/js/include/layout/tooltip.js',
+//	'build/js/include/datatable.js',
 	'build/js/include/file.js',
 	'build/js/include/uploader.js',
 ]
 
 var jsMain = [
 //	'node_modules/sweetalert2/dist/sweetalert2.all.min.js',
-	'node_modules/inputmask/dist/min/jquery.inputmask.bundle.min.js',
+//	'node_modules/inputmask/dist/min/jquery.inputmask.bundle.min.js',
 /*	'node_modules/summernote/dist/summernote.min.js',
 	'node_modules/summernote/dist/lang/summernote-fr-FR.min.js',
 */
@@ -75,9 +75,9 @@ var jsMain = [
 
 var cssMain = [
 //	'node_modules/sweetalert2/dist/sweetalert2.min.css',
-	'node_modules/inputmask/css/inputmask.css',
+//	'node_modules/inputmask/css/inputmask.css',
 //	'node_modules/summernote/dist/summernote.css',
-	'node_modules/@activix/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css',
+//	'node_modules/@activix/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css',
 //	'node_modules/bootstrap-slider/dist/css/bootstrap-slider.min.css',
 //	'node_modules/jQuery-QueryBuilder/dist/css/query-builder.default.min.css',
 	'node_modules/animate.css/animate.min.css',
@@ -271,6 +271,18 @@ module.exports = function(grunt) {
 						src: ['**'],
 						dest: 'public/images/'
 					},
+					{
+						expand: true,
+						cwd: 'node_modules/bootstrap4-toggle/',
+						src: ['**'],
+						dest: 'public/assets/plugins/bootstrap4-toggle',	
+					},
+					{
+						expand: true,
+						cwd: 'node_modules/bootstrap-datepicker/dist/',
+						src: ['**'],
+						dest: 'public/assets/plugins/bootstrap-datepicker',	
+					},
 					{
 						expand: true,
 						cwd: 'build/img/',