diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el
index df3ab6012..60b1af9b2 100644
--- a/modules/lang/data/config.el
+++ b/modules/lang/data/config.el
@@ -17,7 +17,7 @@
 
 
 (def-package! json-mode
-  :mode "\\.js\\(on\\|[hl]int\\(rc\\)?\\)$"
+  :mode "\\.js\\(?:on\\|[hl]int\\(rc\\)?\\)$"
   :config
   (when (featurep! :feature syntax-checker)
     (add-hook 'json-mode-hook #'flycheck-mode))
@@ -30,17 +30,18 @@
   (set! :company-backend 'nxml-mode '(company-nxml company-yasnippet)))
 
 
-(def-package! toml-mode :mode "\\.toml$")
+(def-package! toml-mode
+  :mode "\\.toml$")
 
 
 (def-package! vimrc-mode
   :mode "/\\.?g?vimrc$"
-  :mode "\\.vim$"
-  :mode "\\.?vimperatorrc$"
-  :mode "\\.vimp$")
+  :mode "\\.vimp?$"
+  :mode "\\.?vimperatorrc$")
 
 
-(def-package! yaml-mode :mode "\\.ya?ml$")
+(def-package! yaml-mode
+  :mode "\\.ya?ml$")
 
 
 ;;
diff --git a/modules/lang/java/config.el b/modules/lang/java/config.el
index fd6619ea9..8be32f44c 100644
--- a/modules/lang/java/config.el
+++ b/modules/lang/java/config.el
@@ -22,7 +22,7 @@
 
 
 (def-package! groovy-mode
-  :mode "\\.g\\(radle\\|roovy\\)$"
+  :mode "\\.g\\(?:radle\\|roovy\\)$"
   :config
   (set! :eval 'groovy-mode "groovy"))
 
diff --git a/modules/lang/markdown/config.el b/modules/lang/markdown/config.el
index de879f12f..276518abd 100644
--- a/modules/lang/markdown/config.el
+++ b/modules/lang/markdown/config.el
@@ -3,7 +3,7 @@
 (def-package! markdown-mode
   :mode "/README$"
   :mode ("/README\\.md$" . gfm-mode)
-  :mode "\\.m\\(d\\|arkdown\\)$"
+  :mode "\\.m\\(?:d\\|arkdown\\)$"
   :init
   (setq markdown-enable-wiki-links t
         markdown-enable-math t
diff --git a/modules/lang/plantuml/config.el b/modules/lang/plantuml/config.el
index 8d7f7d259..cb66d1495 100644
--- a/modules/lang/plantuml/config.el
+++ b/modules/lang/plantuml/config.el
@@ -1,7 +1,7 @@
 ;;; lang/plantuml/config.el -*- lexical-binding: t; -*-
 
 (def-package! plantuml-mode
-  :mode "\\.p\\(lant\\)?uml$"
+  :mode "\\.p\\(?:lant\\)?uml$"
   :init
   (setq plantuml-jar-path (concat doom-etc-dir "plantuml.jar")
         org-plantuml-jar-path plantuml-jar-path)
diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index 0359c841c..3d4fd3ae3 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -15,8 +15,8 @@
   :mode "\\.rb$"
   :mode "\\.rake$"
   :mode "\\.gemspec$"
-  :mode "\\.\\(pry\\|irb\\)rc$"
-  :mode "/\\(Gem\\|Cap\\|Vagrant\\|Rake\\|Pod\\|Puppet\\|Berks\\)file$"
+  :mode "\\.\\(?:pry\\|irb\\)rc$"
+  :mode "/\\(?:Gem\\|Cap\\|Vagrant\\|Rake\\|Pod\\|Puppet\\|Berks\\)file$"
   :interpreter "ruby"
   :config
   (set! :company-backend 'ruby-mode '(company-dabbrev-code))
diff --git a/modules/lang/scala/config.el b/modules/lang/scala/config.el
index 510f903e0..b5a2a1bf0 100644
--- a/modules/lang/scala/config.el
+++ b/modules/lang/scala/config.el
@@ -1,7 +1,7 @@
 ;;; lang/scala/config.el -*- lexical-binding: t; -*-
 
 (def-package! scala-mode
-  :mode "\\.s\\(cala\\|bt\\)$"
+  :mode "\\.s\\(?:cala\\|bt\\)$"
   :config (setq scala-indent:align-parameters t))
 
 
diff --git a/modules/lang/web/+html.el b/modules/lang/web/+html.el
index 6e93acb6f..9cf432438 100644
--- a/modules/lang/web/+html.el
+++ b/modules/lang/web/+html.el
@@ -2,7 +2,7 @@
 
 (def-package! web-mode
   :mode "\\.p?html?$"
-  :mode "\\.\\(tpl\\|blade\\)\\(\\.php\\)?$"
+  :mode "\\.\\(?:tpl\\|blade\\)\\(\\.php\\)?$"
   :mode "\\.erb$"
   :mode "\\.jsp$"
   :mode "\\.as[cp]x$"