diff --git a/Gemfile b/Gemfile
index 9288805..05d8885 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.0'
+gem 'rails', '3.1.1.rc1'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
@@ -19,7 +19,7 @@ gem 'cancan', '~> 1.6.5'
 # gem "meta_where", "~> 1.0" # squeel ?
 gem 'sentient_user', '~> 0.3.2'
 gem 'active_scaffold', '~> 3.1.0', :git => 'https://github.com/activescaffold/active_scaffold.git'
-gem 'web-app-theme', :git => 'git://github.com/tscolari/web-app-theme.git' #, :branch => 'v3.1.0'
+gem 'web-app-theme'
 gem 'pjax_rails', '~> 0.1.10'
 gem 'validates_hostname', '~> 1.0.0', :git => 'https://github.com/KimNorgaard/validates_hostname.git'
 gem 'nilify_blanks', '~> 1.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1aeddbb..62681bb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,3 @@
-GIT
-  remote: git://github.com/tscolari/web-app-theme.git
-  revision: 813439b996f0cdd517456ef21271139eae5e892e
-  specs:
-    web-app-theme (0.8.0)
-      thor (~> 0.14)
-
 GIT
   remote: https://github.com/KimNorgaard/validates_hostname.git
   revision: 6421e9bd8261a2fe010c627191a0dbe30352469f
@@ -13,7 +6,7 @@ GIT
 
 GIT
   remote: https://github.com/activescaffold/active_scaffold.git
-  revision: 09b1d2fa9cd2fdc7a576e213e07869b569977afe
+  revision: 60bb1ffeb99e7d3b6b99ffb117a48a527afe2c51
   specs:
     active_scaffold (3.1.2)
       rails (~> 3.1.0)
@@ -21,12 +14,12 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
+    actionmailer (3.1.1.rc1)
+      actionpack (= 3.1.1.rc1)
       mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    actionpack (3.1.1.rc1)
+      activemodel (= 3.1.1.rc1)
+      activesupport (= 3.1.1.rc1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
@@ -35,20 +28,19 @@ GEM
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+    activemodel (3.1.1.rc1)
+      activesupport (= 3.1.1.rc1)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    activerecord (3.1.1.rc1)
+      activemodel (= 3.1.1.rc1)
+      activesupport (= 3.1.1.rc1)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
+    activeresource (3.1.1.rc1)
+      activemodel (= 3.1.1.rc1)
+      activesupport (= 3.1.1.rc1)
+    activesupport (3.1.1.rc1)
       multi_json (~> 1.0)
     arel (2.2.1)
     bcrypt-ruby (3.0.1)
@@ -135,19 +127,19 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
+    rails (3.1.1.rc1)
+      actionmailer (= 3.1.1.rc1)
+      actionpack (= 3.1.1.rc1)
+      activerecord (= 3.1.1.rc1)
+      activeresource (= 3.1.1.rc1)
+      activesupport (= 3.1.1.rc1)
       bundler (~> 1.0)
-      railties (= 3.1.0)
+      railties (= 3.1.1.rc1)
     rails_config (0.2.4)
       activesupport (>= 3.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
+    railties (3.1.1.rc1)
+      actionpack (= 3.1.1.rc1)
+      activesupport (= 3.1.1.rc1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -200,6 +192,9 @@ GEM
       multi_json (>= 1.0.2)
     warden (1.0.5)
       rack (>= 1.0)
+    web-app-theme (0.8.0)
+      rails (~> 3.1.0.rc6)
+      thor (~> 0.14)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -219,7 +214,7 @@ DEPENDENCIES
   mysql2
   nilify_blanks (~> 1.0.0)
   pjax_rails (~> 0.1.10)
-  rails (= 3.1.0)
+  rails (= 3.1.1.rc1)
   rails_config (~> 0.2.4)
   rspec-rails (~> 2.6.1)
   sass-rails (~> 3.1.0)
@@ -229,4 +224,4 @@ DEPENDENCIES
   therubyracer
   uglifier
   validates_hostname (~> 1.0.0)!
-  web-app-theme!
+  web-app-theme