diff --git a/+org.el b/+org.el
index 91d4247..43bd4f9 100644
--- a/+org.el
+++ b/+org.el
@@ -16,7 +16,18 @@
 (use-package! org-super-agenda
   :after org-agenda
   :init
-  (setq org-super-agenda-groups '((:auto-category t)))
+  (setq org-super-agenda-groups '((:name "Overdue"
+                                        :deadline past)
+                                (:name "Due today"
+                                        :deadline today)
+                                (:name "Important"
+                                        :priority "A")
+                                (:name "Assignments"
+                                        :tag "labs"
+                                        :order 10)
+                                (:name "Exams"
+                                        :tag "exams"
+                                        :order 10)))
   :config
   (org-super-agenda-mode))
 ;; Add timestamp to DONE task
@@ -61,8 +72,9 @@
 ;; Set up bibliography management
 (setq! +biblio-pdf-library-dir "~/Documents/Uni/TFG/bibliography/"
        +biblio-default-bibliography-files '("~/Documents/Uni/TFG/assets/bibliography.bib"))
-;; Add citeproc and metadata-file options to ox-latex
-(add-to-list 'org-pandoc-valid-options 'citeproc)
-(add-to-list 'org-pandoc-valid-options 'metadata-file)
+;; Add citeproc and metadata-file options to ox-pandoc
+(after! ox-pandoc
+  (add-to-list 'org-pandoc-valid-options 'citeproc)
+  (add-to-list 'org-pandoc-valid-options 'metadata-file))
 ;; Allow referencing by label in org-ref
 (setq org-latex-prefer-user-labels t)