Use vex and vex autocompletion
Use diff3 merge conflict style
Use i3lock instead of xscreensaver
Use markdown mode