diff --git a/Gemfile b/Gemfile
index cfa34dd..1f6879d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,18 +2,13 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'json'
-gem 'refinerycms', github: 'refinery/refinerycms', branch: 'master'
-gem 'refinerycms-i18n', github: 'refinery/refinerycms-i18n', branch: 'master'
-
-gem 'friendly_id-globalize', github: 'norman/friendly_id-globalize', branch: 'master'
-gem 'globalize'
-gem 'paper_trail', github: 'airblade/paper_trail', branch: 'master'
-gem 'awesome_nested_set', github: 'collectiveidea/awesome_nested_set', branch: 'master'
+gem 'refinerycms', github: 'refinery/refinerycms'
+gem 'refinerycms-i18n', github: 'refinery/refinerycms-i18n'
+gem 'refinerycms-acts-as-indexed', github: 'refinery/refinerycms-acts-as-indexed'
 gem "mime-types", "~> 1.25"
 
 group :test do
-  gem 'refinerycms-testing', github: 'refinery/refinerycms', branch: 'master'
+  gem 'refinerycms-testing', github: 'refinery/refinerycms'
   gem 'poltergeist'
   gem 'pry'
   gem 'pry-nav'
diff --git a/app/models/refinery/setting.rb b/app/models/refinery/setting.rb
index 57f19e4..7bdacff 100644
--- a/app/models/refinery/setting.rb
+++ b/app/models/refinery/setting.rb
@@ -1,3 +1,5 @@
+require 'friendly_id'
+
 module Refinery
   class Setting < Refinery::Core::BaseModel
     extend FriendlyId
@@ -76,7 +78,7 @@ def set(name, value)
         setting.value
       end
     end
-    
+
     def title
       self[:title].presence || auto_title
     end
@@ -132,7 +134,7 @@ def replacements!(current_value)
 
       current_value
     end
-    
+
     # prettier version of the name.
     # site_name becomes Site Name
     def auto_title
diff --git a/lib/refinery/settings.rb b/lib/refinery/settings.rb
index c81fcb7..fd9d423 100644
--- a/lib/refinery/settings.rb
+++ b/lib/refinery/settings.rb
@@ -1,4 +1,3 @@
-require 'json'
 require 'refinerycms-core'
 
 module Refinery
diff --git a/refinerycms-settings.gemspec b/refinerycms-settings.gemspec
index f13f7b0..84131ee 100644
--- a/refinerycms-settings.gemspec
+++ b/refinerycms-settings.gemspec
@@ -17,4 +17,5 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   s.add_dependency    'refinerycms-core',     '~> 3.0.0.dev'
+  s.add_dependency    'friendly_id',          '~> 5.0.1'
 end