Watch style changes more intelligently (dd prototype version)

This is essentially #387, but cherry-picked to have a common history with the redesign-live-dd branch, so we can pull these in without having to reconcile redesign-live-dd with master.