diff --git a/.emacs b/.emacs
index a25ac20..e92ccf4 100644
--- a/.emacs
+++ b/.emacs
@@ -31,7 +31,10 @@
  '(srefactor--getter-prefix "Get")
  '(srefactor--getter-setter-capitalize-p t)
  '(srefactor--setter-prefix "Set")
- '(tab-width 4))
+ '(tab-width 4)
+ '(whitespace-style
+   (quote
+	(face trailing tabs lines-tail newline space-before-tab::tab space-before-tab::space space-before-tab tab-mark))))
 
 
 (toggle-scroll-bar -1)
@@ -382,32 +385,48 @@ header"
 ;; After Init
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (use-package zenburn-theme
-  :config (progn
-			(setq zenburn-override-colors-alist
-				  '(
-					;; ("zenburn-bg-2"     . "#000000")
-					;; ("zenburn-bg-1"     . "#2B2B2B")
-					("zenburn-bg-1"     . "#151515")
-					;; ("zenburn-bg-08"    . "#303030")
-					("zenburn-bg-08"    . "#1a1a1a")
-					;; ("zenburn-bg-05"    . "#383838")
-					("zenburn-bg-05"    . "#202020")
-					;;("zenburn-bg"       . "#3F3F3F")
-					("zenburn-bg"       . "#2b2b2b")
-					;; ("zenburn-bg+05"    . "#494949")
-					("zenburn-bg+05"    . "#393939")
-					;; ("zenburn-bg+1"     . "#4F4F4F")
-					("zenburn-bg+1"     . "#3F3F3F")
-					;; ("zenburn-bg+2"     . "#5F5F5F")
-					("zenburn-bg+2"     . "#4F4F4F")
-					;; ("zenburn-bg+3"     . "#6F6F6F")
-					("zenburn-bg+3"     . "#5F5F5F")
-					)
-				  )
+  :config
+  (setq zenburn-override-colors-alist
+		'(
+		  ;; ("zenburn-bg-2"     . "#000000")
+		  ;; ("zenburn-bg-1"     . "#2B2B2B")
+		  ("zenburn-bg-1"     . "#151515")
+		  ;; ("zenburn-bg-08"    . "#303030")
+		  ("zenburn-bg-08"    . "#1a1a1a")
+		  ;; ("zenburn-bg-05"    . "#383838")
+		  ("zenburn-bg-05"    . "#202020")
+		  ;;("zenburn-bg"       . "#3F3F3F")
+		  ("zenburn-bg"       . "#2b2b2b")
+		  ;; ("zenburn-bg+05"    . "#494949")
+		  ("zenburn-bg+05"    . "#393939")
+		  ;; ("zenburn-bg+1"     . "#4F4F4F")
+		  ("zenburn-bg+1"     . "#3F3F3F")
+		  ;; ("zenburn-bg+2"     . "#5F5F5F")
+		  ("zenburn-bg+2"     . "#4F4F4F")
+		  ;; ("zenburn-bg+3"     . "#6F6F6F")
+		  ("zenburn-bg+3"     . "#5F5F5F")
+		  )
+		)
 
-			(load-theme 'zenburn t)
-			)
-  )
+  (load-theme 'zenburn t)
+  (zenburn-with-color-variables
+	(custom-theme-set-faces
+	 'zenburn
+	 `(whitespace-space ((t (:background ,zenburn-bg :foreground ,zenburn-bg))))
+	 `(whitespace-hspace ((t (:background ,zenburn-bg+1 :foreground ,zenburn-bg+1))))
+	 `(whitespace-tab ((t (:foreground ,zenburn-bg+3))))
+	 `(whitespace-newline ((t (:foreground ,zenburn-bg+1))))
+	 `(whitespace-trailing ((t (:background ,zenburn-red))))
+	 `(whitespace-line ((t (:background ,zenburn-bg :foreground ,zenburn-magenta))))
+	 `(whitespace-space-before-tab ((t (:background ,zenburn-orange :foreground ,zenburn-orange))))
+	 `(whitespace-indentation ((t (:background ,zenburn-bg+1))))
+	 `(whitespace-empty ((t (:background ,zenburn-bg+1))))
+	 `(whitespace-space-after-tab ((t (:background ,zenburn-bg+1 :foreground ,zenburn-red))))
+	 )
+	(global-whitespace-mode 1)
+	)
+
+ )
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.