refactor and update the emacs theme