diff --git a/core/core-modules.el b/core/core-modules.el
index 75d6ed623..46ba3d029 100644
--- a/core/core-modules.el
+++ b/core/core-modules.el
@@ -19,7 +19,8 @@
     (:emacs (electric-indent (:emacs electric))
             (hideshow (:editor fold)))
     (:ui (doom-modeline (:ui modeline)))
-    (:ui (fci (:ui fill-column))))
+    (:ui (fci (:ui fill-column)))
+    (:ui (evil-goggles (:ui ophints))))
   "An alist of deprecated modules, mapping deprecated modules to an optional new
 location (which will create an alias). Each CAR and CDR is a (CATEGORY .
 MODULES). E.g.
diff --git a/init.example.el b/init.example.el
index d65856947..b38fd7718 100644
--- a/init.example.el
+++ b/init.example.el
@@ -22,17 +22,17 @@
        doom              ; what makes DOOM look the way it does
        doom-dashboard    ; a nifty splash screen for Emacs
        doom-quit         ; DOOM quit-message prompts when you quit Emacs
-       evil-goggles      ; display visual hints when editing in evil
        ;;fill-column       ; a `fill-column' indicator
        hl-todo           ; highlight TODO/FIXME/NOTE tags
        ;;indent-guides     ; highlighted indent columns
        modeline          ; snazzy, Atom-inspired modeline, plus API
        nav-flash         ; blink the current line after jumping
        ;;neotree           ; a project drawer, like NERDTree for vim
-       treemacs          ; a project drawer, like neotree but cooler
+       ophints           ; highlight the region an operation acts on
        (popup            ; tame sudden yet inevitable temporary windows
         +all             ; catch all popups that start with an asterix
         +defaults)       ; default popup rules
+       treemacs          ; a project drawer, like neotree but cooler
        ;;pretty-code       ; replace bits of code with pretty symbols
        ;;tabbar            ; FIXME an (incomplete) tab bar for Emacs
        ;;unicode           ; extended unicode support for various languages
diff --git a/modules/ui/evil-goggles/README.org b/modules/ui/evil-goggles/README.org
deleted file mode 100644
index a358d75be..000000000
--- a/modules/ui/evil-goggles/README.org
+++ /dev/null
@@ -1,16 +0,0 @@
-#+TITLE: :ui evil-goggles
-
-This module uses ~evil goggles~ to displays visual hints when editing with evil.
-
-* Table of Contents :TOC:
-- [[#install][Install]]
-- [[#configure][Configure]]
-
-* Install
-This module requires:
-
-+ ~evil~ (inherently tied to evil mode)
-
-* Configure
-By default, ~evil-goggles~ will be enabled by default and requires no additional configuration.
-
diff --git a/modules/ui/evil-goggles/packages.el b/modules/ui/evil-goggles/packages.el
deleted file mode 100644
index a4140cf69..000000000
--- a/modules/ui/evil-goggles/packages.el
+++ /dev/null
@@ -1,5 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; ui/evil-goggles/packages.el
-
-(when (featurep! :feature evil)
-  (package! evil-goggles))
diff --git a/modules/ui/ophints/README.org b/modules/ui/ophints/README.org
new file mode 100644
index 000000000..49868b9b0
--- /dev/null
+++ b/modules/ui/ophints/README.org
@@ -0,0 +1,23 @@
+#+TITLE:   ui/ophints
+#+DATE:    June 4, 2017
+#+SINCE:   v2.0
+#+STARTUP: inlineimages
+
+* Table of Contents :TOC_3:noexport:
+- [[#description][Description]]
+  - [[#module-flags][Module Flags]]
+  - [[#plugins][Plugins]]
+
+* Description
+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.
+
+Uses ~evil-goggles~ for evil users and ~volatile-highlights~ otherwise.
+
+** Module Flags
+This module provides no flags.
+
+** Plugins
++ [[https://github.com/edkolev/evil-goggles/][evil-goggles]]*
++ [[https://github.com/k-talo/volatile-highlights.el][volatile-highlights]]*
diff --git a/modules/ui/evil-goggles/config.el b/modules/ui/ophints/config.el
similarity index 57%
rename from modules/ui/evil-goggles/config.el
rename to modules/ui/ophints/config.el
index df185ac11..1382822d5 100644
--- a/modules/ui/evil-goggles/config.el
+++ b/modules/ui/ophints/config.el
@@ -1,4 +1,4 @@
-;;; ui/evil-goggles/config.el -*- lexical-binding: t; -*-
+;;; ui/ophints/config.el -*- lexical-binding: t; -*-
 
 (def-package! evil-goggles
   :when (featurep! :feature evil)
@@ -12,3 +12,13 @@
         evil-goggles-enable-change nil)
   :config
   (evil-goggles-mode +1))
+
+
+(def-package! volatile-highlights
+  :unless (featurep! :feature evil)
+  :after-call pre-command-hook
+  :config
+  (volatile-highlights-mode)
+  (after! undo-tree
+    (vhl/define-extension 'undo-tree 'undo-tree-yank 'undo-tree-move)
+    (vhl/install-extension 'undo-tree)))
diff --git a/modules/ui/ophints/packages.el b/modules/ui/ophints/packages.el
new file mode 100644
index 000000000..44502c727
--- /dev/null
+++ b/modules/ui/ophints/packages.el
@@ -0,0 +1,6 @@
+;; -*- no-byte-compile: t; -*-
+;;; ui/ophints/packages.el
+
+(if (featurep! :feature evil)
+    (package! evil-goggles)
+  (package! volatile-highlights))