diff --git a/.emacs.d/site-lisp/org-init.el b/.emacs.d/site-lisp/org-init.el
index 6f28432..cccf659 100644
--- a/.emacs.d/site-lisp/org-init.el
+++ b/.emacs.d/site-lisp/org-init.el
@@ -34,24 +34,13 @@
   '(org-crypt-use-before-save-magic))
 
 (setq org-agenda-custom-commands
-      '(("pa" "Avandu" tags-todo "slug=\"avandu\"")
-        ("pb" "Blog" tags-todo "slug=\"blog\"")
-        ("pc" "Configuration" tags-todo "slug=\"configuration\"")
-        ("pd" "dispass.el" tags-todo "slug=\"dispass.el\"")
-        ("pD" "DVDroid" tags-todo "slug=\"dvdroid\"")
-        ("pe" "Eye on Manga" tags-todo "slug=\"eye-on-manga\"")
-        ("pG" "gDisPass" tags-todo "slug=\"gdispass\"")
-        ("pg" "gitto" tags-todo "slug=\"gitto\"")
-        ("pi" "Ideas" tags-todo "slug=\"ideas\"")
-        ("pM" "Maintenance" tags-todo "slug=\"maintenance\"")
-        ("pme" "Metal Express Radio.el" tags-todo
-         "slug=\"metal-express-radio.el\"")
-        ("pmo" "Mode Icons" tags-todo "slug=\"mode-icons\"")
-        ("pmy1" "myAethon" tags-todo "slug=\"myaethon\"")
-        ("pmy2" "myAethon2" tags-todo "slug=\"myaethon2\"")
-        ("ps" "Sawfish Naquadah theme" tags-todo
-         "slug=\"sawfish-naquadah-theme\"")
-        ("w" "Work todo." tags-todo "work")))
+      '(("w" "Work todo." tags-todo "work")))
+(setq org-agenda-prefix-format
+      '((agenda . " %i %-12:c%?-12t% s")
+        (timeline . "  % s")
+        (todo . " %i %-12:c %(concat \"[ \"(org-format-outline-path (org-get-outline-path)) \" ]\") ")
+        (tags . " %i %-12:c")
+        (search . " %i %-12:c")))
 (setq org-agenda-sorting-strategy
       '((agenda habit-down time-up priority-down category-keep)
         (todo priority-down category-keep)
@@ -85,6 +74,7 @@
          ,(concat org-directory "/misc/contacts.org")
          ,(concat org-directory "/misc/bookmarks.org"))
        org-agenda-files))
+(setq org-agenda-show-outline-path nil)
 (setq org-agenda-todo-ignore-deadlines 'far)
 (setq org-agenda-todo-ignore-scheduled t)
 (setq org-default-notes-file (concat org-directory "/org"))