Add emacs theme, some cleanup