 (define-key evil-normal-state-map ",x" 'execute-extended-command)
 (define-key evil-visual-state-map ",x" 'execute-extended-command)
 (define-key evil-normal-state-map ",z" 'recenter-top-bottom)
+
+(define-key yas-minor-mode-map (kbd "<tab>") nil)
+(define-key yas-minor-mode-map (kbd "TAB") nil)
+(evil-define-key 'insert yas-minor-mode-map (kbd "C-s") 'yas-expand)
+(evil-define-key 'insert yas-minor-mode-map (kbd "C-f") 'yas-next-field)
 
 (eval-after-load 'auto-complete
   '(progn

;; TODO: Snippets.
;; TODO: Folding.
;; TODO: Statusbar colors and customisation.
;; TODO: Magit.

       (kbd "C-x 5 RET") 'ibuffer-visit-buffer-other-frame)))

;;; Leftover mode activation.
(evil-mode t)
(global-evil-surround-mode t)
