Fix up magit colors (still not 100% happy tho)