diff --git a/emacs.el b/emacs.el
index 7ad08c07fb50f3b23fd2487557399157c0635f70..0c719d5cec8d7510deaba78fbec4c3268b6ab5a0 100755
--- a/emacs.el
+++ b/emacs.el
@@ -115,10 +115,10 @@ (require 'web-mode)
 (add-to-list 'auto-mode-alist '("\\.twig\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.html\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.django\\'" . web-mode))
-(setq web-mode-enable-auto-pairing t)
-(setq web-mode-enable-auto-closing t)
 (setq web-mode-enable-current-element-highlight t)
 (setq web-mode-enable-current-column-highlight t)
+;; (setq web-mode-enable-auto-pairing t)
+;; (setq web-mode-enable-auto-closing t)
 
 ;; RSS Feeds
 (setq elfeed-search-filter "@48-months-ago")
diff --git a/vimrc b/vimrc
index b8af15e659221f88bbc4bae50f8e8040e73bcba4..11bbf82b5b77668db7f0b5718f7fa9b3e2b33717 100644
--- a/vimrc
+++ b/vimrc
@@ -1,6 +1,7 @@
-set nocompatible
+" https://vimhelp.org/options.txt.html
 
 " General sane defaults.
+set nocompatible
 syntax enable
 colorscheme sorbet
 nnoremap q: <nop>
@@ -15,14 +16,15 @@ set noswapfile
 set autoread
 set wildmenu
 set autoindent
-set noesckeys
 set encoding=utf8
 set backspace=2
 set scrolloff=4
 set spelllang=en_us
 
-nnoremap <silent> <A-,> :silent :bp<CR>
-nnoremap <silent> <A-.> :silent :bn<CR>
+# Buffer navigation remaps.
+nnoremap <C-]> :bnext<cr>
+nnoremap <C-[> :bprevious<cr>
+nnoremap <C-b> :buffers<cr>
 
 " Commenting blocks of code.
 augroup commenting_blocks_of_code
@@ -40,12 +42,6 @@ " Language specific indentation.
 filetype plugin indent on
 autocmd Filetype make,go,sh setlocal noexpandtab tabstop=4 shiftwidth=4
 autocmd Filetype c,cpp,html,javascript,css,python setlocal expandtab tabstop=2 shiftwidth=2
-
-" Status Line enhancements.
-" set laststatus=2
-" set statusline=%f%m%=%y\ %{strlen(&fenc)?&fenc:'none'}\ %l:%c\ %L\ %P
-" hi StatusLine cterm=NONE ctermbg=black ctermfg=brown
-" hi StatusLineNC cterm=NONE ctermbg=black ctermfg=darkgray
 
 " Throwaway config.
 au BufReadPost *.twig set syntax=html