diff --git a/Gemfile b/Gemfile
index 775ddeb8..b1169f10 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,7 +62,8 @@ gem 'openstax_utilities'
 gem 'omniauth-oauth2'
 
 # OpenStax Accounts integration
-gem 'openstax_accounts', '~> 9.5.1'
+# DO NOT UPGRADE until it's updated to work with Rails 6.x
+gem 'openstax_accounts', '9.6.0'
 
 # Access control for API's
 gem 'doorkeeper'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6cde95e6..eed1e845 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -69,13 +69,13 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    acts_as_votable (0.12.0)
+    acts_as_votable (0.13.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    apipie-rails (0.5.16)
+    apipie-rails (0.5.18)
       rails (>= 4.1)
-    ast (2.4.0)
-    autoprefixer-rails (9.6.0)
+    ast (2.4.2)
+    autoprefixer-rails (10.2.4.0)
       execjs
     aws-eventstream (1.1.0)
     aws-partitions (1.422.0)
@@ -87,41 +87,44 @@ GEM
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.41.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kms (1.42.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.87.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-s3 (1.88.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-secretsmanager (1.43.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-secretsmanager (1.44.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.95.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ssm (1.104.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
-    bindex (0.7.0)
-    bootsnap (1.4.4)
+    bindex (0.8.1)
+    bootsnap (1.4.9)
       msgpack (~> 1.0)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
-    brakeman (4.5.1)
+    brakeman (5.0.0)
     builder (3.2.4)
-    byebug (11.0.1)
-    carrierwave (1.3.1)
-      activemodel (>= 4.0.0)
-      activesupport (>= 4.0.0)
-      mime-types (>= 1.16)
+    byebug (11.1.3)
+    carrierwave (2.1.0)
+      activemodel (>= 5.0.0)
+      activesupport (>= 5.0.0)
+      addressable (~> 2.6)
+      image_processing (~> 1.1)
+      mimemagic (>= 0.3.0)
+      mini_mime (>= 0.1.3)
     cheat (1.3.3)
       pager (~> 1.0)
     choice (0.2.0)
-    chunky_png (1.3.11)
+    chunky_png (1.4.0)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
-    codecov (0.2.11)
+    codecov (0.2.12)
       json
       simplecov
     compass (1.0.3)
@@ -136,14 +139,17 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    compass-rails (3.1.0)
+    compass-rails (2.0.1)
       compass (~> 1.0.0)
-      sass-rails (< 5.1)
-      sprockets (< 4.0)
     concurrent-ruby (1.1.8)
     crass (1.0.6)
     daemons (1.3.1)
-    database_cleaner (1.7.0)
+    database_cleaner (2.0.0)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.0)
     declarative (0.0.20)
     deep_cloneable (3.0.0)
       activerecord (>= 3.1.0, < 7)
@@ -162,33 +168,36 @@ GEM
     exception_notification (4.4.3)
       actionmailer (>= 4.0, < 7)
       activesupport (>= 4.0, < 7)
-    excon (0.71.0)
+    excon (0.79.0)
     execjs (2.7.0)
-    factory_bot (5.0.2)
-      activesupport (>= 4.2.0)
-    factory_bot_rails (5.0.2)
-      factory_bot (~> 5.0.2)
-      railties (>= 4.2.0)
-    faker (1.9.3)
-      i18n (>= 0.7)
-    faraday (0.17.3)
+    factory_bot (6.1.0)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.1.0)
+      factory_bot (~> 6.1.0)
+      railties (>= 5.0.0)
+    faker (2.15.1)
+      i18n (>= 1.6, < 2)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     faraday-http-cache (2.2.0)
       faraday (>= 0.8)
-    ffi (1.11.1)
+    faraday-net_http (1.0.1)
+    ffi (1.14.2)
     fine_print (6.0.0)
       action_interceptor
       jquery-rails
       rails
       responders
-    fog-aws (3.5.0)
+    fog-aws (3.8.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (2.1.2)
+    fog-core (2.2.3)
       builder
-      excon (~> 0.58)
+      excon (~> 0.71)
       formatador (~> 0.2)
       mime-types
     fog-json (1.2.0)
@@ -203,7 +212,7 @@ GEM
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashie (4.1.0)
-    httparty (0.17.0)
+    httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (1.8.8)
@@ -212,7 +221,6 @@ GEM
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     ipaddress (0.8.3)
-    jaro_winkler (1.5.2)
     jmespath (1.4.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
@@ -220,7 +228,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.3.1)
+    json (2.5.1)
     jwt (2.2.2)
     keyword_search (1.5.0)
     lev (11.0.0)
@@ -232,12 +240,11 @@ GEM
       hashie
       transaction_isolation
       transaction_retry
-    libv8 (7.3.492.27.1)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lograge (0.11.1)
+    libv8 (8.4.255.0)
+    listen (3.4.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lograge (0.11.2)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
@@ -251,17 +258,17 @@ GEM
       mimemagic (~> 0.3.2)
     maruku (0.7.3)
     method_source (1.0.0)
-    mime-types (3.2.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2020.1104)
     mimemagic (0.3.5)
     mini_magick (4.11.0)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
-    mini_racer (0.2.6)
-      libv8 (>= 6.9.411)
+    mini_racer (0.3.1)
+      libv8 (~> 8.4.255)
     minitest (5.14.3)
-    msgpack (1.2.10)
+    msgpack (1.4.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
@@ -270,7 +277,7 @@ GEM
     nokogiri (1.11.1)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    nokogumbo (2.0.2)
+    nokogumbo (2.0.4)
       nokogiri (~> 1.8, >= 1.8.4)
     oauth2 (1.4.4)
       faraday (>= 0.8, < 2.0)
@@ -278,26 +285,25 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.7.12)
+    oj (3.11.2)
     oj_mimic_json (1.0.1)
-    omniauth (2.0.1)
+    omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-      rack-protection
     omniauth-oauth2 (1.7.1)
       oauth2 (~> 1.4)
       omniauth (>= 1.9, < 3)
-    openstax_accounts (9.5.1)
+    openstax_accounts (9.6.0)
       action_interceptor
       keyword_search
       lev
       oauth2
-      omniauth
+      omniauth (< 2.0)
       omniauth-oauth2
       openstax_api
       openstax_utilities
       pg
-      rails (> 5.0)
+      rails (>= 5.0, < 7.0)
       representable
       roar
     openstax_api (9.4.0)
@@ -324,22 +330,20 @@ GEM
       rails (>= 5.0, < 7.0)
       request_store
     pager (1.0.1)
-    parallel (1.17.0)
-    parallel_tests (2.29.0)
+    parallel (1.20.1)
+    parallel_tests (3.4.0)
       parallel
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
     pg (1.2.3)
     public_suffix (4.0.6)
-    puma (5.1.0)
+    puma (5.2.0)
       nio4r (~> 2.0)
     puma_worker_killer (0.3.1)
       get_process_mem (~> 0.2)
       puma (>= 2.7)
     racc (1.5.2)
     rack (2.2.3)
-    rack-protection (2.1.0)
-      rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     railroady (1.5.3)
@@ -376,11 +380,12 @@ GEM
       thor (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     redis (4.2.5)
-    remotipart (1.4.3)
+    regexp_parser (2.0.3)
+    remotipart (1.4.4)
     representable (3.0.0)
       declarative (~> 0.0.5)
       uber (~> 0.0.15)
@@ -389,6 +394,7 @@ GEM
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
+    rexml (3.2.4)
     rinku (2.0.6)
     roar (1.0.3)
       representable (>= 2.0.1, <= 3.0.0)
@@ -399,9 +405,9 @@ GEM
       roar (>= 1.0.0, <= 1.1.0)
       test_xml (>= 0.1.6)
       uber (>= 0.0.5)
-    roo (2.8.2)
+    roo (2.8.3)
       nokogiri (~> 1)
-      rubyzip (>= 1.2.1, < 2.0.0)
+      rubyzip (>= 1.3.0, < 3.0.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -425,42 +431,47 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    rubocop (0.71.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.9.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rails (2.0.0)
-      rack (>= 2.0)
-      rubocop (>= 0.70.0)
-    ruby-graphviz (1.2.4)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    ruby-graphviz (1.2.5)
+      rexml
+    ruby-progressbar (1.11.0)
     ruby-vips (2.0.17)
       ffi (~> 1.9)
-    ruby_dep (1.5.0)
-    rubyzip (1.3.0)
-    sanitize (5.2.1)
+    ruby2_keywords (0.0.4)
+    rubyzip (2.3.0)
+    sanitize (5.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
     sass (3.4.25)
-    sass-rails (5.0.8)
+    sass-rails (5.1.0)
       railties (>= 5.2.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sassc (2.0.1)
+    sassc (2.4.0)
       ffi (~> 1.9)
-      rake
     scout_apm (4.0.3)
       parser
     sd_notify (0.1.0)
-    sentry-raven (2.9.0)
-      faraday (>= 0.7.6, < 1.0)
-    shoulda-matchers (4.0.1)
+    sentry-raven (3.1.1)
+      faraday (>= 1.0)
+    shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
     simplecov (0.13.0)
       docile (~> 1.1.0)
@@ -479,32 +490,32 @@ GEM
     test_xml (0.1.8)
       diffy (~> 3.0)
       nokogiri (>= 1.3.2)
-    thin (1.7.2)
+    thin (1.8.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (1.1.0)
     tilt (2.0.10)
-    timecop (0.9.1)
+    timecop (0.9.2)
     transaction_isolation (1.0.5)
       activerecord (>= 3.0.11)
     transaction_retry (1.0.3)
       activerecord (>= 3.0.11)
       transaction_isolation (>= 1.0.2)
-    turbolinks (5.2.0)
+    turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     uber (0.0.15)
-    uglifier (4.1.20)
+    uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.6.0)
-    web-console (3.7.0)
-      actionview (>= 5.0)
-      activemodel (>= 5.0)
+    unicode-display_width (2.0.0)
+    web-console (4.1.0)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
-      railties (>= 5.0)
+      railties (>= 6.0.0)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -555,7 +566,7 @@ DEPENDENCIES
   oj
   oj_mimic_json
   omniauth-oauth2
-  openstax_accounts (~> 9.5.1)
+  openstax_accounts (= 9.6.0)
   openstax_api
   openstax_healthcheck
   openstax_rescue_from
@@ -591,4 +602,4 @@ DEPENDENCIES
   web-console
 
 BUNDLED WITH
-   2.2.6
+   2.1.2
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index d692fc23..323a1d2a 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -10,3 +10,6 @@
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
 Rails.application.config.assets.precompile += %w( admin.js admin.css )
+Rails.application.config.assets.paths.concat(
+  Compass::Frameworks::ALL.map { |f| f.stylesheets_directory }
+)