diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c571ca8..e23b2c3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,10 +10,9 @@ jobs:
   test:
     strategy:
       matrix:
-        database: [ mysql, postgresql ]
-        ruby: [ 2.7, 2.6 ]
+        database: [ sqlite3, mysql, postgresql ]
+        ruby: [ 4.0, 3.4, 3.3, 3.2, 3.1 ]
       fail-fast: false
-      max-parallel: 20
     runs-on: ubuntu-latest
 
     env:
@@ -29,7 +28,7 @@ jobs:
     name: ${{ matrix.ruby }} ${{ matrix.database }}
     steps:
       - run: sudo apt-get update && sudo apt-get install libsqlite3-dev -y
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
diff --git a/.gitignore b/.gitignore
index 4988a35..b9efa5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,83 @@ spec/dummy
 
 # Local Gemfile for developing without sharing dependencies
 .gemfile
+# Rails
+.bundle
+db/*.sqlite3
+db/*.sqlite3-journal
+*.log
+tmp
+tmp/**/*
+
+# Documentation
+doc/api
+doc/app
+.yardoc
+.yardopts
+coverage
+
+# Public Uploads
+public/system/*
+public/themes/*
+
+# Public Cache
+public/javascripts/cache
+public/stylesheets/cache
+public/refinery/*
+
+# Vendor Cache
+vendor/cache
+
+# Acts as Indexed
+index/**/*
+
+# Refinery Specific
+*.tmproj
+*.autobackupbyrefinery.*
+refinerycms-*.gem
+
+# Mac
+.DS_Store
+
+# Windows
+Thumbs.db
+
+# NetBeans
+nbproject
+
+# Eclipse
+.project
+
+# Redcar
+.redcar
+
+# Rubinius
+*.rbc
+
+# Vim
+*.swp
+*.swo
+
+# RubyMine
+.idea
+
+# E-texteditor
+.eprj
+
+# Backup
+*~
+
+# Capybara Bug
+capybara-*html
+
+# sass
+.sass-cache
+.sass-cache/*
+
+#rvm
+.rvmrc
+.rvmrc.*
+
+# vendor/extensions dummy applications.
+vendor/extensions/**/spec/dummy
+
diff --git a/Gemfile b/Gemfile
index f16ce01..f4569d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,7 @@
 source "https://rubygems.org"
-
 gemspec
-
-git "https://github.com/refinery/refinerycms", branch: "master" do
+#
+git "https://github.com/anitagraham/refinerycms", branch: "ruby3" do
   gem "refinerycms"
 
   group :test do
@@ -18,22 +17,22 @@ gem 'routing-filter', git: 'https://github.com/svenfuchs/routing-filter', branch
 
 # Database Configuration
 unless ENV["TRAVIS"]
-  gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-  gem "sqlite3", :platform => :ruby
+  gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
+  gem "sqlite3", platform: :ruby
 end
 
 if !ENV["TRAVIS"] || ENV["DB"] == "mysql"
-  gem "activerecord-jdbcmysql-adapter", :platform => :jruby
-  gem "jdbc-mysql", "= 5.1.13", :platform => :jruby
-  gem 'mysql2', '~> 0.5.3', :platform => :ruby
+  gem "activerecord-jdbcmysql-adapter", platform: :jruby
+  gem "jdbc-mysql", "= 5.1.13", platform: :jruby
+  gem 'mysql2', '~> 0.5.3', platform: :ruby
 end
 
 if !ENV["TRAVIS"] || ENV["DB"] == "postgresql"
-  gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
-  gem "pg", :platform => :ruby
+  gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
+  gem "pg", platform: :ruby
 end
 
-gem "jruby-openssl", :platform => :jruby
+gem "jruby-openssl", platform: :jruby
 
 # Refinery/rails should pull in the proper versions of these
 group :assets do
diff --git a/README.md b/README.md
index a95cc47..eaa0b09 100644
--- a/README.md
+++ b/README.md
@@ -10,15 +10,37 @@ rails g refinery:i18n
 
 ```ruby
 Refinery::I18n.configure do |config|
-   config.default_locale = :en
+  config.default_locale = :en
 
   # config.current_locale = :en
 
   # config.default_frontend_locale = :en
 
-   config.frontend_locales = [:en,:ar]
+  config.frontend_locales = [:en, :ar]
 
-   config.locales = {:en=>"English", :ar=>"Arabic"}
-   #, :nl=>"Nederlands", :pt=>"Português", :"pt-BR"=>"Português brasileiro", :da=>"Dansk", :nb=>"Norsk Bokmål", :sl=>"Slovenian", :es=>"Español", :it=>"Italiano", :de=>"Deutsch", :lv=>"Latviski", :ru=>"Русский", :sv=>"Svenska", :pl=>"Polski", :"zh-CN"=>"简体中文", :"zh-TW"=>"繁體中文", :el=>"Ελληνικά", :rs=>"Srpski", :cs=>"Česky", :sk=>"Slovenský", :ja=>"日本語", :bg=>"Български", :hu=>"Hungarian", :uk=>"Українська"}
+  config.locales = { en: "English", ar: "Arabic" }
+  # { nl: "Nederlands",
+  #   pt: "Português",
+  #   "pt-BR": "Português brasileiro",
+  #   da: "Dansk",
+  #   nb: "Norsk Bokmål",
+  #   sl: "Slovenian",
+  #   es: "Español",
+  #   it: "Italiano",
+  #   de: "Deutsch",
+  #   lv: "Latviski",
+  #   ru: "Русский",
+  #   sv: "Svenska",
+  #   pl: "Polski",
+  #   "zh-CN": "简体中文",
+  #   "zh-TW": "繁體中文",
+  #   el: "Ελληνικά",
+  #   rs: "Srpski",
+  #   cs: "Česky",
+  #   sk: "Slovenský",
+  #   ja: "日本語",
+  #   bg: "Български",
+  #   hu: "Hungarian",
+  #   uk: "Українська" }
 end
 ```
diff --git a/Rakefile b/Rakefile
index 30b03df..9032493 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,9 +8,7 @@ end
 ENGINE_PATH = File.dirname(__FILE__)
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 
-if File.exists?(APP_RAKEFILE)
-  load 'rails/tasks/engine.rake'
-end
+load 'rails/tasks/engine.rake' if File.exist?(APP_RAKEFILE)
 
 require "refinerycms-testing"
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
diff --git a/app/assets/images/refinery/icons/flags/ad.png b/app/assets/images/refinery/icons/flags/ad.png
deleted file mode 100644
index 625ca84..0000000
Binary files a/app/assets/images/refinery/icons/flags/ad.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ae.png b/app/assets/images/refinery/icons/flags/ae.png
deleted file mode 100644
index ef3a1ec..0000000
Binary files a/app/assets/images/refinery/icons/flags/ae.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/af.png b/app/assets/images/refinery/icons/flags/af.png
deleted file mode 100644
index a4742e2..0000000
Binary files a/app/assets/images/refinery/icons/flags/af.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ag.png b/app/assets/images/refinery/icons/flags/ag.png
deleted file mode 100644
index 556d550..0000000
Binary files a/app/assets/images/refinery/icons/flags/ag.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ai.png b/app/assets/images/refinery/icons/flags/ai.png
deleted file mode 100644
index 74ed29d..0000000
Binary files a/app/assets/images/refinery/icons/flags/ai.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/al.png b/app/assets/images/refinery/icons/flags/al.png
deleted file mode 100644
index 92354cb..0000000
Binary files a/app/assets/images/refinery/icons/flags/al.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/am.png b/app/assets/images/refinery/icons/flags/am.png
deleted file mode 100644
index 344a2a8..0000000
Binary files a/app/assets/images/refinery/icons/flags/am.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/an.png b/app/assets/images/refinery/icons/flags/an.png
deleted file mode 100644
index 633e4b8..0000000
Binary files a/app/assets/images/refinery/icons/flags/an.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ao.png b/app/assets/images/refinery/icons/flags/ao.png
deleted file mode 100644
index bcbd1d6..0000000
Binary files a/app/assets/images/refinery/icons/flags/ao.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ar.png b/app/assets/images/refinery/icons/flags/ar.png
deleted file mode 100644
index e5ef8f1..0000000
Binary files a/app/assets/images/refinery/icons/flags/ar.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/as.png b/app/assets/images/refinery/icons/flags/as.png
deleted file mode 100644
index 32f30e4..0000000
Binary files a/app/assets/images/refinery/icons/flags/as.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/at.png b/app/assets/images/refinery/icons/flags/at.png
deleted file mode 100644
index 0f15f34..0000000
Binary files a/app/assets/images/refinery/icons/flags/at.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/au.png b/app/assets/images/refinery/icons/flags/au.png
deleted file mode 100644
index a01389a..0000000
Binary files a/app/assets/images/refinery/icons/flags/au.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/aw.png b/app/assets/images/refinery/icons/flags/aw.png
deleted file mode 100644
index a3579c2..0000000
Binary files a/app/assets/images/refinery/icons/flags/aw.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ax.png b/app/assets/images/refinery/icons/flags/ax.png
deleted file mode 100644
index 1eea80a..0000000
Binary files a/app/assets/images/refinery/icons/flags/ax.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/az.png b/app/assets/images/refinery/icons/flags/az.png
deleted file mode 100644
index 4ee9fe5..0000000
Binary files a/app/assets/images/refinery/icons/flags/az.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ba.png b/app/assets/images/refinery/icons/flags/ba.png
deleted file mode 100644
index c774992..0000000
Binary files a/app/assets/images/refinery/icons/flags/ba.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bb.png b/app/assets/images/refinery/icons/flags/bb.png
deleted file mode 100644
index 0df19c7..0000000
Binary files a/app/assets/images/refinery/icons/flags/bb.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bd.png b/app/assets/images/refinery/icons/flags/bd.png
deleted file mode 100644
index 076a8bf..0000000
Binary files a/app/assets/images/refinery/icons/flags/bd.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/be.png b/app/assets/images/refinery/icons/flags/be.png
deleted file mode 100644
index d86ebc8..0000000
Binary files a/app/assets/images/refinery/icons/flags/be.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bf.png b/app/assets/images/refinery/icons/flags/bf.png
deleted file mode 100644
index ab5ce8f..0000000
Binary files a/app/assets/images/refinery/icons/flags/bf.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bg.png b/app/assets/images/refinery/icons/flags/bg.png
deleted file mode 100644
index 0469f06..0000000
Binary files a/app/assets/images/refinery/icons/flags/bg.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bh.png b/app/assets/images/refinery/icons/flags/bh.png
deleted file mode 100644
index ea8ce68..0000000
Binary files a/app/assets/images/refinery/icons/flags/bh.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bi.png b/app/assets/images/refinery/icons/flags/bi.png
deleted file mode 100644
index 5cc2e30..0000000
Binary files a/app/assets/images/refinery/icons/flags/bi.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bj.png b/app/assets/images/refinery/icons/flags/bj.png
deleted file mode 100644
index 1cc8b45..0000000
Binary files a/app/assets/images/refinery/icons/flags/bj.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bm.png b/app/assets/images/refinery/icons/flags/bm.png
deleted file mode 100644
index c0c7aea..0000000
Binary files a/app/assets/images/refinery/icons/flags/bm.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bn.png b/app/assets/images/refinery/icons/flags/bn.png
deleted file mode 100644
index 8fb0984..0000000
Binary files a/app/assets/images/refinery/icons/flags/bn.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bo.png b/app/assets/images/refinery/icons/flags/bo.png
deleted file mode 100644
index ce7ba52..0000000
Binary files a/app/assets/images/refinery/icons/flags/bo.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bs.png b/app/assets/images/refinery/icons/flags/bs.png
deleted file mode 100644
index 639fa6c..0000000
Binary files a/app/assets/images/refinery/icons/flags/bs.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bt.png b/app/assets/images/refinery/icons/flags/bt.png
deleted file mode 100644
index 1d512df..0000000
Binary files a/app/assets/images/refinery/icons/flags/bt.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bv.png b/app/assets/images/refinery/icons/flags/bv.png
deleted file mode 100644
index 160b6b5..0000000
Binary files a/app/assets/images/refinery/icons/flags/bv.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bw.png b/app/assets/images/refinery/icons/flags/bw.png
deleted file mode 100644
index fcb1039..0000000
Binary files a/app/assets/images/refinery/icons/flags/bw.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/by.png b/app/assets/images/refinery/icons/flags/by.png
deleted file mode 100644
index 504774e..0000000
Binary files a/app/assets/images/refinery/icons/flags/by.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/bz.png b/app/assets/images/refinery/icons/flags/bz.png
deleted file mode 100644
index be63ee1..0000000
Binary files a/app/assets/images/refinery/icons/flags/bz.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ca.png b/app/assets/images/refinery/icons/flags/ca.png
deleted file mode 100644
index 5041e30..0000000
Binary files a/app/assets/images/refinery/icons/flags/ca.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/cc.png b/app/assets/images/refinery/icons/flags/cc.png
deleted file mode 100644
index aed3d3b..0000000
Binary files a/app/assets/images/refinery/icons/flags/cc.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/cd.png b/app/assets/images/refinery/icons/flags/cd.png
deleted file mode 100644
index 5e48942..0000000
Binary files a/app/assets/images/refinery/icons/flags/cd.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/cf.png b/app/assets/images/refinery/icons/flags/cf.png
deleted file mode 100644
index da687bd..0000000
Binary files a/app/assets/images/refinery/icons/flags/cf.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/cg.png b/app/assets/images/refinery/icons/flags/cg.png
deleted file mode 100644
index a859792..0000000
Binary files a/app/assets/images/refinery/icons/flags/cg.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ch.png b/app/assets/images/refinery/icons/flags/ch.png
deleted file mode 100644
index 242ec01..0000000
Binary files a/app/assets/images/refinery/icons/flags/ch.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ci.png b/app/assets/images/refinery/icons/flags/ci.png
deleted file mode 100644
index 3f2c62e..0000000
Binary files a/app/assets/images/refinery/icons/flags/ci.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ck.png b/app/assets/images/refinery/icons/flags/ck.png
deleted file mode 100644
index 746d3d6..0000000
Binary files a/app/assets/images/refinery/icons/flags/ck.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/cl.png b/app/assets/images/refinery/icons/flags/cl.png
deleted file mode 100644
index 29c6d61..0000000
Binary files a/app/assets/images/refinery/icons/flags/cl.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/cm.png b/app/assets/images/refinery/icons/flags/cm.png
deleted file mode 100644
index f65c5bd..0000000
Binary files a/app/assets/images/refinery/icons/flags/cm.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/cn.png b/app/assets/images/refinery/icons/flags/cn.png
deleted file mode 100644
index 8914414..0000000
Binary files a/app/assets/images/refinery/icons/flags/cn.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/co.png b/app/assets/images/refinery/icons/flags/co.png
deleted file mode 100644
index a118ff4..0000000
Binary files a/app/assets/images/refinery/icons/flags/co.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/cr.png b/app/assets/images/refinery/icons/flags/cr.png
deleted file mode 100644
index c7a3731..0000000
Binary files a/app/assets/images/refinery/icons/flags/cr.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/cs.png b/app/assets/images/refinery/icons/flags/cs.png
deleted file mode 100644
index c8403dd..0000000
Binary files a/app/assets/images/refinery/icons/flags/cs.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/cu.png b/app/assets/images/refinery/icons/flags/cu.png
deleted file mode 100644
index 083f1d6..0000000
Binary files a/app/assets/images/refinery/icons/flags/cu.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/cv.png b/app/assets/images/refinery/icons/flags/cv.png
deleted file mode 100644
index a63f7ea..0000000
Binary files a/app/assets/images/refinery/icons/flags/cv.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/cx.png b/app/assets/images/refinery/icons/flags/cx.png
deleted file mode 100644
index 48e31ad..0000000
Binary files a/app/assets/images/refinery/icons/flags/cx.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/cy.png b/app/assets/images/refinery/icons/flags/cy.png
deleted file mode 100644
index 5b1ad6c..0000000
Binary files a/app/assets/images/refinery/icons/flags/cy.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/da.png b/app/assets/images/refinery/icons/flags/da.png
deleted file mode 100644
index e2993d3..0000000
Binary files a/app/assets/images/refinery/icons/flags/da.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/de.png b/app/assets/images/refinery/icons/flags/de.png
deleted file mode 100644
index ac4a977..0000000
Binary files a/app/assets/images/refinery/icons/flags/de.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/dj.png b/app/assets/images/refinery/icons/flags/dj.png
deleted file mode 100644
index 582af36..0000000
Binary files a/app/assets/images/refinery/icons/flags/dj.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/dm.png b/app/assets/images/refinery/icons/flags/dm.png
deleted file mode 100644
index 5fbffcb..0000000
Binary files a/app/assets/images/refinery/icons/flags/dm.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/do.png b/app/assets/images/refinery/icons/flags/do.png
deleted file mode 100644
index 5a04932..0000000
Binary files a/app/assets/images/refinery/icons/flags/do.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/dz.png b/app/assets/images/refinery/icons/flags/dz.png
deleted file mode 100644
index 335c239..0000000
Binary files a/app/assets/images/refinery/icons/flags/dz.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ec.png b/app/assets/images/refinery/icons/flags/ec.png
deleted file mode 100644
index 0caa0b1..0000000
Binary files a/app/assets/images/refinery/icons/flags/ec.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/eg.png b/app/assets/images/refinery/icons/flags/eg.png
deleted file mode 100644
index 8a3f7a1..0000000
Binary files a/app/assets/images/refinery/icons/flags/eg.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/eh.png b/app/assets/images/refinery/icons/flags/eh.png
deleted file mode 100644
index 90a1195..0000000
Binary files a/app/assets/images/refinery/icons/flags/eh.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/el.png b/app/assets/images/refinery/icons/flags/el.png
deleted file mode 100644
index 8651ade..0000000
Binary files a/app/assets/images/refinery/icons/flags/el.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/en.png b/app/assets/images/refinery/icons/flags/en.png
deleted file mode 100644
index ff701e1..0000000
Binary files a/app/assets/images/refinery/icons/flags/en.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/england.png b/app/assets/images/refinery/icons/flags/england.png
deleted file mode 100644
index 3a7311d..0000000
Binary files a/app/assets/images/refinery/icons/flags/england.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/er.png b/app/assets/images/refinery/icons/flags/er.png
deleted file mode 100644
index 13065ae..0000000
Binary files a/app/assets/images/refinery/icons/flags/er.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/es.png b/app/assets/images/refinery/icons/flags/es.png
deleted file mode 100644
index c2de2d7..0000000
Binary files a/app/assets/images/refinery/icons/flags/es.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/et.png b/app/assets/images/refinery/icons/flags/et.png
deleted file mode 100644
index 0c82efb..0000000
Binary files a/app/assets/images/refinery/icons/flags/et.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/europeanunion.png b/app/assets/images/refinery/icons/flags/europeanunion.png
deleted file mode 100644
index d6d8711..0000000
Binary files a/app/assets/images/refinery/icons/flags/europeanunion.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/fam.png b/app/assets/images/refinery/icons/flags/fam.png
deleted file mode 100644
index cf50c75..0000000
Binary files a/app/assets/images/refinery/icons/flags/fam.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/fi.png b/app/assets/images/refinery/icons/flags/fi.png
deleted file mode 100644
index 14ec091..0000000
Binary files a/app/assets/images/refinery/icons/flags/fi.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/fj.png b/app/assets/images/refinery/icons/flags/fj.png
deleted file mode 100644
index cee9988..0000000
Binary files a/app/assets/images/refinery/icons/flags/fj.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/fk.png b/app/assets/images/refinery/icons/flags/fk.png
deleted file mode 100644
index ceaeb27..0000000
Binary files a/app/assets/images/refinery/icons/flags/fk.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/fm.png b/app/assets/images/refinery/icons/flags/fm.png
deleted file mode 100644
index 066bb24..0000000
Binary files a/app/assets/images/refinery/icons/flags/fm.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/fo.png b/app/assets/images/refinery/icons/flags/fo.png
deleted file mode 100644
index cbceb80..0000000
Binary files a/app/assets/images/refinery/icons/flags/fo.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/fr.png b/app/assets/images/refinery/icons/flags/fr.png
deleted file mode 100644
index 8332c4e..0000000
Binary files a/app/assets/images/refinery/icons/flags/fr.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ga.png b/app/assets/images/refinery/icons/flags/ga.png
deleted file mode 100644
index 0e0d434..0000000
Binary files a/app/assets/images/refinery/icons/flags/ga.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gd.png b/app/assets/images/refinery/icons/flags/gd.png
deleted file mode 100644
index 9ab57f5..0000000
Binary files a/app/assets/images/refinery/icons/flags/gd.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ge.png b/app/assets/images/refinery/icons/flags/ge.png
deleted file mode 100644
index 728d970..0000000
Binary files a/app/assets/images/refinery/icons/flags/ge.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gf.png b/app/assets/images/refinery/icons/flags/gf.png
deleted file mode 100644
index 8332c4e..0000000
Binary files a/app/assets/images/refinery/icons/flags/gf.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gh.png b/app/assets/images/refinery/icons/flags/gh.png
deleted file mode 100644
index 4e2f896..0000000
Binary files a/app/assets/images/refinery/icons/flags/gh.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gi.png b/app/assets/images/refinery/icons/flags/gi.png
deleted file mode 100644
index e76797f..0000000
Binary files a/app/assets/images/refinery/icons/flags/gi.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gl.png b/app/assets/images/refinery/icons/flags/gl.png
deleted file mode 100644
index ef12a73..0000000
Binary files a/app/assets/images/refinery/icons/flags/gl.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gm.png b/app/assets/images/refinery/icons/flags/gm.png
deleted file mode 100644
index 0720b66..0000000
Binary files a/app/assets/images/refinery/icons/flags/gm.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gn.png b/app/assets/images/refinery/icons/flags/gn.png
deleted file mode 100644
index ea660b0..0000000
Binary files a/app/assets/images/refinery/icons/flags/gn.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gp.png b/app/assets/images/refinery/icons/flags/gp.png
deleted file mode 100644
index dbb086d..0000000
Binary files a/app/assets/images/refinery/icons/flags/gp.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gq.png b/app/assets/images/refinery/icons/flags/gq.png
deleted file mode 100644
index ebe20a2..0000000
Binary files a/app/assets/images/refinery/icons/flags/gq.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gr.png b/app/assets/images/refinery/icons/flags/gr.png
deleted file mode 100644
index 8651ade..0000000
Binary files a/app/assets/images/refinery/icons/flags/gr.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gs.png b/app/assets/images/refinery/icons/flags/gs.png
deleted file mode 100644
index 7ef0bf5..0000000
Binary files a/app/assets/images/refinery/icons/flags/gs.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gt.png b/app/assets/images/refinery/icons/flags/gt.png
deleted file mode 100644
index c43a70d..0000000
Binary files a/app/assets/images/refinery/icons/flags/gt.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gu.png b/app/assets/images/refinery/icons/flags/gu.png
deleted file mode 100644
index 92f37c0..0000000
Binary files a/app/assets/images/refinery/icons/flags/gu.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gw.png b/app/assets/images/refinery/icons/flags/gw.png
deleted file mode 100644
index b37bcf0..0000000
Binary files a/app/assets/images/refinery/icons/flags/gw.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/gy.png b/app/assets/images/refinery/icons/flags/gy.png
deleted file mode 100644
index 22cbe2f..0000000
Binary files a/app/assets/images/refinery/icons/flags/gy.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/hk.png b/app/assets/images/refinery/icons/flags/hk.png
deleted file mode 100644
index d5c380c..0000000
Binary files a/app/assets/images/refinery/icons/flags/hk.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/hm.png b/app/assets/images/refinery/icons/flags/hm.png
deleted file mode 100644
index a01389a..0000000
Binary files a/app/assets/images/refinery/icons/flags/hm.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/hn.png b/app/assets/images/refinery/icons/flags/hn.png
deleted file mode 100644
index 96f8388..0000000
Binary files a/app/assets/images/refinery/icons/flags/hn.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/hr.png b/app/assets/images/refinery/icons/flags/hr.png
deleted file mode 100644
index 696b515..0000000
Binary files a/app/assets/images/refinery/icons/flags/hr.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ht.png b/app/assets/images/refinery/icons/flags/ht.png
deleted file mode 100644
index 416052a..0000000
Binary files a/app/assets/images/refinery/icons/flags/ht.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/hu.png b/app/assets/images/refinery/icons/flags/hu.png
deleted file mode 100644
index 7baafe4..0000000
Binary files a/app/assets/images/refinery/icons/flags/hu.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/id.png b/app/assets/images/refinery/icons/flags/id.png
deleted file mode 100644
index c6bc0fa..0000000
Binary files a/app/assets/images/refinery/icons/flags/id.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ie.png b/app/assets/images/refinery/icons/flags/ie.png
deleted file mode 100644
index 26baa31..0000000
Binary files a/app/assets/images/refinery/icons/flags/ie.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/il.png b/app/assets/images/refinery/icons/flags/il.png
deleted file mode 100644
index 2ca772d..0000000
Binary files a/app/assets/images/refinery/icons/flags/il.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/in.png b/app/assets/images/refinery/icons/flags/in.png
deleted file mode 100644
index e4d7e81..0000000
Binary files a/app/assets/images/refinery/icons/flags/in.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/io.png b/app/assets/images/refinery/icons/flags/io.png
deleted file mode 100644
index 3e74b6a..0000000
Binary files a/app/assets/images/refinery/icons/flags/io.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/iq.png b/app/assets/images/refinery/icons/flags/iq.png
deleted file mode 100644
index 878a351..0000000
Binary files a/app/assets/images/refinery/icons/flags/iq.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ir.png b/app/assets/images/refinery/icons/flags/ir.png
deleted file mode 100644
index c5fd136..0000000
Binary files a/app/assets/images/refinery/icons/flags/ir.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/is.png b/app/assets/images/refinery/icons/flags/is.png
deleted file mode 100644
index b8f6d0f..0000000
Binary files a/app/assets/images/refinery/icons/flags/is.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/it.png b/app/assets/images/refinery/icons/flags/it.png
deleted file mode 100644
index 89692f7..0000000
Binary files a/app/assets/images/refinery/icons/flags/it.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ja.png b/app/assets/images/refinery/icons/flags/ja.png
deleted file mode 100644
index 325fbad..0000000
Binary files a/app/assets/images/refinery/icons/flags/ja.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/jm.png b/app/assets/images/refinery/icons/flags/jm.png
deleted file mode 100644
index 7be119e..0000000
Binary files a/app/assets/images/refinery/icons/flags/jm.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/jo.png b/app/assets/images/refinery/icons/flags/jo.png
deleted file mode 100644
index 11bd497..0000000
Binary files a/app/assets/images/refinery/icons/flags/jo.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ke.png b/app/assets/images/refinery/icons/flags/ke.png
deleted file mode 100644
index 51879ad..0000000
Binary files a/app/assets/images/refinery/icons/flags/ke.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/kg.png b/app/assets/images/refinery/icons/flags/kg.png
deleted file mode 100644
index 0a818f6..0000000
Binary files a/app/assets/images/refinery/icons/flags/kg.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/kh.png b/app/assets/images/refinery/icons/flags/kh.png
deleted file mode 100644
index 30f6bb1..0000000
Binary files a/app/assets/images/refinery/icons/flags/kh.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ki.png b/app/assets/images/refinery/icons/flags/ki.png
deleted file mode 100644
index 2dcce4b..0000000
Binary files a/app/assets/images/refinery/icons/flags/ki.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/km.png b/app/assets/images/refinery/icons/flags/km.png
deleted file mode 100644
index 812b2f5..0000000
Binary files a/app/assets/images/refinery/icons/flags/km.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/kn.png b/app/assets/images/refinery/icons/flags/kn.png
deleted file mode 100644
index febd5b4..0000000
Binary files a/app/assets/images/refinery/icons/flags/kn.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ko.png b/app/assets/images/refinery/icons/flags/ko.png
deleted file mode 100644
index 9c0a78e..0000000
Binary files a/app/assets/images/refinery/icons/flags/ko.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/kp.png b/app/assets/images/refinery/icons/flags/kp.png
deleted file mode 100644
index d3d509a..0000000
Binary files a/app/assets/images/refinery/icons/flags/kp.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/kr.png b/app/assets/images/refinery/icons/flags/kr.png
deleted file mode 100644
index 9c0a78e..0000000
Binary files a/app/assets/images/refinery/icons/flags/kr.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/kw.png b/app/assets/images/refinery/icons/flags/kw.png
deleted file mode 100644
index 96546da..0000000
Binary files a/app/assets/images/refinery/icons/flags/kw.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ky.png b/app/assets/images/refinery/icons/flags/ky.png
deleted file mode 100644
index 15c5f8e..0000000
Binary files a/app/assets/images/refinery/icons/flags/ky.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/kz.png b/app/assets/images/refinery/icons/flags/kz.png
deleted file mode 100644
index 45a8c88..0000000
Binary files a/app/assets/images/refinery/icons/flags/kz.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/la.png b/app/assets/images/refinery/icons/flags/la.png
deleted file mode 100644
index e28acd0..0000000
Binary files a/app/assets/images/refinery/icons/flags/la.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/lb.png b/app/assets/images/refinery/icons/flags/lb.png
deleted file mode 100644
index d0d452b..0000000
Binary files a/app/assets/images/refinery/icons/flags/lb.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/lc.png b/app/assets/images/refinery/icons/flags/lc.png
deleted file mode 100644
index a47d065..0000000
Binary files a/app/assets/images/refinery/icons/flags/lc.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/li.png b/app/assets/images/refinery/icons/flags/li.png
deleted file mode 100644
index 6469909..0000000
Binary files a/app/assets/images/refinery/icons/flags/li.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/lk.png b/app/assets/images/refinery/icons/flags/lk.png
deleted file mode 100644
index 088aad6..0000000
Binary files a/app/assets/images/refinery/icons/flags/lk.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/lr.png b/app/assets/images/refinery/icons/flags/lr.png
deleted file mode 100644
index 89a5bc7..0000000
Binary files a/app/assets/images/refinery/icons/flags/lr.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ls.png b/app/assets/images/refinery/icons/flags/ls.png
deleted file mode 100644
index 33fdef1..0000000
Binary files a/app/assets/images/refinery/icons/flags/ls.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/lt.png b/app/assets/images/refinery/icons/flags/lt.png
deleted file mode 100644
index c8ef0da..0000000
Binary files a/app/assets/images/refinery/icons/flags/lt.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/lu.png b/app/assets/images/refinery/icons/flags/lu.png
deleted file mode 100644
index 4cabba9..0000000
Binary files a/app/assets/images/refinery/icons/flags/lu.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/lv.png b/app/assets/images/refinery/icons/flags/lv.png
deleted file mode 100644
index 49b6998..0000000
Binary files a/app/assets/images/refinery/icons/flags/lv.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ly.png b/app/assets/images/refinery/icons/flags/ly.png
deleted file mode 100644
index b163a9f..0000000
Binary files a/app/assets/images/refinery/icons/flags/ly.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ma.png b/app/assets/images/refinery/icons/flags/ma.png
deleted file mode 100644
index f386770..0000000
Binary files a/app/assets/images/refinery/icons/flags/ma.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mc.png b/app/assets/images/refinery/icons/flags/mc.png
deleted file mode 100644
index 1aa830f..0000000
Binary files a/app/assets/images/refinery/icons/flags/mc.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/md.png b/app/assets/images/refinery/icons/flags/md.png
deleted file mode 100644
index 4e92c18..0000000
Binary files a/app/assets/images/refinery/icons/flags/md.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/me.png b/app/assets/images/refinery/icons/flags/me.png
deleted file mode 100644
index ac72535..0000000
Binary files a/app/assets/images/refinery/icons/flags/me.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mg.png b/app/assets/images/refinery/icons/flags/mg.png
deleted file mode 100644
index d2715b3..0000000
Binary files a/app/assets/images/refinery/icons/flags/mg.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mh.png b/app/assets/images/refinery/icons/flags/mh.png
deleted file mode 100644
index fb523a8..0000000
Binary files a/app/assets/images/refinery/icons/flags/mh.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mk.png b/app/assets/images/refinery/icons/flags/mk.png
deleted file mode 100644
index db173aa..0000000
Binary files a/app/assets/images/refinery/icons/flags/mk.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ml.png b/app/assets/images/refinery/icons/flags/ml.png
deleted file mode 100644
index 2cec8ba..0000000
Binary files a/app/assets/images/refinery/icons/flags/ml.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mm.png b/app/assets/images/refinery/icons/flags/mm.png
deleted file mode 100644
index f464f67..0000000
Binary files a/app/assets/images/refinery/icons/flags/mm.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mn.png b/app/assets/images/refinery/icons/flags/mn.png
deleted file mode 100644
index 9396355..0000000
Binary files a/app/assets/images/refinery/icons/flags/mn.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mo.png b/app/assets/images/refinery/icons/flags/mo.png
deleted file mode 100644
index deb801d..0000000
Binary files a/app/assets/images/refinery/icons/flags/mo.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mp.png b/app/assets/images/refinery/icons/flags/mp.png
deleted file mode 100644
index 298d588..0000000
Binary files a/app/assets/images/refinery/icons/flags/mp.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mq.png b/app/assets/images/refinery/icons/flags/mq.png
deleted file mode 100644
index 010143b..0000000
Binary files a/app/assets/images/refinery/icons/flags/mq.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mr.png b/app/assets/images/refinery/icons/flags/mr.png
deleted file mode 100644
index 319546b..0000000
Binary files a/app/assets/images/refinery/icons/flags/mr.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ms.png b/app/assets/images/refinery/icons/flags/ms.png
deleted file mode 100644
index d4cbb43..0000000
Binary files a/app/assets/images/refinery/icons/flags/ms.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mt.png b/app/assets/images/refinery/icons/flags/mt.png
deleted file mode 100644
index 00af948..0000000
Binary files a/app/assets/images/refinery/icons/flags/mt.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mu.png b/app/assets/images/refinery/icons/flags/mu.png
deleted file mode 100644
index b7fdce1..0000000
Binary files a/app/assets/images/refinery/icons/flags/mu.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mv.png b/app/assets/images/refinery/icons/flags/mv.png
deleted file mode 100644
index 5073d9e..0000000
Binary files a/app/assets/images/refinery/icons/flags/mv.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mw.png b/app/assets/images/refinery/icons/flags/mw.png
deleted file mode 100644
index 13886e9..0000000
Binary files a/app/assets/images/refinery/icons/flags/mw.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mx.png b/app/assets/images/refinery/icons/flags/mx.png
deleted file mode 100644
index 5bc58ab..0000000
Binary files a/app/assets/images/refinery/icons/flags/mx.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/my.png b/app/assets/images/refinery/icons/flags/my.png
deleted file mode 100644
index 9034cba..0000000
Binary files a/app/assets/images/refinery/icons/flags/my.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/mz.png b/app/assets/images/refinery/icons/flags/mz.png
deleted file mode 100644
index 76405e0..0000000
Binary files a/app/assets/images/refinery/icons/flags/mz.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/na.png b/app/assets/images/refinery/icons/flags/na.png
deleted file mode 100644
index 63358c6..0000000
Binary files a/app/assets/images/refinery/icons/flags/na.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/nb.png b/app/assets/images/refinery/icons/flags/nb.png
deleted file mode 100644
index 160b6b5..0000000
Binary files a/app/assets/images/refinery/icons/flags/nb.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/nc.png b/app/assets/images/refinery/icons/flags/nc.png
deleted file mode 100644
index 2cad283..0000000
Binary files a/app/assets/images/refinery/icons/flags/nc.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ne.png b/app/assets/images/refinery/icons/flags/ne.png
deleted file mode 100644
index d85f424..0000000
Binary files a/app/assets/images/refinery/icons/flags/ne.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/nf.png b/app/assets/images/refinery/icons/flags/nf.png
deleted file mode 100644
index f9bcdda..0000000
Binary files a/app/assets/images/refinery/icons/flags/nf.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ng.png b/app/assets/images/refinery/icons/flags/ng.png
deleted file mode 100644
index 3eea2e0..0000000
Binary files a/app/assets/images/refinery/icons/flags/ng.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ni.png b/app/assets/images/refinery/icons/flags/ni.png
deleted file mode 100644
index 3969aaa..0000000
Binary files a/app/assets/images/refinery/icons/flags/ni.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/nl.png b/app/assets/images/refinery/icons/flags/nl.png
deleted file mode 100644
index fe44791..0000000
Binary files a/app/assets/images/refinery/icons/flags/nl.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/nn.png b/app/assets/images/refinery/icons/flags/nn.png
deleted file mode 100644
index 160b6b5..0000000
Binary files a/app/assets/images/refinery/icons/flags/nn.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/np.png b/app/assets/images/refinery/icons/flags/np.png
deleted file mode 100644
index aeb058b..0000000
Binary files a/app/assets/images/refinery/icons/flags/np.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/nr.png b/app/assets/images/refinery/icons/flags/nr.png
deleted file mode 100644
index 705fc33..0000000
Binary files a/app/assets/images/refinery/icons/flags/nr.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/nu.png b/app/assets/images/refinery/icons/flags/nu.png
deleted file mode 100644
index c3ce4ae..0000000
Binary files a/app/assets/images/refinery/icons/flags/nu.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/nz.png b/app/assets/images/refinery/icons/flags/nz.png
deleted file mode 100644
index 10d6306..0000000
Binary files a/app/assets/images/refinery/icons/flags/nz.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/om.png b/app/assets/images/refinery/icons/flags/om.png
deleted file mode 100644
index 2ffba7e..0000000
Binary files a/app/assets/images/refinery/icons/flags/om.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/pa.png b/app/assets/images/refinery/icons/flags/pa.png
deleted file mode 100644
index 9b2ee9a..0000000
Binary files a/app/assets/images/refinery/icons/flags/pa.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/pe.png b/app/assets/images/refinery/icons/flags/pe.png
deleted file mode 100644
index 62a0497..0000000
Binary files a/app/assets/images/refinery/icons/flags/pe.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/pf.png b/app/assets/images/refinery/icons/flags/pf.png
deleted file mode 100644
index 771a0f6..0000000
Binary files a/app/assets/images/refinery/icons/flags/pf.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/pg.png b/app/assets/images/refinery/icons/flags/pg.png
deleted file mode 100644
index 10d6233..0000000
Binary files a/app/assets/images/refinery/icons/flags/pg.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ph.png b/app/assets/images/refinery/icons/flags/ph.png
deleted file mode 100644
index b89e159..0000000
Binary files a/app/assets/images/refinery/icons/flags/ph.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/pk.png b/app/assets/images/refinery/icons/flags/pk.png
deleted file mode 100644
index e9df70c..0000000
Binary files a/app/assets/images/refinery/icons/flags/pk.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/pl.png b/app/assets/images/refinery/icons/flags/pl.png
deleted file mode 100644
index d413d01..0000000
Binary files a/app/assets/images/refinery/icons/flags/pl.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/pm.png b/app/assets/images/refinery/icons/flags/pm.png
deleted file mode 100644
index ba91d2c..0000000
Binary files a/app/assets/images/refinery/icons/flags/pm.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/pn.png b/app/assets/images/refinery/icons/flags/pn.png
deleted file mode 100644
index aa9344f..0000000
Binary files a/app/assets/images/refinery/icons/flags/pn.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/pr.png b/app/assets/images/refinery/icons/flags/pr.png
deleted file mode 100644
index 82d9130..0000000
Binary files a/app/assets/images/refinery/icons/flags/pr.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ps.png b/app/assets/images/refinery/icons/flags/ps.png
deleted file mode 100644
index f5f5477..0000000
Binary files a/app/assets/images/refinery/icons/flags/ps.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/pt-BR.png b/app/assets/images/refinery/icons/flags/pt-BR.png
deleted file mode 100644
index 9b1a553..0000000
Binary files a/app/assets/images/refinery/icons/flags/pt-BR.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/pt.png b/app/assets/images/refinery/icons/flags/pt.png
deleted file mode 100644
index ece7980..0000000
Binary files a/app/assets/images/refinery/icons/flags/pt.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/pw.png b/app/assets/images/refinery/icons/flags/pw.png
deleted file mode 100644
index 6178b25..0000000
Binary files a/app/assets/images/refinery/icons/flags/pw.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/py.png b/app/assets/images/refinery/icons/flags/py.png
deleted file mode 100644
index cb8723c..0000000
Binary files a/app/assets/images/refinery/icons/flags/py.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/qa.png b/app/assets/images/refinery/icons/flags/qa.png
deleted file mode 100644
index ed4c621..0000000
Binary files a/app/assets/images/refinery/icons/flags/qa.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/re.png b/app/assets/images/refinery/icons/flags/re.png
deleted file mode 100644
index 8332c4e..0000000
Binary files a/app/assets/images/refinery/icons/flags/re.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ro.png b/app/assets/images/refinery/icons/flags/ro.png
deleted file mode 100644
index 57e74a6..0000000
Binary files a/app/assets/images/refinery/icons/flags/ro.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/rs.png b/app/assets/images/refinery/icons/flags/rs.png
deleted file mode 100644
index 9439a5b..0000000
Binary files a/app/assets/images/refinery/icons/flags/rs.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ru.png b/app/assets/images/refinery/icons/flags/ru.png
deleted file mode 100644
index 47da421..0000000
Binary files a/app/assets/images/refinery/icons/flags/ru.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/rw.png b/app/assets/images/refinery/icons/flags/rw.png
deleted file mode 100644
index 5356491..0000000
Binary files a/app/assets/images/refinery/icons/flags/rw.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sa.png b/app/assets/images/refinery/icons/flags/sa.png
deleted file mode 100644
index b4641c7..0000000
Binary files a/app/assets/images/refinery/icons/flags/sa.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sb.png b/app/assets/images/refinery/icons/flags/sb.png
deleted file mode 100644
index a9937cc..0000000
Binary files a/app/assets/images/refinery/icons/flags/sb.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sc.png b/app/assets/images/refinery/icons/flags/sc.png
deleted file mode 100644
index 39ee371..0000000
Binary files a/app/assets/images/refinery/icons/flags/sc.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/scotland.png b/app/assets/images/refinery/icons/flags/scotland.png
deleted file mode 100644
index a0e57b4..0000000
Binary files a/app/assets/images/refinery/icons/flags/scotland.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sd.png b/app/assets/images/refinery/icons/flags/sd.png
deleted file mode 100644
index eaab69e..0000000
Binary files a/app/assets/images/refinery/icons/flags/sd.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sg.png b/app/assets/images/refinery/icons/flags/sg.png
deleted file mode 100644
index dd34d61..0000000
Binary files a/app/assets/images/refinery/icons/flags/sg.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sh.png b/app/assets/images/refinery/icons/flags/sh.png
deleted file mode 100644
index 4b1d2a2..0000000
Binary files a/app/assets/images/refinery/icons/flags/sh.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/si.png b/app/assets/images/refinery/icons/flags/si.png
deleted file mode 100644
index 12d812d..0000000
Binary files a/app/assets/images/refinery/icons/flags/si.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sj.png b/app/assets/images/refinery/icons/flags/sj.png
deleted file mode 100644
index 160b6b5..0000000
Binary files a/app/assets/images/refinery/icons/flags/sj.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sk.png b/app/assets/images/refinery/icons/flags/sk.png
deleted file mode 100644
index 7ccbc82..0000000
Binary files a/app/assets/images/refinery/icons/flags/sk.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sl.png b/app/assets/images/refinery/icons/flags/sl.png
deleted file mode 100644
index bb1476f..0000000
Binary files a/app/assets/images/refinery/icons/flags/sl.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sm.png b/app/assets/images/refinery/icons/flags/sm.png
deleted file mode 100644
index 3df2fdc..0000000
Binary files a/app/assets/images/refinery/icons/flags/sm.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sn.png b/app/assets/images/refinery/icons/flags/sn.png
deleted file mode 100644
index eabb71d..0000000
Binary files a/app/assets/images/refinery/icons/flags/sn.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/so.png b/app/assets/images/refinery/icons/flags/so.png
deleted file mode 100644
index 4a1ea4b..0000000
Binary files a/app/assets/images/refinery/icons/flags/so.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sr.png b/app/assets/images/refinery/icons/flags/sr.png
deleted file mode 100644
index 5eff927..0000000
Binary files a/app/assets/images/refinery/icons/flags/sr.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/st.png b/app/assets/images/refinery/icons/flags/st.png
deleted file mode 100644
index 2978557..0000000
Binary files a/app/assets/images/refinery/icons/flags/st.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sv.png b/app/assets/images/refinery/icons/flags/sv.png
deleted file mode 100644
index 1994653..0000000
Binary files a/app/assets/images/refinery/icons/flags/sv.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sy.png b/app/assets/images/refinery/icons/flags/sy.png
deleted file mode 100644
index f5ce30d..0000000
Binary files a/app/assets/images/refinery/icons/flags/sy.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/sz.png b/app/assets/images/refinery/icons/flags/sz.png
deleted file mode 100644
index 914ee86..0000000
Binary files a/app/assets/images/refinery/icons/flags/sz.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/tc.png b/app/assets/images/refinery/icons/flags/tc.png
deleted file mode 100644
index 8fc1156..0000000
Binary files a/app/assets/images/refinery/icons/flags/tc.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/td.png b/app/assets/images/refinery/icons/flags/td.png
deleted file mode 100644
index 667f21f..0000000
Binary files a/app/assets/images/refinery/icons/flags/td.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/tf.png b/app/assets/images/refinery/icons/flags/tf.png
deleted file mode 100644
index 80529a4..0000000
Binary files a/app/assets/images/refinery/icons/flags/tf.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/tg.png b/app/assets/images/refinery/icons/flags/tg.png
deleted file mode 100644
index 3aa00ad..0000000
Binary files a/app/assets/images/refinery/icons/flags/tg.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/th.png b/app/assets/images/refinery/icons/flags/th.png
deleted file mode 100644
index dd8ba91..0000000
Binary files a/app/assets/images/refinery/icons/flags/th.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/tj.png b/app/assets/images/refinery/icons/flags/tj.png
deleted file mode 100644
index 617bf64..0000000
Binary files a/app/assets/images/refinery/icons/flags/tj.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/tk.png b/app/assets/images/refinery/icons/flags/tk.png
deleted file mode 100644
index 67b8c8c..0000000
Binary files a/app/assets/images/refinery/icons/flags/tk.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/tl.png b/app/assets/images/refinery/icons/flags/tl.png
deleted file mode 100644
index 77da181..0000000
Binary files a/app/assets/images/refinery/icons/flags/tl.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/tm.png b/app/assets/images/refinery/icons/flags/tm.png
deleted file mode 100644
index 828020e..0000000
Binary files a/app/assets/images/refinery/icons/flags/tm.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/tn.png b/app/assets/images/refinery/icons/flags/tn.png
deleted file mode 100644
index 183cdd3..0000000
Binary files a/app/assets/images/refinery/icons/flags/tn.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/to.png b/app/assets/images/refinery/icons/flags/to.png
deleted file mode 100644
index f89b8ba..0000000
Binary files a/app/assets/images/refinery/icons/flags/to.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/tr.png b/app/assets/images/refinery/icons/flags/tr.png
deleted file mode 100644
index be32f77..0000000
Binary files a/app/assets/images/refinery/icons/flags/tr.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/tt.png b/app/assets/images/refinery/icons/flags/tt.png
deleted file mode 100644
index 2a11c1e..0000000
Binary files a/app/assets/images/refinery/icons/flags/tt.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/tv.png b/app/assets/images/refinery/icons/flags/tv.png
deleted file mode 100644
index 28274c5..0000000
Binary files a/app/assets/images/refinery/icons/flags/tv.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/tw.png b/app/assets/images/refinery/icons/flags/tw.png
deleted file mode 100644
index f31c654..0000000
Binary files a/app/assets/images/refinery/icons/flags/tw.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/tz.png b/app/assets/images/refinery/icons/flags/tz.png
deleted file mode 100644
index c00ff79..0000000
Binary files a/app/assets/images/refinery/icons/flags/tz.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ug.png b/app/assets/images/refinery/icons/flags/ug.png
deleted file mode 100644
index 33f4aff..0000000
Binary files a/app/assets/images/refinery/icons/flags/ug.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/uk.png b/app/assets/images/refinery/icons/flags/uk.png
deleted file mode 100644
index 09563a2..0000000
Binary files a/app/assets/images/refinery/icons/flags/uk.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/um.png b/app/assets/images/refinery/icons/flags/um.png
deleted file mode 100644
index c1dd965..0000000
Binary files a/app/assets/images/refinery/icons/flags/um.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/us.png b/app/assets/images/refinery/icons/flags/us.png
deleted file mode 100644
index 10f451f..0000000
Binary files a/app/assets/images/refinery/icons/flags/us.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/uy.png b/app/assets/images/refinery/icons/flags/uy.png
deleted file mode 100644
index 31d948a..0000000
Binary files a/app/assets/images/refinery/icons/flags/uy.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/uz.png b/app/assets/images/refinery/icons/flags/uz.png
deleted file mode 100644
index fef5dc1..0000000
Binary files a/app/assets/images/refinery/icons/flags/uz.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/va.png b/app/assets/images/refinery/icons/flags/va.png
deleted file mode 100644
index b31eaf2..0000000
Binary files a/app/assets/images/refinery/icons/flags/va.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/vc.png b/app/assets/images/refinery/icons/flags/vc.png
deleted file mode 100644
index 8fa17b0..0000000
Binary files a/app/assets/images/refinery/icons/flags/vc.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ve.png b/app/assets/images/refinery/icons/flags/ve.png
deleted file mode 100644
index 00c90f9..0000000
Binary files a/app/assets/images/refinery/icons/flags/ve.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/vg.png b/app/assets/images/refinery/icons/flags/vg.png
deleted file mode 100644
index 4156907..0000000
Binary files a/app/assets/images/refinery/icons/flags/vg.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/vi.png b/app/assets/images/refinery/icons/flags/vi.png
deleted file mode 100644
index ed26915..0000000
Binary files a/app/assets/images/refinery/icons/flags/vi.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/vn.png b/app/assets/images/refinery/icons/flags/vn.png
deleted file mode 100644
index ec7cd48..0000000
Binary files a/app/assets/images/refinery/icons/flags/vn.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/vu.png b/app/assets/images/refinery/icons/flags/vu.png
deleted file mode 100644
index b3397bc..0000000
Binary files a/app/assets/images/refinery/icons/flags/vu.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/wales.png b/app/assets/images/refinery/icons/flags/wales.png
deleted file mode 100644
index e0d7cee..0000000
Binary files a/app/assets/images/refinery/icons/flags/wales.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/wf.png b/app/assets/images/refinery/icons/flags/wf.png
deleted file mode 100644
index 9f95587..0000000
Binary files a/app/assets/images/refinery/icons/flags/wf.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ws.png b/app/assets/images/refinery/icons/flags/ws.png
deleted file mode 100644
index c169508..0000000
Binary files a/app/assets/images/refinery/icons/flags/ws.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/ye.png b/app/assets/images/refinery/icons/flags/ye.png
deleted file mode 100644
index 468dfad..0000000
Binary files a/app/assets/images/refinery/icons/flags/ye.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/yt.png b/app/assets/images/refinery/icons/flags/yt.png
deleted file mode 100644
index c298f37..0000000
Binary files a/app/assets/images/refinery/icons/flags/yt.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/za.png b/app/assets/images/refinery/icons/flags/za.png
deleted file mode 100644
index 57c58e2..0000000
Binary files a/app/assets/images/refinery/icons/flags/za.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/zh-CN.png b/app/assets/images/refinery/icons/flags/zh-CN.png
deleted file mode 100644
index 8914414..0000000
Binary files a/app/assets/images/refinery/icons/flags/zh-CN.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/zh-TW.png b/app/assets/images/refinery/icons/flags/zh-TW.png
deleted file mode 100644
index f31c654..0000000
Binary files a/app/assets/images/refinery/icons/flags/zh-TW.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/zm.png b/app/assets/images/refinery/icons/flags/zm.png
deleted file mode 100644
index c25b07b..0000000
Binary files a/app/assets/images/refinery/icons/flags/zm.png and /dev/null differ
diff --git a/app/assets/images/refinery/icons/flags/zw.png b/app/assets/images/refinery/icons/flags/zw.png
deleted file mode 100644
index 53c9725..0000000
Binary files a/app/assets/images/refinery/icons/flags/zw.png and /dev/null differ
diff --git a/lib/refinery/i18n-filter.rb b/lib/refinery/i18n-filter.rb
index 452d79b..9dfb511 100644
--- a/lib/refinery/i18n-filter.rb
+++ b/lib/refinery/i18n-filter.rb
@@ -24,13 +24,19 @@ def around_generate(params, &block)
 
       yield.tap do |result|
         result = result.is_a?(Array) ? result.first : result
-        if ::Refinery::I18n.url_filter_enabled? and
-           locale != ::Refinery::I18n.default_frontend_locale and
-           result.url !~ %r{^/(#{Refinery::Core.backend_route}|wymiframe)}
-          result.url.sub!(%r(^(http.?://[^/]*)?(.*))) { "#{$1}/#{locale}#{$2}" }
-        end
+        insert_locale(result.url, locale) if url_needs_locale?(result.url, locale)
       end
     end
 
+    # locale should be inserted if filtering AND not in default locale AND not a backend url
+    private def url_needs_locale?(url, locale)
+      ::Refinery::I18n.url_filter_enabled? &&
+        locale != ::Refinery::I18n.default_frontend_locale &&
+        url !~ %r{^/(#{Refinery::Core.backend_route}|wymiframe)}
+    end
+
+    private def insert_locale(url, locale)
+      url.sub!(%r(^(http.?://[^/]*)?(.*))) { "#{$1}/#{locale}#{$2}" }
+    end
   end
 end
diff --git a/lib/refinery/i18n.rb b/lib/refinery/i18n.rb
index a019404..dff5be6 100644
--- a/lib/refinery/i18n.rb
+++ b/lib/refinery/i18n.rb
@@ -3,6 +3,7 @@
 require 'routing-filter'
 require 'rails-i18n'
 require 'refinery/i18n/engine'
+require 'refinery/i18n/override_routing_filter'
 
 module Refinery
   autoload :I18nGenerator, 'generators/refinery/i18n_generator'
diff --git a/lib/refinery/i18n/engine.rb b/lib/refinery/i18n/engine.rb
index 87bbf45..a0843c2 100644
--- a/lib/refinery/i18n/engine.rb
+++ b/lib/refinery/i18n/engine.rb
@@ -18,38 +18,45 @@ class Engine < Rails::Engine
       config.to_prepare do
         ::ApplicationController.module_eval do
           def default_url_options
-            super.reverse_merge ({ locale: ::I18n.locale })
+            super.reverse_merge({ locale: ::I18n.locale })
           end
 
           def find_or_set_locale
-            ::I18n.locale = ::Refinery::I18n.current_frontend_locale
+            locale = params[:locale]&.to_sym
+            ::I18n.locale = ::Refinery::I18n.default_frontend_locale
 
-            if ::Refinery::I18n.has_locale?(locale = params[:locale].try(:to_sym))
-              ::I18n.locale = locale
-            elsif locale.present? && locale != ::Refinery::I18n.default_frontend_locale
-              ::I18n.locale = ::Refinery::I18n.default_frontend_locale
+            if locale.nil? || valid_locale?(locale) || locale == ::Refinery::I18n.default_frontend_locale
+              ::I18n.locale = locale || ::Refinery::I18n.default_frontend_locale
+            else
               redirect_to(params.permit(:locale).merge(locale: ::I18n.locale),
                           notice: "The locale '#{locale}' is not supported.") and return
-            else
-              ::I18n.locale = ::Refinery::I18n.default_frontend_locale
             end
             Mobility.locale = ::I18n.locale
           end
 
+          def valid_locale?(locale)
+            locale && ::Refinery::I18n.locales.keys.include?(locale)
+          end
+
           prepend_before_action :find_or_set_locale
           protected :default_url_options, :find_or_set_locale
         end
 
         ::Refinery::AdminController.class_eval do
           def find_or_set_locale
-            if (params[:set_locale] && ::Refinery::I18n.locales.keys.map(&:to_sym).include?(params[:set_locale].to_sym))
-              ::Refinery::I18n.current_locale = params[:set_locale].to_sym
+            locale = params[:set_locale]&.to_sym
+            if valid_locale?(locale)
+              ::Refinery::I18n.current_locale = locale
               redirect_back_or_default(refinery.admin_root_path) and return
             else
               ::I18n.locale = ::Refinery::I18n.current_locale
             end
           end
 
+          def valid_locale?(locale)
+            locale && ::Refinery::I18n.locales.keys.include?(locale)
+          end
+
           def globalize!
             if ::Refinery::I18n.frontend_locales.any?
               if params[:switch_locale]
@@ -61,9 +68,11 @@ def globalize!
               end
             end
           end
+
           # globalize! should be prepended first so that it runs after find_or_set_locale
           prepend_before_action :globalize!, :find_or_set_locale
           protected :globalize!, :find_or_set_locale
+          private :valid_locale?
         end
       end
 
diff --git a/lib/refinery/i18n/override_routing_filter.rb b/lib/refinery/i18n/override_routing_filter.rb
new file mode 100644
index 0000000..bcf5af1
--- /dev/null
+++ b/lib/refinery/i18n/override_routing_filter.rb
@@ -0,0 +1,70 @@
+module RoutingFilterOverrideShared
+  private
+
+  def apply_routing_filters(path, env)
+    filter_parameters = {}
+    original_path = path.dup
+
+    @routes.filters.run(:around_recognize, path, env) do
+      filter_parameters
+    end
+
+    [path, original_path, filter_parameters]
+  end
+end
+
+if Rails::VERSION::MAJOR == 8 && Rails::VERSION::MINOR >= 1
+  # from: https://github.com/svenfuchs/routing-filter/pull/87
+  # Removing the (existing) broken find_routes override from the routing-filter gem first
+  if defined?(ActionDispatchJourneyRouterWithFiltering) &&
+    ActionDispatchJourneyRouterWithFiltering.method_defined?(:find_routes)
+    ActionDispatchJourneyRouterWithFiltering.remove_method(:find_routes)
+  end
+
+  # Rails 8.1+ uses recognize method instead of find_routes
+  module CustomOverridesActionDispatchJourneyRouterRails8
+    include RoutingFilterOverrideShared
+
+    def recognize(req, &block)
+      path, original_path, filter_parameters = apply_routing_filters(req.path_info, req.env)
+      req.path_info = path
+
+      ##### OVERRIDE STARTS #####
+      super(req) do |route, parameters|
+        parameters.merge!(filter_parameters)
+        req.path_info = original_path
+        yield route, parameters
+      end.tap { req.path_info = original_path }
+      ##### OVERRIDE ENDS #####
+    end
+  end
+
+  ActionDispatch::Journey::Router.prepend(CustomOverridesActionDispatchJourneyRouterRails8)
+elsif Rails::VERSION::MAJOR == 8 || (Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR >= 1)
+  # from: https://github.com/svenfuchs/routing-filter/pull/87
+  # Removing the (existing) broken find_routes override from the routing-filter gem first
+  if defined?(ActionDispatchJourneyRouterWithFiltering) &&
+    ActionDispatchJourneyRouterWithFiltering.method_defined?(:find_routes)
+    ActionDispatchJourneyRouterWithFiltering.remove_method(:find_routes)
+  end
+
+  # Rails < 8.1 uses find_routes method
+  module CustomOverridesActionDispatchJourneyRouterWithFiltering
+    include RoutingFilterOverrideShared
+
+    def find_routes(env)
+      path = env.is_a?(Hash) ? env['PATH_INFO'] : env.path_info
+      path, original_path, filter_parameters = apply_routing_filters(path, env)
+
+      ##### OVERRIDE STARTS #####
+      super(env) do |match, parameters, route|
+        parameters = parameters.merge(filter_parameters)
+        env.is_a?(Hash) ? env['PATH_INFO'] = original_path : env.path_info = original_path
+        yield [match, parameters, route]
+      end
+      ##### OVERRIDE ENDS #####
+    end
+  end
+
+  ActionDispatch::Journey::Router.prepend(CustomOverridesActionDispatchJourneyRouterWithFiltering)
+end
diff --git a/refinerycms-i18n.gemspec b/refinerycms-i18n.gemspec
index 79a4c1a..7e6d739 100644
--- a/refinerycms-i18n.gemspec
+++ b/refinerycms-i18n.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-i18n}
-  s.version           = %q{5.0.1}
+  s.version           = %q{5.1.0}
   s.description       = %q{i18n logic extracted from Refinery CMS, for Refinery CMS.}
   s.summary           = %q{i18n logic for Refinery CMS.}
   s.email             = %q{info@refinerycms.com}
@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.required_ruby_version = '>= 2.2.9'
+  s.required_ruby_version = '>= 2.7'
 
-  s.add_dependency    'routing-filter',   '~> 0.6'
+  s.add_dependency    'routing-filter',   '~> 0.7'
   s.add_dependency    'rails-i18n',       '>= 5.0'
-  s.add_dependency    'mobility',         '~> 0.8.8'
+  s.add_dependency    'mobility',         '~> 1.2'
 
   s.cert_chain  = [File.expand_path("../certs/parndt.pem", __FILE__)]
   if $0 =~ /gem\z/ && ARGV.include?("build") && ARGV.include?(__FILE__)
diff --git a/spec/controllers/refinery/pages_controller_spec.rb b/spec/controllers/refinery/pages_controller_spec.rb
index 786365d..5a3723d 100644
--- a/spec/controllers/refinery/pages_controller_spec.rb
+++ b/spec/controllers/refinery/pages_controller_spec.rb
@@ -10,7 +10,7 @@ module Refinery
       subject { get :show, params: { path: 'test', locale: 'en%20217' } }
 
       it 'redirects to the location with the default frontend locale' do
-        expect(subject).to redirect_to ('/test')
+        expect(subject).to redirect_to('/test')
       end
 
       it 'flashes a notice message' do
@@ -18,4 +18,4 @@ module Refinery
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/features/set_locale_spec.rb b/spec/features/set_locale_spec.rb
index d36497c..0ceae47 100644
--- a/spec/features/set_locale_spec.rb
+++ b/spec/features/set_locale_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require "spec_helper"
 
-describe "set_locale parameter", :type => :feature do
+describe "set_locale parameter", type: :feature do
   refinery_login
 
   it "changes language used in backend" do
@@ -9,7 +9,7 @@
 
     expect(page).to have_content("Switch to your website")
 
-    visit refinery.admin_pages_path(:set_locale => :cs)
+    visit refinery.admin_pages_path(set_locale: :cs)
 
     expect(page).to have_content("Přepnout na web")
   end
diff --git a/translate-readme.md b/translate-readme.md
index a7dd452..eceb385 100644
--- a/translate-readme.md
+++ b/translate-readme.md
@@ -1,9 +1,10 @@
 Translate
 =========
 
-This plugin provides a web interface for translating Rails I18n texts (requires Rails 2.2 or higher) from one locale to another. The plugin has been tested only with the simple I18n backend that ships with Rails. I18n texts are read from and written to YAML files under config/locales.
+This plugin provides a web interface for translating Rails I18n texts (requires Rails 2.2 or higher) from one locale to another. The plugin has been tested only with the simple I18n backend that ships with Rails. I18n texts are read from and written to YAML files under `config/locales`.
 
-To translate to a new locale you need to add a YAML file for that locale that contains the locale as the top key and at least one translation.
+To translate to a new locale you need to add a YAML file for that locale.
+A translation file has the _locale_ as the top key and at least one translation.
 
 Please note that there are certain I18n keys that map to Array objects rather than strings and those are currently not dealt with by the translation UI. This means that Rails built in keys such as date.day_names need to be translated manually directly in the YAML file.
 
@@ -19,21 +20,29 @@ Rake Tasks
 
 In addition to the web UI this plugin adds the following rake tasks:
 
-translate:lost_in_translation
-translate:merge_keys
-translate:google
-translate:changed
+* translate:lost_in_translation
+* translate:merge_keys
+* translate:google
+* translate:changed
 
-The lost_in_translation task shows you any I18n keys in your code that are do not have translations in the YAML file for your default locale, i.e. config/locales/sv.yml.
+### Lost in Translation
+The `translate:lost_in_translation` task shows you any I18n keys in your code that are do not have translations in the YAML file for your default locale, i.e. config/locales/sv.yml.
 
-The merge_keys task is supposed to be used in conjunction with Sven Fuch's Rails I18n TextMate bundle (http://github.com/svenfuchs/rails-i18n/tree/master). Texts and keys extracted with the TextMate bundle end up in the temporary file log/translations.yml. When you run the merge_keys rake task the keys are moved over to the corresponding I18n locale file, i.e. config/locales/sv.yml. The merge_keys task also checks for overwrites of existing keys by warning you that one of your extracted keys already exists with a different translation.
+### Merge Keys
+The `translate:merge_keys` task is supposed to be used in conjunction with Sven Fuch's [Rails I18n TextMate bundle](http://github.com/svenfuchs/rails-i18n/tree/master). 
 
-The google task is used for auto translating from one locale to another using Google Translate.
+Texts and keys extracted with the TextMate bundle end up in a temporary file `log/translations.yml`. 
+When you run the `merge_keys` rake task these keys are moved to the corresponding I18n locale file, i.e. `config/locales/sv.yml`. 
+The `merge_keys` task also warns you if one of your extracted keys will overwrite an existing translation.
 
-The changed rake task can show you between one YAML file to another which keys have had their texts changed.
+### Translate Google
+The `translate:google` task is used for auto translating from one locale to another using Google Translate.
+
+### Translate Changed
+The `translate:changed` task can show you which keys have had their texts changed between one file and another.
+
+## Installation
 
-Installation
-=========
 Obtain the source with:
 
 ./script/plugin install git://github.com/newsdesk/translate.git