Shadow style refactor