[shadow-styling] Rearrange more sections.