Colors and controls tweaks