 (desktop-save-mode 1)
 
 ;; Automatically start server
-(server-start)
+(require 'server)
+(unless (server-running-p) (server-start))
 
 
 ;;-----------------------------------------------------------------------------

(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/atom-one-dark-theme")
(load-theme 'atom-one-dark t)

;; Cursor
(setq-default cursor-type 'bar)


;; Org-mode
(setq org-mobile-directory "~/Dropbox/Apps/MobileOrg"
      org-replace-disputed-keys t
      org-src-fontify-natively t)


;;-----------------------------------------------------------------------------
