diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 01c59d2..6b881d1 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -132,6 +132,8 @@ endfunction
 :command Restoresess call RestoreSess()
 :command Removesess call RemoveSess()
 
+nnoremap <A-r> :Restoresess<cr>
+
 " Save session on quitting Vim
 autocmd VimLeave * call AutoSaveSess()
 
@@ -141,8 +143,8 @@ autocmd VimLeave * call AutoSaveSess()
 "----------------------
 
 " move between tabs
-nnoremap <A-Left>  :tabprevious<CR>
-nnoremap <A-Right> :tabnext<CR>
+nnoremap <A-h>  :tabprevious<CR>
+nnoremap <A-l>  :tabnext<CR>
 
 
 map <C-n> :NERDTreeMirrorToggle<CR>
@@ -221,6 +223,10 @@ set expandtab
 :command WQa wqa
 :command Wqa wqa
 
+" Terminal stuff
+:tnoremap <Esc> <C-\><C-n>
+:set ma
+
 let g:C_Mapfeader = ','
 nnoremap <cr> :noh<CR><CR>:<backspace>
 
@@ -235,10 +241,6 @@ smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
 \ "\<Plug>(neosnippet_expand_or_jump)"
 \: "\<TAB>"
 
-let g:deoplete#enable_smart_case = 1
-imap <expr><CR> pumvisible() ? deoplete#close_popup() : "\<CR>"
-:tnoremap <Esc> <C-\><C-n>
-
 inoremap <silent><expr> <TAB>
       \ pumvisible() ? coc#_select_confirm() :
       \ coc#expandableOrJumpable() ? "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
@@ -253,6 +255,14 @@ endfunction
 let g:coc_snippet_next = '<tab>'
 
 nnoremap <C-f> :Files<cr>
+nnoremap <C-b> :Buffers<cr>
+nnoremap ,s :split<cr>
+nnoremap .s :vsplit<cr>
+
+nnoremap <C-J> <C-W><C-J>
+nnoremap <C-K> <C-W><C-K>
+nnoremap <C-L> <C-W><C-L>
+nnoremap <C-H> <C-W><C-H>
 
 set completeopt=menu,noinsert
 
diff --git a/.zshrc b/.zshrc
index 9aa8288..790afed 100644
--- a/.zshrc
+++ b/.zshrc
@@ -70,7 +70,7 @@ alias nodeindex="node lib/index.js"
 plugins=(
   git
   archlinux
-  tig gitfast colorize command-not-found cp dirhistory sudo zsh-syntax-highlighting
+  tig gitfast colorize command-not-found cp dirhistory sudo
 )
 
 ZSH_COMPDUMP=/tmp/zcompdump-$USER
@@ -213,6 +213,7 @@ alias polybarc="$EDITOR ~/.config/polybar/config"
 alias i3c="$EDITOR ~/.config/i3/config"
 alias termitec="$EDITOR ~/.config/termite/config"
 alias rofic="$EDITOR ~/.config/rofi/config.rasi"
+alias vimrc="$EDITOR ~/.config/nvim/init.vim"
 
 alias vim="nvim"
 alias vi="vim"