Code update for theme controls.