Adds beginning of style overhaul of controls