 ;; Add load paths
 (add-to-list 'load-path "~/.emacs.d/scripts/")
 
+;; Configure duplicate buffer name uniqueness
+;; Names will look like "foo:a" and "foo:b"
+;; TODO: This doesn't seem to be working correctly yet...
+(require 'uniquify)
+(setq 
+  uniquify-buffer-name-style 'post-forward
+  uniquify-separator ":")
+
 ;; Themes - http://emacsthemes.caisah.info/
-;(use-package twilight-anti-bright-theme :ensure t)            ; Best so far
-(use-package badger-theme :ensure t)                           ; Cool, but not my favorite
+;(use-package twilight-anti-bright-theme :ensure t)
+(use-package badger-theme :ensure t)
 ;(use-package dakrone-theme :ensure t)
-;(load-theme 'tango-dark)                                      ; A little too mild
+;(load-theme 'tango-dark)
 ;; (use-package color-theme-sanityinc-tomorrow
 ;;   :ensure t
 ;;   :config

    ;; Configure paths
    (setq org-directory "~/Notes")
    (setq org-default-notes-file (concat org-directory "/Inbox.org"))
    (setq org-blank-before-new-entry
	  '((heading . t)
	    (plain-list-item . auto)))

    ;; Configure the agenda
    (setq org-agenda-window-setup 'other-window)
    (setq org-agenda-files
	  '("~/Notes/Inbox.org" 
	    "~/Notes/Habits.org" 

    (evilnc-default-hotkeys)
    (global-set-key (kbd "s-/") 'evilnc-comment-or-uncomment-lines)))

;; Add org-mode git repository to the load path
(add-to-list 'load-path (expand-file-name "~/.emacs.d/org-mode/lisp"))

(use-package org
  :ensure t
  :config
