diff --git a/themes/bootstrap/scss/_bootstrap.scss b/themes/bootstrap/scss/_bootstrap.scss
index f4ce0e48c5..ebad12b08b 100644
--- a/themes/bootstrap/scss/_bootstrap.scss
+++ b/themes/bootstrap/scss/_bootstrap.scss
@@ -4,32 +4,32 @@
 @import "../../../node_modules/bootstrap/scss/root";
 @import "../../../node_modules/bootstrap/scss/reboot";
 @import "../../../node_modules/bootstrap/scss/type";
-@import "../../../node_modules/bootstrap/scss/images";
+//@import "../../../node_modules/bootstrap/scss/images";
 @import "../../../node_modules/bootstrap/scss/code";
 @import "../../../node_modules/bootstrap/scss/grid";
 @import "../../../node_modules/bootstrap/scss/tables";
 @import "../../../node_modules/bootstrap/scss/forms";
 @import "../../../node_modules/bootstrap/scss/buttons";
-@import "../../../node_modules/bootstrap/scss/transitions";
-@import "../../../node_modules/bootstrap/scss/dropdown";
-@import "../../../node_modules/bootstrap/scss/button-group";
-@import "../../../node_modules/bootstrap/scss/input-group";
-@import "../../../node_modules/bootstrap/scss/custom-forms";
-@import "../../../node_modules/bootstrap/scss/nav";
-@import "../../../node_modules/bootstrap/scss/navbar";
+//@import "../../../node_modules/bootstrap/scss/transitions";
+//@import "../../../node_modules/bootstrap/scss/dropdown";
+//@import "../../../node_modules/bootstrap/scss/button-group";
+//@import "../../../node_modules/bootstrap/scss/input-group";
+//@import "../../../node_modules/bootstrap/scss/custom-forms";
+//@import "../../../node_modules/bootstrap/scss/nav";
+//@import "../../../node_modules/bootstrap/scss/navbar";
 @import "../../../node_modules/bootstrap/scss/card";
 @import "../../../node_modules/bootstrap/scss/breadcrumb";
-@import "../../../node_modules/bootstrap/scss/pagination";
-@import "../../../node_modules/bootstrap/scss/badge";
-@import "../../../node_modules/bootstrap/scss/jumbotron";
+//@import "../../../node_modules/bootstrap/scss/pagination";
+//@import "../../../node_modules/bootstrap/scss/badge";
+//@import "../../../node_modules/bootstrap/scss/jumbotron";
 @import "../../../node_modules/bootstrap/scss/alert";
-@import "../../../node_modules/bootstrap/scss/progress";
-@import "../../../node_modules/bootstrap/scss/media";
-@import "../../../node_modules/bootstrap/scss/list-group";
-@import "../../../node_modules/bootstrap/scss/close";
-@import "../../../node_modules/bootstrap/scss/modal";
-@import "../../../node_modules/bootstrap/scss/tooltip";
-@import "../../../node_modules/bootstrap/scss/popover";
-@import "../../../node_modules/bootstrap/scss/carousel";
+//@import "../../../node_modules/bootstrap/scss/progress";
+//@import "../../../node_modules/bootstrap/scss/media";
+//@import "../../../node_modules/bootstrap/scss/list-group";
+//@import "../../../node_modules/bootstrap/scss/close";
+//@import "../../../node_modules/bootstrap/scss/modal";
+//@import "../../../node_modules/bootstrap/scss/tooltip";
+//@import "../../../node_modules/bootstrap/scss/popover";
+//@import "../../../node_modules/bootstrap/scss/carousel";
 @import "../../../node_modules/bootstrap/scss/utilities";
 @import "../../../node_modules/bootstrap/scss/print";
diff --git a/themes/metro/scss/theme.scss b/themes/metro/scss/theme.scss
index 72e72269d7..001ca45329 100644
--- a/themes/metro/scss/theme.scss
+++ b/themes/metro/scss/theme.scss
@@ -1,7 +1,7 @@
 @import "font";
 @import "../../pmahomme/scss/direction";
 @import "variables";
-@import "../../pmahomme/scss/bootstrap";
+@import "../../bootstrap/scss/bootstrap";
 @import "common";
 @import "enum-editor";
 @import "gis";
diff --git a/themes/original/scss/theme.scss b/themes/original/scss/theme.scss
index 9ec0012f25..cabf431105 100644
--- a/themes/original/scss/theme.scss
+++ b/themes/original/scss/theme.scss
@@ -1,6 +1,6 @@
 @import "../../pmahomme/scss/direction";
 @import "variables";
-@import "../../pmahomme/scss/bootstrap";
+@import "../../bootstrap/scss/bootstrap";
 @import "common";
 @import "../../pmahomme/scss/enum-editor";
 @import "../../pmahomme/scss/gis";
diff --git a/themes/pmahomme/scss/_bootstrap.scss b/themes/pmahomme/scss/_bootstrap.scss
deleted file mode 100644
index f4ce0e48c5..0000000000
--- a/themes/pmahomme/scss/_bootstrap.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-@import "../../../node_modules/bootstrap/scss/functions";
-@import "../../../node_modules/bootstrap/scss/variables";
-@import "../../../node_modules/bootstrap/scss/mixins";
-@import "../../../node_modules/bootstrap/scss/root";
-@import "../../../node_modules/bootstrap/scss/reboot";
-@import "../../../node_modules/bootstrap/scss/type";
-@import "../../../node_modules/bootstrap/scss/images";
-@import "../../../node_modules/bootstrap/scss/code";
-@import "../../../node_modules/bootstrap/scss/grid";
-@import "../../../node_modules/bootstrap/scss/tables";
-@import "../../../node_modules/bootstrap/scss/forms";
-@import "../../../node_modules/bootstrap/scss/buttons";
-@import "../../../node_modules/bootstrap/scss/transitions";
-@import "../../../node_modules/bootstrap/scss/dropdown";
-@import "../../../node_modules/bootstrap/scss/button-group";
-@import "../../../node_modules/bootstrap/scss/input-group";
-@import "../../../node_modules/bootstrap/scss/custom-forms";
-@import "../../../node_modules/bootstrap/scss/nav";
-@import "../../../node_modules/bootstrap/scss/navbar";
-@import "../../../node_modules/bootstrap/scss/card";
-@import "../../../node_modules/bootstrap/scss/breadcrumb";
-@import "../../../node_modules/bootstrap/scss/pagination";
-@import "../../../node_modules/bootstrap/scss/badge";
-@import "../../../node_modules/bootstrap/scss/jumbotron";
-@import "../../../node_modules/bootstrap/scss/alert";
-@import "../../../node_modules/bootstrap/scss/progress";
-@import "../../../node_modules/bootstrap/scss/media";
-@import "../../../node_modules/bootstrap/scss/list-group";
-@import "../../../node_modules/bootstrap/scss/close";
-@import "../../../node_modules/bootstrap/scss/modal";
-@import "../../../node_modules/bootstrap/scss/tooltip";
-@import "../../../node_modules/bootstrap/scss/popover";
-@import "../../../node_modules/bootstrap/scss/carousel";
-@import "../../../node_modules/bootstrap/scss/utilities";
-@import "../../../node_modules/bootstrap/scss/print";
diff --git a/themes/pmahomme/scss/theme.scss b/themes/pmahomme/scss/theme.scss
index 03d6ede27d..a466bb5ce6 100644
--- a/themes/pmahomme/scss/theme.scss
+++ b/themes/pmahomme/scss/theme.scss
@@ -1,6 +1,6 @@
 @import "direction";
 @import "variables";
-@import "bootstrap";
+@import "../../bootstrap/scss/bootstrap";
 @import "common";
 @import "enum-editor";
 @import "gis";