diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index 32bcb53..b82fa6c 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -29,7 +29,7 @@ address-book-cmd=
 
 [filters]
 subject,~^\[PATCH=awk -f /usr/share/aerc/filters/hldiff
-text/html=/usr/bin/w3m -T text/html -o display_link_number=1
+text/html=/usr/share/aerc/filters/html
 text/*=awk -f /usr/share/aerc/filters/plaintext
 
 [triggers]
diff --git a/.config/aerc/base16 b/.config/aerc/base16
new file mode 100644
index 0000000..1f35e19
--- /dev/null
+++ b/.config/aerc/base16
@@ -0,0 +1,99 @@
+# %%base16_template: aerc##default%%
+# Grab defaults for anything not explicit
+*.default=true
+
+# Use one coherent selection color unless overridden
+*.selected.fg=#c0c0c0
+*.selected.bg=#311647
+
+
+# Normal Text
+default.fg=#f0f0f0
+default.bg=#000000
+
+error.fg=#ed008c
+error.bg=#000000
+
+warning.fg=#f7c61d
+warning.bg=#000000
+
+success.fg=#65cdcd
+success.bg=#000000
+
+# Titlebars over elements
+title.fg=#b0b0b0
+title.bg=#202020
+
+# Headers in elements
+header.fg=#b0b0b0
+header.bg=#202020
+
+# Statusline
+statusline_default.fg=#c0c0c0
+statusline_default.bg=#202020
+
+statusline_error.fg=#ed008c
+statusline_error.bg=#202020
+
+statusline_success.fg=#65cdcd
+statusline_success.bg=#202020
+
+# Message List Items
+msglist_default.fg=#f0f0f0
+msglist_default.bg=#000000
+
+msglist_unread.fg=#c0c0c0
+msglist_unread.bg=#000000
+
+msglist_read.fg=#f0f0f0
+msglist_read.bg=#000000
+
+msglist_flagged.fg=#f0f0f0
+msglist_flagged.bg=#202020
+
+msglist_deleted.fg=#b0b0b0
+msglist_deleted.bg=#000000
+
+msglist_marked.fg=#f0f0f0
+msglist_marked.bg=#202020
+
+# Directory List
+dirlist_default.fg=#f0f0f0
+dirlist_default.bg=#000000
+
+# Command Completion List
+completion_default.fg=#b0b0b0
+completion_default.bg=#202020
+
+completion_gutter.fg=#b0b0b0
+completion_gutter.bg=#202020
+
+completion_pill.fg=#311647
+completion_pill.bg=#311647
+
+# Tab Bar
+tab.fg=#c0c0c0
+tab.bg=#202020
+
+# Stack UI Element
+stack.fg=
+stack.bg=
+
+# Spinner
+spinner.fg=
+spinner.bg=
+
+# UI Borders. Only BG color
+border.bg=#202020
+
+# Selection UI
+selector_default.fg=
+selector_default.bg=
+
+selector_focused.fg=
+selector_focused.bg=
+
+selector_chooser.fg=
+selector_chooser.bg=
+
+# %%base16_template_end%%
diff --git a/.mostrc b/.mostrc
index e285b20..205361c 100644
--- a/.mostrc
+++ b/.mostrc
@@ -25,7 +25,8 @@ setkey page_up "^B"
 setkey other_window "z"
 setkey other_window "w"
 setkey search_backward "?"
-setkey bob "p"
+setkey bob "g"
+setkey eob "G"
 setkey goto_mark "'"
 setkey find_file "E"
 setkey edit "v"
diff --git a/README.md b/README.md
index 99969ed..e32051b 100644
--- a/README.md
+++ b/README.md
@@ -14,3 +14,5 @@ The setup_dotfiles.py script takes the contents of this path and creates symlink
 * `python3 setup_dotfiles.py`
 
 You can run the setup script from any path and it'll figure out what to do. The script will create symlinks in your home directory matching its layout. If you want to create the tree in a different location, you'll need to open the interpreter and manually invoke `install_dotfiles()` with the correct arguments.
+
+You shouldn't do this if you're not me though because this will clobber your environment and replace it with mine. :)