diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index c14b2ce..a58a4ff 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -23,8 +23,10 @@ set -g display-time 2000
 ######
 # Mouse
 ###
-setw -g mode-mouse on
-set -g mouse-select-pane on
+#setw -g mode-mouse on
+#set -g mouse-select-pane on
+
+set -g mouse on
 
 ######
 # Colors
@@ -111,8 +113,11 @@ bind r source-file ~/.tmux.conf \; display "Config Reloaded!"
 # TPM - Tmux Plugin Manager
 set -g @plugin 'tmux-plugins/tpm'
 
-# Session related
+# Resurrect sessions
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 
+# Allow for scroll-wheel copy mode
+set -g @plugin 'nhdaly/tmux-scroll-copy-mode'
+
 # Run TPM
 run '~/.tmux/plugins/tpm/tpm'
diff --git a/vim/vimrc b/vim/vimrc
index 88f24eb..3c3e8c9 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -73,12 +73,22 @@ colorscheme desert
 " Map Leader key
 let mapleader = ","
 
-" Making moving up/down work on wrapped lines of text
+" Make moving up/down work on wrapped lines of text
 nnoremap <silent> j gj
 nnoremap <silent> k gk
 nnoremap <silent> ^ g^
 nnoremap <silent> $ g$
 
+" Shift between tabs with Shift+h/l
+nnoremap <silent> <S-l> gt
+nnoremap <silent> <S-h> gT
+
+" Move between splits with CTRL+h/j/k/l
+nnoremap <silent> <C-l> <C-w>l
+nnoremap <silent> <C-k> <C-w>k
+nnoremap <silent> <C-j> <C-w>j
+nnoremap <silent> <C-h> <C-w>h
+
 " Allow saving of files as sudo when I forgot to start vim using sudo.
 cmap w!! w !sudo tee > /dev/null %