Today
merge from keycard_color_fix