add magit colors, and a few extras from emacs-live