Update dist cleanup part
Migrate components from theme demo