diff --git a/Gemfile b/Gemfile
index 49815c09..82d599a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,12 +8,17 @@ gem 'rails', '3.1.0.rc4'
 gem 'sqlite3'
 
 # Asset template engines
-gem 'sass-rails', "~> 3.1.0.rc"
+gem 'sass'
+gem 'sass-rails', '3.1.0.rc.4'
+gem 'compass', :git => "git://github.com/chriseppstein/compass.git", :branch => "rails31"
 gem 'coffee-script'
 gem 'uglifier'
 
 gem 'jquery-rails'
 
+gem 'haml'
+gem 'haml-rails'
+
 # Use unicorn as the web server
 # gem 'unicorn'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 3b17e860..7b073dd1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,13 @@
+GIT
+  remote: git://github.com/chriseppstein/compass.git
+  revision: 2124003550bf96e828f6e63351d44a61b647cbf1
+  branch: rails31
+  specs:
+    compass (0.11.3.rails.0.2124003)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -35,6 +45,7 @@ GEM
     arel (2.1.3)
     bcrypt-ruby (2.1.4)
     builder (3.0.0)
+    chunky_png (1.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
@@ -42,6 +53,13 @@ GEM
     erubis (2.7.0)
     execjs (1.2.0)
       multi_json (~> 1.0)
+    fssm (0.2.7)
+    haml (3.1.2)
+    haml-rails (0.3.4)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      haml (~> 3.0)
+      railties (~> 3.0)
     hike (1.1.0)
     i18n (0.6.0)
     jquery-rails (1.0.12)
@@ -107,9 +125,13 @@ PLATFORMS
 
 DEPENDENCIES
   coffee-script
+  compass!
+  haml
+  haml-rails
   jquery-rails
   rails (= 3.1.0.rc4)
-  sass-rails (~> 3.1.0.rc)
+  sass
+  sass-rails (= 3.1.0.rc.4)
   sqlite3
   turn
   uglifier