diff --git a/modules/languages/siren-conf.el b/modules/languages/siren-conf.el
index fe5a9d4..f7a380b 100644
--- a/modules/languages/siren-conf.el
+++ b/modules/languages/siren-conf.el
@@ -9,7 +9,13 @@
 (require 'siren-prog-mode)
 
 (use-package conf-mode
-  :mode "Procfile\\'" "\\.conf\\'" "\\.cfg\\'"
+  :mode
+  "/Procfile\\'"
+  "/\\.env\\'"
+  "/\\.env\\.[^/]+\\'"
+  "\\.cfg\\'"
+  "\\.conf\\'"
+
   :hook (conf-mode . siren-conf-mode-setup)
 
   :init
diff --git a/modules/languages/siren-dockerfile.el b/modules/languages/siren-dockerfile.el
index b014810..074a9bd 100644
--- a/modules/languages/siren-dockerfile.el
+++ b/modules/languages/siren-dockerfile.el
@@ -7,7 +7,10 @@
 ;;; Code:
 
 (use-package dockerfile-mode
-  :mode "/Dockerfile\\'" "/Dockerfile\\..+\\'"
+  :mode
+  "/Dockerfile\\'"
+  "/Dockerfile\\.[^/]+\\'"
+
   :hook (dockerfile-mode . siren-dockerfile-mode-setup)
 
   :init
diff --git a/modules/languages/siren-sh.el b/modules/languages/siren-sh.el
index dcd3619..d984253 100644
--- a/modules/languages/siren-sh.el
+++ b/modules/languages/siren-sh.el
@@ -9,9 +9,12 @@
 (use-package sh-script
   :straight (:type built-in)
   :mode
-  "\\.tmux"
-  "\\.tmuxsh"
-  "\\.tmuxtheme"
+  "\\.tmux\\'"
+  "\\.tmuxsh\\'"
+  "\\.tmuxtheme\\'"
+  "zshenv\\'"
+  "zshrc\\'"
+
   :hook
   (sh-mode . siren-sh-mode-setup)
 
diff --git a/modules/workspaces/siren-persp-mode.el b/modules/workspaces/siren-persp-mode.el
index 5d83164..a186859 100644
--- a/modules/workspaces/siren-persp-mode.el
+++ b/modules/workspaces/siren-persp-mode.el
@@ -59,7 +59,7 @@
           persp-auto-save-opt 0))
 
   (defun siren-persp-mode-filter-magit-buffers (buf)
-    (string-match "^magit.*:" (buffer-name buf)))
+    (string-prefix-p "magit" (buffer-name buf)))
 
   (defun siren-persp-mode-ibuffer (arg)
       (interactive "P")