diff --git a/modules/editor/siren-doom-modeline.el b/modules/editor/siren-doom-modeline.el
index c9e2988..88d9acc 100644
--- a/modules/editor/siren-doom-modeline.el
+++ b/modules/editor/siren-doom-modeline.el
@@ -7,7 +7,7 @@
 ;;; Code:
 
 (use-package doom-modeline
-  :hook (after-init . doom-modeline-mode)
+  :hook (emacs-startup . doom-modeline-mode)
 
   :custom
   (doom-modeline-bar-width 3)
diff --git a/modules/editor/siren-edit-server.el b/modules/editor/siren-edit-server.el
index 8a29609..ff6213a 100644
--- a/modules/editor/siren-edit-server.el
+++ b/modules/editor/siren-edit-server.el
@@ -8,7 +8,7 @@
 
 (use-package edit-server
   :if window-system
-  :hook (after-init . edit-server-start)
+  :hook (emacs-startup . edit-server-start)
 
   :custom
   (edit-server-default-major-mode 'markdown-mode)
diff --git a/modules/editor/siren-undo-tree.el b/modules/editor/siren-undo-tree.el
index 279dd87..adeb8db 100644
--- a/modules/editor/siren-undo-tree.el
+++ b/modules/editor/siren-undo-tree.el
@@ -8,7 +8,7 @@
 
 (use-package undo-tree
   :hook
-  (after-init . global-undo-tree-mode)
+  (emacs-startup . global-undo-tree-mode)
 
   :bind
   ("C-x u" . undo-tree-visualize)
diff --git a/modules/projects/siren-projectile.el b/modules/projects/siren-projectile.el
index 1881fd9..84a99e5 100644
--- a/modules/projects/siren-projectile.el
+++ b/modules/projects/siren-projectile.el
@@ -8,7 +8,7 @@
 
 (use-package projectile
   :hook
-  (after-init . projectile-mode)
+  (emacs-startup . projectile-mode)
 
   :bind
   ("C-c p p" . projectile-switch-project)
diff --git a/modules/text-editing/siren-yasnippet.el b/modules/text-editing/siren-yasnippet.el
index 72efa19..25fb449 100644
--- a/modules/text-editing/siren-yasnippet.el
+++ b/modules/text-editing/siren-yasnippet.el
@@ -9,7 +9,7 @@
 (use-package yasnippet-snippets)
 
 (use-package yasnippet
-  :hook (after-init . yas-global-mode)
+  :hook (emacs-startup . yas-global-mode)
   :diminish yas-minor-mode)
 
 (provide 'siren-yasnippet)
diff --git a/modules/version-control/siren-diff-hl.el b/modules/version-control/siren-diff-hl.el
index 94787e7..4904aca 100644
--- a/modules/version-control/siren-diff-hl.el
+++ b/modules/version-control/siren-diff-hl.el
@@ -10,8 +10,8 @@
 
 (use-package diff-hl
   :hook
-  (after-init . global-diff-hl-mode)
-  (after-init . diff-hl-flydiff-mode)
+  (emacs-startup . global-diff-hl-mode)
+  (emacs-startup . diff-hl-flydiff-mode)
   (dired-mode . diff-hl-dired-mode)
   (magit-post-refresh . diff-hl-magit-post-refresh))
 
diff --git a/modules/workspaces/siren-persp-mode.el b/modules/workspaces/siren-persp-mode.el
index 871d06f..5d83164 100644
--- a/modules/workspaces/siren-persp-mode.el
+++ b/modules/workspaces/siren-persp-mode.el
@@ -8,7 +8,7 @@
 
 (use-package persp-mode
   :hook
-  (after-init . persp-mode)
+  (emacs-startup . persp-mode)
 
   :bind
   ("s-}" . persp-next)