 ;; Activate powerline
 ;;------------------------------------------------------------------------------
 (require-package 'powerline)
-(add-hook 'after-init-hook 'powerline-default-theme)
-
+;; Use this if only using powerline
+;; (add-hook 'after-init-hook 'powerline-default-theme)
 ;;------------------------------------------------------------------------------
 ;; Setup theme for Org-mode
 ;; Taken from: https://github.com/howardabrams/dot-files/blob/6433f7593b6a2832ddd5806ff14cea1451fd0261/emacs-client.org

     ((t (:background "#111111"))))
   '(org-block-end-line
     ((t (:foreground "#008ED1" :background "#002E41"))))

   ;;'(mode-line ((t (:foreground "#3A85BD"))))
   ;;'(mode-line ((t (:background "#292B2D" :foreground "#3A85BD"))))
   '(mode-line-buffer-id ((t (:foreground "Black" :bold t))))
   '(which-func ((t (:foreground "green")))))

  ;; Looks like the minibuffer issues are only for v23

(defun sk/change-theme (theme org-block-style)
  "Changes the color scheme and reset the mode line."
  (funcall theme)
  (funcall org-block-style)

  (when (memq window-system '(mac ns x))
