diff --git a/Gemfile b/Gemfile
index 67307ba5fd..35133f5fb7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,8 +36,8 @@ gem 'jquery-rails'
 
 gem 'devise', '>= 2.0'
 gem 'whenever'
-gem 'web-app-theme', :git => 'https://github.com/pilu/web-app-theme.git'
 gem 'rails-backbone'
+gem 'rails-boilerplate'
 gem 'heroku'
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 48892f56ff..c8500bd329 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/pilu/web-app-theme.git
-  revision: b7310fe5001ed03b965049f293fce3527ae98dae
-  specs:
-    web-app-theme (0.8.0)
-      rails (~> 3.2.0)
-      thor (~> 0.14)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -102,6 +94,7 @@ GEM
       coffee-script (~> 2.2.0)
       ejs (~> 1.0.0)
       railties (>= 3.1.0)
+    rails-boilerplate (0.1.6)
     railties (3.2.1)
       actionpack (= 3.2.1)
       activesupport (= 3.2.1)
@@ -156,8 +149,8 @@ DEPENDENCIES
   pg
   rails (= 3.2.1)
   rails-backbone
+  rails-boilerplate
   sass-rails (~> 3.2.3)
   thin
   uglifier (>= 1.0.3)
-  web-app-theme!
   whenever