diff --git a/src/Bundle/ChillMainBundle/Resources/public/main.js b/src/Bundle/ChillMainBundle/Resources/public/main.js
index 2c0b37a8f..1e03bc527 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/main.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/main.js
@@ -29,7 +29,7 @@ require('./css/pikaday.css');
 
 require('./js/collection/collections.js');
 
-// in node-modules
+// from node-modules
 require('select2/dist/css/select2.css');
 
 require('./modules/breadcrumb/index.js');
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..515a6a993
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom.scss
@@ -0,0 +1,42 @@
+/*
+*   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
new file mode 100644
index 000000000..d462cbf0b
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js
@@ -0,0 +1,9 @@
+// Compile all bootstrap assets from nodes-modules
+//require('bootstrap/scss/bootstrap.scss')
+
+// Compile custom styles to adapt bootstrap in chill context
+require('./custom.scss')
+
+// You can specify which plugins you need
+//import { Tooltip, Toast, Popover } from 'bootstrap';
+//import Alert from 'bootstrap/js/dist/alert';
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/forkawesome/index.js b/src/Bundle/ChillMainBundle/Resources/public/modules/forkawesome/index.js
index 1c9051fc1..4841b9b80 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/forkawesome/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/forkawesome/index.js
@@ -1,2 +1,2 @@
-// Compile all Fork-Awesome fonts assets
+// Compile all Fork-Awesome fonts assets from node-modules
 require('fork-awesome/scss/fork-awesome.scss');
diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js
index 02e561851..f65ef3b24 100644
--- a/src/Bundle/ChillMainBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js
@@ -10,6 +10,7 @@ module.exports = function(encore, entries)
         .addEntry('tabs', __dirname + '/Resources/public/modules/tabs/index.js')
 
         // chill2 assets
+        .addEntry('bootstrap', __dirname + '/Resources/public/modules/bootstrap/index.js')
         .addEntry('forkawesome', __dirname + '/Resources/public/modules/forkawesome/index.js')
 
         // Alias are used by Webpack when trying to resolve modules