diff --git a/app/assets/sass/application.scss b/app/assets/sass/application.scss
index f44df01..15a73fd 100644
--- a/app/assets/sass/application.scss
+++ b/app/assets/sass/application.scss
@@ -1,23 +1,51 @@
 
-// ---------------------------
-//  Bootstrap & Fonts
-// ---------------------------
-
-@import "bootstrap-custom";
+// Fonts
 @import url('https://fonts.googleapis.com/css?family=Lato:400,400i,700,700i');
 @import url('https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700,700i');
 
+@import "bootstrap/scss/functions";
+
+// ---------------------------
+//  Bootstrap config
+// ---------------------------
+
+@import "bootstrap-config";
+
+// ---------------------------
+//  Bootstrap
+// ---------------------------
+
+@import "bootstrap/scss/variables";
+@import "bootstrap/scss/maps";
+@import "bootstrap/scss/mixins";
+@import "bootstrap/scss/root";
+
+// Optional
+@import "bootstrap/scss/reboot";
+@import "bootstrap/scss/utilities";
+@import "bootstrap/scss/close";
+@import "bootstrap/scss/alert";
+@import "bootstrap/scss/type";
+@import "bootstrap/scss/tables";
+@import "bootstrap/scss/forms";
+@import "bootstrap/scss/containers";
+@import "bootstrap/scss/grid";
+@import "bootstrap/scss/nav";
+@import "bootstrap/scss/dropdown";
+
+@import "bootstrap/scss/utilities/api";
+
 // ---------------------------
 //  Site
 // ---------------------------
 
-// variables & mixins.
 @import "variables";
 @import "mixins";
 
 // Base
 @import "base/global";
 @import "base/typography";
+@import "base/utils";
 
 // Layout
 @import "layout/sections";