diff --git a/Gemfile b/Gemfile
index 6cc516b..a6061c1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,8 +11,9 @@ gem 'json'
 # To use OAuth login
 gem "oauth-plugin", "~> 0.4.0"
 
-gem 'anjlab-bootstrap-rails', :require => 'bootstrap-rails',
-                              :git => 'git@github.com:anjlab/bootstrap-rails'
+gem 'twitter-bootstrap-rails'
+gem 'less-rails'
+
 # use Devise for login
 gem 'devise'
 gem 'omniauth'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6c54fac..6bec297 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
-  remote: git@github.com:anjlab/bootstrap-rails
-  revision: 178781059753555cc0d00aef56d8766049b81f93
-  specs:
-    anjlab-bootstrap-rails (2.2.2.0)
-      railties (>= 3.0)
-      sass (>= 3.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -52,6 +44,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
+    commonjs (0.2.6)
     daemons (1.1.9)
     devise (2.1.2)
       bcrypt-ruby (~> 3.0)
@@ -81,6 +74,11 @@ GEM
     json (1.7.5)
     jwt (0.1.5)
       multi_json (>= 1.0)
+    less (2.2.2)
+      commonjs (~> 0.2.6)
+    less-rails (2.2.6)
+      actionpack (>= 3.1)
+      less (~> 2.2.0)
     libv8 (3.11.8.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -172,6 +170,10 @@ GEM
     turbo-sprockets-rails3 (0.2.13)
       railties (>= 3.1.0, < 3.2.9)
       sprockets (>= 2.0.0)
+    twitter-bootstrap-rails (2.1.9)
+      actionpack (>= 3.1)
+      execjs
+      railties (>= 3.1)
     tzinfo (0.3.35)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
@@ -183,13 +185,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  anjlab-bootstrap-rails!
   capistrano
   coffee-rails (~> 3.2.1)
   devise
   factory_girl_rails
   jquery-rails
   json
+  less-rails
   libv8
   mysql2
   oauth-plugin (~> 0.4.0)
@@ -203,4 +205,5 @@ DEPENDENCIES
   therubyracer
   thin
   turbo-sprockets-rails3
+  twitter-bootstrap-rails
   uglifier (>= 1.0.3)
diff --git a/app/assets/javascripts/bootstrap.js.coffee b/app/assets/javascripts/bootstrap.js.coffee
new file mode 100644
index 0000000..c9404a8
--- /dev/null
+++ b/app/assets/javascripts/bootstrap.js.coffee
@@ -0,0 +1,4 @@
+jQuery ->
+  $("a[rel=popover]").popover()
+  $(".tooltip").tooltip()
+  $("a[rel=tooltip]").tooltip()
\ No newline at end of file
diff --git a/app/assets/stylesheets/app_bootstrap.css.scss b/app/assets/stylesheets/app_bootstrap.css.scss
deleted file mode 100644
index 762c7e7..0000000
--- a/app/assets/stylesheets/app_bootstrap.css.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-$iconSpritePath: image-path("twitter/glyphicons-halflings");
-$iconWhiteSpritePath: image-path("twitter/glyphicons-halflings-white");
-
-@import 'twitter/bootstrap';
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index be4ebae..e000d2c 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -12,9 +12,6 @@
  *= require_tree .
  */
 
-/*
- *= require app_bootstrap
- */
 body {
-  padding-top :60px;
+  padding-top: 60px;
 }
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
new file mode 100644
index 0000000..8faff3d
--- /dev/null
+++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -0,0 +1,31 @@
+@import "twitter/bootstrap/bootstrap";
+
+// Set the correct sprite paths
+@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
+@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
+
+// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
+// Note: If you use asset_path() here, your compiled bootstrap_and_overrides.css will not
+//       have the proper paths. So for now we use the absolute path.
+@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot");
+@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot#iefix");
+@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff");
+@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf");
+@fontAwesomeSvgPath: asset-path("fontawesome-webfont.svg");
+
+// Font Awesome
+@import "fontawesome";
+
+// Glyphicons
+//@import "twitter/bootstrap/sprites.less";
+
+// Your custom LESS stylesheets goes here
+//
+// Since bootstrap was imported above you have access to its mixins which
+// you may use and inherit here
+//
+// If you'd like to override bootstrap's own variables, you can do so here as well
+// See http://twitter.github.com/bootstrap/customize.html#variables for their names and documentation
+//
+// Example:
+// @linkColor: #ff0000;