diff --git a/Gemfile b/Gemfile
index 57c6830..41a7553 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,16 +3,16 @@ source 'https://rubygems.org'
 group :development do
 
   # Sass, Compass and extensions.
-  gem 'sass'                    # Sass.
-  gem 'sass-globbing'           # Import Sass files based on globbing pattern.
-  gem 'compass'                 # Framework built on Sass.
+  gem 'sass', '~>3.3'           # Sass.
+  gem 'sass-globbing', '~>1.1.0'# Import Sass files based on globbing pattern.
+  gem 'compass', '~>1.0.0.rc.0' # Framework built on Sass.
   gem 'compass-validator'       # So you can `compass validate`.
   gem 'compass-normalize'       # Compass version of normalize.css.
   gem 'compass-rgbapng'         # Turns rgba() into .png's for backwards compatibility.
-  gem 'susy'                    # Susy grid framework.
-  gem 'singularitygs'           # Alternative to the Susy grid framework.
-  gem 'toolkit'                 # Compass utility from the fabulous Snugug.
-  gem 'breakpoint'              # Manages CSS media queries.
+  gem 'susy', '~>2.1.2'         # Susy grid framework.
+  gem 'singularitygs', '~>1.2.1'# Alternative to the Susy grid framework.
+  gem 'toolkit', '~>2.5.2'      # Compass utility from the fabulous Snugug.
+  gem 'breakpoint', '~>2.4.2'   # Manages CSS media queries.
   gem 'oily_png'                # Faster Compass sprite generation.
   gem 'css_parser'              # Helps `compass stats` output statistics.
 
diff --git a/Gemfile.lock b/Gemfile.lock
index dc2ca45..5a29fe6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,21 +2,25 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.6)
-    breakpoint (2.0.7)
-      compass (>= 0.12.1)
-      sass (>= 3.2.0)
+    breakpoint (2.4.6)
+      sass (~> 3.3.0)
+      sassy-maps (< 1.0.0)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     chunky_png (1.3.1)
     coderay (1.1.0)
-    color-schemer (0.2.8)
-      compass-blend-modes (~> 0.0.2)
-    compass (0.12.6)
+    compass (1.0.0.rc.0)
       chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.2.19)
-    compass-blend-modes (0.0.2)
-      compass
+      compass-core (~> 1.0.0.rc.0)
+      compass-import-once (~> 1.0.4)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.0.rc.0)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.4)
+      sass (>= 3.2, < 3.5)
     compass-normalize (1.5)
       compass (>= 0.12.0)
     compass-rgbapng (0.2.1)
@@ -31,7 +35,6 @@ GEM
     eventmachine (1.0.3)
     ffi (1.9.3)
     formatador (0.2.5)
-    fssm (0.2.10)
     guard (2.6.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
@@ -66,35 +69,29 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    sass (3.2.19)
+    sass (3.3.13)
     sass-globbing (1.1.1)
       sass (>= 3.1)
-    sassy-strings (1.0.0)
-      compass (>= 0.12.2)
-    singularitygs (1.1.2)
-      breakpoint (>= 2.0.1)
-      compass (>= 0.12.2)
-      sass (>= 3.2.1)
-    slop (3.5.0)
-    susy (1.0.9)
-      compass (>= 0.12.2)
-      sass (>= 3.2.0)
+    sassy-maps (0.4.0)
+      sass (~> 3.3)
+    singularitygs (1.2.3)
+      breakpoint (~> 2.4)
+      sass (~> 3.3.0)
+    slop (3.6.0)
+    susy (2.1.3)
+      sass (>= 3.3.0, < 3.5)
     thor (0.19.1)
     timers (1.1.0)
-    toolkit (1.3.8)
-      breakpoint (>= 2.0.6)
-      color-schemer (>= 0.2.7)
-      compass (>= 0.12.2)
-      sassy-strings (>= 1.0.0)
-      singularitygs (>= 1.1.2)
+    toolkit (2.5.2)
+      sass (~> 3.3.0)
     yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  breakpoint
-  compass
+  breakpoint (~> 2.4.2)
+  compass (~> 1.0.0.rc.0)
   compass-normalize
   compass-rgbapng
   compass-validator
@@ -107,9 +104,9 @@ DEPENDENCIES
   rb-fchange
   rb-fsevent
   rb-inotify (~> 0.9)
-  sass
-  sass-globbing
-  singularitygs
-  susy
-  toolkit
+  sass (~> 3.3)
+  sass-globbing (~> 1.1.0)
+  singularitygs (~> 1.2.1)
+  susy (~> 2.1.2)
+  toolkit (~> 2.5.2)
   yajl-ruby
diff --git a/config.rb b/config.rb
index 17e7286..3fcbe24 100644
--- a/config.rb
+++ b/config.rb
@@ -24,6 +24,8 @@ javascripts_dir = "js"
 # Require any additional compass plugins installed on your system.
 require 'compass-normalize'
 require 'rgbapng'
+require 'breakpoint'
+require 'singularitygs'
 require 'toolkit'
 require 'susy'
 require 'sass-globbing'
@@ -45,7 +47,5 @@ relative_assets = true
 line_comments = false
 
 # Output debugging info in development mode.
-sass_options = {:debug_info => false, :line_comments => false}
+sass_options = {:debug_info => false, :line_comments => false, :sourcemap => true}
 
-# Add the 'sass' directory itself as an import path to ease imports.
-add_import_path 'sass'
diff --git a/sass/{{ THEME SANITIZED }}.normalize.scss b/sass/{{ THEME SANITIZED }}.normalize.scss
index a7dbbd6..3d6b6dd 100644
--- a/sass/{{ THEME SANITIZED }}.normalize.scss
+++ b/sass/{{ THEME SANITIZED }}.normalize.scss
@@ -5,4 +5,4 @@
 @import "normalize";
 
 // Use 'border-box' for the box model.
-@import "toolkit/border-box";
+@import "toolkit/kickstart";
diff --git a/sass/{{ THEME SANITIZED }}.styles.scss b/sass/{{ THEME SANITIZED }}.styles.scss
index ccbe160..7fafbfa 100644
--- a/sass/{{ THEME SANITIZED }}.styles.scss
+++ b/sass/{{ THEME SANITIZED }}.styles.scss
@@ -2,7 +2,7 @@
 @import "compass";
 @import "breakpoint";
 @import "singularitygs";
-@import "toolkit-no-css";
+@import "toolkit";
 
 // Import variables, abstractions, base styles and components using globbing.
 //