Take 2 on color scheme change