diff --git a/.brackets.json b/.brackets.json
index 51310bd..3a33a00 100644
--- a/.brackets.json
+++ b/.brackets.json
@@ -1,7 +1,7 @@
 {
   "sass.enabled": false,
   "path": {
-    "assets/scss/main.scss": {
+    "assets/scss/*": {
       "sass.enabled": true,
       "sass.options": {
         "outputDir": "../css/",
@@ -9,6 +9,24 @@
         "sourceComments": true,
         "outputStyle": "nested"
       }
+    },
+    "assets/scss/templates/*": {
+      "sass.enabled": true,
+      "sass.options": {
+        "outputDir": "../../css/templates",
+        "includePaths": [],
+        "sourceComments": true,
+        "outputStyle": "nested"
+      }
+    },
+    "assets/vendors/bootstrap/scss/*": {
+      "sass.enabled": true,
+      "sass.options": {
+        "outputDir": "../../../css/twbs/",
+        "includePaths": [],
+        "sourceComments": true,
+        "outputStyle": "nested"
+      }
     }
   }
 }
diff --git a/.gitmodules b/.gitmodules
index d65dc61..28387cd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,3 +31,7 @@
 [submodule "modules/kirby-kirbytag-html5video"]
 	path = modules/kirby-kirbytag-html5video
 	url = https://github.com/jbeyerstedt/kirby-kirbytag-html5video.git
+[submodule "assets/vendors/bootstrap"]
+	path = assets/vendors/bootstrap
+	url = https://github.com/twbs/bootstrap.git
+	branch = v4-dev
diff --git a/assets/vendors/bootstrap b/assets/vendors/bootstrap
new file mode 160000
index 0000000..064fda0
--- /dev/null
+++ b/assets/vendors/bootstrap
@@ -0,0 +1 @@
+Subproject commit 064fda0e802679e56e88db2910fdf5369dde6e4c
diff --git a/site/snippets/base/html-head.php b/site/snippets/base/html-head.php
index 1084ce5..212e16e 100644
--- a/site/snippets/base/html-head.php
+++ b/site/snippets/base/html-head.php
@@ -24,9 +24,9 @@
 <?php endif; ?>
 
   <?php echo css('assets/vendors/font-awesome/css/font-awesome.min.css') ?>
-  <?php echo css('assets/vendors/font-awesome/css/font-awesome.min.css') ?>
 
   <?php echo css('assets/css/main.css') ?>
+  
   <?php echo css('@auto') ?>
 
   <!-- Google web fonts -->