diff --git a/Gemfile b/Gemfile
index 187c525b32..aaefa0a822 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,6 +21,7 @@ if ENV['DEPENDENCIES_NEXT']
   gem 'responders'
   gem 'sass', '<= 4.7.1'
   gem 'sass-rails', '< 6.0.0'
+  gem 'libv8', '< 8'
 else
   gem 'rails', '~> 4.2'
 
@@ -34,6 +35,10 @@ else
 
   gem 'db2fog'
   gem 'unicorn'
+
+  group :test do
+    gem 'test_after_commit' # needed to test Devise callbacks
+  end
 end
 
 gem 'i18n'
@@ -160,7 +165,6 @@ end
 group :test do
   gem 'simplecov', require: false
   gem 'test-prof'
-  gem 'test_after_commit' # needed to test Devise callbacks
   gem 'webmock'
   # See spec/spec_helper.rb for instructions
   # gem 'perftools.rb'
diff --git a/Gemfile_next.lock b/Gemfile_next.lock
index 437a99d5e7..70dbeba73b 100644
--- a/Gemfile_next.lock
+++ b/Gemfile_next.lock
@@ -270,7 +270,7 @@ GEM
       addressable (~> 2.3)
     letter_opener (1.7.0)
       launchy (~> 2.2)
-    libv8 (8.4.255.0)
+    libv8 (7.3.492.27.1)
     loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -502,8 +502,6 @@ GEM
     test-prof (0.7.5)
     test-unit (3.3.7)
       power_assert
-    test_after_commit (1.1.0)
-      activerecord (>= 3.2)
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.10)
@@ -608,6 +606,7 @@ DEPENDENCIES
   kaminari (~> 1.2.1)
   knapsack
   letter_opener (>= 1.4.1)
+  libv8 (< 8)
   mini_racer (= 0.2.15)
   monetize (~> 1.1)
   oauth2 (~> 1.4.4)
@@ -649,7 +648,6 @@ DEPENDENCIES
   stripe
   test-prof
   test-unit (~> 3.3)
-  test_after_commit
   timecop
   uglifier (>= 1.0.3)
   unicorn-rails
diff --git a/app/assets/stylesheets/darkswarm/sidebar.scss b/app/assets/stylesheets/darkswarm/sidebar.scss
index 18718062da..2e6a7d0a2e 100644
--- a/app/assets/stylesheets/darkswarm/sidebar.scss
+++ b/app/assets/stylesheets/darkswarm/sidebar.scss
@@ -3,9 +3,9 @@
 // See https://github.com/zurb/foundation/issues/3855#issuecomment-30372252
 
 @import "variables";
-@import "components/global";
-@import "components/buttons";
-@import "components/panels";
+@import "foundation/components/global";
+@import "foundation/components/buttons";
+@import "foundation/components/panels";
 
 #sidebar {
   margin-top: 1.875em;
diff --git a/config/initializers/compass.rb b/config/initializers/compass.rb
new file mode 100644
index 0000000000..ea537f0390
--- /dev/null
+++ b/config/initializers/compass.rb
@@ -0,0 +1,2 @@
+require 'compass'
+Sass.load_paths << Compass::Frameworks['compass'].stylesheets_directory
diff --git a/lib/spree/i18n.rb b/lib/spree/i18n.rb
index 7780bc3ad7..39bd4590cd 100644
--- a/lib/spree/i18n.rb
+++ b/lib/spree/i18n.rb
@@ -6,6 +6,7 @@ require 'spree/i18n/base'
 
 module Spree
   extend ActionView::Helpers::TranslationHelper
+  extend ActionView::Helpers::TagHelper if ENV['DEPENDENCIES_NEXT']
 
   class << self
     # Add spree namespace and delegate to Rails TranslationHelper for some nice