     
     (setq org-capture-templates
           '(("t" "Todo"
-             entry (file+headline "todo.org" "Inbox")
-             "* TODO %?\nAdded: %T\n")
+             entry (file "inbox.org")
+             "* TODO %? \nAdded: %T\n")
             ("m" "Multi-part Todo"
-             entry (file+headline "todo.org" "Inbox")
+             entry (file "inbox.org")
              "* TODO %? [/]\nAdded: %T\n- [ ] ")
             ("n" "Note"
              entry (file "dump.org")
-             "* %? :NOTE:\n%U\n")))
+             "* %? :NOTE:\n%U\n")
+            ("l" "Link"
+             entry (file "bookmarks.org")
+             "* %:annotation\n:PROPERTIES:\n:CREATED: %u\n:URL: %:link\n:END:\n%:initial\n%?"
+             :empty-lines 1)))
 
     ;; Tags with fast selection keys
     (setq org-tag-alist (quote ((:startgroup)

    ;;
    ;; All the agenda/capture/refile stuff is heavily influenced by http://doc.norang.ca/org-mode.html
    (setq org-agenda-window-setup (quote current-window))
    (setq org-agenda-files (list (expand-file-name "todo.org" org-directory)
                                 (expand-file-name "dump.org" org-directory)
                                 (expand-file-name "projects/" org-directory)))
    
    ;; (add-hook 'org-mode-hook 'turn-on-auto-fill)


(use-package org-bullets
  :after (org)
  :init
  (setq org-bullets-bullet-list
        '("⚫" "◉" "◎" "○"))
  :config
  (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))

