 ;;;; Load external files
 ;; =============================================================================
 
-(load-file (concat (getenv "DOTFILES") "/splitscreen/splitscreen.el"))
+(load-file (concat (md/get-dotfiles-path) "/splitscreen/splitscreen.el"))
 
 ;;;; Backups
 ;; =============================================================================
 
 ;; Backup everything to the same directory, rather than dropping
 ;; files all over the place
-(if (getenv "DOTFILES")
-    (setq backup-directory-alist
-          `(("." . ,(concat (getenv "DOTFILES") "/emacs.d.symlink/.backups")))))
+(setq backup-directory-alist
+      `(("." . ,(concat (md/get-dotfiles-path) "/emacs.d.symlink/.backups"))))
 
 ;;;; General
 (setq confirm-kill-emacs 'yes-or-no-p)

;;;; Reload
(defun md/dotfiles-reload ()
    (interactive)
    (load-file (concat (getenv "DOTFILES") "/emacs.d.symlink/init.el")))

;;;; Download and install packages
;; =============================================================================

;;;; Add "non-elpa" dir to load-path
;; =============================================================================

(let ((base (concat (md/get-dotfiles-path) "/emacs.d.symlink/non-elpa")))
  (add-to-list 'load-path base)
  (dolist (f (directory-files base)) ; Include top-level sub-directories
    (let ((name (concat base "/" f)))
