 (define-key evil-normal-state-map [f1] 'save-buffer) ; save
 (define-key evil-normal-state-map ",w" 'save-buffer) ; save
 (define-key evil-normal-state-map ",W" ":w!") ; force save
-(define-key evil-normal-state-map ",q" ":q") ; close current window
+(define-key evil-normal-state-map ",q" 'vimlike-quit) ; close current elscreen, or current window if only one elscreen
 (define-key evil-normal-state-map ",Q" ":q!") ; close current window, *even if modified*
 (define-key evil-normal-state-map ",d" 'kill-this-buffer) ; kill current buffer without confirmation
 (define-key evil-normal-state-map ",D" 'kill-this-buffer-volatile) ; kill current buffer without confirmation, *even if modified*

	(interactive)
	(set-buffer-modified-p nil)
	(kill-this-buffer))
;}}}

; General indentation behavior {{{

;(elscreen-start)
; new vimlike "tab", aka "screen"
(define-key evil-normal-state-map ",N" 'elscreen-create)
(define-key evil-normal-state-map (kbd "C-h") 'elscreen-previous)
(define-key evil-normal-state-map (kbd "C-l") 'elscreen-next)
; }}}
