     (set-face-attribute 'mode-line nil :box nil)
     (set-face-attribute 'mode-line-inactive nil :box nil))
 
-  ;; (if (display-graphic-p)
-  ;;     ;; use custom theme only if Emacs run in GUI mode (and not 'emacs -nw')
   ;; (use-package zenburn-theme
   ;;   ;; the best theme there is!
   ;;   :ensure t
+  ;;   :if window-system ;; load only when GUI
   ;;   :config
   ;;   (load-theme 'zenburn t)
   ;;   ;; stylize the mode line
   ;;   (set-face-attribute 'mode-line nil :box nil)
   ;;   (set-face-attribute 'mode-line-inactive nil :box nil))
-  ;;   )
 
   (use-package dired+
     ;; advanced Dired functionality


       ;; max history (# lines) to keep (0 == keep everything)
       (setq term-buffer-maximum-size 50000)))

  ;; fix Semantic package issue of uncompressing/parsing tons of .eg.gz
  ;; files when editing certain buffers (primarily Emacs-Lisp, but also

       (define-key term-raw-map (kbd "M-&") 'nil)
       (define-key term-raw-map (kbd "M-!") 'nil)

       ;; make sure C-c t e launches a new ansi-term buffer when current
       ;; buffer is also ansi-term
       (define-key term-raw-map (kbd "C-c t e") 'nil)
