diff --git a/modules/ui/ophints/README.org b/modules/ui/ophints/README.org
index 181d82075..d8346e97d 100644
--- a/modules/ui/ophints/README.org
+++ b/modules/ui/ophints/README.org
@@ -5,10 +5,11 @@
 
 * Description :unfold:
 This module provides op-hints (operation hinting), i.e. visual feedback for
-certain operations. It highlights regions of text that the last operation (like
-yank) acted on.
+certain editing operations. It highlights regions of text that the last
+operation (like yank) acted on.
 
-Uses [[doom-package:evil-goggles]] for evil users and [[doom-package:volatile-highlights]] otherwise.
+Uses [[doom-package:evil-goggles]] for evil users and [[doom-package:goggles]]
+otherwise.
 
 ** Maintainers
 - [[doom-user:][@hlissner]]
@@ -20,7 +21,7 @@ Uses [[doom-package:evil-goggles]] for evil users and [[doom-package:volatile-hi
 
 ** Packages
 - [[doom-package:evil-goggles]] if [[doom-module::editor evil]]
-- [[doom-package:volatile-highlights]] unless [[doom-module::editor evil]]
+- [[doom-package:goggles]] unless [[doom-module::editor evil]]
 
 ** Hacks
 /No hacks documented for this module./
diff --git a/modules/ui/ophints/config.el b/modules/ui/ophints/config.el
index 563fc06b7..ebefc583e 100644
--- a/modules/ui/ophints/config.el
+++ b/modules/ui/ophints/config.el
@@ -63,11 +63,11 @@
                 :switch evil-goggles-enable-join
                 :advice evil-goggles--join-advice))))
 
-
-(use-package! volatile-highlights
+(use-package! goggles
   :unless (modulep! :editor evil)
-  :hook (doom-first-input . volatile-highlights-mode)
+  :hook ((prog-mode text-mode) . goggles-mode)
   :config
-  (after! undo-fu
-    (vhl/define-extension 'undo-fu 'undo-fu-only-undo 'undo-fu-only-redo)
-    (vhl/install-extension 'undo-fu)))
+  (goggles-define +goggles-general-undo undo) ; goggles only supports `primitive-undo' by default
+  (goggles-define +goggles-register-paste insert-register)
+  (goggles-define +goggles-kill-word backward-kill-word kill-word)
+  (goggles-define +goggles-undo-fu undo-fu-only-undo undo-fu-only-redo))
diff --git a/modules/ui/ophints/packages.el b/modules/ui/ophints/packages.el
index ccd75d1da..b1fcf048d 100644
--- a/modules/ui/ophints/packages.el
+++ b/modules/ui/ophints/packages.el
@@ -3,4 +3,4 @@
 
 (if (modulep! :editor evil)
     (package! evil-goggles :pin "34ca276a85f615d2b45e714c9f8b5875bcb676f3")
-  (package! volatile-highlights :pin "fcf6e2778454ce514c189a7d1fe70e03ad81c325"))
+  (package! goggles :pin "41d3669d7ae7b73bd39d298e5373ece48b656ce3"))