diff --git a/emacs/init.el b/emacs/init.el
index fc9266e..76359b0 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -1,6 +1,6 @@
 (require 'package)
 (add-to-list 'package-archives
-    '("melpa" . "https://melpa.org/packages/") t)
+	     '("melpa" . "https://melpa.org/packages/") t)
 (package-initialize)
 (package-refresh-contents)
 
@@ -11,7 +11,7 @@
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (git-gutter rainbow-delimiters auto-complete-distel ## auto-complete evil-magit evil magit))))
+    (lispy smartparens which-key git-gutter rainbow-delimiters auto-complete-distel ## auto-complete evil-magit evil magit))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -19,19 +19,46 @@
  ;; If there is more than one, they won't work right.
  )
 
+;; Autocomplete
 (require 'auto-complete)
 (global-auto-complete-mode t)
 
+;; EVIL
 (require 'evil)
 (define-key evil-normal-state-map (kbd "C-k") 'evil-scroll-up)
 (define-key evil-normal-state-map (kbd "C-j") 'evil-scroll-down)
 (evil-mode 1)
 (require 'evil-magit)
 
+;; Rainbow Delims
 (add-hook 'prog-mode-hook #'rainbow-delimiters-mode)
 
+;; Git gutter
 (global-git-gutter-mode +1)
 
+;; smartparens
+(require 'smartparens-config)
+(add-hook 'prog-mode-hook #'smartparens-mode)
+
+
 (setq cider-font-lock-dynamically '(macro core function var))
-(define-key evil-insert-state-map (kbd "C-\\") 'cider-eval-defun-up-to-point)
-(define-key evil-normal-state-map (kbd "C-\\") 'cider-eval-defun-up-to-point)
+;; These don't work yet?
+;; (define-key evil-insert-state-map (kbd "C-\\") 'cider-eval-defun-up-to-point)
+;; (define-key evil-normal-state-map (kbd "C-\\") 'cider-eval-defun-up-to-point)
+
+;; Extra things
+(global-whitespace-mode 1)
+
+(progn
+  ;; Make whitespace-mode with very basic background coloring for whitespaces.
+  ;; http://ergoemacs.org/emacs/whitespace-mode.html
+  (setq whitespace-style (quote (face spaces tabs newline space-mark tab-mark newline-mark )))
+
+  ;; Make whitespace-mode and whitespace-newline-mode use “¶” for end of line char and “▷” for tab.
+  (setq whitespace-display-mappings
+	;; all numbers are unicode codepoint in decimal. e.g. (insert-char 182 1)
+	'(
+	  (space-mark 32 [183] [46]) ; SPACE 32 「 」, 183 MIDDLE DOT 「·」, 46 FULL STOP 「.」
+	  (newline-mark 10 [182 10]) ; LINE FEED,
+	  (tab-mark 9 [8614])	     ; tab
+	  )))