diff --git a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-theme.el b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-theme.el
index 0bb1137e..29177377 100644
--- a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-theme.el
+++ b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-theme.el
@@ -97,6 +97,18 @@
                 ((derived-mode-p 'emacs-lisp-mode))
                 ((string-match-p "-theme" file)))
       (rainbow-mode 1)))
+  :config
+  (defun prot/rainbow-colorize-match (color &optional match)
+  "Like `rainbow-colorize-match' but works with `hl-line-mode'."
+  (let ((match (or match 0)))
+    (put-text-property
+     (match-beginning match) (match-end match)
+     'face `((:background ,(if (> 0.5 (rainbow-x-color-luminance color))
+                               "white" "black"))
+             (:foreground ,color)
+             (:inverse-video t)))))
+
+  (advice-add #'rainbow-colorize-match :override #'prot/rainbow-colorize-match)
   :bind ( :map ctl-x-x-map
           ("c" . rainbow-mode)) ; C-x x c
   :hook (emacs-lisp-mode . prot/rainbow-mode-in-themes))
diff --git a/emacs/.emacs.d/prot-emacs.org b/emacs/.emacs.d/prot-emacs.org
index e86e58f3..caf10574 100644
--- a/emacs/.emacs.d/prot-emacs.org
+++ b/emacs/.emacs.d/prot-emacs.org
@@ -1931,6 +1931,18 @@ to activate ~rainbow-mode~ if I am editing a theme file.
                 ((derived-mode-p 'emacs-lisp-mode))
                 ((string-match-p "-theme" file)))
       (rainbow-mode 1)))
+  :config
+  (defun prot/rainbow-colorize-match (color &optional match)
+  "Like `rainbow-colorize-match' but works with `hl-line-mode'."
+  (let ((match (or match 0)))
+    (put-text-property
+     (match-beginning match) (match-end match)
+     'face `((:background ,(if (> 0.5 (rainbow-x-color-luminance color))
+                               "white" "black"))
+             (:foreground ,color)
+             (:inverse-video t)))))
+
+  (advice-add #'rainbow-colorize-match :override #'prot/rainbow-colorize-match)
   :bind ( :map ctl-x-x-map
           ("c" . rainbow-mode)) ; C-x x c
   :hook (emacs-lisp-mode . prot/rainbow-mode-in-themes))