Fix class color toggling