diff --git a/.spacemacs b/.spacemacs
index b22a9a343cf9057e0daf5761c979b1d8b1de7f84..83af1265cae4a2d8dc8acdea176cf5986cda4db1 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -577,19 +577,30 @@ before packages are loaded."
 ;; make the agenda view pretty
 (setq org-agenda-skip-scheduled-if-done nil
       org-agenda-skip-deadline-if-done nil
+      org-agenda-skip-timestamp-if-done nil
+      org-agenda-skip-comment-trees nil
+      org-agenda-skip-deadline-prewarning-if-scheduled nil
+      org-agenda-skip-scheduled-delay-if-deadline nil
+      org-agenda-skip-scheduled-if-deadline-is-shown nil
       org-agenda-include-deadlines t
       org-agenda-include-diary t
+      org-agenda-include-inactive-timestamps nil
+      org-agenda-todo-ignore-deadlines nil
+      org-agenda-todo-ignore-scheduled nil
+      org-agenda-todo-ignore-timestamp nil
+      org-agenda-todo-ignore-with-date nil
+      org-agenda-todo-list-sublevels t
 ;     org-agenda-todo-ignore-scheduled 'future
 ;     org-agenda-block-separator nil
 ;     org-agenda-compact-blocks nil
 ;     org-agenda-time-grid '((daily today require-timed) "----------------------" nil)
 ;     org-agenda-time-grid nil
-      org-agenda-start-with-log-mode t
+;      org-agenda-start-with-log-mode nil
       org-agenda-compact-blocks nil)
 (setq org-super-agenda-groups
       '(;; Each group has an implicit boolean OR operator between its selectors.
          (:name "Finished"
-                :todo ("CANCELED" "DONE")
+                :todo ("DONE" "CANCELED")
                 :order 120)
          (:name "Emergency!"
                 :priority>= "0"