some fixes to get the colors working right on new system
Modes working