     (add-to-list 'custom-theme-load-path "~/mblair_src/dotfiles/")
     ))
 
-;; (load-theme 'telstar t)
-(load-theme 'zenburn t)
+(load-theme 'telstar t)
 
 (add-to-list 'load-path (concat go-location "misc/emacs"))
 (require 'go-mode-load)

(require 'package)

(setq package-archives '(("ELPA" . "http://tromey.com/elpa/")
                         ("gnu" . "http://elpa.gnu.org/packages/")
                         ("marmalade" . "http://marmalade-repo.org/packages/")
			 ("melpa" . "http://melpa.milkbox.net/packages/")))

(package-initialize)
(when (not package-archive-contents)

(set-face-attribute 'default nil :height 160)
(set-face-attribute 'default nil :family "Ubuntu Mono")

;; (load-theme 'zenburn t)

;; http://stackoverflow.com/questions/7616761/even-when-emacsclient-is-started-in-a-terminal-window-system-is-non-nil
(defun color-config (&optional frame)
  (select-frame frame)
  (if window-system (load-theme 'solarized-dark t)
    (load-theme 'zenburn t)))

;; for emacsclient:
(add-hook 'after-make-frame-functions 'color-config)

;; for regular emacs:
(color-config (selected-frame))

(if (equal system-type 'darwin)
    (progn
