diff --git a/config/org-mode.org b/config/org-mode.org
index 978c132..0dabbe6 100644
--- a/config/org-mode.org
+++ b/config/org-mode.org
@@ -121,6 +121,12 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
     (setq org-roam-graph-executable "dot"
           org-roam-graph-filetype "svg"))
 #+end_src
+* Calendar
+#+begin_src emacs-lisp
+  (customize-set-variable 'calendar-date-style 'iso)
+  (customize-set-variable 'calendar-mark-diary-entries-flag t)
+  (customize-set-variable 'calendar-mark-holidays-flag t)
+#+end_src
 * org-agenda
 #+begin_src emacs-lisp :results output silent
   (setq org-agenda-span 'day
@@ -128,6 +134,8 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
         org-agenda-sticky nil
         org-agenda-window-setup 'current-window
         org-agenda-tags-column 0
+        org-agenda-include-diary t
+        org-agenda-include-deadlines t
         org-agenda-todo-ignore-scheduled 'future
         org-agenda-todo-ignore-deadlines 'far
         org-agenda-prefix-format '((agenda . " %-12:c%?-12t% s")