diff --git a/config.ini b/config.ini
index 927c474..adfa441 100644
--- a/config.ini
+++ b/config.ini
@@ -17,7 +17,8 @@ files:
 [home kitty]
 when: host.has('kitty')
 files:
-  kitty/kitty.conf > .config/kitty/kitty.conf
+  kitty/kitty.conf > ~/.config/kitty/kitty.conf
+  desktop/kitty.desktop > ~/.local/share/applications/kitty.desktop
 
 [link-files rofi]
 when: host.has('rofi')
@@ -25,9 +26,13 @@ target_root: ~/.config
 files:
   rofi
 
-[run vim-plugins]
-when: host.has('vim')
-cmd: vim +PluginInstall +qall
+# This needs to be run, but it's really annoying when you run the installer
+# from within Vim because it tries to do this recursive Vim thing that does not
+# work, so I'd rather just run it by hand.
+#
+# [run vim-plugins]
+# when: host.has('vim')
+# cmd: vim +PluginInstall +qall
 
 [link-files neovim:windows]
 when: host.is_windows and host.has('nvim')
@@ -109,9 +114,14 @@ crates:
   cargo-edit
   cargo-get
 
+[link-files gitui:linux]
+when: host.is_linux and host.has('gitui')
+target_root: ~/.config
+files:
+  gitui
+
 [link-files gitui:windows]
 when: host.is_windows and host.has('gitui')
 target_root: ~/AppData/Roaming
 files:
   gitui
-
diff --git a/desktop/kitty.desktop b/desktop/kitty.desktop
new file mode 100644
index 0000000..0f8360d
--- /dev/null
+++ b/desktop/kitty.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=kitty
+GenericName=Terminal emulator
+Comment=Fast, feature-rich, GPU based terminal
+TryExec=kitty
+Exec=kitty --single-instance
+Icon=kitty
+# Path=/home/jordan/dev/kitty/kitty/launcher
+# Terminal=false
diff --git a/vimrc b/vimrc
index eaf262a..630ecda 100644
--- a/vimrc
+++ b/vimrc
@@ -399,6 +399,7 @@ cabbrev ~ $HOME
 " ctrl-k to go to the next tab
 tnoremap <C-k> <C-w>:tabnext<CR>
 
+
 " ctrl-j to go to the previous tab
 tnoremap <C-j> <C-w>:tabprevious<CR>
 
@@ -410,6 +411,12 @@ tnoremap <C-n><C-n> <C-w>:tabnew<CR>
 tnoremap <C-n><o> <C-w>:tab term<CR>
 tnoremap <C-n><C-o> <C-w>:tab term<CR>
 
+nnoremap <F1> :bnext!<CR>
+tnoremap <F1> <C-\><C-n>:bnext!<CR>
+nnoremap <F2> :term ++curwin<CR>
+nnoremap <F3> :belo term<CR>
+
+
 let g:terminal_ansi_colors = [
   \ '#929292',
   \ '#e27373',