--- a/.elisp/settings/50.preferences.el
+++ b/.elisp/settings/50.preferences.el
@@ -8,7 +8,6 @@
 ;; Cleanup whitespace before saves.
 (add-hook 'before-save-hook '(lambda ()
                                (if af-cleanup-whitespace (whitespace-cleanup))))
-(setq whitespace-chars (quote (tabs spaces trailing lines newline empty)))
 
 ;; Disable that startup screen
 (setq inhibit-startup-message t)
@@ -16,19 +15,6 @@
 ;; Basically everything I do is in version control, stop saving backup files
 (setq make-backup-files nil)
 
-;; Set some pretty colors that are gentler on my eyes
-(setq default-frame-alist
-      '((width . 80)
-        (cursor-color . "white")
-        (cursor-type . box)
-        (foreground-color . "white")
-        (background-color . "black")
-        )
-      )
-
-;; tell ipython we have a dark background
-(setq py-python-command-args (quote ("-i")))
-
 ; always highlight matching paren
 (show-paren-mode 1)
 
@@ -75,7 +61,6 @@
 ;; use y or n instead of yes or no
 (fset 'yes-or-no-p 'y-or-n-p)
 
-;; customized theme faces
-(custom-set-faces
- '(magit-diff-add ((t (:foreground "DarkGreen"))) 'now)
- '(magit-item-highlight ((t (:background "grey19"))) 'now))
+;; whitespace detection
+(setq whitespace-style '(trailing tabs lines-tail indentation trailing empty))
+(global-whitespace-mode 1)