diff --git a/dot_config/aerc/binds.conf b/dot_config/aerc/binds.conf
index 8f0bfd3..5f53108 100644
--- a/dot_config/aerc/binds.conf
+++ b/dot_config/aerc/binds.conf
@@ -1,39 +1,96 @@
-H = :prev-tab<Enter>
-L = :next-tab<Enter>
+# Binds are of the form <key sequence> = <command to run>
+# To use '=' in a key sequence, substitute it with "Eq": "<Ctrl+Eq>"
+# If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit
+<C-p> = :prev-tab<Enter>
+<C-n> = :next-tab<Enter>
+<C-t> = :term<Enter>
 
 [messages]
 q = :quit<Enter>
 
 j = :next<Enter>
-k = :prev<Enter>
+<Down> = :next<Enter>
+<C-d> = :next 50%<Enter>
+<C-f> = :next 100%<Enter>
 <PgDn> = :next -s 100%<Enter>
+
+k = :prev<Enter>
+<Up> = :prev<Enter>
+<C-u> = :prev 50%<Enter>
+<C-b> = :prev 100%<Enter>
 <PgUp> = :prev -s 100%<Enter>
+g = :select 0<Enter>
+G = :select -1<Enter>
+
+J = :next-folder<Enter>
+K = :prev-folder<Enter>
+
+v = :mark -t<Enter>
+V = :mark -v<Enter>
 
 <Enter> = :view<Enter>
-a = :archive flat<Enter>
-c = :compose<Enter>
-f = :forward<Enter>
-rr = :reply -q<Enter>
-ra = :reply -aq<Enter>
+d = :prompt 'Really delete this message?' 'delete-message'<Enter>
+D = :delete<Enter>
+A = :archive flat<Enter>
+
+C = :compose<Enter>
+
+rr = :reply -a<Enter>
+rq = :reply -aq<Enter>
+Rr = :reply<Enter>
+Rq = :reply -q<Enter>
+
+c = :cf<space>
+$ = :term<space>
+! = :term<space>
+| = :pipe<space>
+
+/ = :search<space>
+\ = :filter<space>
+n = :next-result<Enter>
+N = :prev-result<Enter>
 
 [view]
 q = :close<Enter>
-t = :toggle-headers<Enter>
-a = :archive flat<Enter>
+| = :pipe<space>
+D = :delete<Enter>
+S = :save<space>
+A = :archive flat<Enter>
+
 f = :forward<Enter>
-rr = :reply -q<Enter>
-ra = :reply -aq<Enter>
+rr = :reply -a<Enter>
+rq = :reply -aq<Enter>
+Rr = :reply<Enter>
+Rq = :reply -q<Enter>
+
+H = :toggle-headers<Enter>
+<C-k> = :prev-part<Enter>
+<C-j> = :next-part<Enter>
+J = :next<Enter>
+K = :prev<Enter>
 
 [compose]
+# Keybindings used when the embedded terminal is not selected in the compose
+# view
 $ex = <C-x>
+<C-k> = :prev-field<Enter>
+<C-j> = :next-field<Enter>
+<tab> = :next-field<Enter>
 
 [compose::editor]
+# Keybindings used when the embedded terminal is selected in the compose view
 $noinherit = true
 $ex = <C-x>
+<C-k> = :prev-field<Enter>
+<C-j> = :next-field<Enter>
+<C-p> = :prev-tab<Enter>
+<C-n> = :next-tab<Enter>
 
 [compose::review]
+# Keybindings used when reviewing a message to be sent
 y = :send<Enter>
 n = :abort<Enter>
+p = :postpone<Enter>
 q = :abort<Enter>
 e = :edit<Enter>
 a = :attach<space>
@@ -41,3 +98,7 @@ a = :attach<space>
 [terminal]
 $noinherit = true
 $ex = <C-x>
+
+<C-p> = :prev-tab<Enter>
+<C-n> = :next-tab<Enter>
+
diff --git a/dot_config/fontconfig/.keep b/dot_config/fontconfig/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/dot_config/fontconfig/executable_fonts.conf b/dot_config/fontconfig/executable_fonts.conf
new file mode 100644
index 0000000..60da922
--- /dev/null
+++ b/dot_config/fontconfig/executable_fonts.conf
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> 
+<fontconfig> 
+  <alias> 
+    <family>serif</family> 
+    <prefer> 
+      <family>Noto Color Emoji</family> 
+    </prefer> 
+  </alias> 
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Noto Color Emoji</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Noto Color Emoji</family>
+    </prefer>
+  </alias>
+</fontconfig>
+
diff --git a/dot_config/i3/config b/dot_config/i3/config
index 30dbd49..994b881 100644
--- a/dot_config/i3/config
+++ b/dot_config/i3/config
@@ -43,7 +43,7 @@ exec --no-startup-id picom -b
 exec --no-startup-id feh --bg-fill $HOME/.config/i3/wallpaper.jpg
 exec --no-startup-id polybar -r michael
 exec --no-startup-id dunst
-exec --no-startup-id i3-msg 'workspace 10; exec thunderbird; exec rocketchat-desktop; workspace_layout tabbed'
+exec --no-startup-id i3-msg 'workspace 10; exec rocketchat-desktop; workspace_layout tabbed'
 
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim
index efe49d7..3b66cff 100644
--- a/dot_config/nvim/init.vim
+++ b/dot_config/nvim/init.vim
@@ -14,10 +14,11 @@ exe 'source' (stdpath('config') . '/nerdtree.vim')
 Plug 'ctrlpvim/ctrlp.vim'
 let g:ctrlp_user_command = 'rg %s --files --color=never --glob ""'
 
-Plug 'kovisoft/slimv'
+Plug 'kovisoft/slimv', { 'for': 'lisp' }
 
 Plug 'mhinz/vim-startify'
 Plug 'tomasiser/vim-code-dark'
+Plug 'tpope/vim-sleuth'
 Plug 'jiangmiao/auto-pairs'
 Plug 'leafOfTree/vim-svelte-plugin'
 Plug 'tpope/vim-sleuth'
@@ -31,6 +32,7 @@ Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
 Plug 'godlygeek/tabular'
 Plug 'plasticboy/vim-markdown'
 
+Plug 'wakatime/vim-wakatime'
 Plug 'aurieh/discord.nvim', { 'do': ':UpdateRemotePlugins'}
 Plug 'wakatime/vim-wakatime'
 
diff --git a/dot_local/scripts/executable_screenshot.sh b/dot_local/scripts/executable_screenshot.sh
index b5b46f3..d4b847d 100644
--- a/dot_local/scripts/executable_screenshot.sh
+++ b/dot_local/scripts/executable_screenshot.sh
@@ -13,8 +13,8 @@ $XCLIP -selection clipboard -t image/png -i $FILE
 notify-send "captured $FILENAME"
 
 # upload it
-url=$(ssh -vv -i $HOME/.ssh/id_rsa homelab $HOME/.local/bin/file-upload $FILENAME < $FILE 2> log)
-url=${url%$'\n'}
-$XCLIP -selection clipboard <<< "$url"
-notify-send "uploaded $FILENAME"
+# url=$(ssh -vv -i $HOME/.ssh/id_rsa homelab $HOME/.local/bin/file-upload $FILENAME < $FILE 2> log)
+# url=${url%$'\n'}
+# $XCLIP -selection clipboard <<< "$url"
+# notify-send "uploaded $FILENAME"