diff --git a/core/core-ui.el b/core/core-ui.el
index c67888738..2fcc7af02 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -736,6 +736,7 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
   (run-hook-wrapped 'doom-init-ui-hook #'doom-try-run-hook))
 
 (add-hook 'doom-post-init-hook #'doom|init-ui)
+(add-hook 'prog-mode-hook #'highlight-numbers-mode)
 
 (provide 'core-ui)
 ;;; core-ui.el ends here
diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el
index ae33e0b37..7c492a6be 100644
--- a/modules/lang/cc/config.el
+++ b/modules/lang/cc/config.el
@@ -79,8 +79,7 @@ compilation database is present in the project.")
   ;;; Better fontification (also see `modern-cpp-font-lock')
   (add-hook 'c-mode-common-hook #'rainbow-delimiters-mode)
   (add-hook! '(c-mode-hook c++-mode-hook)
-    #'(highlight-numbers-mode
-       +cc|fontify-constants))
+    #'(+cc|fontify-constants))
 
   ;; Custom style, based off of linux
   (unless (assoc "doom" c-style-alist)
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index 3a14c8f09..44213cafe 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -45,7 +45,7 @@
     #'(;; 3rd-party functionality
        auto-compile-on-save-mode doom|enable-delete-trailing-whitespace
        ;; fontification
-       rainbow-delimiters-mode highlight-quoted-mode highlight-numbers-mode +emacs-lisp|extra-fontification
+       rainbow-delimiters-mode highlight-quoted-mode +emacs-lisp|extra-fontification
        ;; initialization
        +emacs-lisp|init-imenu +emacs-lisp|disable-flycheck-maybe))
 
diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index 69521d61a..8a123d636 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -22,8 +22,6 @@ is loaded.")
         python-indent-guess-indent-offset-verbose nil
         python-shell-interpreter "python")
   :config
-  (add-hook 'python-mode-hook #'highlight-numbers-mode)
-
   (set-env! "PYTHONPATH" "PYENV_ROOT")
   (set-electric! 'python-mode :chars '(?:))
   (set-repl-handler! 'python-mode #'+python/repl)
diff --git a/modules/lang/sh/config.el b/modules/lang/sh/config.el
index e739f2f00..0ae3712d6 100644
--- a/modules/lang/sh/config.el
+++ b/modules/lang/sh/config.el
@@ -15,7 +15,6 @@
   :mode ("\\.zunit\\'" . sh-mode)
   :mode ("/bspwmrc\\'" . sh-mode)
   :config
-  (add-hook 'sh-mode-hook #'highlight-numbers-mode)
   (set-electric! 'sh-mode :words '("else" "elif" "fi" "done" "then" "do" "esac" ";;"))
   (set-repl-handler! 'sh-mode #'+sh/repl)
 
diff --git a/modules/lang/web/+css.el b/modules/lang/web/+css.el
index 48f26a858..2ddacc41e 100644
--- a/modules/lang/web/+css.el
+++ b/modules/lang/web/+css.el
@@ -17,7 +17,6 @@
 (add-hook! (css-mode sass-mode stylus-mode)
   #'(yas-minor-mode-on
      flycheck-mode
-     highlight-numbers-mode
      rainbow-mode))