diff --git a/frontend/app/app.js b/frontend/app/app.js
index ea639008..aceec1ad 100644
--- a/frontend/app/app.js
+++ b/frontend/app/app.js
@@ -4,7 +4,7 @@ var FacilPad = {
 
 (function(fp, $, ng, undefined) {
 
-	fp.app = angular.module("facilpad", [ "ui.sortable" ]).config([ "$compileProvider", function($compileProvider) {
+	fp.app = angular.module("facilpad", [ "ui.sortable", "ui.bootstrap" ]).config([ "$compileProvider", function($compileProvider) {
 		$compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|javascript):/);
 	} ]);
 
diff --git a/frontend/bower.json b/frontend/bower.json
index 45764fba..25d91537 100644
--- a/frontend/bower.json
+++ b/frontend/bower.json
@@ -20,6 +20,18 @@
     "marked": "^0.3.6",
     "angular-ui-sortable": "^0.14.3",
     "FileSaver": "https://raw.githubusercontent.com/eligrey/FileSaver.js/master/FileSaver.js",
-    "blob": "*"
+    "blob": "*",
+    "angular-bootstrap": "^2.1.4",
+    "bootstrap": "^3.3.7"
+  },
+  "overrides": {
+    "bootstrap": {
+      "main": [
+        "dist/css/bootstrap.css",
+        "dist/css/bootstrap-theme.css",
+        "dist/js/bootstrap.js",
+        "dist/fonts/glyphicons-halflings-regular.ttf"
+      ]
+    }
   }
 }
diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js
index 7673381f..29d13ce2 100644
--- a/frontend/gulpfile.js
+++ b/frontend/gulpfile.js
@@ -44,14 +44,19 @@ gulp.task("deps", function() {
 		gulpIf([ "**/*.js", "**/*.css" ], combine(
 			gulpIf("**/*.js", combine(
 				newer("build/dependencies.js"),
-				sourcemaps.init(),
+				sourcemaps.init({ loadMaps: true }),
 				concat("dependencies.js"),
 				uglify(),
 				sourcemaps.write("./sourcemaps")
 			)),
 			gulpIf("**/*.css", combine(
 				newer("build/dependencies.css"),
-				sourcemaps.init(),
+				gulpIf("**/bower_components/bootstrap/**", combine(
+					replace("src: url('../fonts/glyphicons-halflings-regular.eot');", ""),
+					replace(/src: url\('\.\.\/fonts\/glyphicons-halflings-regular\..*/g, "src: url('../fonts/glyphicons-halflings-regular.ttf') format('truetype');")
+				)),
+				cssBase64({ maxWeightResource: 1000000 }),
+				sourcemaps.init({ loadMaps: true }),
 				concat("dependencies.css"),
 				cleanCss(),
 				sourcemaps.write("./sourcemaps")