diff --git a/Gemfile b/Gemfile
index 1372c1cc..04fa25f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,22 +4,20 @@ ruby "1.9.3"
 
 gem "rails", '~> 3.2.9'
 
-gem 'jquery-rails'
-gem 'bootstrap-datepicker-rails'
-
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  gem 'therubyracer', platforms: :ruby
-
   gem 'sass-rails',   '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
-  gem 'less-rails-bootstrap'
-
+  gem 'less-rails'
   gem 'uglifier', '>= 1.0.3'
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  gem 'therubyracer', platforms: :ruby
 end
 
+gem 'jquery-rails'
+gem 'bootstrap-datepicker-rails'
+
 gem 'mysql2'
 gem 'prawn'
 gem 'haml-rails'
@@ -42,7 +40,7 @@ gem 'resque'
 gem 'whenever', require: false # For defining cronjobs, see config/schedule.rb
 
 group :production do
-  gem 'exception_notification', require: 'exception_notifier'
+  gem 'exception_notification'
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index a9f7a177..8095b8e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -123,8 +123,6 @@ GEM
     less-rails (2.3.3)
       actionpack (>= 3.1)
       less (~> 2.3.1)
-    less-rails-bootstrap (2.3.3)
-      less-rails (~> 2.3.1)
     libv8 (3.11.8.17)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -290,7 +288,7 @@ DEPENDENCIES
   inherited_resources
   jquery-rails
   kaminari
-  less-rails-bootstrap
+  less-rails
   localize_input!
   mailcatcher
   meta_search
diff --git a/config/initializers/load_app_config.rb b/config/initializers/load_app_config.rb
index 1509536e..9501a48a 100644
--- a/config/initializers/load_app_config.rb
+++ b/config/initializers/load_app_config.rb
@@ -14,13 +14,15 @@ url_options.merge!({:port => FoodsoftConfig[:port]}) if FoodsoftConfig[:port]
 Foodsoft::Application.configure do
   config.action_mailer.default_url_options = url_options
   
-  if Rails.env !~ /development|test/
+  if %w(production).include? Rails.env 
     # Configuration of the exception_notification plugin
     # Mailadresses are set in config/app_config.yml
-    config.middleware.use ExceptionNotifier,
-                          :email_prefix => FoodsoftConfig[:notification]['email_prefix'],
-                          :sender_address => FoodsoftConfig[:notification]['sender_address'],
-                          :exception_recipients => FoodsoftConfig[:notification]['error_recipients']
+    config.middleware.use ExceptionNotification::Rack,
+                          :email => {
+                            :email_prefix => FoodsoftConfig[:notification]['email_prefix'],
+                            :sender_address => FoodsoftConfig[:notification]['sender_address'],
+                            :exception_recipients => FoodsoftConfig[:notification]['error_recipients']
+                          }
   end
 end