- Move shadows surface responsibility - Draw shadows directly into DropShadows and InnerShadows surfaces - Draw stroke shadows directly into Strokes in order - Clean up old shadow surfaces (Shadow & Overlay)