Flesh out Controls a little, and allow dimming