More state handling for in-progress styles