diff --git a/Gemfile b/Gemfile
index 87ea2d0..61fffd8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gemspec
 gem "rails", " ~> 4.2.3"
 group :assets do
   gem 'sass-rails' #, ' ~> 5.0.0'
-  gem 'bourbon'
+  gem 'bourbon', '~> 4.3.1'
   gem 'coffee-script'
   #gem 'therubyracer', :platforms => :ruby
   #gem 'less-rails'
diff --git a/app/controllers/cmtool/application_controller.rb b/app/controllers/cmtool/application_controller.rb
index f8f8863..d7b61e7 100644
--- a/app/controllers/cmtool/application_controller.rb
+++ b/app/controllers/cmtool/application_controller.rb
@@ -1,7 +1,7 @@
 module Cmtool
   class ApplicationController < ::ApplicationController
     include Cmtool::ControllerGlue
-    before_filter :authorize_user, :check_environment, :set_locale
+    before_action :authorize_user, :check_environment, :set_locale
     layout 'cmtool/application'
 
     private
diff --git a/app/controllers/cmtool/contact_forms_controller.rb b/app/controllers/cmtool/contact_forms_controller.rb
index 4648098..a492aaf 100644
--- a/app/controllers/cmtool/contact_forms_controller.rb
+++ b/app/controllers/cmtool/contact_forms_controller.rb
@@ -1,6 +1,6 @@
 module Cmtool
   class Cmtool::ContactFormsController < Cmtool::ApplicationController
-    skip_before_filter :authenticate_user!, :authorize_user, only: :add
+    skip_before_action :authenticate_user!, :authorize_user, only: :add
 
     # GET /contact_forms
     # GET /contact_forms.xml
diff --git a/app/controllers/cmtool/newsletter_subscriptions_controller.rb b/app/controllers/cmtool/newsletter_subscriptions_controller.rb
index 60cb25b..64a8999 100644
--- a/app/controllers/cmtool/newsletter_subscriptions_controller.rb
+++ b/app/controllers/cmtool/newsletter_subscriptions_controller.rb
@@ -1,6 +1,6 @@
 module Cmtool
   class Cmtool::NewsletterSubscriptionsController < Cmtool::ApplicationController
-    skip_before_filter :authenticate_user!, :authorize_user, only: :add
+    skip_before_action :authenticate_user!, :authorize_user, only: :add
 
     # GET /newsletter_subscriptions
     # GET /newsletter_subscriptions.xml