diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8c02271..d88c8e0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,15 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.7', '3.0']
+        ruby: ['3.1', '3.2', '3.3']
         gemfile:
-          - rails_5_2
-          - rails_6
           - rails_6_1
-          - rails_master
-        exclude:
-          - ruby: '3.0'
-            gemfile: 'rails_5_2'
+          - rails_7
+          - rails_7_1
+          - rails_main
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
       BUNDLE_PATH_RELATIVE_TO_CWD: true
@@ -33,12 +30,12 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler: default
           bundler-cache: true
+          rubygems: latest
       - name: StandardRb check
         run: bundle exec standardrb
       - name: Run tests
         env:
-          DATABASE_URL: "sqlite3:noticed_test"
-          STRIPE_PRIVATE_KEY: ${{ secrets.STRIPE_PRIVATE_KEY }}
+          DATABASE_URL: "sqlite3:simple_discussion_test"
         run: |
           bin/rails db:test:prepare
           bin/rails test
diff --git a/Appraisals b/Appraisals
index 5df6c91..5d01c59 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,16 +1,21 @@
-appraise "rails-5-2" do
-  gem "rails", "~> 5.2.0"
+# frozen_string_literal: true
+
+appraise "rails-6-1" do
+  gem "rails", "~> 6.1.0"
+  gem "sqlite3", "~> 1.7.2"
 end
 
-appraise "rails-6" do
-  gem "rails", "~> 6.0.0"
+appraise "rails-7" do
+  gem "rails", "~> 7.0.0"
+  gem "sqlite3", "~> 1.7.2"
 end
 
-appraise "rails-6-1" do
-  gem "rails", "~> 6.1.0"
+appraise "rails-7-1" do
+  gem "rails", "~> 7.1.0"
+  gem "sqlite3", "~> 1.7.2"
 end
 
-appraise "rails-master" do
+appraise "rails-main" do
   gem "rails", github: "rails/rails", branch: "main"
-  gem "devise", github: "ghiculescu/devise", branch: "patch-2"
+  gem "sqlite3", "~> 2.0"
 end
diff --git a/Gemfile b/Gemfile
index 3ce913b..ae8dea2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,9 +5,15 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in simple_discussion.gemspec
 gemspec
 
-gem "appraisal"
-gem "standardrb"
-
+# used for dummy rails app integration
 gem "devise"
 gem "puma"
-gem "sqlite3"
+gem "sprockets-rails"
+
+# testing against sqlite3 db
+gem "sqlite3", "~> 1.7"
+
+# testing
+gem "appraisal"
+gem "standardrb"
+gem "font-awesome-sass", "~> 5.13.1"
diff --git a/app/helpers/simple_discussion/forum_threads_helper.rb b/app/helpers/simple_discussion/forum_threads_helper.rb
index c31315e..dfb7344 100644
--- a/app/helpers/simple_discussion/forum_threads_helper.rb
+++ b/app/helpers/simple_discussion/forum_threads_helper.rb
@@ -1,7 +1,7 @@
 module SimpleDiscussion::ForumThreadsHelper
   # Used for flagging links in the navbar as active
-  def forum_link_to(path, opts = {}, &block)
-    link_to path, class: forum_link_class(path, opts), &block
+  def forum_link_to(path, opts = {}, &)
+    link_to(path, class: forum_link_class(path, opts), &)
   end
 
   def forum_link_class(matches, opts = {})
diff --git a/app/jobs/simple_discussion/forum_post_notification_job.rb b/app/jobs/simple_discussion/forum_post_notification_job.rb
index 1f184f0..c5d1213 100644
--- a/app/jobs/simple_discussion/forum_post_notification_job.rb
+++ b/app/jobs/simple_discussion/forum_post_notification_job.rb
@@ -15,7 +15,7 @@ def send_emails(forum_post)
   end
 
   def send_webhook(forum_post)
-    slack_webhook_url = Rails.application.secrets.simple_discussion_slack_url
+    slack_webhook_url = Rails.application.credentials.simple_discussion_slack_url
     return if slack_webhook_url.blank?
 
     forum_thread = forum_post.forum_thread
diff --git a/app/jobs/simple_discussion/forum_thread_notification_job.rb b/app/jobs/simple_discussion/forum_thread_notification_job.rb
index 4f78346..a5977f5 100644
--- a/app/jobs/simple_discussion/forum_thread_notification_job.rb
+++ b/app/jobs/simple_discussion/forum_thread_notification_job.rb
@@ -13,7 +13,7 @@ def send_emails(forum_thread)
   end
 
   def send_webhook(forum_thread)
-    slack_webhook_url = Rails.application.secrets.simple_discussion_slack_url
+    slack_webhook_url = Rails.application.credentials.simple_discussion_slack_url
     return if slack_webhook_url.blank?
 
     forum_post = forum_thread.forum_posts.first
diff --git a/bin/rails b/bin/rails
index c789bdc..b3c9c18 100755
--- a/bin/rails
+++ b/bin/rails
@@ -2,8 +2,10 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
+ENV['RAILS_ENV'] ||= 'test'
+
 ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/pay/engine', __dir__)
+ENGINE_PATH = File.expand_path('../lib/simple_discussion/engine', __dir__)
 APP_PATH = File.expand_path('../test/dummy/config/application', __dir__)
 
 # Set up gems listed in the Gemfile.
diff --git a/gemfiles/rails_5_2.gemfile.lock b/gemfiles/rails_5_2.gemfile.lock
deleted file mode 100644
index 10ccee7..0000000
--- a/gemfiles/rails_5_2.gemfile.lock
+++ /dev/null
@@ -1,191 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    simple_discussion (1.3.0)
-      font-awesome-sass (>= 5.13.0)
-      friendly_id (>= 5.2.0)
-      rails (>= 4.2)
-      will_paginate (>= 3.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.2.6)
-      actionpack (= 5.2.6)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.6)
-      actionview (= 5.2.6)
-      activesupport (= 5.2.6)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.6)
-      activesupport (= 5.2.6)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.6)
-      activesupport (= 5.2.6)
-      globalid (>= 0.3.6)
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
-      arel (>= 9.0)
-    activestorage (5.2.6)
-      actionpack (= 5.2.6)
-      activerecord (= 5.2.6)
-      marcel (~> 1.0.0)
-    activesupport (5.2.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.4.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (9.0.0)
-    ast (2.4.2)
-    bcrypt (3.1.16)
-    builder (3.2.4)
-    concurrent-ruby (1.1.8)
-    crass (1.0.6)
-    devise (4.8.0)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
-      responders
-      warden (~> 1.2.3)
-    erubi (1.10.0)
-    ffi (1.15.0)
-    font-awesome-sass (5.15.1)
-      sassc (>= 1.11)
-    friendly_id (5.4.2)
-      activerecord (>= 4.0.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    loofah (2.9.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (1.0.1)
-    method_source (1.0.0)
-    mini_mime (1.1.0)
-    minitest (5.14.4)
-    nio4r (2.5.7)
-    nokogiri (1.11.3-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.11.3-x86_64-linux)
-      racc (~> 1.4)
-    orm_adapter (0.5.0)
-    parallel (1.20.1)
-    parser (3.0.1.1)
-      ast (~> 2.4.1)
-    puma (5.3.1)
-      nio4r (~> 2.0)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.6)
-      actioncable (= 5.2.6)
-      actionmailer (= 5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
-      activemodel (= 5.2.6)
-      activerecord (= 5.2.6)
-      activestorage (= 5.2.6)
-      activesupport (= 5.2.6)
-      bundler (>= 1.3.0)
-      railties (= 5.2.6)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (5.2.6)
-      actionpack (= 5.2.6)
-      activesupport (= 5.2.6)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
-    rexml (3.2.5)
-    rubocop (1.14.0)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.11.2)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    standard (1.1.1)
-      rubocop (= 1.14.0)
-      rubocop-performance (= 1.11.2)
-    standardrb (1.0.0)
-      standard
-    thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    unicode-display_width (2.0.0)
-    warden (1.2.9)
-      rack (>= 2.0.9)
-    websocket-driver (0.7.3)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    will_paginate (3.3.0)
-
-PLATFORMS
-  x86_64-darwin-20
-  x86_64-linux
-
-DEPENDENCIES
-  appraisal
-  devise
-  puma
-  rails (~> 5.2.0)
-  simple_discussion!
-  sqlite3
-  standardrb
-
-BUNDLED WITH
-   2.2.15
diff --git a/gemfiles/rails_6.gemfile.lock b/gemfiles/rails_6.gemfile.lock
deleted file mode 100644
index 09c5b36..0000000
--- a/gemfiles/rails_6.gemfile.lock
+++ /dev/null
@@ -1,207 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    simple_discussion (1.3.0)
-      font-awesome-sass (>= 5.13.0)
-      friendly_id (>= 5.2.0)
-      rails (>= 4.2)
-      will_paginate (>= 3.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-      mail (>= 2.7.1)
-    actionmailer (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      actionview (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.7)
-      actionview (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.3.7)
-      activesupport (= 6.0.3.7)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.7)
-      activesupport (= 6.0.3.7)
-      globalid (>= 0.3.6)
-    activemodel (6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activerecord (6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activestorage (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      marcel (~> 1.0.0)
-    activesupport (6.0.3.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    appraisal (2.4.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    ast (2.4.2)
-    bcrypt (3.1.16)
-    builder (3.2.4)
-    concurrent-ruby (1.1.8)
-    crass (1.0.6)
-    devise (4.8.0)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
-      responders
-      warden (~> 1.2.3)
-    erubi (1.10.0)
-    ffi (1.15.0)
-    font-awesome-sass (5.15.1)
-      sassc (>= 1.11)
-    friendly_id (5.4.2)
-      activerecord (>= 4.0.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    loofah (2.9.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (1.0.1)
-    method_source (1.0.0)
-    mini_mime (1.1.0)
-    minitest (5.14.4)
-    nio4r (2.5.7)
-    nokogiri (1.11.3-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.11.3-x86_64-linux)
-      racc (~> 1.4)
-    orm_adapter (0.5.0)
-    parallel (1.20.1)
-    parser (3.0.1.1)
-      ast (~> 2.4.1)
-    puma (5.3.1)
-      nio4r (~> 2.0)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.0.3.7)
-      actioncable (= 6.0.3.7)
-      actionmailbox (= 6.0.3.7)
-      actionmailer (= 6.0.3.7)
-      actionpack (= 6.0.3.7)
-      actiontext (= 6.0.3.7)
-      actionview (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.7)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
-    rexml (3.2.5)
-    rubocop (1.14.0)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.11.2)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    standard (1.1.1)
-      rubocop (= 1.14.0)
-      rubocop-performance (= 1.11.2)
-    standardrb (1.0.0)
-      standard
-    thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    unicode-display_width (2.0.0)
-    warden (1.2.9)
-      rack (>= 2.0.9)
-    websocket-driver (0.7.3)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    will_paginate (3.3.0)
-    zeitwerk (2.4.2)
-
-PLATFORMS
-  x86_64-darwin-20
-  x86_64-linux
-
-DEPENDENCIES
-  appraisal
-  devise
-  puma
-  rails (~> 6.0.0)
-  simple_discussion!
-  sqlite3
-  standardrb
-
-BUNDLED WITH
-   2.2.15
diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
index 4346afb..4045170 100644
--- a/gemfiles/rails_6_1.gemfile
+++ b/gemfiles/rails_6_1.gemfile
@@ -2,11 +2,13 @@
 
 source "https://rubygems.org"
 
-gem "appraisal"
-gem "standardrb"
 gem "devise"
 gem "puma"
-gem "sqlite3"
+gem "sprockets-rails"
+gem "sqlite3", "~> 1.7.2"
+gem "appraisal"
+gem "standardrb"
+gem "font-awesome-sass", "~> 5.13.1"
 gem "rails", "~> 6.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6_1.gemfile.lock b/gemfiles/rails_6_1.gemfile.lock
index 0fe6dd9..a2726ce 100644
--- a/gemfiles/rails_6_1.gemfile.lock
+++ b/gemfiles/rails_6_1.gemfile.lock
@@ -10,201 +10,233 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actioncable (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionmailbox (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activestorage (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       mail (>= 2.7.1)
-    actionmailer (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionmailer (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      actionview (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.3.2)
-      actionview (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionpack (6.1.7.7)
+      actionview (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actiontext (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activestorage (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       nokogiri (>= 1.8.5)
-    actionview (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionview (6.1.7.7)
+      activesupport (= 6.1.7.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    activejob (6.1.7.7)
+      activesupport (= 6.1.7.7)
       globalid (>= 0.3.6)
-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord (6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activestorage (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-      marcel (~> 1.0.0)
-      mini_mime (~> 1.0.2)
-    activesupport (6.1.3.2)
+    activemodel (6.1.7.7)
+      activesupport (= 6.1.7.7)
+    activerecord (6.1.7.7)
+      activemodel (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
+    activestorage (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.7.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    appraisal (2.4.0)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
-    bcrypt (3.1.16)
+    bcrypt (3.1.20)
     builder (3.2.4)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.3.1)
     crass (1.0.6)
-    devise (4.8.0)
+    date (3.3.4)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    erubi (1.10.0)
-    ffi (1.15.0)
-    font-awesome-sass (5.15.1)
+    erubi (1.12.0)
+    ffi (1.17.0-x86_64-linux-gnu)
+    font-awesome-sass (5.13.1)
       sassc (>= 1.11)
-    friendly_id (5.4.2)
+    friendly_id (5.5.1)
       activerecord (>= 4.0.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.10)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    loofah (2.9.1)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.1.0)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
-    method_source (1.0.0)
-    mini_mime (1.0.3)
-    minitest (5.14.4)
-    nio4r (2.5.7)
-    nokogiri (1.11.3-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.11.3-x86_64-linux)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    method_source (1.1.0)
+    mini_mime (1.1.5)
+    minitest (5.23.1)
+    net-imap (0.4.12)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.3)
+    nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.24.0)
+    parser (3.3.2.0)
       ast (~> 2.4.1)
-    puma (5.3.1)
+      racc
+    puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.3.2)
-      actioncable (= 6.1.3.2)
-      actionmailbox (= 6.1.3.2)
-      actionmailer (= 6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actiontext (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    racc (1.8.0)
+    rack (2.2.9)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (6.1.7.7)
+      actioncable (= 6.1.7.7)
+      actionmailbox (= 6.1.7.7)
+      actionmailer (= 6.1.7.7)
+      actionpack (= 6.1.7.7)
+      actiontext (= 6.1.7.7)
+      actionview (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activemodel (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activestorage (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       bundler (>= 1.15.0)
-      railties (= 6.1.3.2)
+      railties (= 6.1.7.7)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
-    rexml (3.2.5)
-    rubocop (1.14.0)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    responders (3.1.1)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rubocop (1.63.5)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.11.2)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-progressbar (1.13.0)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sprockets (4.0.2)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    standard (1.1.1)
-      rubocop (= 1.14.0)
-      rubocop-performance (= 1.11.2)
-    standardrb (1.0.0)
+    sqlite3 (1.7.3-x86_64-linux)
+    standard (1.36.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.63.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.4)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.4.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.21.0)
+    standardrb (1.0.1)
       standard
-    thor (1.1.0)
-    tzinfo (2.0.4)
+    strscan (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.5.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (3.3.0)
-    zeitwerk (2.4.2)
+    will_paginate (4.0.0)
+    zeitwerk (2.6.15)
 
 PLATFORMS
-  x86_64-darwin-20
-  x86_64-linux
+  x86_64-linux-gnu
 
 DEPENDENCIES
   appraisal
   devise
+  font-awesome-sass (~> 5.13.1)
   puma
   rails (~> 6.1.0)
   simple_discussion!
-  sqlite3
+  sprockets-rails
+  sqlite3 (~> 1.7.2)
   standardrb
 
 BUNDLED WITH
-   2.2.15
+   2.5.11
diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_7.gemfile
similarity index 57%
rename from gemfiles/rails_5_2.gemfile
rename to gemfiles/rails_7.gemfile
index cd2c38a..0ddc27e 100644
--- a/gemfiles/rails_5_2.gemfile
+++ b/gemfiles/rails_7.gemfile
@@ -2,11 +2,13 @@
 
 source "https://rubygems.org"
 
-gem "appraisal"
-gem "standardrb"
 gem "devise"
 gem "puma"
-gem "sqlite3"
-gem "rails", "~> 5.2.0"
+gem "sprockets-rails"
+gem "sqlite3", "~> 1.7.2"
+gem "appraisal"
+gem "standardrb"
+gem "font-awesome-sass", "~> 5.13.1"
+gem "rails", "~> 7.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock
new file mode 100644
index 0000000..dd9e779
--- /dev/null
+++ b/gemfiles/rails_7.gemfile.lock
@@ -0,0 +1,248 @@
+PATH
+  remote: ..
+  specs:
+    simple_discussion (1.3.0)
+      font-awesome-sass (>= 5.13.0)
+      friendly_id (>= 5.2.0)
+      rails (>= 4.2)
+      will_paginate (>= 3.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.0.8.3)
+      actionpack (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (7.0.8.3)
+      actionpack (= 7.0.8.3)
+      activejob (= 7.0.8.3)
+      activerecord (= 7.0.8.3)
+      activestorage (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.8.3)
+      actionpack (= 7.0.8.3)
+      actionview (= 7.0.8.3)
+      activejob (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.8.3)
+      actionview (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
+      rack (~> 2.0, >= 2.2.4)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.8.3)
+      actionpack (= 7.0.8.3)
+      activerecord (= 7.0.8.3)
+      activestorage (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.0.8.3)
+      activesupport (= 7.0.8.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.8.3)
+      activesupport (= 7.0.8.3)
+      globalid (>= 0.3.6)
+    activemodel (7.0.8.3)
+      activesupport (= 7.0.8.3)
+    activerecord (7.0.8.3)
+      activemodel (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
+    activestorage (7.0.8.3)
+      actionpack (= 7.0.8.3)
+      activejob (= 7.0.8.3)
+      activerecord (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.8.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    bcrypt (3.1.20)
+    builder (3.2.4)
+    concurrent-ruby (1.3.1)
+    crass (1.0.6)
+    date (3.3.4)
+    devise (4.9.4)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0)
+      responders
+      warden (~> 1.2.3)
+    erubi (1.12.0)
+    ffi (1.17.0-x86_64-linux-gnu)
+    font-awesome-sass (5.13.1)
+      sassc (>= 1.11)
+    friendly_id (5.5.1)
+      activerecord (>= 4.0.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.1.0)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    method_source (1.1.0)
+    mini_mime (1.1.5)
+    minitest (5.23.1)
+    net-imap (0.4.12)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.3)
+    nokogiri (1.16.5-x86_64-linux)
+      racc (~> 1.4)
+    orm_adapter (0.5.0)
+    parallel (1.24.0)
+    parser (3.3.2.0)
+      ast (~> 2.4.1)
+      racc
+    puma (6.4.2)
+      nio4r (~> 2.0)
+    racc (1.8.0)
+    rack (2.2.9)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (7.0.8.3)
+      actioncable (= 7.0.8.3)
+      actionmailbox (= 7.0.8.3)
+      actionmailer (= 7.0.8.3)
+      actionpack (= 7.0.8.3)
+      actiontext (= 7.0.8.3)
+      actionview (= 7.0.8.3)
+      activejob (= 7.0.8.3)
+      activemodel (= 7.0.8.3)
+      activerecord (= 7.0.8.3)
+      activestorage (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
+      bundler (>= 1.15.0)
+      railties (= 7.0.8.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.0.8.3)
+      actionpack (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    responders (3.1.1)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rubocop (1.63.5)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-progressbar (1.13.0)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.7.3-x86_64-linux)
+    standard (1.36.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.63.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.4)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.4.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.21.0)
+    standardrb (1.0.1)
+      standard
+    strscan (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+    warden (1.2.9)
+      rack (>= 2.0.9)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    will_paginate (4.0.0)
+    zeitwerk (2.6.15)
+
+PLATFORMS
+  x86_64-linux-gnu
+
+DEPENDENCIES
+  appraisal
+  devise
+  font-awesome-sass (~> 5.13.1)
+  puma
+  rails (~> 7.0.0)
+  simple_discussion!
+  sprockets-rails
+  sqlite3 (~> 1.7.2)
+  standardrb
+
+BUNDLED WITH
+   2.5.11
diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_7_1.gemfile
similarity index 57%
rename from gemfiles/rails_6.gemfile
rename to gemfiles/rails_7_1.gemfile
index 77e1f7d..c4c702b 100644
--- a/gemfiles/rails_6.gemfile
+++ b/gemfiles/rails_7_1.gemfile
@@ -2,11 +2,13 @@
 
 source "https://rubygems.org"
 
-gem "appraisal"
-gem "standardrb"
 gem "devise"
 gem "puma"
-gem "sqlite3"
-gem "rails", "~> 6.0.0"
+gem "sprockets-rails"
+gem "sqlite3", "~> 1.7.2"
+gem "appraisal"
+gem "standardrb"
+gem "font-awesome-sass", "~> 5.13.1"
+gem "rails", "~> 7.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_1.gemfile.lock b/gemfiles/rails_7_1.gemfile.lock
new file mode 100644
index 0000000..7fad461
--- /dev/null
+++ b/gemfiles/rails_7_1.gemfile.lock
@@ -0,0 +1,279 @@
+PATH
+  remote: ..
+  specs:
+    simple_discussion (1.3.0)
+      font-awesome-sass (>= 5.13.0)
+      friendly_id (>= 5.2.0)
+      rails (>= 4.2)
+      will_paginate (>= 3.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activestorage (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      actionview (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.3.3)
+      actionview (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activestorage (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.1.3.3)
+      activesupport (= 7.1.3.3)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.3.3)
+      activesupport (= 7.1.3.3)
+      globalid (>= 0.3.6)
+    activemodel (7.1.3.3)
+      activesupport (= 7.1.3.3)
+    activerecord (7.1.3.3)
+      activemodel (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      timeout (>= 0.4.0)
+    activestorage (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      marcel (~> 1.0)
+    activesupport (7.1.3.3)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    bcrypt (3.1.20)
+    bigdecimal (3.1.8)
+    builder (3.2.4)
+    concurrent-ruby (1.3.1)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    date (3.3.4)
+    devise (4.9.4)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0)
+      responders
+      warden (~> 1.2.3)
+    drb (2.2.1)
+    erubi (1.12.0)
+    ffi (1.17.0-x86_64-linux-gnu)
+    font-awesome-sass (5.13.1)
+      sassc (>= 1.11)
+    friendly_id (5.5.1)
+      activerecord (>= 4.0.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    io-console (0.7.2)
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.1.0)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    mini_mime (1.1.5)
+    minitest (5.23.1)
+    mutex_m (0.2.0)
+    net-imap (0.4.12)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.3)
+    nokogiri (1.16.5-x86_64-linux)
+      racc (~> 1.4)
+    orm_adapter (0.5.0)
+    parallel (1.24.0)
+    parser (3.3.2.0)
+      ast (~> 2.4.1)
+      racc
+    psych (5.1.2)
+      stringio
+    puma (6.4.2)
+      nio4r (~> 2.0)
+    racc (1.8.0)
+    rack (3.0.11)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails (7.1.3.3)
+      actioncable (= 7.1.3.3)
+      actionmailbox (= 7.1.3.3)
+      actionmailer (= 7.1.3.3)
+      actionpack (= 7.1.3.3)
+      actiontext (= 7.1.3.3)
+      actionview (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activemodel (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activestorage (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      bundler (>= 1.15.0)
+      railties (= 7.1.3.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.5.8)
+      io-console (~> 0.5)
+    responders (3.1.1)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rubocop (1.63.5)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-progressbar (1.13.0)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.7.3-x86_64-linux)
+    standard (1.36.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.63.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.4)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.4.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.21.0)
+    standardrb (1.0.1)
+      standard
+    stringio (3.1.0)
+    strscan (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+    warden (1.2.9)
+      rack (>= 2.0.9)
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    will_paginate (4.0.0)
+    zeitwerk (2.6.15)
+
+PLATFORMS
+  x86_64-linux-gnu
+
+DEPENDENCIES
+  appraisal
+  devise
+  font-awesome-sass (~> 5.13.1)
+  puma
+  rails (~> 7.1.0)
+  simple_discussion!
+  sprockets-rails
+  sqlite3 (~> 1.7.2)
+  standardrb
+
+BUNDLED WITH
+   2.5.11
diff --git a/gemfiles/rails_master.gemfile b/gemfiles/rails_main.gemfile
similarity index 67%
rename from gemfiles/rails_master.gemfile
rename to gemfiles/rails_main.gemfile
index 26a3628..1cdd81c 100644
--- a/gemfiles/rails_master.gemfile
+++ b/gemfiles/rails_main.gemfile
@@ -2,11 +2,13 @@
 
 source "https://rubygems.org"
 
+gem "devise"
+gem "puma"
+gem "sprockets-rails"
+gem "sqlite3", "~> 2.0"
 gem "appraisal"
 gem "standardrb"
-gem "devise", branch: "patch-2", git: "https://github.com/ghiculescu/devise"
-gem "puma"
-gem "sqlite3"
+gem "font-awesome-sass", "~> 5.13.1"
 gem "rails", branch: "main", git: "https://github.com/rails/rails"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_main.gemfile.lock b/gemfiles/rails_main.gemfile.lock
new file mode 100644
index 0000000..1eeb031
--- /dev/null
+++ b/gemfiles/rails_main.gemfile.lock
@@ -0,0 +1,311 @@
+GIT
+  remote: https://github.com/rails/rails
+  revision: 3769f1eee6a1ec4f6438155d67477db6d192577f
+  branch: main
+  specs:
+    actioncable (8.0.0.alpha)
+      actionpack (= 8.0.0.alpha)
+      activesupport (= 8.0.0.alpha)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (8.0.0.alpha)
+      actionpack (= 8.0.0.alpha)
+      activejob (= 8.0.0.alpha)
+      activerecord (= 8.0.0.alpha)
+      activestorage (= 8.0.0.alpha)
+      activesupport (= 8.0.0.alpha)
+      mail (>= 2.8.0)
+    actionmailer (8.0.0.alpha)
+      actionpack (= 8.0.0.alpha)
+      actionview (= 8.0.0.alpha)
+      activejob (= 8.0.0.alpha)
+      activesupport (= 8.0.0.alpha)
+      mail (>= 2.8.0)
+      rails-dom-testing (~> 2.2)
+    actionpack (8.0.0.alpha)
+      actionview (= 8.0.0.alpha)
+      activesupport (= 8.0.0.alpha)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actiontext (8.0.0.alpha)
+      actionpack (= 8.0.0.alpha)
+      activerecord (= 8.0.0.alpha)
+      activestorage (= 8.0.0.alpha)
+      activesupport (= 8.0.0.alpha)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (8.0.0.alpha)
+      activesupport (= 8.0.0.alpha)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (8.0.0.alpha)
+      activesupport (= 8.0.0.alpha)
+      globalid (>= 0.3.6)
+    activemodel (8.0.0.alpha)
+      activesupport (= 8.0.0.alpha)
+    activerecord (8.0.0.alpha)
+      activemodel (= 8.0.0.alpha)
+      activesupport (= 8.0.0.alpha)
+      timeout (>= 0.4.0)
+    activestorage (8.0.0.alpha)
+      actionpack (= 8.0.0.alpha)
+      activejob (= 8.0.0.alpha)
+      activerecord (= 8.0.0.alpha)
+      activesupport (= 8.0.0.alpha)
+      marcel (~> 1.0)
+    activesupport (8.0.0.alpha)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0, >= 2.0.5)
+    rails (8.0.0.alpha)
+      actioncable (= 8.0.0.alpha)
+      actionmailbox (= 8.0.0.alpha)
+      actionmailer (= 8.0.0.alpha)
+      actionpack (= 8.0.0.alpha)
+      actiontext (= 8.0.0.alpha)
+      actionview (= 8.0.0.alpha)
+      activejob (= 8.0.0.alpha)
+      activemodel (= 8.0.0.alpha)
+      activerecord (= 8.0.0.alpha)
+      activestorage (= 8.0.0.alpha)
+      activesupport (= 8.0.0.alpha)
+      bundler (>= 1.15.0)
+      railties (= 8.0.0.alpha)
+    railties (8.0.0.alpha)
+      actionpack (= 8.0.0.alpha)
+      activesupport (= 8.0.0.alpha)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+
+PATH
+  remote: ..
+  specs:
+    simple_discussion (1.3.0)
+      font-awesome-sass (>= 5.13.0)
+      friendly_id (>= 5.2.0)
+      rails (>= 4.2)
+      will_paginate (>= 3.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    bcrypt (3.1.20)
+    bigdecimal (3.1.8)
+    builder (3.2.4)
+    concurrent-ruby (1.3.1)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    date (3.3.4)
+    devise (4.9.4)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0)
+      responders
+      warden (~> 1.2.3)
+    drb (2.2.1)
+    erubi (1.12.0)
+    ffi (1.17.0)
+    ffi (1.17.0-x86_64-linux-gnu)
+    font-awesome-sass (5.13.1)
+      sassc (>= 1.11)
+    friendly_id (5.5.1)
+      activerecord (>= 4.0.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    io-console (0.7.2)
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.1.0)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    mini_mime (1.1.5)
+    minitest (5.23.1)
+    net-imap (0.4.12)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.3)
+    nokogiri (1.16.5-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.5-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.5-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.5-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.5-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.5-x86_64-linux)
+      racc (~> 1.4)
+    orm_adapter (0.5.0)
+    parallel (1.24.0)
+    parser (3.3.2.0)
+      ast (~> 2.4.1)
+      racc
+    psych (5.1.2)
+      stringio
+    puma (6.4.2)
+      nio4r (~> 2.0)
+    racc (1.8.0)
+    rack (3.0.11)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.5.8)
+      io-console (~> 0.5)
+    responders (3.1.1)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rubocop (1.63.5)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-progressbar (1.13.0)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      sprockets (>= 3.0.0)
+    sqlite3 (2.0.2-aarch64-linux-gnu)
+    sqlite3 (2.0.2-aarch64-linux-musl)
+    sqlite3 (2.0.2-arm-linux-gnu)
+    sqlite3 (2.0.2-arm-linux-musl)
+    sqlite3 (2.0.2-arm64-darwin)
+    sqlite3 (2.0.2-x86-linux-gnu)
+    sqlite3 (2.0.2-x86-linux-musl)
+    sqlite3 (2.0.2-x86_64-darwin)
+    sqlite3 (2.0.2-x86_64-linux-gnu)
+    sqlite3 (2.0.2-x86_64-linux-musl)
+    standard (1.36.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.63.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.4)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.4.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.21.0)
+    standardrb (1.0.1)
+      standard
+    stringio (3.1.0)
+    strscan (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+    useragent (0.16.10)
+    warden (1.2.9)
+      rack (>= 2.0.9)
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    will_paginate (4.0.0)
+    zeitwerk (2.6.15)
+
+PLATFORMS
+  aarch64-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86-linux
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
+
+DEPENDENCIES
+  appraisal
+  devise
+  font-awesome-sass (~> 5.13.1)
+  puma
+  rails!
+  simple_discussion!
+  sprockets-rails
+  sqlite3 (~> 2.0)
+  standardrb
+
+BUNDLED WITH
+   2.5.11
diff --git a/gemfiles/rails_master.gemfile.lock b/gemfiles/rails_master.gemfile.lock
deleted file mode 100644
index 2c5a2c7..0000000
--- a/gemfiles/rails_master.gemfile.lock
+++ /dev/null
@@ -1,222 +0,0 @@
-GIT
-  remote: https://github.com/ghiculescu/devise
-  revision: e37ea6a0143b9b8a3477b1ed397d8a22ad317a61
-  branch: patch-2
-  specs:
-    devise (4.7.3)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
-      responders
-      warden (~> 1.2.3)
-
-GIT
-  remote: https://github.com/rails/rails
-  revision: 24a1759d7050e51c00777ec28138e99669ca7ecb
-  branch: main
-  specs:
-    actioncable (7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      activejob (= 7.0.0.alpha)
-      activerecord (= 7.0.0.alpha)
-      activestorage (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      mail (>= 2.7.1)
-    actionmailer (7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      actionview (= 7.0.0.alpha)
-      activejob (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.0.alpha)
-      actionview (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      rack (~> 2.0, >= 2.0.9)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      activerecord (= 7.0.0.alpha)
-      activestorage (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      nokogiri (>= 1.8.5)
-    actionview (7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      globalid (>= 0.3.6)
-    activemodel (7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-    activerecord (7.0.0.alpha)
-      activemodel (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-    activestorage (7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      activejob (= 7.0.0.alpha)
-      activerecord (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      marcel (~> 1.0.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.0.alpha)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    rails (7.0.0.alpha)
-      actioncable (= 7.0.0.alpha)
-      actionmailbox (= 7.0.0.alpha)
-      actionmailer (= 7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      actiontext (= 7.0.0.alpha)
-      actionview (= 7.0.0.alpha)
-      activejob (= 7.0.0.alpha)
-      activemodel (= 7.0.0.alpha)
-      activerecord (= 7.0.0.alpha)
-      activestorage (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      bundler (>= 1.15.0)
-      railties (= 7.0.0.alpha)
-      sprockets-rails (>= 2.0.0)
-    railties (7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      method_source
-      rake (>= 0.13)
-      thor (~> 1.0)
-
-PATH
-  remote: ..
-  specs:
-    simple_discussion (1.3.0)
-      font-awesome-sass (>= 5.13.0)
-      friendly_id (>= 5.2.0)
-      rails (>= 4.2)
-      will_paginate (>= 3.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    appraisal (2.4.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    ast (2.4.2)
-    bcrypt (3.1.16)
-    builder (3.2.4)
-    concurrent-ruby (1.1.8)
-    crass (1.0.6)
-    erubi (1.10.0)
-    ffi (1.15.0)
-    font-awesome-sass (5.15.1)
-      sassc (>= 1.11)
-    friendly_id (5.4.2)
-      activerecord (>= 4.0.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    loofah (2.9.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (1.0.1)
-    method_source (1.0.0)
-    mini_mime (1.1.0)
-    minitest (5.14.4)
-    nio4r (2.5.7)
-    nokogiri (1.11.3-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.11.3-x86_64-linux)
-      racc (~> 1.4)
-    orm_adapter (0.5.0)
-    parallel (1.20.1)
-    parser (3.0.1.1)
-      ast (~> 2.4.1)
-    puma (5.3.1)
-      nio4r (~> 2.0)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
-    rexml (3.2.5)
-    rubocop (1.14.0)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.11.2)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    standard (1.1.1)
-      rubocop (= 1.14.0)
-      rubocop-performance (= 1.11.2)
-    standardrb (1.0.0)
-      standard
-    thor (1.1.0)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    warden (1.2.9)
-      rack (>= 2.0.9)
-    websocket-driver (0.7.3)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    will_paginate (3.3.0)
-    zeitwerk (2.4.2)
-
-PLATFORMS
-  x86_64-darwin-20
-  x86_64-linux
-
-DEPENDENCIES
-  appraisal
-  devise!
-  puma
-  rails!
-  simple_discussion!
-  sqlite3
-  standardrb
-
-BUNDLED WITH
-   2.2.15
diff --git a/simple_discussion.gemspec b/simple_discussion.gemspec
index 87b4987..c243509 100644
--- a/simple_discussion.gemspec
+++ b/simple_discussion.gemspec
@@ -1,4 +1,6 @@
-lib = File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "simple_discussion/version"
 
@@ -24,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "friendly_id", ">= 5.2.0"
   spec.add_dependency "rails", ">= 4.2"
   spec.add_dependency "will_paginate", ">= 3.1.0"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end
diff --git a/test/dummy/db/migrate/20210331160629_create_forum_categories.simple_discussion.rb b/test/dummy/db/migrate/20210331160629_create_forum_categories.simple_discussion.rb
deleted file mode 100644
index 83e458f..0000000
--- a/test/dummy/db/migrate/20210331160629_create_forum_categories.simple_discussion.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# This migration comes from simple_discussion (originally 20170417012930)
-class CreateForumCategories < ActiveRecord::Migration[4.2]
-  def change
-    create_table :forum_categories do |t|
-      t.string :name, null: false
-      t.string :slug, null: false
-      t.string :color, default: "000000"
-
-      t.timestamps
-    end
-
-    ForumCategory.reset_column_information
-
-    ForumCategory.create(
-      name: "General",
-      color: "#4ea1d3"
-    )
-
-    ForumCategory.create(
-      name: "Feedback",
-      color: "#16bc9c"
-    )
-  end
-end
diff --git a/test/dummy/db/migrate/20210331160630_create_forum_threads.simple_discussion.rb b/test/dummy/db/migrate/20210331160630_create_forum_threads.simple_discussion.rb
deleted file mode 100644
index 651409b..0000000
--- a/test/dummy/db/migrate/20210331160630_create_forum_threads.simple_discussion.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# This migration comes from simple_discussion (originally 20170417012931)
-class CreateForumThreads < ActiveRecord::Migration[4.2]
-  def change
-    create_table :forum_threads do |t|
-      t.references :forum_category, foreign_key: true
-      t.references :user, foreign_key: true
-      t.string :title, null: false
-      t.string :slug, null: false
-      t.integer :forum_posts_count, default: 0
-      t.boolean :pinned, default: false
-      t.boolean :solved, default: false
-
-      t.timestamps
-    end
-  end
-end
diff --git a/test/dummy/db/migrate/20210331160631_create_forum_posts.simple_discussion.rb b/test/dummy/db/migrate/20210331160631_create_forum_posts.simple_discussion.rb
deleted file mode 100644
index 9872a57..0000000
--- a/test/dummy/db/migrate/20210331160631_create_forum_posts.simple_discussion.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# This migration comes from simple_discussion (originally 20170417012932)
-class CreateForumPosts < ActiveRecord::Migration[4.2]
-  def change
-    create_table :forum_posts do |t|
-      t.references :forum_thread, foreign_key: true
-      t.references :user, foreign_key: true
-      t.text :body
-      t.boolean :solved, default: false
-
-      t.timestamps
-    end
-  end
-end
diff --git a/test/dummy/db/migrate/20210331160632_create_forum_subscriptions.simple_discussion.rb b/test/dummy/db/migrate/20210331160632_create_forum_subscriptions.simple_discussion.rb
deleted file mode 100644
index 57d4911..0000000
--- a/test/dummy/db/migrate/20210331160632_create_forum_subscriptions.simple_discussion.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# This migration comes from simple_discussion (originally 20170417012933)
-class CreateForumSubscriptions < ActiveRecord::Migration[4.2]
-  def change
-    create_table :forum_subscriptions do |t|
-      t.references :forum_thread, foreign_key: true
-      t.references :user, foreign_key: true
-      t.string :subscription_type
-
-      t.timestamps
-    end
-  end
-end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8242a39..d8224a6 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -10,13 +10,16 @@
 Minitest.backtrace_filter = Minitest::BacktraceFilter.new
 
 # Load fixtures from the engine
-if ActiveSupport::TestCase.respond_to?(:fixture_path=)
+if ActiveSupport::TestCase.respond_to?(:fixture_paths=)
+  ActiveSupport::TestCase.fixture_paths << File.expand_path("../fixtures", __FILE__)
+  ActionDispatch::IntegrationTest.fixture_paths << File.expand_path("../fixtures", __FILE__)
+elsif ActiveSupport::TestCase.respond_to?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
   ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
-  ActiveSupport::TestCase.file_fixture_path = ActiveSupport::TestCase.fixture_path + "/files"
-  ActiveSupport::TestCase.fixtures :all
 end
 
+ActiveSupport::TestCase.fixtures :all
+
 class ActiveSupport::TestCase
   include ActionMailer::TestHelper
   include ActiveJob::TestHelper