Reduced header size, and some other color updates