More tweaking of emacs setup