diff --git a/Gemfile b/Gemfile
index b48da1db..b6ed9b1f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,7 +53,7 @@ gem "versionaire", "~> 15.0"
 gem "wholeable", "~> 2.1"
 
 group :quality do
-  gem "caliber", "~> 0.90"
+  gem "caliber", "~> 0.91"
   gem "git-lint", "~> 10.0"
   gem "reek", "~> 6.5", require: false
   gem "rubocop-sequel", "~> 0.3"
diff --git a/Gemfile.lock b/Gemfile.lock
index 7ed84d96..8e45a123 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,9 +14,9 @@ GEM
     bigdecimal (3.3.1)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
-    caliber (0.90.0)
+    caliber (0.91.0)
       rubocop (~> 1.86)
-      rubocop-capybara (~> 2.22)
+      rubocop-capybara (~> 2.23)
       rubocop-disable_syntax (~> 0.2)
       rubocop-packaging (~> 0.6)
       rubocop-performance (~> 1.26)
@@ -282,7 +282,7 @@ GEM
     irb-kit (2.2.0)
       irb (~> 1.16)
       zeitwerk (~> 2.7)
-    json (2.19.4)
+    json (2.19.5)
     jwt (3.1.2)
       base64
     language_server-protocol (3.17.0.5)
@@ -463,9 +463,9 @@ GEM
     rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-capybara (2.22.1)
+    rubocop-capybara (2.23.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (~> 1.81)
     rubocop-disable_syntax (0.2.0)
       lint_roller
       rubocop (>= 1.72.0)
@@ -594,7 +594,7 @@ PLATFORMS
 DEPENDENCIES
   amazing_print (~> 2.0)
   bcrypt (~> 3.1)
-  caliber (~> 0.90)
+  caliber (~> 0.91)
   capybara (~> 3.40)
   capybara-validate_html5 (~> 2.1)
   cogger (~> 2.0)
@@ -672,7 +672,7 @@ CHECKSUMS
   better_errors (2.10.1) sha256=f798f1bac93f3e775925b7fcb24cffbcf0bb62ee2210f5350f161a6b75fc0a73
   bigdecimal (3.3.1) sha256=eaa01e228be54c4f9f53bf3cc34fe3d5e845c31963e7fcc5bedb05a4e7d52218
   binding_of_caller (1.0.1) sha256=2b2902abff4246ddcfbc4da9b69bc4a019e22aeb300c2ff6289a173d4b90b29a
-  caliber (0.90.0) sha256=5205bba388272e48d6013430f456473b0e76d07dddedcd3c8ec0b6982d01f4c6
+  caliber (0.91.0) sha256=820a65713613f0c1ec639e7598b977e45988fcf8c66e1cd61fd029d70cff8c0e
   capybara (3.40.0) sha256=42dba720578ea1ca65fd7a41d163dd368502c191804558f6e0f71b391054aeef
   capybara-validate_html5 (2.1.0) sha256=9c5bcac8058f05c8468c0856ccfbf91478e24c7ff07c79b8ac7c64ba9291cf5a
   childprocess (5.1.0) sha256=9a8d484be2fd4096a0e90a0cd3e449a05bc3aa33f8ac9e4d6dcef6ac1455b6ec
@@ -757,7 +757,7 @@ CHECKSUMS
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
   irb-kit (2.2.0) sha256=aa81c2f2442c39c435c0818b68aa163d3e99a05bda51fac20188e486ba737032
-  json (2.19.4) sha256=670a7d333fb3b18ca5b29cb255eb7bef099e40d88c02c80bd42a3f30fe5239ac
+  json (2.19.5) sha256=218a18553e4801d579ca7e0f5bc72bafd776d7397238a1fb4e74db5b0a812c59
   jwt (3.1.2) sha256=af6991f19a6bb4060d618d9add7a66f0eeb005ac0bc017cd01f63b42e122d535
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
   launchy (3.1.1) sha256=72b847b5cc961589dde2c395af0108c86ff0119f42d4648d25b5440ebb10059e
@@ -832,7 +832,7 @@ CHECKSUMS
   rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
   rubocop (1.86.1) sha256=44415f3f01d01a21e01132248d2fd0867572475b566ca188a0a42133a08d4531
   rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
-  rubocop-capybara (2.22.1) sha256=ced88caef23efea53f46e098ff352f8fc1068c649606ca75cb74650970f51c0c
+  rubocop-capybara (2.23.0) sha256=f9ea1ba3a7561ee8e88cf76fc378ce517ce5327155f305ee7b5c2500e5aee357
   rubocop-disable_syntax (0.2.0) sha256=1e61645773b3fc2f74e995ec65f605f7db59437c274fdfd4f385f60bf86af73e
   rubocop-packaging (0.6.0) sha256=fb92bd0fb48e6f8cdb1648d2249b0cd51c2497dcc87340132d22f01edbf558a7
   rubocop-performance (1.26.1) sha256=cd19b936ff196df85829d264b522fd4f98b6c89ad271fa52744a8c11b8f71834
diff --git a/spec/features/bulk_device_logs_spec.rb b/spec/features/bulk_device_logs_spec.rb
index aa348f6c..ccb6cb70 100644
--- a/spec/features/bulk_device_logs_spec.rb
+++ b/spec/features/bulk_device_logs_spec.rb
@@ -10,6 +10,6 @@ RSpec.describe "Bulk Device Logs", :db do
     visit routes.path(:device_logs, device_id: log.device_id)
     accept_prompt { click_button "Delete All" }
 
-    expect(page).to have_content("No logs found.")
+    expect(page).to have_text("No logs found.")
   end
 end
diff --git a/spec/features/change_login_spec.rb b/spec/features/change_login_spec.rb
index fa9f0e98..4ecd3b8d 100644
--- a/spec/features/change_login_spec.rb
+++ b/spec/features/change_login_spec.rb
@@ -10,12 +10,12 @@ RSpec.describe "Change Login", :db do
     fill_in "Password", with: "password"
     click_button "Save"
 
-    expect(page).to have_content "logins do not match"
+    expect(page).to have_text "logins do not match"
 
     fill_in "Confirm Email", with: "alternative@test.io"
     fill_in "Password", with: "password"
     click_button "Save"
 
-    expect(page).to have_content "Your login has been changed"
+    expect(page).to have_text "Your login has been changed"
   end
 end
diff --git a/spec/features/change_password_spec.rb b/spec/features/change_password_spec.rb
index e1e170e5..b03126be 100644
--- a/spec/features/change_password_spec.rb
+++ b/spec/features/change_password_spec.rb
@@ -9,6 +9,6 @@ RSpec.describe "Change Password", :db do
     fill_in "New Password", with: "password-123"
     click_button "Save"
 
-    expect(page).to have_content "Your password has been changed"
+    expect(page).to have_text "Your password has been changed"
   end
 end
diff --git a/spec/features/dashboard_spec.rb b/spec/features/dashboard_spec.rb
index eb0af9ca..1d41ba3a 100644
--- a/spec/features/dashboard_spec.rb
+++ b/spec/features/dashboard_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe "Dashboard", :db do
 
   it "renders dashboard when firmware is missing" do
     visit routes.path(:root)
-    expect(page).to have_content("Dashboard")
+    expect(page).to have_text("Dashboard")
   end
 
   it "shows linked resource counts", :aggregate_failures do
diff --git a/spec/features/designer_spec.rb b/spec/features/designer_spec.rb
index 773d2d2f..acc6ba8e 100644
--- a/spec/features/designer_spec.rb
+++ b/spec/features/designer_spec.rb
@@ -5,6 +5,6 @@ require "hanami_helper"
 RSpec.describe "Designer", :db do
   it "renders page" do
     visit routes.path(:designer)
-    expect(page).to have_content("Welcome to the Terminus designer!")
+    expect(page).to have_text("Welcome to the Terminus designer!")
   end
 end
diff --git a/spec/features/device_logs_spec.rb b/spec/features/device_logs_spec.rb
index 310839d5..053d5e8a 100644
--- a/spec/features/device_logs_spec.rb
+++ b/spec/features/device_logs_spec.rb
@@ -12,10 +12,10 @@ RSpec.describe "Device Logs", :db do
     visit routes.path(:devices)
     click_link "Logs"
 
-    expect(page).to have_content("Danger!")
+    expect(page).to have_text("Danger!")
 
     click_link device_log.id.to_s
 
-    expect(page).to have_content("connected")
+    expect(page).to have_text("connected")
   end
 end
diff --git a/spec/features/devices_spec.rb b/spec/features/devices_spec.rb
index 1248543d..9e6c7239 100644
--- a/spec/features/devices_spec.rb
+++ b/spec/features/devices_spec.rb
@@ -14,14 +14,14 @@ RSpec.describe "Devices", :db do
     click_link "New"
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     select model.label, from: "device[model_id]"
     fill_in "device[mac_address]", with: "AA:BB:CC:11:22:33"
     click_button "Save"
     click_link "View"
 
-    expect(page).to have_content("AA:BB:CC:11:22:33")
+    expect(page).to have_text("AA:BB:CC:11:22:33")
   end
 
   it "edits", :aggregate_failures, :js do
@@ -31,12 +31,12 @@ RSpec.describe "Devices", :db do
     fill_in "device[label]", with: nil
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "device[label]", with: "Edit Test"
     click_button "Save"
 
-    expect(page).to have_content("Edit Test")
+    expect(page).to have_text("Edit Test")
   end
 
   it "deletes", :aggregate_failures, :js do
@@ -44,6 +44,6 @@ RSpec.describe "Devices", :db do
     visit routes.path(:devices)
     accept_prompt { click_button "Delete" }
 
-    expect(page).to have_no_content(device.label)
+    expect(page).to have_no_text(device.label)
   end
 end
diff --git a/spec/features/extension_exchanges_spec.rb b/spec/features/extension_exchanges_spec.rb
index 614e3687..dc97e719 100644
--- a/spec/features/extension_exchanges_spec.rb
+++ b/spec/features/extension_exchanges_spec.rb
@@ -11,12 +11,12 @@ RSpec.describe "Extension Exchanges", :db do
     click_link "New"
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "exchange[template]", with: "https://test.io"
     click_button "Save"
 
-    expect(page).to have_content("https://test.io")
+    expect(page).to have_text("https://test.io")
   end
 
   it "edits", :aggregate_failures, :js do
@@ -24,7 +24,7 @@ RSpec.describe "Extension Exchanges", :db do
     fill_in "exchange[template]", with: nil
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "exchange[template]", with: "https://test.io/1"
 
@@ -39,6 +39,6 @@ RSpec.describe "Extension Exchanges", :db do
       accept_prompt { click_button "Delete" }
     end
 
-    expect(page).to have_no_content(exchange.template)
+    expect(page).to have_no_text(exchange.template)
   end
 end
diff --git a/spec/features/extensions_spec.rb b/spec/features/extensions_spec.rb
index ab807eb6..3f454ccd 100644
--- a/spec/features/extensions_spec.rb
+++ b/spec/features/extensions_spec.rb
@@ -12,13 +12,13 @@ RSpec.describe "Extensions", :db do
     fill_in "extension[label]", with: "Test"
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "extension[name]", with: "test"
     click_button "Save"
 
-    expect(page).to have_content("Test")
-    expect(page).to have_content("poll")
+    expect(page).to have_text("Test")
+    expect(page).to have_text("poll")
   end
 
   it "edits", :aggregate_failures, :js do
@@ -29,12 +29,12 @@ RSpec.describe "Extensions", :db do
     fill_in "extension[label]", with: nil
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "extension[label]", with: "Edit Test"
     click_button "Save"
 
-    expect(page).to have_content("Changes saved.")
+    expect(page).to have_text("Changes saved.")
     expect(page).to have_field(with: "Edit Test")
   end
 
@@ -44,7 +44,7 @@ RSpec.describe "Extensions", :db do
     visit routes.path(:extension_edit, id: extension.id)
     click_link "Exchanges"
 
-    expect(page).to have_content(exchange.template)
+    expect(page).to have_text(exchange.template)
   end
 
   it "builds", :js do
@@ -53,7 +53,7 @@ RSpec.describe "Extensions", :db do
     visit routes.path(:extension_edit, id: extension.id)
     click_button "Build"
 
-    expect(page).to have_content("Enqueuing...")
+    expect(page).to have_text("Enqueuing...")
   end
 
   it "clones", :aggregate_failures, :js do
@@ -65,17 +65,17 @@ RSpec.describe "Extensions", :db do
     fill_in "extension[label]", with: nil
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "extension[label]", with: extension.label
     click_button "Save"
 
-    expect(page).to have_content("must be unique")
+    expect(page).to have_text("must be unique")
 
     fill_in "extension[label]", with: "Clone Test"
     click_button "Save"
 
-    expect(page).to have_content("Clone Test")
+    expect(page).to have_text("Clone Test")
   end
 
   it "deletes", :js do
@@ -86,14 +86,14 @@ RSpec.describe "Extensions", :db do
       accept_prompt { click_button "Delete" }
     end
 
-    expect(page).to have_no_content(extension.label)
+    expect(page).to have_no_text(extension.label)
   end
 
   it "views gallery", :aggregate_failures do
     Hanami.app.start :trmnl_api
     visit routes.path(:extensions_gallery)
 
-    expect(page).to have_content("Gallery")
-    expect(page).to have_content("connection")
+    expect(page).to have_text("Gallery")
+    expect(page).to have_text("connection")
   end
 end
diff --git a/spec/features/firmware_spec.rb b/spec/features/firmware_spec.rb
index f7e43f98..0a734437 100644
--- a/spec/features/firmware_spec.rb
+++ b/spec/features/firmware_spec.rb
@@ -13,16 +13,16 @@ RSpec.describe "Firmware", :db do
     click_link "New"
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "firmware[version]", with: "0.0.0"
     click_button "Save"
 
-    expect(page).to have_content("is missing")
+    expect(page).to have_text("is missing")
     attach_file "Attachment", path
     click_button "Save"
 
-    expect(page).to have_content("0.0.0")
+    expect(page).to have_text("0.0.0")
   end
 
   it "edits", :aggregate_failures, :js do
@@ -32,23 +32,23 @@ RSpec.describe "Firmware", :db do
     fill_in "firmware[version]", with: nil
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "firmware[version]", with: "0.0.1"
     click_button "Save"
 
-    expect(page).to have_content("0.0.1")
+    expect(page).to have_text("0.0.1")
 
     click_link "Edit"
     attach_file "Attachment", path
     click_button "Save"
 
-    expect(page).to have_content("0.0.1")
+    expect(page).to have_text("0.0.1")
 
     visit routes.path(:firmware)
     accept_prompt { click_button "Delete" }
 
-    expect(page).to have_no_content("0.0.1")
+    expect(page).to have_no_text("0.0.1")
   end
 
   it "deletes", :js do
@@ -56,6 +56,6 @@ RSpec.describe "Firmware", :db do
     visit routes.path(:firmware)
     accept_prompt { click_button "Delete" }
 
-    expect(page).to have_no_content(firmware.version)
+    expect(page).to have_no_text(firmware.version)
   end
 end
diff --git a/spec/features/login_spec.rb b/spec/features/login_spec.rb
index 33050e0a..5ed7cca2 100644
--- a/spec/features/login_spec.rb
+++ b/spec/features/login_spec.rb
@@ -10,13 +10,13 @@ RSpec.describe "Login", :db do
     check "Logout all Logged In Sessions?"
     click_button "Logout"
 
-    expect(page).to have_content "Please log in to continue."
+    expect(page).to have_text "Please log in to continue."
 
     fill_in "Email", with: user.email
     fill_in "Password", with: "password"
     click_button "Login"
 
-    expect(page).to have_content "You have been logged in."
+    expect(page).to have_text "You have been logged in."
   end
 
   it "logs out but can't log in when account is not verified" do
@@ -29,7 +29,7 @@ RSpec.describe "Login", :db do
     fill_in "Password", with: "password"
     click_button "Login"
 
-    expect(page).to have_content "Your account requires verification before proceeding. " \
-                                 "Please contact administration for access"
+    expect(page).to have_text "Your account requires verification before proceeding. " \
+                              "Please contact administration for access"
   end
 end
diff --git a/spec/features/models_spec.rb b/spec/features/models_spec.rb
index a24ba2d8..3dda66ec 100644
--- a/spec/features/models_spec.rb
+++ b/spec/features/models_spec.rb
@@ -12,12 +12,12 @@ RSpec.describe "Models", :db do
 
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "model[name]", with: "test"
     click_button "Save"
 
-    expect(page).to have_content("Test")
+    expect(page).to have_text("Test")
   end
 
   it "edits", :aggregate_failures, :js do
@@ -27,12 +27,12 @@ RSpec.describe "Models", :db do
     fill_in "model[label]", with: nil
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "model[label]", with: "Edit Test"
     click_button "Save"
 
-    expect(page).to have_content("Edit Test")
+    expect(page).to have_text("Edit Test")
   end
 
   it "clones", :aggregate_failures, :js do
@@ -42,18 +42,18 @@ RSpec.describe "Models", :db do
     fill_in "model[name]", with: nil
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "model[name]", with: "test"
     click_button "Save"
 
-    expect(page).to have_content("must be unique")
+    expect(page).to have_text("must be unique")
 
     fill_in "model[label]", with: "Clone Test"
     fill_in "model[name]", with: "clone_test"
     click_button "Save"
 
-    expect(page).to have_content("Clone Test")
+    expect(page).to have_text("Clone Test")
   end
 
   it "deletes", :js do
@@ -64,6 +64,6 @@ RSpec.describe "Models", :db do
       accept_prompt { click_button "Delete" }
     end
 
-    expect(page).to have_no_content(model.label)
+    expect(page).to have_no_text(model.label)
   end
 end
diff --git a/spec/features/playlists_spec.rb b/spec/features/playlists_spec.rb
index 4c51120d..3681673f 100644
--- a/spec/features/playlists_spec.rb
+++ b/spec/features/playlists_spec.rb
@@ -12,12 +12,12 @@ RSpec.describe "Playlists", :db do
 
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "playlist[name]", with: "test"
     click_button "Save"
 
-    expect(page).to have_content("Test")
+    expect(page).to have_text("Test")
   end
 
   it "edits", :aggregate_failures, :js do
@@ -27,12 +27,12 @@ RSpec.describe "Playlists", :db do
     fill_in "playlist[label]", with: nil
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "playlist[label]", with: "Edit Playlist"
     click_button "Save"
 
-    expect(page).to have_content("Edit Playlist")
+    expect(page).to have_text("Edit Playlist")
   end
 
   it "clones", :aggregate_failures, :js do
@@ -42,18 +42,18 @@ RSpec.describe "Playlists", :db do
     fill_in "playlist[name]", with: nil
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "playlist[name]", with: "test"
     click_button "Save"
 
-    expect(page).to have_content("must be unique")
+    expect(page).to have_text("must be unique")
 
     fill_in "playlist[label]", with: "Clone Test"
     fill_in "playlist[name]", with: "clone_test"
     click_button "Save"
 
-    expect(page).to have_content("Clone Test")
+    expect(page).to have_text("Clone Test")
   end
 
   it "deletes", :js do
@@ -64,13 +64,13 @@ RSpec.describe "Playlists", :db do
       accept_prompt { click_button "Delete" }
     end
 
-    expect(page).to have_no_content(playlist.label)
+    expect(page).to have_no_text(playlist.label)
   end
 
   it "plays screenshow", :aggregate_failures, :js do
     visit routes.path(:playlist_screens, playlist_id: playlist.id)
 
-    expect(page).to have_content("No screens found.")
+    expect(page).to have_text("No screens found.")
 
     items = (1..3).map do |position|
       Factory[
@@ -86,35 +86,35 @@ RSpec.describe "Playlists", :db do
     visit routes.path(:playlists)
     click_link "Play"
 
-    expect(page).to have_content(playlist.label)
+    expect(page).to have_text(playlist.label)
     expect(page).to have_css(%(#progress[value="0"]))
     expect(page).to have_css(%(#progress[max="2"]))
-    expect(page).to have_content("1 of 3")
+    expect(page).to have_text("1 of 3")
 
     click_link "Next"
 
     expect(page).to have_css(%(#progress[value="1"]))
-    expect(page).to have_content("2 of 3")
+    expect(page).to have_text("2 of 3")
 
     click_link "Next"
 
     expect(page).to have_css(%(#progress[value="2"]))
-    expect(page).to have_content("3 of 3")
+    expect(page).to have_text("3 of 3")
 
     click_link "Previous"
 
     expect(page).to have_css(%(#progress[value="1"]))
-    expect(page).to have_content("2 of 3")
+    expect(page).to have_text("2 of 3")
 
     click_link "First"
 
     expect(page).to have_css(%(#progress[value="0"]))
-    expect(page).to have_content("1 of 3")
+    expect(page).to have_text("1 of 3")
 
     click_link "Last"
 
     expect(page).to have_css(%(#progress[value="2"]))
-    expect(page).to have_content("3 of 3")
+    expect(page).to have_text("3 of 3")
   end
 
   it "mirrors to device", :aggregate_failures, :js do
@@ -126,11 +126,11 @@ RSpec.describe "Playlists", :db do
     check device.label
     click_button "Save"
 
-    expect(page).to have_content(playlist.label)
+    expect(page).to have_text(playlist.label)
 
     click_link "Mirror"
     click_link "Cancel"
 
-    expect(page).to have_content(playlist.label)
+    expect(page).to have_text(playlist.label)
   end
 end
diff --git a/spec/features/problem_details_spec.rb b/spec/features/problem_details_spec.rb
index d81edc12..07cc0117 100644
--- a/spec/features/problem_details_spec.rb
+++ b/spec/features/problem_details_spec.rb
@@ -5,6 +5,6 @@ require "hanami_helper"
 RSpec.describe "Problem Details", :db do
   it "renders page" do
     visit routes.path(:problem_details)
-    expect(page).to have_content("Problem Details")
+    expect(page).to have_text("Problem Details")
   end
 end
diff --git a/spec/features/registration_spec.rb b/spec/features/registration_spec.rb
index e97c7db4..c25513c8 100644
--- a/spec/features/registration_spec.rb
+++ b/spec/features/registration_spec.rb
@@ -24,13 +24,13 @@ RSpec.describe "Registration", :db do
     fill_in "Confirm Email", with: "bogus"
     click_button "Create"
 
-    expect(page).to have_content "logins do not match"
+    expect(page).to have_text "logins do not match"
 
     fill_in "Confirm Email", with: "jill@test.io"
     fill_in "Password", with: "password-123"
     click_button "Create"
 
-    expect(page).to have_content "Your account has been created"
+    expect(page).to have_text "Your account has been created"
   end
 
   it "registers multiple users for the default account", :aggregate_failures do
@@ -41,7 +41,7 @@ RSpec.describe "Registration", :db do
     fill_in "Password", with: "password-123"
     click_button "Create"
 
-    expect(page).to have_content "Your account has been created"
+    expect(page).to have_text "Your account has been created"
     expect(database[:user].where(email: "jill@test.io").first).to include(status_id: 2)
 
     visit "/logout"
@@ -55,7 +55,7 @@ RSpec.describe "Registration", :db do
     fill_in "Password", with: "password-123"
     click_button "Create"
 
-    expect(page).to have_content "Your account requires verification before proceeding. " \
-                                 "Please contact administration for access"
+    expect(page).to have_text "Your account requires verification before proceeding. " \
+                              "Please contact administration for access"
   end
 end
diff --git a/spec/features/screens_spec.rb b/spec/features/screens_spec.rb
index d9d66d7e..b2cb9bd5 100644
--- a/spec/features/screens_spec.rb
+++ b/spec/features/screens_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe "Screens", :db do
     click_link "New"
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     select model.label, from: "screen[model_id]"
     fill_in "screen[label]", with: "Test"
@@ -21,7 +21,7 @@ RSpec.describe "Screens", :db do
     attach_file "Image", path
     click_button "Save"
 
-    expect(page).to have_content("Test")
+    expect(page).to have_text("Test")
   end
 
   it "edits", :aggregate_failures, :js do
@@ -31,19 +31,19 @@ RSpec.describe "Screens", :db do
     click_link "Edit"
     click_button "Save"
 
-    expect(page).to have_content(model.label)
+    expect(page).to have_text(model.label)
 
     click_link "Edit"
     fill_in "screen[label]", with: nil
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "screen[label]", with: "Edit Test"
     attach_file "Image", path
     click_button "Save"
 
-    expect(page).to have_content("Edit Test")
+    expect(page).to have_text("Edit Test")
   end
 
   it "deletes", :js do
@@ -54,6 +54,6 @@ RSpec.describe "Screens", :db do
       accept_prompt { click_button "Delete" }
     end
 
-    expect(page).to have_no_content(screen.label)
+    expect(page).to have_no_text(screen.label)
   end
 end
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index 0f3972ee..79154dfa 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe "Users", :db do
     fill_in "Name", with: "Test User"
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "Email", with: "test@test.io"
     fill_in "Password", with: "test-1234567890"
@@ -17,7 +17,7 @@ RSpec.describe "Users", :db do
 
     click_button "Save"
 
-    expect(page).to have_content("test@test.io")
+    expect(page).to have_text("test@test.io")
   end
 
   it "edits", :aggregate_failures, :js do
@@ -31,13 +31,13 @@ RSpec.describe "Users", :db do
     fill_in "Name", with: nil
     click_button "Save"
 
-    expect(page).to have_content("must be filled")
+    expect(page).to have_text("must be filled")
 
     fill_in "Name", with: "Test User"
     select "Closed", from: "Status"
     click_button "Save"
 
-    expect(page).to have_content("Test User")
-    expect(page).to have_content("Closed")
+    expect(page).to have_text("Test User")
+    expect(page).to have_text("Closed")
   end
 end