diff --git a/modules/module-ruby.el b/modules/module-ruby.el
index 58f7c1e6e..3df3ab665 100644
--- a/modules/module-ruby.el
+++ b/modules/module-ruby.el
@@ -4,15 +4,8 @@
 (eval-when-compile (require 'defuns-quickrun))
 
 (use-package ruby-mode
-  :mode (("\\.rb$"        . ruby-mode)
-         ("\\.ru$"        . ruby-mode)
-         ("\\.rake$"      . ruby-mode)
-         ("\\.gemspec$"   . ruby-mode)
-         ("\\.?pryrc$"    . ruby-mode)
-         ("/Gemfile$"     . ruby-mode)
-         ("/Capfile$"     . ruby-mode)
-         ("/Vagrantfile$" . ruby-mode)
-         ("/Rakefile$"    . ruby-mode))
+  :mode ("\\.r[bu]$" "\\.rake$" "\\.gemspec$" "\\.?pryrc$"
+         "/\\(Gem\\|Cap\\|Vagrant\\|Rake\\)file$")
   :interpreter "ruby"
   :init
   (add-hook! ruby-mode 'narf|enable-tab-width-2)
diff --git a/modules/module-web.el b/modules/module-web.el
index 98361e103..b9cf074ca 100644
--- a/modules/module-web.el
+++ b/modules/module-web.el
@@ -13,10 +13,7 @@
   :config (require 'sws-mode))
 
 (use-package web-mode
-  :mode (("\\.\\(p\\)?htm\\(l\\)?$"         . web-mode)
-         ("\\.tpl\\(\\.php\\)?$"            . web-mode)
-         ("\\.erb$"                         . web-mode)
-         ("wp-content/themes/.+/.+\\.php$"  . web-mode))
+  :mode ("\\.\\(p\\)?htm\\(l\\)?$" "\\.tpl\\(\\.php\\)?$" "\\.erb$" "wp-content/themes/.+/.+\\.php$")
   :init
   (add-hook! web-mode 'narf|enable-tab-width-2)
   (setq web-mode-markup-indent-offset  2