diff --git a/vim/bundle/emmet-vim b/vim/bundle/emmet-vim
index 6adab8a..ff1aaf8 160000
--- a/vim/bundle/emmet-vim
+++ b/vim/bundle/emmet-vim
@@ -1 +1 @@
-Subproject commit 6adab8a234c7165502f555a9e0cff5c5a4f99ac0
+Subproject commit ff1aaf88a9c04d53fd23501cae2cdfc914631022
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
index 8131361..f161992 160000
--- a/vim/bundle/syntastic
+++ b/vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 81313611ae3ac45d85bd36e68d5a981bde5d5886
+Subproject commit f161992c116c9fbfaf900524acd7034586fd3309
diff --git a/vim/bundle/tcomment_vim b/vim/bundle/tcomment_vim
index a6677df..a9b7d23 160000
--- a/vim/bundle/tcomment_vim
+++ b/vim/bundle/tcomment_vim
@@ -1 +1 @@
-Subproject commit a6677df3e3e2adf59f074841966f1117e85fc02f
+Subproject commit a9b7d23a74b91d5c124de30fad146ac359f9d6a4
diff --git a/vim/bundle/unite.vim b/vim/bundle/unite.vim
index b82501c..204e56d 160000
--- a/vim/bundle/unite.vim
+++ b/vim/bundle/unite.vim
@@ -1 +1 @@
-Subproject commit b82501c01c39b6d9e098b1ec13205571271b14cc
+Subproject commit 204e56d5cddf694d084d8cf604de9f6038cef403
diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim
index 53f745a..2addd0e 100644
--- a/vim/config/keyboard.vim
+++ b/vim/config/keyboard.vim
@@ -43,6 +43,9 @@
 "
 " Mappings:
 "  (mouse)
+"    <MiddleMouse         | (N) -> enter input mode where you click
+"    <C-MiddleMouse>      | (N) -> paste text from current buffer at cursor
+"
 "    <C-LeftMouse>        | (N) -> select the current line in normal mode
 "    <C-LeftMouse>        | (I) -> select the current line in input mode
 "
@@ -247,9 +250,9 @@
 
 "MAPPINGS: GENERAL KEYBINDINGS AND REBINDINGS {{{
     "MOUSE:{
-        "hold shift to enable middle-click paste
-        noremap <S-Insert> <MiddleMouse>
-        noremap! <S-Insert> <MiddleMouse>
+        "midle click enters input mode
+        nnoremap <MiddleMouse> <LeftMouse>i
+        nnoremap <C-MiddleMouse> <LeftMouse>p
 
         "hold ctrl to scroll left/right instead of up/down
         noremap <C-ScrollWheelUp> 4zl