diff --git a/.gitignore b/.gitignore
index 1adb2e3..47ab7af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ app/components
 .DS_Store
 .idea
 /BUILDLOG.md
-/app/styles/css/main.css
\ No newline at end of file
+/app/styles/css/main.css
+/.jshint
\ No newline at end of file
diff --git a/app/index.html b/app/index.html
index 124edda..d0ee233 100644
--- a/app/index.html
+++ b/app/index.html
@@ -41,28 +41,14 @@
         <script src="components/angular-cookies/angular-cookies.js"></script>
         <script src="components/angular-sanitize/angular-sanitize.js"></script>
         <script src="components/angular-socket-io/socket.js"></script>
+        <script src="components/angular-bootstrap/ui-bootstrap.min.js"></script>
+        <script src="components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
 
         <script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
         <script>window.jQuery || document.write('<script src="components/jquery/jquery.min.js"><\/script>')</script>
         <script src="components/underscore/underscore-min.js"></script>
         <script src="components/socket.io-client/dist/socket.io.min.js"></script>
 
-        <!-- build:js scripts/vendor/bootstrap-min.js -->
-        <script src="components/bootstrap/js/bootstrap-transition.js"></script>
-        <script src="components/bootstrap/js/bootstrap-alert.js"></script>
-        <script src="components/bootstrap/js/bootstrap-modal.js"></script>
-        <script src="components/bootstrap/js/bootstrap-dropdown.js"></script>
-        <script src="components/bootstrap/js/bootstrap-scrollspy.js"></script>
-        <script src="components/bootstrap/js/bootstrap-tab.js"></script>
-        <script src="components/bootstrap/js/bootstrap-tooltip.js"></script>
-        <script src="components/bootstrap/js/bootstrap-popover.js"></script>
-        <script src="components/bootstrap/js/bootstrap-button.js"></script>
-        <script src="components/bootstrap/js/bootstrap-collapse.js"></script>
-        <script src="components/bootstrap/js/bootstrap-carousel.js"></script>
-        <script src="components/bootstrap/js/bootstrap-typeahead.js"></script>
-        <script src="components/bootstrap/js/bootstrap-affix.js"></script>
-        <!-- endbuild -->
-
         <!-- build:js scripts/scripts.js -->
         <script src="scripts/app.js"></script>
         <script src="scripts/controllers/main.js"></script>
diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js
index b6be203..5d50b91 100644
--- a/app/scripts/controllers/main.js
+++ b/app/scripts/controllers/main.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('yoAngularExpressTestApp')
+angular.module('yoAngularExpressTestApp', ['ui.bootstrap'])
     .controller('MainCtrl', function ($scope) {
 
         $scope.awesomeThings = [
@@ -8,7 +8,7 @@ angular.module('yoAngularExpressTestApp')
             'AngularJS',
             'Karma',
             'jQuery',
-            'Bootstrap',
+            'UI-Bootstrap',
             'Font-Awesome',
             'Modernizr',
             'Underscore'
diff --git a/component.json b/component.json
index c833c0e..097444f 100644
--- a/component.json
+++ b/component.json
@@ -15,7 +15,8 @@
     "font-awesome-more": "latest",
     "modernizr": "~2.6.2",
     "angular-socket-io": "~0.0.1",
-    "socket.io-client": "~0.9.11"
+    "socket.io-client": "~0.9.11",
+    "angular-bootstrap": "~0.3.0"
   },
   "devDependencies": {
     "angular-mocks": "~1.0.5",