diff --git a/.gitmodules b/.gitmodules
index ff4b91f..17d089a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -79,3 +79,6 @@
 [submodule "vim/bundle/vim-neco-calc"]
 	path = vim/bundle/vim-neco-calc
 	url = https://github.com/hrsh7th/vim-neco-calc.git
+[submodule "vim/bundle/vim-fixkey"]
+	path = vim/bundle/vim-fixkey
+	url = https://github.com/drmikehenry/vim-fixkey.git
diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim
index ac8ce00..7d65654 100644
--- a/vim/config/keyboard.vim
+++ b/vim/config/keyboard.vim
@@ -460,30 +460,4 @@
         nmap <Esc>OF <End>
         imap <Esc>OF <End>
     endif
-
-    "full keyboard compatibility for tmux with xterm-keys enabled
-    if &term =~ '^screen' && exists('$TMUX')
-        execute "set <xUp>=\e[1;*A"
-        execute "set <xDown>=\e[1;*B"
-        execute "set <xRight>=\e[1;*C"
-        execute "set <xLeft>=\e[1;*D"
-        execute "set <xHome>=\e[1;*H"
-        execute "set <xEnd>=\e[1;*F"
-        execute "set <Insert>=\e[2;*~"
-        execute "set <Delete>=\e[3;*~"
-        execute "set <PageUp>=\e[5;*~"
-        execute "set <PageDown>=\e[6;*~"
-        execute "set <xF1>=\e[1;*P"
-        execute "set <xF2>=\e[1;*Q"
-        execute "set <xF3>=\e[1;*R"
-        execute "set <xF4>=\e[1;*S"
-        execute "set <F5>=\e[15;*~"
-        execute "set <F6>=\e[17;*~"
-        execute "set <F7>=\e[18;*~"
-        execute "set <F8>=\e[19;*~"
-        execute "set <F9>=\e[20;*~"
-        execute "set <F10>=\e[21;*~"
-        execute "set <F11>=\e[23;*~"
-        execute "set <F12>=\e[24;*~"
-    endif
 "}}}