diff --git a/README.org b/README.org
index 806ec7b..78481d0 100644
--- a/README.org
+++ b/README.org
@@ -378,10 +378,10 @@ Rules and packages for buffer management and window navigation.
 (add-to-list 'package-selected-packages 'khalel)
 (use-package khalel
   :if (package-installed-p 'khalel)
-  :functions (khalel-add-capture-template)
-  :hook (org-agenda-mode . khalel-import-events)
-  :config
-  (khalel-add-capture-template)
+  :after (org-agenda)
+  :commands (khalel-add-capture-template khalel-import-events)
+  :bind ( :map org-agenda-mode-map
+          ("<remap> <org-agenda-redo>" . khalel-import-events))
   :custom
   (khalel-default-alarm "10")
   (khalel-default-calendar nil)
@@ -1021,8 +1021,9 @@ Configure email with iCalendar event support, to integrate with
   :custom
   (org-agenda-span 'week)
   (org-agenda-start-on-weekday 1)
-  (org-agenda-sticky t)
+  (org-agenda-sticky nil)
   (org-agenda-window-setup 'current-window)
+  (org-agenda-inhibit-startup t)
   (org-agenda-tags-column 0)
   (org-agenda-diary-file (expand-file-name "calendar/diary.org" org-directory))
   (org-agenda-include-diary nil)
@@ -1042,7 +1043,14 @@ Configure email with iCalendar event support, to integrate with
                      (expand-file-name "calendar" org-directory)
                      (expand-file-name "roam/journal.org" org-directory)))
   :config
-  (appt-activate +1))
+  (appt-activate +1)
+  (setq org-agenda-custom-commands
+        '(("p" "Personal Agenda" tags "+personal")
+          ("w" "Work Agenda" tags "+work"))))
+
+(with-eval-after-load 'org-agenda
+  (require 'khalel)
+  (khalel-import-events))
 
 (use-package ox-icalendar
   :after org