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