diff --git a/Rakefile b/Rakefile
index 33ce58f7..f9bb8881 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,7 +11,7 @@ task :test do
   puts "Creating a Bourbon directory..."
   `bourbon install --path test`
   puts "Generating CSS..."
-  `sass --watch test:css/ --style expanded`
+  `sass -I . --watch test:css/ --style expanded`
 end
 
 task :clean do
diff --git a/app/assets/stylesheets/functions/_new-breakpoint.scss b/app/assets/stylesheets/functions/_new-breakpoint.scss
index 83aed7e5..a89c9ce6 100644
--- a/app/assets/stylesheets/functions/_new-breakpoint.scss
+++ b/app/assets/stylesheets/functions/_new-breakpoint.scss
@@ -9,7 +9,7 @@
   }
 
   @if not belongs-to($query, $visual-grid-breakpoints) {
-    $visual-grid-breakpoints: append($visual-grid-breakpoints, $query, comma);
+    $visual-grid-breakpoints: append($visual-grid-breakpoints, $query, comma) !global;
   }
 
   @return $query;
diff --git a/app/assets/stylesheets/functions/_private.scss b/app/assets/stylesheets/functions/_private.scss
index da350593..6f03cfcc 100644
--- a/app/assets/stylesheets/functions/_private.scss
+++ b/app/assets/stylesheets/functions/_private.scss
@@ -45,7 +45,7 @@
 }
 
 @function container-shift($shift: $shift) {
-  $parent-columns: $grid-columns !default;
+  $parent-columns: $grid-columns !global !default;
 
   @if length($shift) == 3 {
     $container-columns: nth($shift, 3);
diff --git a/app/assets/stylesheets/grid/_media.scss b/app/assets/stylesheets/grid/_media.scss
index fdc6c3f6..bf27f70e 100644
--- a/app/assets/stylesheets/grid/_media.scss
+++ b/app/assets/stylesheets/grid/_media.scss
@@ -2,9 +2,9 @@
   @if length($query) == 1 {
     @media screen and ($default-feature: nth($query, 1)) {
       $default-grid-columns: $grid-columns;
-      $grid-columns: $total-columns;
+      $grid-columns: $total-columns !global;
       @content;
-      $grid-columns: $default-grid-columns;
+      $grid-columns: $default-grid-columns !global;
     }
   }
 
@@ -12,10 +12,10 @@
     $loopTo: length($query);
     $mediaQuery: 'screen and ';
     $default-grid-columns: $grid-columns;
-    $grid-columns: $total-columns;
+    $grid-columns: $total-columns !global;
 
     @if length($query) % 2 != 0 {
-      $grid-columns: nth($query, $loopTo);
+      $grid-columns: nth($query, $loopTo) !global;
       $loopTo: $loopTo - 1;
     }
 
@@ -32,7 +32,7 @@
 
     @media #{$mediaQuery} {
       @content;
-      $grid-columns: $default-grid-columns;
+      $grid-columns: $default-grid-columns !global;
     }
   }
 }
diff --git a/app/assets/stylesheets/grid/_private.scss b/app/assets/stylesheets/grid/_private.scss
index 5d818534..b1953368 100644
--- a/app/assets/stylesheets/grid/_private.scss
+++ b/app/assets/stylesheets/grid/_private.scss
@@ -22,9 +22,9 @@ $layout-direction: nil !default;
 
 @function get-parent-columns($columns) {
   @if $columns != $grid-columns {
-    $parent-columns: $columns;
+    $parent-columns: $columns !global;
   } @else {
-    $parent-columns: $grid-columns;
+    $parent-columns: $grid-columns !global;
   }
 
   @return $parent-columns;
diff --git a/app/assets/stylesheets/grid/_reset.scss b/app/assets/stylesheets/grid/_reset.scss
index f670019e..496c4a77 100644
--- a/app/assets/stylesheets/grid/_reset.scss
+++ b/app/assets/stylesheets/grid/_reset.scss
@@ -1,9 +1,9 @@
 @mixin reset-display {
-  $container-display-table: false;
+  $container-display-table: false !global;
 }
 
 @mixin reset-layout-direction {
-  $layout-direction: $default-layout-direction;
+  $layout-direction: $default-layout-direction !global;
 }
 
 @mixin reset-all {
diff --git a/app/assets/stylesheets/grid/_row.scss b/app/assets/stylesheets/grid/_row.scss
index 582603dd..81da6d36 100644
--- a/app/assets/stylesheets/grid/_row.scss
+++ b/app/assets/stylesheets/grid/_row.scss
@@ -1,17 +1,17 @@
 @mixin row($display: block, $direction: $default-layout-direction) {
   @include clearfix;
-  $layout-direction: $direction;
+  $layout-direction: $direction !global;
 
   @if $display == table {
     display: table;
     @include fill-parent;
     table-layout: fixed;
-    $container-display-table: true;
+    $container-display-table: true !global;
   }
 
   @else {
     display: block;
-    $container-display-table: false;
+    $container-display-table: false !global;
   }
 }
 
diff --git a/app/assets/stylesheets/grid/_shift.scss b/app/assets/stylesheets/grid/_shift.scss
index 30c4f535..1d27b9b7 100644
--- a/app/assets/stylesheets/grid/_shift.scss
+++ b/app/assets/stylesheets/grid/_shift.scss
@@ -4,7 +4,7 @@
 
 @mixin shift-in-context($shift: $columns of $container-columns) {
   $n-columns: nth($shift, 1);
-  $parent-columns: container-shift($shift);
+  $parent-columns: container-shift($shift) !global;
 
   $direction: get-direction($layout-direction, $default-layout-direction);
   $opposite-direction: get-opposite-direction($direction);
@@ -12,5 +12,5 @@
   margin-#{$opposite-direction}: $n-columns * flex-grid(1, $parent-columns) + $n-columns * flex-gutter($parent-columns);
 
   // Reset nesting context
-  $parent-columns: $grid-columns;
+  $parent-columns: $grid-columns !global;
 }
diff --git a/app/assets/stylesheets/grid/_span-columns.scss b/app/assets/stylesheets/grid/_span-columns.scss
index e59e4e26..c79193d9 100644
--- a/app/assets/stylesheets/grid/_span-columns.scss
+++ b/app/assets/stylesheets/grid/_span-columns.scss
@@ -3,7 +3,7 @@
   $container-columns: container-span($span);
 
   // Set nesting context (used by shift())
-  $parent-columns: get-parent-columns($container-columns);
+  $parent-columns: get-parent-columns($container-columns) !global;
 
   $direction: get-direction($layout-direction, $default-layout-direction);
   $opposite-direction: get-opposite-direction($direction);
diff --git a/neat.gemspec b/neat.gemspec
index 1302b545..ead56e41 100644
--- a/neat.gemspec
+++ b/neat.gemspec
@@ -23,9 +23,9 @@ Neat is an open source grid framework built on top of Bourbon with the aim of be
   s.require_paths = ['lib']
 
   s.add_dependency('sass', '>= 3.3')
-  s.add_dependency('bourbon', '>= 3.1')
+  s.add_dependency('bourbon', '~> 3.0')
 
-  s.add_development_dependency('aruba', '~> 0.4')
+  s.add_development_dependency('aruba', '~> 0.5.0')
   s.add_development_dependency('rake')
   s.add_development_dependency('css_parser')
   s.add_development_dependency('rspec')
diff --git a/spec/support/sass_support.rb b/spec/support/sass_support.rb
index 96238157..afd0f140 100644
--- a/spec/support/sass_support.rb
+++ b/spec/support/sass_support.rb
@@ -1,7 +1,7 @@
 module SassSupport
   def generate_css
     _mkdir('tmp')
-    `sass --update test:tmp --style expanded`
+    `sass -I . --update test:tmp`
   end
 
   def clean_up