diff --git a/init.el b/init.el
index a7dadce..4989a25 100644
--- a/init.el
+++ b/init.el
@@ -232,21 +232,14 @@
 	(sound-wav-play (expand-file-name (concat user-emacs-directory "elpaca/builds/org-pomodoro/resources/bell.wav")))
 	(message alert))
 
-; Org timer set timer alert sound
+; Org timer custom alert
 (defun org-timer-sound-alert ()
-  	"Sound notification on org timer finish."
+	"Sound notification on org timer finish."
 	(sound-alert "Timer done!"))
 (add-hook 'org-timer-done-hook 'org-timer-sound-alert)
-
-; System notifications of org agenda items
-(use-package org-alert
+(use-package alert
 	:ensure t
-	:after org
 	:config
-		(setq org-alert-headline-regexp "TODO\\|WAITING")
-		(setq org-agenda-skip-scheduled-if-done t)
-		(setq org-agenda-skip-deadline-if-done t)
-
 		(alert-define-style 'custom-org-alert-notification
 			:title "Custom Notification"
 			:notifier
@@ -255,14 +248,35 @@
 					(sound-alert (concat "ORG ALERT: "
 						;(plist-get info :title)
 						(plist-get info :message)))))
-
 		(setq alert-default-style 'custom-org-alert-notification)
-		(org-alert-enable)
-
-		; Update notifications whenever the agenda is refreshed
-		(add-hook 'org-finalize-agenda-hook 'org-alert-enable)
 )
 
+; System notifications of org agenda items
+(use-package org-wild-notifier
+	:ensure t
+	:after org
+	:config
+		;; Notifications fire N minutes before an event
+		(setq org-wild-notifier-alert-time '(1 10 30))
+		;; Notification title and icon
+		(setq org-wild-notifier-notification-title "Org Reminder")
+		;(setq org-wild-notifier-notification-icon "/path/to/icon.png")
+		
+		;; Alert severity: 'high, 'medium, or 'low
+		(setq org-wild-notifier--alert-severity 'high)
+		
+		;; Pass additional arguments to alert
+		(setq org-wild-notifier-extra-alert-plist '(:persistent t))
+		(org-wild-notifier-mode)
+)
+
+; Upcoming agenda items in modeline
+(use-package org-upcoming-modeline
+  :ensure t
+  :after org                               ; if you don't want it to start until org has been loaded
+  :config
+  (org-upcoming-modeline-mode))
+
 ; Org Mode Journalling
 (use-package org-journal
 	:ensure t