diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss
new file mode 100644
index 000000000..f47043fe2
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss
@@ -0,0 +1,4 @@
+/*
+ *  These custom styles will override bootstrap enabled stylesheets
+ */
+
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss
new file mode 100644
index 000000000..6347e0e1b
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss
@@ -0,0 +1,45 @@
+/*
+ *  Enable / disable bootstrap assets
+ *
+ *  ( when bootstrap.css comes after scratch.css, we have to disable conflict classes )
+ */
+
+@import "bootstrap/scss/functions";
+@import "bootstrap/scss/variables";
+@import "bootstrap/scss/mixins";
+// @import "bootstrap/scss/root";
+@import "bootstrap/scss/reboot";  // h1, h2, h3, ...
+@import "bootstrap/scss/type";    // h1, h2, h3, ...
+// @import "bootstrap/scss/images";
+// @import "bootstrap/scss/code";
+@import "bootstrap/scss/grid";    // container
+// @import "bootstrap/scss/tables";
+// @import "bootstrap/scss/forms";
+// @import "bootstrap/scss/buttons";
+// @import "bootstrap/scss/transitions";
+// @import "bootstrap/scss/dropdown";
+// @import "bootstrap/scss/button-group";
+// @import "bootstrap/scss/input-group";
+// @import "bootstrap/scss/custom-forms";
+// @import "bootstrap/scss/nav";
+// @import "bootstrap/scss/navbar";
+// @import "bootstrap/scss/card";
+// @import "bootstrap/scss/breadcrumb";
+// @import "bootstrap/scss/pagination";
+// @import "bootstrap/scss/badge";
+// @import "bootstrap/scss/jumbotron";
+// @import "bootstrap/scss/alert";
+// @import "bootstrap/scss/progress";
+// @import "bootstrap/scss/media";
+// @import "bootstrap/scss/list-group";
+// @import "bootstrap/scss/close";
+// @import "bootstrap/scss/toasts";
+// @import "bootstrap/scss/modal";
+// @import "bootstrap/scss/tooltip";
+// @import "bootstrap/scss/popover";
+// @import "bootstrap/scss/carousel";
+// @import "bootstrap/scss/spinners";
+// @import "bootstrap/scss/utilities";
+// @import "bootstrap/scss/print";
+
+@import "custom";
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom.scss
deleted file mode 100644
index 515a6a993..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-*   when bootstrap.css comes after chill.css
-*   we have to disable conflict classes
-*/
-
-@import "bootstrap/scss/functions";
-@import "bootstrap/scss/variables";
-@import "bootstrap/scss/mixins";
-@import "bootstrap/scss/root";
-//@import "bootstrap/scss/reboot";  // h1, h2, h3, ...
-//@import "bootstrap/scss/type";    // h1, h2, h3, ...
-@import "bootstrap/scss/images";
-@import "bootstrap/scss/code";
-//@import "bootstrap/scss/grid";    // container
-@import "bootstrap/scss/tables";
-@import "bootstrap/scss/forms";
-@import "bootstrap/scss/buttons";
-@import "bootstrap/scss/transitions";
-@import "bootstrap/scss/dropdown";
-@import "bootstrap/scss/button-group";
-@import "bootstrap/scss/input-group";
-@import "bootstrap/scss/custom-forms";
-@import "bootstrap/scss/nav";
-@import "bootstrap/scss/navbar";
-@import "bootstrap/scss/card";
-@import "bootstrap/scss/breadcrumb";
-@import "bootstrap/scss/pagination";
-@import "bootstrap/scss/badge";
-@import "bootstrap/scss/jumbotron";
-@import "bootstrap/scss/alert";
-@import "bootstrap/scss/progress";
-@import "bootstrap/scss/media";
-@import "bootstrap/scss/list-group";
-@import "bootstrap/scss/close";
-@import "bootstrap/scss/toasts";
-@import "bootstrap/scss/modal";
-@import "bootstrap/scss/tooltip";
-@import "bootstrap/scss/popover";
-@import "bootstrap/scss/carousel";
-@import "bootstrap/scss/spinners";
-@import "bootstrap/scss/utilities";
-@import "bootstrap/scss/print";
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js
index d462cbf0b..29e57c309 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js
@@ -1,8 +1,8 @@
 // Compile all bootstrap assets from nodes-modules
 //require('bootstrap/scss/bootstrap.scss')
 
-// Compile custom styles to adapt bootstrap in chill context
-require('./custom.scss')
+// Or compile bootstrap only enabled assets
+require('./bootstrap.scss');
 
 // You can specify which plugins you need
 //import { Tooltip, Toast, Popover } from 'bootstrap';