 ;; Reading
 (require 'kindly-init)
 
-;(load-library "auto-complete-init")
-;(load-library "multi-web-mode-init")
-;(load-library "sql-init")
-;(load-library "yaml-init")
-;(load-library "geben-init")
+                                        ;(load-library "auto-complete-init")
+                                        ;(load-library "multi-web-mode-init")
+                                        ;(load-library "sql-init")
+                                        ;(load-library "yaml-init")
+                                        ;(load-library "geben-init")
 ;;(load-library "etags-init")
 ;;(load-library "etags-table-init")
-;(load-library "puppet-init")
-;(load-library "nix-init")
-;(load-library "emacsclient-init")
-;(load-library "cmake-init")
-;(load-library "diatheke-init")
-;(load-library "function-args-init")
-;(load-library "graphiz-init")
+                                        ;(load-library "puppet-init")
+                                        ;(load-library "nix-init")
+                                        ;(load-library "emacsclient-init")
+                                        ;(load-library "cmake-init")
+                                        ;(load-library "diatheke-init")
+                                        ;(load-library "function-args-init")
+                                        ;(load-library "graphiz-init")
 
 ;; Save desktop on exit, load saved desktop on startup.
-;(setq desktop-dirname             "~/.emacs.d/desktop/"
-;  desktop-base-file-name      "emacs24.desktop"
-;  desktop-base-lock-name      "emacs24.lock"
-;  desktop-path                (list desktop-dirname)
-;  desktop-save                t
-;  desktop-files-not-to-save   "^$" ;reload tramp paths
-;  desktop-load-locked-desktop nil
-;)
-;(desktop-save-mode 1)
+                                        ;(setq desktop-dirname             "~/.emacs.d/desktop/"
+                                        ;  desktop-base-file-name      "emacs24.desktop"
+                                        ;  desktop-base-lock-name      "emacs24.lock"
+                                        ;  desktop-path                (list desktop-dirname)
+                                        ;  desktop-save                t
+                                        ;  desktop-files-not-to-save   "^$" ;reload tramp paths
+                                        ;  desktop-load-locked-desktop nil
+                                        ;)
+                                        ;(desktop-save-mode 1)
 
-;; themes directory
-(add-to-list 'custom-theme-load-path "~/.emacs.d/themes")
-(load-theme 'odersky t)
-(load-theme 'org-beautify t)
+;; themes directory (only if not running in terminal!)
+(if (display-graphic-p)
+    (progn
+      (add-to-list 'custom-theme-load-path "~/.emacs.d/themes")
+      (load-theme 'odersky t)
+      (load-theme 'org-beautify t))
+  (progn
+    ;; For when running in a terminal
+    (require 'terminal-mode-init)))
 
 (require 'transparent-window)
 (load custom-file)
-(require 'terminal-mode-init)
 
 (set-default 'server-socket-dir "~/.emacs.d/server")
 (if (functionp 'window-system)
-  (when (and (window-system)
-    (>= emacs-major-version 24))
-   (server-start)))
+    (when (and (window-system)
+               (>= emacs-major-version 24))
+      (server-start)))
 
 (benchmark-init/deactivate)

;; Allow for UTF-8 in place of utf-8
(define-coding-system-alias 'UTF-8 'utf-8)

; Display clock and line and column numbers.
(display-time)
(line-number-mode 1)
(column-number-mode 1)


(if (string= system-name "scotus")
    (progn
                                        ; Email and user's name.
      (setq user-mail-address "Tim.Hawes@inin.com")

      (setq message-send-mail-function 'smtpmail-send-it
